diff --git a/.gitignore b/.gitignore
index a503fa2..9b74aa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /unpackage/
+/node_modules/
\ No newline at end of file
diff --git a/apiRc/company/index.js b/apiRc/company/index.js
new file mode 100644
index 0000000..ba181c1
--- /dev/null
+++ b/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
+	})
+}
diff --git a/apiRc/jobType/index.js b/apiRc/jobType/index.js
new file mode 100644
index 0000000..fa751e2
--- /dev/null
+++ b/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
+  })
+}
\ No newline at end of file
diff --git a/apiRc/login.js b/apiRc/login.js
new file mode 100644
index 0000000..74ee74b
--- /dev/null
+++ b/apiRc/login.js
@@ -0,0 +1,53 @@
+/*
+ * @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 getInfo() {
+  return request({
+    url: '/getInfo',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/apiRc/needs/person.js b/apiRc/needs/person.js
new file mode 100644
index 0000000..2297a97
--- /dev/null
+++ b/apiRc/needs/person.js
@@ -0,0 +1,34 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: lip
+ * @LastEditTime: 2025-11-03 12:48:30
+ */
+// 人员接口
+// 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
+  })
+}
diff --git a/apiRc/needs/personDemand.js b/apiRc/needs/personDemand.js
new file mode 100644
index 0000000..02eefd3
--- /dev/null
+++ b/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
+  })
+}
+
diff --git a/apiRc/person.js b/apiRc/person.js
new file mode 100644
index 0000000..ed193ff
--- /dev/null
+++ b/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',
+	})
+}
diff --git a/apiRc/personinfo/index.js b/apiRc/personinfo/index.js
new file mode 100644
index 0000000..29af896
--- /dev/null
+++ b/apiRc/personinfo/index.js
@@ -0,0 +1,49 @@
+/*
+ * @Descripttion: 
+ * @Author: lip
+ * @Date: 2025-11-03 12:35:56
+ * @LastEditors: lip
+ */
+// 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
+	})
+}
\ No newline at end of file
diff --git a/apiRc/system/dict.js b/apiRc/system/dict.js
new file mode 100644
index 0000000..5d47ae5
--- /dev/null
+++ b/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'
+  })
+}
diff --git a/main.js b/main.js
index 1a45f9f..7d6f49f 100644
--- a/main.js
+++ b/main.js
@@ -1,3 +1,8 @@
+/*
+ * @Date: 2025-11-03 10:52:09
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 17:26:29
+ */
 import App from '@/App'
 import * as Pinia from 'pinia'
 import globalFunction from '@/common/globalFunction'
@@ -13,6 +18,12 @@ 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'
 // iconfont.css 已在 App.vue 中通过 @import 引入，无需在此处重复引入
 // import Tabbar from '@/components/tabbar/midell-box.vue'
 // 自动导入 directives 目录下所有指令
@@ -27,6 +38,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 +50,23 @@ 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.$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 +85,8 @@ export function createApp() {
 
     app.use(SelectPopupPlugin);
     app.use(Pinia.createPinia());
+    // 注册vuex
+    app.use(storeRc);
 
     return {
         app,
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..a04b5bf
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,62 @@
+{
+  "name": "ks-app-employment-service",
+  "lockfileVersion": 2,
+  "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.npmjs.org/sm-crypto/-/sm-crypto-0.3.13.tgz",
+      "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==",
+      "dependencies": {
+        "jsbn": "^1.1.0"
+      }
+    }
+  },
+  "dependencies": {
+    "@dcloudio/uni-ui": {
+      "version": "1.5.11",
+      "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.11.tgz",
+      "integrity": "sha512-DBtk046ofmeFd82zRI7d89SoEwrAxYzUN3WVPm1DIBkpLPG5F5QDNkHMnZGu2wNrMEmGBjBpUh3vqEY1L3jaMw=="
+    },
+    "dayjs": {
+      "version": "1.11.19",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw=="
+    },
+    "jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
+    "sm-crypto": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.13.tgz",
+      "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==",
+      "requires": {
+        "jsbn": "^1.1.0"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..bcc7116
--- /dev/null
+++ b/package.json
@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "@dcloudio/uni-ui": "^1.5.11",
+    "dayjs": "^1.11.19",
+    "sm-crypto": "^0.3.13"
+  }
+}
diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue
index aa2a086..c11cc7d 100644
--- a/packageA/pages/UnitDetails/UnitDetails.vue
+++ b/packageA/pages/UnitDetails/UnitDetails.vue
@@ -47,43 +47,31 @@
           <view class="Detail-title"><text class="title">在招职位</text></view>
           <template v-if="companyInfo.jobInfoList.length != 0">
             <view v-for="job in companyInfo.jobInfoList" :key="job.id">
-              <view class="cards" @click="navTo(`/packageA/pages/post/post?jobId=${JSON.stringify(job)}`)">
+              <!-- @click="navTo(`/packageA/pages/post/post?jobId=${JSON.stringify(job)}`)" -->
+              <view class="cards" :style="getItemBackgroundStyle('bj2.png')">
                 <view class="card-company">
                   <text class="company">{{ job.jobTitle }}</text>
-                  <view class="salary"> {{ job.salaryRange }}元 </view>
+                  <view class="salary"> ￥{{ job.salaryRange }}/月 </view>
                 </view>
-                <view class="card-companyName">{{ job.companyName }}</view>
-                <view class="card-companyName">{{ job.jobDescription }}</view>
                 <view class="card-tags">
-                  <view class="tag">
-                    {{ job.educationRequirement }}
-                  </view>
-                  <view class="tag">
+                  <view class="tag jy">
+									  <image :src="`${baseUrl}/jobfair/jy.png`" mode=""></image>
                     {{ job.experienceRequirement }}
                   </view>
-                  <!-- <view class="tag">
-                 {{ vacanciesTo(job.vacancies) }}
-                </view> -->
-                  <view class="tag" v-if="job.jobRequirement">
+                  <view class="tag xl">
+									<image :src="`${baseUrl}/jobfair/xx.png`" mode=""></image>
+                    {{ job.educationRequirement }}
+                  </view>
+                  <view class="tag yd" v-if="job.jobRequirement">
+									<image :src="`${baseUrl}/jobfair/lx-1.png`" mode=""></image>
                     {{ job.jobRequirement }}
                   </view>
                 </view>
-                <view class="card-bottom">
-                  <view>{{ job.postingDate }}</view>
-                  <view>
-                    <convert-distance
-                      :alat="job.latitude"
-                      :along="job.longitude"
-                      :blat="latitude"
-                      :blong="longitude"
-                    ></convert-distance>
-                    <dict-Label
-                      class="mar_le10"
-                      dictType="area"
-                      :value="job.jobLocationAreaCode"
-                    ></dict-Label>
+                <view class="card-companyName">
+									<image :src="`${baseUrl}/jobfair/hd.png`" mode=""></image>
+                  {{ job.jobDescription }}
                   </view>
-                </view>
+
               </view>
             </view>
           </template>
@@ -95,15 +83,14 @@
 </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 config from "@/config.js";
 import { storeToRefs } from "pinia";
 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,
@@ -112,7 +99,17 @@ const pageState = reactive({
   maxPage: 1,
   pageSize: 10,
 });
-const companyInfo = ref({});
+const companyInfo = ref({
+  jobInfoList: [],
+});
+
+const baseUrl = config.imgBaseUrl;
+const getItemBackgroundStyle = (imageName) => ({
+  backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
+  backgroundSize: "100% 100%", // 覆盖整个容器
+  backgroundPosition: "center", // 居中
+  backgroundRepeat: "no-repeat",
+});
 
 onLoad((options) => {
   companyInfo.value = JSON.parse(options.job);
@@ -268,6 +265,7 @@ image {
       box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
       border-radius: 20rpx 20rpx 20rpx 20rpx;
       margin-top: 22rpx;
+      padding-bottom: 18rpx;
 
       .card-company {
         display: flex;
@@ -275,15 +273,15 @@ image {
         align-items: flex-start;
 
         .company {
-          font-weight: 500;
+          font-weight: 600;
           font-size: 32rpx;
           color: #333333;
         }
 
         .salary {
-          font-weight: 500;
+          font-weight: 600;
           font-size: 28rpx;
-          color: #4C6EFB;
+          color: #F83A3C;
           white-space: nowrap;
           line-height: 48rpx;
         }
@@ -292,27 +290,53 @@ image {
       .card-companyName {
         font-weight: 400;
         font-size: 28rpx;
-        color: #6C7282;
+        color: #fff;
+        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 35rpx;
+          image{
+            width: 24rpx;
+            height: 24rpx;
+            margin-right: 8rpx;
+          }
+        .jy {
+          background: #D9EDFF;
+          color: #0086FF;
+        }
+
+        .xl {
+          background: #FFF1D5;
+          color: #FF7F01;
+        }
+        .yd {
+          background: #FFD8D8;
+          color: #F83A3C;
+        }
 
         .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;
+          display: flex;
+          align-items: center;
         }
       }
 
diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue
index b2cbab3..2219672 100644
--- a/packageA/pages/exhibitors/exhibitors.vue
+++ b/packageA/pages/exhibitors/exhibitors.vue
@@ -68,31 +68,37 @@
 						<text class="title">参会单位（{{ companyList.length }}）</text>
 					</view>
 					<view v-for="job in companyList" :key="job.id">
-					    <view class="cards" @click="navTo('/packageA/pages/UnitDetails/UnitDetails?job='+JSON.stringify(job))">
-					        <view class="card-company">
-					            <text class="company line_1">{{ job.companyName }}</text>
-					        </view>
-					        <view class="card-bottom">
-					            <view class="fl_box fs_14">
-					                {{ job.scale }}
-					            </view>
-					            <view class="ris">
-					                <text class="fs_14">
-					                    在招职位·
-					                    <text class="color_256BFA">{{ job.jobInfoList.length || '-' }}</text>
-					                    个
-					                </text>
-					            </view>
-					        </view>
-					        <view class="card-tags">
-					            <view class="tag" v-if="job.industry">
-					                {{ job.industry }}
-					            </view>
-					            <view class="tag">
-					                {{ job.companyType }}
-					            </view>
-					        </view>
-					    </view>
+						<view class="cards" :style="getItemBackgroundStyle('bj.png')"
+							@click="navTo('/packageA/pages/UnitDetails/UnitDetails?job='+JSON.stringify(job))">
+							<view class="card-company">
+								<view class="company line_1">
+									<image :src="`${baseUrl}/jobfair/mc.png`" mode=""></image>
+									{{ job.companyName }}
+								</view>
+								<view class="ris">
+									<text class="fs_14">
+										在招职位：
+										{{ job.jobInfoList.length || '-' }}
+										个
+									</text>
+								</view>
+							</view>
+							<view class="card-bottom">
+								<view class="fl_box fs_14">
+									{{ job.scale }}
+								</view>
+							</view>
+							<view class="card-tags">
+								<view class="tag" v-if="job.industry">
+									<image :src="`${baseUrl}/jobfair/hy.png`" mode=""></image>
+									{{ job.industry }}
+								</view>
+								<view class="tag">
+									<image :src="`${baseUrl}/jobfair/lx.png`" mode=""></image>
+									{{ job.companyType }}
+								</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</scroll-view>
@@ -109,7 +115,7 @@
 </template>
 
 <script setup>
-	import point from '@/static/icon/point.png';
+	import config from "@/config.js"
 	import {
 		reactive,
 		inject,
@@ -142,6 +148,14 @@
 	const fairInfo = ref({});
 	const companyList = ref([]);
 	const hasnext = ref(true);
+
+	const baseUrl = config.imgBaseUrl
+	const getItemBackgroundStyle = (imageName) => ({
+		backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
+		backgroundSize: '100% 100%', // 覆盖整个容器
+		backgroundPosition: 'center', // 居中
+		backgroundRepeat: 'no-repeat'
+	});
 	onLoad((options) => {
 		getCompanyInfo(options.jobFairId);
 	});
@@ -241,19 +255,24 @@
 		// 判断状态：0 开始中，1 过期，2 待开始
 		let status = 0;
 		let statusText = '开始中';
+		let color = '#13C57C'; // 进行中 - 绿色
 		if (now < startTime) {
 			status = 2; // 待开始
 			statusText = '待开始';
+			color = '#015EEA'; // 未开始 - 蓝色
 		} else if (now > endTime) {
 			status = 1; // 已过期
 			statusText = '已过期';
+			color = '#999999'; // 已过期 - 灰色
 		} else {
 			status = 0; // 进行中
 			statusText = '进行中';
+			color = '#13C57C'; // 进行中 - 绿色
 		}
 		return {
 			status, // 0: 进行中，1: 已过期，2: 待开始
 			statusText,
+			color
 		};
 	}
 
@@ -291,25 +310,30 @@
 		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 {
 				flex: 1;
+
 				.row1 {
 					font-weight: 500;
 					font-size: 32rpx;
 					color: #333333;
 					font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
 				}
+
 				.row2 {
 					font-weight: 400;
 					font-size: 28rpx;
@@ -348,6 +372,7 @@
 					align-items: center;
 					justify-content: space-between;
 					white-space: nowrap;
+
 					.info-title {
 						font-weight: 600;
 						font-size: 28rpx;
@@ -496,10 +521,19 @@
 					display: flex;
 					justify-content: space-between;
 					align-items: flex-start;
+
 					.company {
-						font-weight: 500;
+						font-weight: 600;
 						font-size: 32rpx;
 						color: #333333;
+						display: flex;
+						align-items: center;
+						image {
+							width: 30rpx;
+							height: 30rpx;
+							margin-right: 10rpx;
+
+						}
 					}
 
 					.salary {
@@ -508,6 +542,13 @@
 						white-space: nowrap;
 						line-height: 48rpx;
 					}
+
+					.ris {
+						background: #53ACFF;
+						color: #fff;
+						padding: 7rpx 20rpx;
+						border-radius: 8rpx;
+					}
 				}
 
 				.card-companyName {
@@ -519,25 +560,33 @@
 				.card-tags {
 					display: flex;
 					flex-wrap: wrap;
+
 					.tag {
 						width: fit-content;
 						height: 30rpx;
-						background: #F4F4F4;
+						background: #E0F0FF;
 						border-radius: 4rpx;
-						padding: 6rpx 20rpx;
+						padding: 6rpx 26rpx;
 						line-height: 30rpx;
 						font-weight: 400;
 						font-size: 24rpx;
-						color: #6C7282;
+						color: #595959;
 						text-align: center;
 						margin-top: 14rpx;
 						white-space: nowrap;
+						display: flex;
+						align-items: center;
 						margin-right: 20rpx;
+						image{
+							width: 22rpx;
+							height: 22rpx;
+							margin-right: 8rpx;
+						}
 					}
 				}
 
 				.card-bottom {
-					margin-top: 32rpx;
+					margin-top: 15rpx;
 					display: flex;
 					justify-content: space-between;
 					font-size: 28rpx;
@@ -552,14 +601,17 @@
 		justify-content: space-between;
 		align-items: center;
 		padding: 24rpx 30rpx 10rpx 30rpx;
+
 		.time-left,
 		.time-right {
 			text-align: center;
+
 			.left-date {
 				font-weight: 500;
 				font-size: 48rpx;
 				color: #333333;
 			}
+
 			.left-dateDay {
 				font-weight: 400;
 				font-size: 24rpx;
@@ -567,23 +619,27 @@
 				margin-top: 12rpx;
 			}
 		}
+
 		.line {
 			width: 40rpx;
 			height: 0rpx;
 			border: 2rpx solid #D4D4D4;
 			margin-top: 64rpx;
 		}
+
 		.time-center {
 			text-align: center;
 			display: flex;
 			flex-direction: column;
 			justify-content: center;
 			align-items: center;
+
 			.center-date {
 				font-weight: 400;
 				font-size: 28rpx;
 				color: #FF881A;
 			}
+
 			.center-dateDay {
 				font-weight: 400;
 				font-size: 24rpx;
diff --git a/packageA/pages/myResume/myResume.vue b/packageA/pages/myResume/myResume.vue
index 3950683..babf046 100644
--- a/packageA/pages/myResume/myResume.vue
+++ b/packageA/pages/myResume/myResume.vue
@@ -122,7 +122,7 @@
         </view>
 
         <!-- 4. 新增：简历上传区域（固定在页面底部） -->
-        <!-- <view class="resume-upload-section">
+        <view class="resume-upload-section">
             <button class="upload-btn" @click="handleResumeUpload" :loading="isUploading" :disabled="isUploading">
                 <uni-icons type="cloud-upload" size="20"></uni-icons>
                 <text class="upload-text">
@@ -138,7 +138,7 @@
                 <text class="file-name">{{ uploadedResumeName }}</text>
                 <button class="delete-file-btn" size="mini" @click.stop="handleDeleteResume">删除</button>
             </view>
-        </view> -->
+        </view>
     </view>
 </template>
 
@@ -267,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%;
diff --git a/packageB/train/mockExam/examList.vue b/packageB/train/mockExam/examList.vue
index f9364ae..fa2ad83 100644
--- a/packageB/train/mockExam/examList.vue
+++ b/packageB/train/mockExam/examList.vue
@@ -1,6 +1,30 @@
 <template>
 	<div class="app-box">
 		<div class="con-box">
+			<template #headContent>
+			    <view class="collection-search">
+			        <view class="search-content">
+			            <view class="header-input button-click">
+			                <uni-icons class="iconsearch" color="#6A6A6A" type="search" size="22"></uni-icons>
+			                <input
+			                    class="input"
+			                    v-model="searchKeyword"
+			                    @confirm="searchVideo"
+			                    placeholder="输入考试名称"
+			                    placeholder-class="inputplace"
+			                />
+			                <uni-icons 
+			                    v-if="searchKeyword" 
+			                    class="clear-icon" 
+			                    type="clear" 
+			                    size="24" 
+			                    color="#999" 
+			                    @click="clearSearch"
+			                />
+			            </view>
+			        </view>
+			    </view>
+			</template>
 			<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
 				<div class="cards">
 					<div class="cardHead">
@@ -17,18 +41,53 @@
 						<div class="conten">及格分数：60分</div>
 						<div class="conten">截止日期：2025-12-31</div>
 					</div>
+					<div class="flooter">
+						<div @click="jumps('/packageB/train/mockExam/viewGrades')">查看成绩</div>
+						<div>详情</div>
+						<div>收藏</div>
+					</div>
 				</div>
 				<div class="cards"></div>
 				<div class="cards"></div>
 			</scroll-view>
 		</div>
+		<div class="cards2" v-if="dialogVisible">
+			<div class="cardCon">
+				<div class="cardHead">
+					<div></div>
+					<div style="font-size: 40rpx;" @click="clones()">×</div>
+				</div>
+				
+			</div>
+		</div>
 	</div>
 </template>
 
-<script>
+<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 searchKeyword = ref('');
+const pageState = reactive({
+    page: 0,
+    list: [],
+    total: 0,
+    maxPage: 1,
+    pageSize: 12,
+    search: {},
+});
+const baseUrl = config.imgBaseUrl
+const dialogVisible = ref(false);
 const handleScrollToLower = () => {
     
 };
+function jumps(url){
+	navTo(url);
+}
+function clones(){
+	dialogVisible.value=false
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -46,6 +105,48 @@ const handleScrollToLower = () => {
 		padding: 20rpx 28rpx;
 		box-sizing: border-box;
 		overflow: hidden;
+		.collection-search{
+		    padding: 10rpx 20rpx;
+		    .search-content{
+		        position: relative
+		        display: flex
+		        align-items: center
+		        padding: 14rpx 0
+		        .header-input{
+		            padding: 0
+		            width: calc(100%);
+		            position: relative
+		            .iconsearch{
+		                position: absolute
+		                left: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		            }
+		            .input{
+		                padding: 0 80rpx 0 80rpx
+		                height: 80rpx;
+		                background: #FFFFFF;
+		                border-radius: 75rpx 75rpx 75rpx 75rpx;
+		                border: 2rpx solid #ECECEC
+		                font-size: 28rpx;
+		            }
+		            .clear-icon{
+		                position: absolute
+		                right: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		                cursor: pointer
+		            }
+		            .inputplace{
+		                font-weight: 400;
+		                font-size: 28rpx;
+		                color: #B5B5B5;
+		            }
+		        }
+		    }
+		}
 		.main-scroll {
 		    width: 100%;
 		    height: 100%;
@@ -57,7 +158,7 @@ const handleScrollToLower = () => {
 				border-radius: 12rpx;
 				border: 2px solid #EDF5FF;
 				margin-bottom: 30rpx;
-				padding: 30rpx 40rpx;
+				padding: 30rpx 40rpx 0;
 				box-sizing: border-box
 				.cardHead{
 					display: flex;
@@ -128,8 +229,44 @@ const handleScrollToLower = () => {
 						margin-bottom: 20rpx;
 					}
 				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+					}
+				}
 			}
 		}
 	}
+	.cards2{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100vh;
+		background-color: rgba(0,0,0,0.5);
+		z-index: 10000;
+		padding: 100rpx 50rpx;
+		box-sizing: border-box;
+		.cardCon{
+			height: 100%;
+			background-color: #fff;
+			padding: 20rpx;
+			box-sizing: border-box;
+			.cardHead{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+			
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/packageB/train/mockExam/viewGrades.vue b/packageB/train/mockExam/viewGrades.vue
new file mode 100644
index 0000000..5bd0ad2
--- /dev/null
+++ b/packageB/train/mockExam/viewGrades.vue
@@ -0,0 +1,65 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+			<div class="tabCon">
+				<div class="tabLeft">
+					<div><span>考试名称：</span>456546456</div>
+					<div><span>考试时间：</span>456546456</div>
+					<div><span>考试成绩：</span>456546456</div>
+				</div>
+				<div class="tabRight">查看</div>
+				<div class="tabLeft"></div>
+				<div class="tabRight">查看</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style lang="stylus" scoped>
+.app-box{
+	width: 100%;
+	height: 100vh;
+	position: relative;
+	.con-box{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top:0;
+		z-index: 10;
+		padding: 20rpx 28rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+		.tabCon{
+			border-top: 1px solid #ccc;
+			border-left: 1px solid #ccc;
+			display: flex;
+			flex-wrap: wrap;
+			.tabLeft{
+				width: 80%;
+				height: 140rpx;
+				border-bottom: 1px solid #ccc;
+				border-right: 1px solid #ccc;
+				box-sizing: border-box;
+				view{
+					line-height: 45rpx
+				}
+			}
+			.tabRight{
+				width: 20%;
+				height: 140rpx;
+				border-bottom: 1px solid #ccc;
+				border-right: 1px solid #ccc;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				text-align: center;
+				line-height: 140rpx;
+				color: #2175F3;
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/packageRc/api/company/index.js b/packageRc/api/company/index.js
new file mode 100644
index 0000000..ba181c1
--- /dev/null
+++ b/packageRc/api/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
+	})
+}
diff --git a/packageRc/api/jobType/index.js b/packageRc/api/jobType/index.js
new file mode 100644
index 0000000..fa751e2
--- /dev/null
+++ b/packageRc/api/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
+  })
+}
\ No newline at end of file
diff --git a/packageRc/api/login.js b/packageRc/api/login.js
new file mode 100644
index 0000000..f1b2016
--- /dev/null
+++ b/packageRc/api/login.js
@@ -0,0 +1,50 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: lip
+ * @LastEditTime: 2025-11-03 12:51:45
+ */
+import request from '@/utilsRc/request'
+
+// 登录方法
+export function login(data) {
+  return request({
+    method: 'post',
+    url: '/personnel/personBaseInfo/loginGrAndQy',
+    data,
+    headers: {
+      isToken: false
+    }
+  })
+}
+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
+    }
+  })
+}
+
+
diff --git a/packageRc/api/needs/person.js b/packageRc/api/needs/person.js
new file mode 100644
index 0000000..2297a97
--- /dev/null
+++ b/packageRc/api/needs/person.js
@@ -0,0 +1,34 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: lip
+ * @LastEditTime: 2025-11-03 12:48:30
+ */
+// 人员接口
+// 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
+  })
+}
diff --git a/packageRc/api/needs/personDemand.js b/packageRc/api/needs/personDemand.js
new file mode 100644
index 0000000..02eefd3
--- /dev/null
+++ b/packageRc/api/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
+  })
+}
+
diff --git a/packageRc/api/personinfo/index.js b/packageRc/api/personinfo/index.js
new file mode 100644
index 0000000..29af896
--- /dev/null
+++ b/packageRc/api/personinfo/index.js
@@ -0,0 +1,49 @@
+/*
+ * @Descripttion: 
+ * @Author: lip
+ * @Date: 2025-11-03 12:35:56
+ * @LastEditors: lip
+ */
+// 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
+	})
+}
\ No newline at end of file
diff --git a/packageRc/components/PopupLists.vue b/packageRc/components/PopupLists.vue
new file mode 100644
index 0000000..589cf89
--- /dev/null
+++ b/packageRc/components/PopupLists.vue
@@ -0,0 +1,374 @@
+<template>
+	<view>
+		<view class="popupAll">
+			<view class="tabList dispalyF" v-if="!allCheckShow">
+				<scroll-view scroll-x style="white-space: nowrap;width: calc(100% - 144rpx);margin-left: 32rpx">
+					<view class="rightView">
+						<view
+							@click="getTopActive(newCkeckData[0], index, item)"
+							:class="
+								index == newCkeckData[0].activeIndex
+									? 'popupItem-active tabItem rightView'
+									: 'popupItem tabItem rightView'
+							"
+							v-for="(item, index) in newCkeckData[0] && newCkeckData[0].data"
+							:key="index"
+							style="display: inline-block; margin-right: 15rpx;margin-bottom: 0"
+						>
+							{{ item.dictLabel }}
+						</view>
+					</view>
+				</scroll-view>
+				<view class="tabrightBtnOut" @click="allCheckShowChange">
+					<image
+						class="tabrightBtn"
+						src="https://rc.jinan.gov.cn/qcwjyH5/static/images/getMoreCheck.png"
+						mode=""
+					></image>
+				</view>
+			</view>
+			<view class="popupListAll" v-if="allCheckShow">
+				<view
+					class="popupList"
+					v-for="(item, index) in newCkeckData"
+					:key="index"
+				>
+					<view class="tabTitle">
+						{{ item.name }}
+					</view>
+					<view
+						class="dispalyF"
+						:style="[
+							{
+								position: 'sticky',
+								top: '-2rpx',
+								zIndex: 1,
+								flexWrap: 'wrap',
+							},
+						]"
+					>
+						<template>
+							<template v-for="(itm, idx) in item.data">
+								<view :key="idx" v-if="!itm.mode"
+									@click="getActive(itm, index, idx)"
+									:class="
+										idx == item.activeIndex
+										? 'popupItem-active'
+										: 'popupItem'
+										"
+									style="margin-right: 20rpx"
+								>
+									{{ itm.dictLabel }}
+								</view>
+								<!-- <view v-if="itm.mode == 'timerange'">
+									{{itm.start||'开始时间'}} - {{ item.end||'结束时间' }}
+								</view> -->
+							</template>
+						</template>
+					</view>
+				</view>
+				<!-- <view class="search_btn" @click="search">
+					查询
+				</view> -->
+				<view class="bottom-search">
+					<view class="search-left" @click="clearAll">
+						清空
+					</view>
+					<view class="search-right" @click="search">查询</view>
+				</view>
+				<view class="popupPic" @click="close">
+					<u-icon name="arrow-up"></u-icon>
+				</view>
+			</view>
+
+			<view class="gropo" v-if="allCheckShow"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: "popupList",
+	props: {
+		checkData: {
+			type: Array,
+			default: [],
+		},
+	},
+	data() {
+		return {
+			newCkeckData: this.checkData,
+			allCheckShow: false,
+			params: "",
+			fijItem: "",
+			outData: [],
+			nickName: ''
+		};
+	},
+	watch: {
+		checkData(newVal) {
+			this.newCkeckData = newVal;
+		},
+		allCheckShow(newVal) {
+			this.$parent.zctopShow = newVal;
+		},
+	},
+	mounted() {
+    if (uni.getStorageSync("userInfo")) {
+      let userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+      this.nickName = userInfo.userName ? userInfo.userName : "";
+    }
+	},
+	methods: {
+		allCheckShowChange() {
+			this.allCheckShow = !this.allCheckShow;
+		},
+		search() {
+			this.allCheckShow = false;
+			let param = [];
+			this.$emit('popupSearch', this.newCkeckData)
+		},
+		clearAll(){
+			this.allCheckShow = false;
+			this.newCkeckData.forEach((item, index) => {
+				item.activeIndex=0
+			});
+			this.$emit('popupSearch', this.newCkeckData)
+		},
+		close() {
+			this.allCheckShow = false;
+		},
+		getActive(item, index, idx) {
+			if(item.checkLogin&&!this.nickName){
+				uni.showToast({
+					title: item.noLoginText,
+					icon: 'none'
+				})
+				return
+			}
+			this.newCkeckData[index].activeIndex = idx;
+		},
+		getTopActive(list, index, item) {
+			if(item.checkLogin&&!this.nickName){
+				uni.showToast({
+					title: item.noLoginText,
+					icon: 'none'
+				})
+				return
+			}
+			this.$set(this.newCkeckData[0], "activeIndex", index);
+			this.search();
+		},
+	},
+};
+</script>
+
+<style lang="scss">
+.dispalyF {
+	display: flex;
+	align-items: center;
+}
+
+.popupAll {
+	width: 100%;
+	position: relative;
+	z-index: 9;
+}
+
+.popupListAll {
+	background: #F2F4F7;
+	position: relative;
+	z-index: 99;
+	width: 100%;
+	padding-top: 8rpx;
+}
+
+.popupList {
+	background: #F2F4F7;
+	margin: 0 32rpx;
+
+	.tabTitle {
+		font-family: Source Han Sans;
+		font-size: 24rpx;
+		color: #282828;
+		margin: 16rpx 0;
+	}
+
+	.popupItem {
+		padding: 0 32rpx;
+		text-align: center;
+		background: #fff;
+		border-radius: 4rpx;
+		font-family: Source Han Sans;
+		font-size: 24rpx;
+		font-feature-settings: "kern" on;
+		color: #282828;
+		margin-right: 15rpx;
+		flex-shrink: 0;
+		margin-bottom: 20rpx;
+		line-height: 56rpx;
+		min-width: 144rpx;
+		border: 1rpx solid #CAD4E2;
+		box-sizing: border-box;
+	}
+
+	.popupItem-active {
+		padding: 0 32rpx;
+		text-align: center;
+		background: #1A62CE;
+		border-radius: 4rpx;
+		font-family: Source Han Sans;
+		font-size: 24rpx;
+		font-feature-settings: "kern" on;
+		color: #fff;
+		margin-right: 15rpx;
+		flex-shrink: 0;
+		margin-bottom: 20rpx;
+		line-height: 56rpx;
+		min-width: 144rpx;
+		border: 1rpx solid #1A62CE;
+		box-sizing: border-box;
+	}
+}
+
+.popupPic {
+	width: 100%;
+	padding-top: 16rpx;
+	padding-bottom: 28rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.gropo {
+	position: fixed;
+	left: 0rpx;
+	top: 0rpx;
+	width: 100vw;
+	height: 100vh;
+	opacity: 0.6;
+	background: rgba(0, 0, 0, 0.23);
+}
+
+.tabList {
+	padding: 32rpx 0;
+	position: relative;
+	overflow: hidden;
+	flex-wrap: nowrap;
+	width: 100%;
+	z-index: 9;
+
+	.tabItem {
+		line-height: 56rpx;
+		padding: 0 32rpx;
+		background: #fff;
+		border-radius: 4rpx;
+		font-family: Source Han Sans;
+		font-size: 24rpx;
+		font-feature-settings: "kern" on;
+		color: #282828;
+		margin-right: 15rpx;
+		flex-shrink: 0;
+		min-width: 144rpx;
+		box-sizing: border-box;
+		text-align: center;
+	}
+
+	.tabrightBtnOut {
+		position: absolute;
+		right: 0;
+		width: 87rpx;
+		height: 56rpx;
+		// background: linear-gradient(270deg, #2A51DF 0%, rgba(66, 110, 230, 0) 100%);
+	}
+
+	.tabrightBtn {
+		position: absolute;
+		right: 36rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 32rpx;
+		height: 32rpx;
+		z-index: 99;
+	}
+	.popupItem {
+		padding: 0 32rpx;
+		text-align: center;
+		background: #fff;
+		border-radius: 4rpx;
+		font-family: Source Han Sans;
+		font-size: 24rpx;
+		font-feature-settings: "kern" on;
+		color: #282828;
+		margin-right: 15rpx;
+		flex-shrink: 0;
+		margin-bottom: 20rpx;
+		line-height: 56rpx;
+		min-width: 144rpx;
+		border: 1rpx solid #CAD4E2;
+		box-sizing: border-box;
+	}
+
+	.popupItem-active {
+		padding: 0 32rpx;
+		text-align: center;
+		background: #1A62CE;
+		border-radius: 4rpx;
+		font-family: Source Han Sans;
+		font-size: 24rpx;
+		font-feature-settings: "kern" on;
+		color: #fff;
+		margin-right: 15rpx;
+		flex-shrink: 0;
+		margin-bottom: 20rpx;
+		line-height: 56rpx;
+		min-width: 144rpx;
+		border: 1rpx solid #1A62CE;
+		box-sizing: border-box;
+	}
+}
+
+.dispalyF {
+	display: flex;
+	align-items: center;
+}
+
+.rightView :last-child {
+	margin-right: 100rpx !important;
+}
+
+.bottom-search {
+	margin-top:56rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin: 16rpx 32rpx 0;
+	.search-left {
+		font-family: Source Han Sans;
+		font-size: 28rpx;
+		font-weight: bold;
+		line-height: 70rpx;
+		background: #fff;
+		color: #3D3D3D;
+		border-radius: 4rpx;
+		height: 62rpx;
+		flex-grow: 1;
+		text-align: center;
+	}
+	.search-right {
+		margin-right: 30rpx;
+		width: 472rpx;
+		line-height: 64rpx;
+		border-radius: 4rpx;
+		background: linear-gradient(270deg, #53A0EA 10%, #1A62CE 100%);
+		font-family: Source Han Sans;
+		font-size: 28rpx;
+		font-weight: bold;
+		margin-left: 24rpx;
+		color: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+}
+</style>
diff --git a/packageRc/components/exitPopup.vue b/packageRc/components/exitPopup.vue
new file mode 100644
index 0000000..72e3f98
--- /dev/null
+++ b/packageRc/components/exitPopup.vue
@@ -0,0 +1,130 @@
+<template>
+	<u-popup :show="showExitPopup" @close="closeExitPopup" closeOnClickOverlay>
+		<view class="exit_popup df_flex df__direction_column ">
+			<view class="popup-header">
+				<u-icon name="warning" size="60rpx" color="#E33C3C"></u-icon>
+				<view class="popup-title">退出登录</view>
+			</view>
+			<view class="df_flex df_justify_center name">{{nick || '--'}}</view>
+			<view class="popup-content">确定要退出当前账号吗？</view>
+			<view class="df_flex">
+				<u-button class="custom_btn" text="退出登录" @tap="logOut"></u-button>
+				<u-button class="cancel_btn" text="取 消" @tap="closeExitPopup"></u-button>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+	// import {
+	// 	mapGetters
+	// } from 'vuex'
+	export default {
+		name: "exitPopup",
+		// computed: {
+		// 	...mapGetters(['showExitPopup', 'nick'])
+		// },
+		data() {
+			return {
+				showExitPopup: false,
+				nick: ''
+			}
+		},
+		onload() {
+			this.nick = this.$store.state.user.nick
+			this.showExitPopup = this.$store.state.user.showExitPopup
+		},
+		methods: {
+			closeExitPopup() {
+				this.$store.commit('SET_SHOWEXITPOPUP', false)
+			},
+			// 退出
+			logOut() {
+				this.$store.dispatch('LogOut').then((res) => {
+					this.closeExitPopup()
+					uni.navigateTo({
+						url: '/pages/login/login-one'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.exit_popup {
+		padding: 48rpx 60rpx 60rpx 60rpx;
+		background: #ffffff;
+		border-radius: 24rpx;
+		box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.12);
+
+		&>view {
+			width: 100%;
+		}
+
+		.popup-header {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-bottom: 32rpx;
+			
+			.popup-title {
+				margin-top: 16rpx;
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+
+		.popup-content {
+			text-align: center;
+			font-size: 28rpx;
+			color: #666666;
+			margin-bottom: 48rpx;
+			line-height: 1.5;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.name {
+			margin: 16rpx auto 32rpx auto;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333333;
+			text-align: center;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.custom_btn {
+			margin: 16rpx;
+			color: #ffffff;
+			border: none;
+			border-radius: 12rpx;
+			background: linear-gradient(135deg, #E33C3C 0%, #ff4757 100%);
+			box-shadow: 0 4rpx 12rpx rgba(227, 60, 60, 0.3);
+			transition: all 0.3s ease;
+			
+			&:active {
+				transform: scale(0.95);
+				box-shadow: 0 2rpx 8rpx rgba(227, 60, 60, 0.4);
+			}
+		}
+
+		.cancel_btn {
+			margin: 16rpx;
+			color: #666666;
+			border: 2rpx solid #e5e5e5;
+			border-radius: 12rpx;
+			background-color: #ffffff;
+			transition: all 0.3s ease;
+			
+			&:active {
+				transform: scale(0.95);
+				background-color: #f8f9fa;
+			}
+		}
+	}
+</style>
diff --git a/packageRc/components/placePicker.vue b/packageRc/components/placePicker.vue
new file mode 100644
index 0000000..2baebaa
--- /dev/null
+++ b/packageRc/components/placePicker.vue
@@ -0,0 +1,203 @@
+<template>
+  <view>
+    <u-popup :show="visible">
+      <view style="position: relative;height: 100vh;width: 100%;">
+        <view class="button-area" style="padding: 8vh 32rpx 24rpx 32rpx; margin: 0;border: 0;position: relative;z-index: 2;display: block; top: 10rpx; border-radius: 0;">
+          <u-input style="margin-bottom: 16px;" v-model="placeInput" @change="getLocations" placeholder="请输入并选择相应地点"></u-input>
+          <view v-if="checkedMarker&&checkedMarker.name" class="selected">您已选择：{{ checkedMarker.name }}<text v-if="checkedMarker.address">（{{ checkedMarker.address }}）</text></view>
+          <view v-for="(item, index) in placeList" :key="index" :label="item.name" :value="item.name" @click="addIcon(item.name)" class="place-list">
+            <view style="display: flex;justify-content: space-between;">{{ item.name }}
+              <view style="color: #8492a6; font-size: 13px;width: 50%">{{ item.address }}</view>
+            </view>
+          </view>
+        </view>
+        <view class="map" id="map"></view>
+        <view class="button-area">
+          <view class="btn" @click="cancel">取 消</view>
+          <view class="btn save" @click="submitForm">确 定</view>
+        </view>
+      </view>
+    </u-popup>
+  </view>
+</template>
+
+<script>
+//import { jsonp } from "vue-jsonp";
+export default {
+  data() {
+    return {
+      map: '',
+      placeList: [],
+      placeInput: '',
+      markerList: [],
+      checkedMarker: '',
+      visible: false,
+    }
+  },
+  mounted() {
+    // this.openDialog();
+  },
+  methods: {
+    submitForm() {
+      if(this.checkedMarker&&this.checkedMarker.name){
+        this.$emit('selected', this.checkedMarker)
+        this.visible = false;
+      }else{
+        this.$message.warning('您尚未选择地点！')
+      }
+    },
+    cancel() {
+      this.visible = false;
+      if (this.map) {
+    this.map.removeEventListener('click', this.handleMapClick);
+  }
+    },
+    openDialog() {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.map = new BMapGL.Map("map");
+        var point = new BMapGL.Point(117.123237,36.657017);
+        this.map.centerAndZoom(point, 15);
+        this.map.enableScrollWheelZoom();
+        var locationCtrl = new BMapGL.LocationControl();
+        this.map.addControl(locationCtrl)
+        this.map.addEventListener('click', this.handleMapClick);
+      })
+    },
+    handleMapClick(e) {
+  const lng = e.latlng.lng;
+  const lat = e.latlng.lat;
+  // 逆地理编码
+  jsonp("https://api.map.baidu.com/reverse_geocoding/v3/", {
+    ak: "qr93Dm5Ph6Vb4n1aTfvHG9KZkvG8S4YU",
+    output: "json",
+    location: `${lat},${lng}`,
+  }).then(res => {
+    if (res.status === 0) {
+      // 清除原有标记
+      this.removeOverlay();
+      // 新建标记
+      const point = new BMapGL.Point(lng, lat);
+      const marker = new BMapGL.Marker(point);
+      this.map.addOverlay(marker);
+      this.markerList = [marker];
+      // 保存选中信息
+      this.checkedMarker = {
+        name: res.result.formatted_address,
+        address: res.result.sematic_description,
+        location: { lng, lat }
+      };
+      this.$forceUpdate();
+    }
+  });
+},
+    getLocations(place) {
+      jsonp("https://api.map.baidu.com/place/v2/suggestion", {
+        q: place,
+        ak: "qr93Dm5Ph6Vb4n1aTfvHG9KZkvG8S4YU",
+        region: '济南市',
+        output: "json",
+      })
+        .then((json) => {
+          console.log(json,23423434)
+          this.placeList = json.result
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    addIcon(e) {
+      let arr = this.placeList.filter(ele => ele.name == e)
+      if(arr.length){
+        this.addMaker(arr)
+        this.clickMaker(arr[0]);
+      }else{
+        this.addMaker(JSON.parse(JSON.stringify(this.placeList)))
+      }
+      this.placeList = []
+    },
+    removeOverlay() {
+      this.markerList.forEach(ele => {
+        this.map.removeOverlay(ele)
+      })
+    },
+    addMaker(list) {
+      this.removeOverlay()
+      list.forEach((ele, index) => {
+        let point = new BMapGL.Point(ele.location.lng, ele.location.lat);
+        if(index == 0){
+          this.map.centerAndZoom(point, 15)
+        }
+        let marker = new BMapGL.Marker(point);        // 创建标注
+        this.map.addOverlay(marker);
+        let that = this;
+        this.markerList.push(marker)
+        marker.addEventListener("click", function(){
+          that.clickMaker(ele)
+        });
+      })
+    },
+    clickMaker(e){
+      this.checkedMarker = e;
+      this.$forceUpdate();
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.selected {
+  margin-bottom: 16px;
+  position: relative;z-index: 2;
+  background: #DCE2E9;
+  border-radius: 8rpx;
+  padding: 12rpx 24rpx;
+}
+.map{
+  width: 100%;
+  margin-top: 16px;
+  height: 100%;
+  position: absolute;
+  z-index: 1;
+  left: 0;
+  top: 0;
+}
+
+.button-area{
+  position: absolute;
+  z-index: 2;
+  bottom: 0;
+  padding: 24rpx 32rpx 68rpx;
+  width: 100%;
+  background: #fff;
+  display: flex;
+  box-sizing: border-box;
+  margin-top: 40rpx;
+  border-radius: 16px 16px 0px 0px;
+  .btn{
+    line-height: 72rpx;
+    width: 176rpx;
+    margin-right: 16rpx;
+    font-size: 28rpx;
+    border: 1px solid #B8C5D4;
+    color: #282828;
+    text-align: center;
+    border-radius: 8rpx;
+  }
+  .reset{
+    background: #DCE2E9;
+  }
+  .save{
+    background: linear-gradient(103deg, #1D64CF 0%, #1590D4 99%);
+    color: #fff;
+    border: 0;
+    flex-grow: 1;
+  }
+}
+.place-list{
+  line-height: 32rpx;
+  padding: 16rpx 0;
+  border-bottom: 1px solid #DCE2E9;
+}
+</style>
diff --git a/packageRc/pages/daiban/addbangfu.vue b/packageRc/pages/daiban/addbangfu.vue
new file mode 100644
index 0000000..452fdfc
--- /dev/null
+++ b/packageRc/pages/daiban/addbangfu.vue
@@ -0,0 +1,969 @@
+<template>
+  <view class="page">
+    <u-navbar
+      title="帮扶登记"
+      :autoBack="true"
+      bgColor="transparent"
+      leftIconColor="#fff"
+      :titleStyle="{ color: '#fff' }"
+    ></u-navbar>
+    <view class="input-outer-part">
+      <scroll-view scroll-y="true" style="height: calc(100vh - 100px)">
+        <view class="inner">
+          <div class="self-form">
+            <view class="inner-part">
+              <div class="form-item required">
+                <label class="form-label">被帮扶对象</label>
+                <input
+                  v-model="serviceForm.serviceObjectName"
+                  style="border: none; width: 100%; padding: 10px 0;"
+                  placeholder="请输入"
+                  disabled
+                />
+              </div>
+              
+              <div class="form-item required">
+                <label class="form-label">帮扶方式</label>
+                <div class="form-select-wrapper" style="position: relative;">
+                  <!-- 显示区域 -->
+                  <div 
+                    class="form-value" 
+                    :class="{ 'noValue': !serviceForm.demandType }"
+                    @click="showDemandTypePicker = !showDemandTypePicker"
+                    style="width: 100%; height: 40px; padding: 0 10px; border: 1px solid #e6e6e6; border-radius: 8rpx; background-color: #fff; display: flex; align-items: center; justify-content: space-between; cursor: pointer;"
+                  >
+                    {{ getDemandTypeLabel(serviceForm.demandType) || "请选择" }}
+                    <span class="arrow-down">▼</span>
+                  </div>
+                  
+                  <!-- 选项列表 -->
+                  <div 
+                    v-if="showDemandTypePicker" 
+                    class="options-list"
+                    style="position: absolute; top: 45px; left: 0; right: 0; background-color: #fff; border: 1px solid #e6e6e6; border-radius: 8rpx; z-index: 1000; max-height: 200px; overflow-y: auto;"
+                  >
+                    <div 
+                      v-for="option in demandTypeOptions" 
+                      :key="option.value"
+                      @click="selectDemandType(option.value)"
+                      style="padding: 10px; border-bottom: 1px solid #f0f0f0; cursor: pointer;"
+                    >
+                      {{ option.label }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+              
+              <div class="form-item required" v-if="serviceForm.demandType == '4' || serviceForm.demandType == '5'">
+                <label class="form-label">帮扶时间 <text class="required">*</text></label>
+                <picker mode="date" :value="serviceForm.practicalSolutionTime" start="1900-01-01" end="2100-12-31" @change="onDateChange">
+                  <view class="date-picker-wrapper" :class="{ noValue: !serviceForm.practicalSolutionTime }">
+                    <view v-if="serviceForm.practicalSolutionTime" class="date-value">{{ serviceForm.practicalSolutionTime }}</view>
+                    <view v-else>请选择</view>
+                    <view class="icon-right">✏️</view>
+                  </view>
+                </picker>
+              </div>
+              
+              <div class="form-item required" v-if="serviceForm.demandType == '4' || serviceForm.demandType == '5'">
+                <label class="form-label">经办人</label>
+                <div class="form-select-wrapper">
+                  <el-select 
+                    style="width: 100%" 
+                    v-model="serviceForm.agentUserId" 
+                    placeholder="请选择经办人" 
+                    @change="handleAgentChange"
+                  > 
+                    <el-option 
+                      v-for="item in jingbrList1" 
+                      :key="item.userId" 
+                      :label="item.nickName" 
+                      :value="item.userId" 
+                    ></el-option> 
+                  </el-select>
+                </div>
+              </div>
+              
+              <div class="form-item required" v-if="serviceForm.demandType == '5'">
+                <label class="form-label">电话沟通结果</label>
+                <div class="form-value" @click="showPicker('dhgtjg')" :class="{ noValue: !serviceForm.dhgtjg }">
+                  {{ getDhgtjgLabel(serviceForm.dhgtjg) || "请选择" }}
+                  <span class="arrow-down">▼</span>
+                </div>
+              </div>
+              
+              <div class="form-item required" v-if="serviceForm.demandType == '4' || serviceForm.demandType == '5'">
+                <label class="form-label">帮扶内容</label>
+                <div class="date-picker-wrapper" :class="{ noValue: !serviceForm.serviceContent }">
+                  <picker 
+                    @change="onServiceContentChange" 
+                    :range="serviceContentOptions.map(item => item.label)" 
+                    :value="getServiceContentIndex(serviceForm.serviceContent)"
+                    mode="selector"
+                  >
+                    <view class="date-value">
+                      {{ getServiceContentLabel(serviceForm.serviceContent) || "请选择" }}
+                      <span class="arrow-down">▼</span>
+                    </view>
+                  </picker>
+                </div>
+              </div>
+            </view>
+
+            <view class="inner-part">
+              <div class="form-item required" v-if="serviceForm.demandType == '4' || serviceForm.demandType == '5'">
+                <label class="form-label">帮扶情况说明</label>
+                <textarea
+                  v-model="serviceForm.blqksm"
+                  style="width: 100%; border: none; padding: 10px 0; min-height: 100px; resize: none;"
+                  placeholder="请输入"
+                ></textarea>
+              </div>
+       </view>
+
+
+
+            <view class="inner-part">
+              <div class="form-item required" v-if="serviceForm.demandType == '4' || serviceForm.demandType == '5'">
+                <label class="form-label">帮扶情况说明</label>
+                <div class="file-upload-container">
+                  <button class="upload-btn" @click="chooseImages" :disabled="fileList.length >= 6">
+                    + 添加图片 ({{ fileList.length }}/6)
+                  </button>
+                  <div class="file-list" v-if="fileList.length > 0">
+                    <div v-for="(file, index) in fileList" :key="index" class="file-item">
+                      <image :src="file.url" mode="aspectFill" class="uploaded-image"></image>
+                      <span class="delete-btn" @click="removeImage(index)">删除</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+       </view>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+         
+            <view class="inner-part" v-if="serviceForm.demandType == '4' || serviceForm.demandType == '5'">
+              <div class="form-item">
+                <label class="form-label">附件</label>
+                <div style="width: 100%; padding: 10px 0;">
+                  <button @click="triggerFileUpload" style="padding: 8px 16px; background: #f0f0f0; border: none; border-radius: 4px;">
+                    上传附件 (最多6个)
+                  </button>
+                  <!-- 简单的文件列表显示 -->
+                  <div v-if="serviceForm.fileUrl.length > 0" class="file-list">
+                    <div v-for="(file, index) in serviceForm.fileUrl" :key="index" class="file-item">
+                      {{ file.name }}
+                      <span @click="removeFile(index)" style="margin-left: 10px; cursor: pointer; color: #ff4444;">删除</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </view>
+        </div>
+        </view>
+      </scroll-view>
+
+      <view class="button-area">
+        <view class="btn" @click="cancelPage">取消</view>
+        <view class="btn save" @click="submitServiceForm">保存</view>
+      </view>
+    </view>
+    
+    <!-- 通用选择器 -->
+    <div v-if="currentPicker" class="datetime-picker-overlay">
+      <div class="datetime-picker">
+        <div class="picker-header">
+          <span @click="cancelPicker" style="padding: 10px;">取消</span>
+          <span style="font-weight: bold;">{{ getPickerTitle(currentPicker) }}</span>
+          <span @click="confirmPicker" style="padding: 10px; color: #007AFF;">确定</span>
+        </div>
+        <div class="picker-content">
+          <div v-if="currentPicker === 'practicalSolutionTime'">
+            <input 
+              type="datetime-local" 
+              v-model="manualDateTime" 
+              style="width: 100%; padding: 15px; box-sizing: border-box;"
+            />
+          </div>
+          <div v-else class="picker-options">
+            <div 
+              v-for="option in getPickerOptions(currentPicker)" 
+              :key="option.value"
+              @click="selectPickerOption(option.value)"
+              :class="{ 'selected': selectedOption === option.value }"
+            >
+              {{ option.label }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </view>
+</template>
+
+<script>
+import {getJbrInfo} from "../../api/personinfo/index"
+import { getDicts } from '@/apiRc/system/dict.js';
+export default {
+  data() {
+    return {
+      serviceForm: {
+        serviceObjectName: '',
+        userId: '',
+        demandType: '', // 帮扶方式
+        practicalSolutionTime: '', // 帮扶时间
+        agentUserId: '', // 经办人ID
+        agentUserName: '', // 经办人名称
+        dhgtjg: '', // 电话沟通结果
+        serviceContent: '', // 帮扶内容
+        blqksm: '', // 帮扶情况说明
+        personStatus: '', // 人员状态
+        fileUrl: [] // 附件
+      },
+      
+      serviceContentMap: {
+        '1': '就业政策咨询',
+        '2': '职业指导',
+        '3': '技能培训',
+        '4': '岗位推荐',
+        '5': '创业指导',
+        '6': '其他'
+      },
+      // 帮扶内容选项（picker组件需要的格式）
+      serviceContentOptions: [
+        { value: '1', label: '就业政策咨询' },
+        { value: '2', label: '职业指导' },
+        { value: '3', label: '技能培训' },
+        { value: '4', label: '岗位推荐' },
+        { value: '5', label: '创业指导' },
+        { value: '6', label: '其他' }
+      ],
+      showDemandTypePicker: false, // 控制帮扶方式选择器显示
+      jingbrList1:[],
+      currentPicker: null,
+      selectedOption: '',
+      manualDateTime: this.formatDateTime(new Date()),
+      fileList: [], // 初始化文件列表
+      // 帮扶方式选项 (4: 上门服务, 5: 电话回访)
+      demandTypeOptions: [
+        { value: '4', label: '上门服务' },
+        { value: '5', label: '电话回访' }
+      ],
+      // 经办人选项（模拟数据）
+      jingbrList: [
+        { userId: '1', nickName: '张三' },
+        { userId: '2', nickName: '李四' },
+        { userId: '3', nickName: '王五' }
+      ],
+      // 电话沟通结果选项
+      dhgtjgOptions: [
+        { value: '1', label: '已沟通' },
+        { value: '2', label: '未接通' },
+        { value: '3', label: '拒绝沟通' }
+      ],
+      // 帮扶内容选项（通过字典获取）
+      serviceContentOptions: [],
+      // 人员状态选项（通过字典获取）
+      personStatusOptions: []
+    };
+  },
+    created(){
+      this.getJbrInfo11();
+      // 使用getDicts API获取帮扶内容字典数据
+      getDicts('qcjy_fwnr').then(res => {
+        if (res.data && Array.isArray(res.data)) {
+          // 将字典数据转换为picker组件需要的格式
+          this.serviceContentOptions = res.data.map(item => ({
+            value: item.dictValue,
+            label: item.dictLabel
+          }));
+        }
+      });
+      
+      // 使用getDicts API获取人员状态字典数据
+      getDicts('qcjy_ryzt').then(res => {
+        if (res.data && Array.isArray(res.data)) {
+          this.personStatusOptions = res.data.map(item => ({
+            value: item.dictValue,
+            label: item.dictLabel
+          }));
+        }
+      });
+    },
+  onLoad(options) {
+    if (options.name) {
+      this.serviceForm.serviceObjectName = options.name;
+    }
+    if (options.id) {
+      this.serviceForm.userId = options.id;
+    }
+  },
+  methods: {
+    // 选择图片
+    chooseImages() {
+      const remainingCount = 6 - this.fileList.length;
+      if (remainingCount <= 0) {
+        uni.showToast({ title: '最多只能上传6张图片', icon: 'none' });
+        return;
+      }
+      
+      uni.chooseImage({
+        count: remainingCount,
+        sizeType: ['original', 'compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          // 添加新选择的图片到列表
+          res.tempFilePaths.forEach((path, index) => {
+            this.fileList.push({
+              url: path,
+              file: res.tempFiles[index]
+            });
+          });
+          // 更新 serviceForm.fileUrl
+          this.updateFileUrls();
+        },
+        fail: (err) => {
+          console.error('选择图片失败:', err);
+        }
+      });
+    },
+    
+    // 移除图片
+    removeImage(index) {
+      this.fileList.splice(index, 1);
+      // 更新 serviceForm.fileUrl
+      this.updateFileUrls();
+    },
+    
+    // 更新文件URL数组
+    updateFileUrls() {
+      this.serviceForm.fileUrl = this.fileList.map(file => file.url);
+    },
+   async getJbrInfo11(){
+        const res=await getJbrInfo()
+        this.jingbrList1=res
+    },
+    // 显示选择器
+    showPicker(type) {
+      this.currentPicker = type;
+      if (type !== 'practicalSolutionTime') {
+        this.selectedOption = this.serviceForm[type] || '';
+      }
+    },
+    // 取消选择器
+    cancelPicker() {
+      this.currentPicker = null;
+    },
+    // 确认选择器
+    confirmPicker() {
+      if (this.currentPicker === 'practicalSolutionTime') {
+        this.manualConfirmDate();
+      } else {
+        this.serviceForm[this.currentPicker] = this.selectedOption;
+        // 特殊处理经办人，同时保存名称
+        if (this.currentPicker === 'agentUserId') {
+          const agent = this.jingbrList1.find(item => item.userId === this.selectedOption);
+          this.serviceForm.agentUserName = agent ? agent.nickName : '';
+        }
+      }
+      this.currentPicker = null;
+    },
+    // 选择选项
+    selectPickerOption(value) {
+      this.selectedOption = value;
+    },
+    // 获取选择器标题
+    getPickerTitle(type) {
+      const titles = {
+        demandType: '选择帮扶方式',
+        practicalSolutionTime: '选择帮扶时间',
+        agentUserId: '选择经办人',
+        dhgtjg: '选择电话沟通结果',
+        serviceContent: '选择帮扶内容'
+      };
+      return titles[type] || '请选择';
+    },
+    // 获取选择器选项
+    getPickerOptions(type) {
+      const options = {
+        demandType: this.demandTypeOptions || [],
+        agentUserId: this.jingbrList1 && this.jingbrList1.length > 0 ? 
+          this.jingbrList1.map(item => ({ value: item.userId, label: item.nickName })) : [],
+        dhgtjg: this.dhgtjgOptions || [],
+        serviceContent: this.serviceContentOptions || []
+      };
+      return options[type] || [];
+    },
+    // 获取帮扶方式标签
+    getDemandTypeLabel(value) {
+      const option = this.demandTypeOptions.find(item => item.value === value);
+      return option ? option.label : '';
+    },
+    // 获取经办人名称
+    getAgentUserName(userId) {
+      const agent = this.jingbrList1.find(item => item.userId === userId);
+      return agent ? agent.nickName : '';
+    },
+    // 处理经办人选择变化
+    handleAgentChange(value) {
+      if (!value || !this.jingbrList1 || !this.jingbrList1.length) {
+        this.serviceForm.agentUserName = '';
+        return;
+      }
+      const user = this.jingbrList1.find(item => item.userId === value);
+      if (user) {
+        this.serviceForm.agentUserName = user.nickName;
+      } else {
+        this.serviceForm.agentUserName = '';
+      }
+    },
+    
+    // 处理帮扶方式选择变化
+    handleDemandTypeChange(event) {
+      this.serviceForm.demandType = event.target.value;
+    },
+    
+    // 选择帮扶方式
+    selectDemandType(value) {
+      this.serviceForm.demandType = value;
+      this.showDemandTypePicker = false;
+    },
+    // 获取电话沟通结果标签
+    getDhgtjgLabel(value) {
+      const option = this.dhgtjgOptions.find(item => item.value === value);
+      return option ? option.label : '';
+    },
+    // 获取帮扶内容标签
+    getServiceContentLabel(value) {
+      return this.serviceContentMap[value] || '';
+    },
+    
+    // 处理帮扶内容选择变化
+    onServiceContentChange(e) {
+      const index = e.detail.value;
+      if (this.serviceContentOptions && this.serviceContentOptions[index]) {
+        this.serviceForm.serviceContent = this.serviceContentOptions[index].value;
+      }
+    },
+    
+    // 获取帮扶内容当前索引
+    getServiceContentIndex(value) {
+      if (!value) return 0;
+      const index = this.serviceContentOptions.findIndex(item => item.value === value);
+      return index !== -1 ? index : 0;
+    },
+    // 格式化日期时间为YYYY-MM-DDTHH:MM格式（datetime-local输入框需要）
+    formatDateTime(date) {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      const hours = String(date.getHours()).padStart(2, '0');
+      const minutes = String(date.getMinutes()).padStart(2, '0');
+      return `${year}-${month}-${day}T${hours}:${minutes}`;
+    },
+    
+    // 日期选择变化处理
+    onDateChange(e) {
+      this.serviceForm.practicalSolutionTime = e.detail.value;
+    },
+    
+    // 手动确认日期选择
+    manualConfirmDate() {
+      // 将datetime-local格式转换为显示格式
+      const date = new Date(this.manualDateTime);
+      this.serviceForm.practicalSolutionTime = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+    },
+    
+    // 触发文件上传
+    triggerFileUpload() {
+      if (this.serviceForm.fileUrl.length < 6) {
+        // 模拟添加文件
+        const mockFiles = ['文档.pdf', '图片.jpg', '表格.xlsx', '报告.docx'];
+        const randomFile = mockFiles[Math.floor(Math.random() * mockFiles.length)];
+        this.serviceForm.fileUrl.push({
+          name: randomFile,
+          url: `mock-url/${Date.now()}/${randomFile}`
+        });
+      } else {
+        uni.showToast({ title: '最多只能上传6个文件', icon: 'none' });
+      }
+    },
+    
+    // 删除文件
+    removeFile(index) {
+      this.serviceForm.fileUrl.splice(index, 1);
+    },
+    
+    // 取消页面
+    cancelPage() {
+      uni.navigateBack();
+    },
+    
+    // 验证表单
+    validateForm() {
+      if (!this.serviceForm.serviceObjectName) {
+        uni.showToast({ title: '请填写被帮扶对象', icon: 'none' });
+        return false;
+      }
+      if (!this.serviceForm.demandType) {
+        uni.showToast({ title: '请选择帮扶方式', icon: 'none' });
+        return false;
+      }
+      
+      // 如果是上门服务或电话回访，需要验证更多字段
+      if (this.serviceForm.demandType === '4' || this.serviceForm.demandType === '5') {
+        if (!this.serviceForm.practicalSolutionTime) {
+          uni.showToast({ title: '请选择帮扶时间', icon: 'none' });
+          return false;
+        }
+        if (!this.serviceForm.agentUserId) {
+          uni.showToast({ title: '请选择经办人', icon: 'none' });
+          return false;
+        }
+        if (this.serviceForm.demandType === '5' && !this.serviceForm.dhgtjg) {
+          uni.showToast({ title: '请选择电话沟通结果', icon: 'none' });
+          return false;
+        }
+        if (!this.serviceForm.serviceContent) {
+          uni.showToast({ title: '请选择帮扶内容', icon: 'none' });
+          return false;
+        }
+        if (!this.serviceForm.blqksm) {
+          uni.showToast({ title: '请填写帮扶情况说明', icon: 'none' });
+          return false;
+        }
+        if (!this.serviceForm.personStatus) {
+          uni.showToast({ title: '请选择人员状态', icon: 'none' });
+          return false;
+        }
+      }
+      
+      return true;
+    },
+    setName(){
+			this.serviceForm.serviceObjectName = this.name
+			this.serviceForm.serviceObjectId = this.userId
+			this.serviceForm.userId = this.userId
+
+			this.$forceUpdate();
+			},
+    // 提交表单
+    async submitServiceForm() {
+      try {
+        // 验证表单
+        if (!this.validateForm()) {
+          return;
+        }
+        
+        // 模拟加载状态
+        uni.showLoading({ title: '保存中...' });
+        
+        // 准备提交数据
+        const submitData = {
+          ...this.serviceForm,
+          // 格式化文件数据
+          fileUrl: JSON.stringify(this.serviceForm.fileUrl)
+        };
+        
+        // 打印提交数据
+        console.log('提交数据:', submitData);
+        
+        // 模拟API调用延迟
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        
+        uni.showToast({ title: '保存成功', icon: 'success' });
+        uni.navigateBack();
+      } catch (error) {
+        console.error(error);
+        uni.showToast({ title: '保存失败', icon: 'none' });
+      } finally {
+        uni.hideLoading();
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+  height: 100vh;
+  background-color: #eef1f5 !important;
+  background-image: url("~@/packageRc/static/images/top.png");
+  background-repeat: no-repeat;
+  background-size: 100% auto;
+}
+
+.input-outer-part {
+  background: #eef1f5;
+  padding: 32rpx;
+  padding-top: 100rpx; /* 增加顶部内边距，防止内容被遮挡 */
+  position: relative;
+  top: -80rpx;
+  border-radius: 32rpx 32rpx 0 0;
+}
+
+.inner {
+  .inner-part {
+    background: #fff;
+    padding: 0 32rpx;
+    border-radius: 16rpx;
+    margin-bottom: 20rpx;
+  }
+}
+
+.self-form {
+  // 表单样式
+}
+
+/* 表单项目样式 */
+.form-item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 20px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+/* 选择器容器样式 */
+.form-select-wrapper {
+  flex: 1;
+  padding: 5px 0;
+  position: relative;
+}
+  
+.form-select {
+  width: 100%;
+  padding: 20rpx;
+  border: 1px solid #e6e6e6;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+  background-color: #fff;
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  cursor: pointer;
+}
+  
+.form-select.noValue {
+  color: #999;
+}
+  
+.form-select-wrapper::after {
+  content: '▼';
+  position: absolute;
+  right: 30rpx;
+    top: 50%;
+    transform: translateY(-50%);
+    pointer-events: none;
+    color: #999;
+    font-size: 20rpx;
+  }
+
+.form-item.required .form-label::after {
+  content: '*';
+  color: #ff4444;
+  margin-left: 4px;
+}
+
+.form-label {
+  width: 110px;
+  flex-shrink: 0;
+  font-size: 14px;
+  color: #333;
+  padding: 10px 0;
+}
+
+.form-value {
+  flex: 1;
+  padding: 10px 0;
+  font-size: 14px;
+  color: #666;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.form-value.noValue {
+  color: #999;
+}
+
+.arrow-down {
+  font-size: 12px;
+  color: #A6A6A6;
+}
+
+.edit-icon {
+  font-size: 14px;
+  color: #A6A6A6;
+}
+
+.form-input-wrapper {
+  flex: 1;
+  position: relative;
+}
+
+.form-input-wrapper input {
+  width: 100%;
+  padding: 10px 0;
+  border: none;
+  outline: none;
+  font-size: 14px;
+}
+
+.form-input-wrapper .edit-icon {
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+/* 单选按钮样式 */
+.radio-group {
+  flex: 1;
+  display: flex;
+  flex-wrap: wrap;
+  padding: 10px 0;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 20px;
+  margin-bottom: 10px;
+  cursor: pointer;
+}
+
+.radio-item input[type="radio"] {
+  margin-right: 6px;
+}
+
+.radio-label {
+  font-size: 14px;
+  color: #666;
+}
+
+/* 文件列表样式 */
+.file-list {
+  margin-top: 10px;
+}
+
+.file-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 0;
+  font-size: 14px;
+  color: #666;
+}
+
+/* 文件上传样式 */
+.file-upload-container {
+  width: 100%;
+  padding: 10px 0;
+}
+
+.upload-btn {
+  padding: 10px 20px;
+  background-color: #f0f0f0;
+  border: 1px dashed #ddd;
+  border-radius: 4px;
+  color: #666;
+  margin-bottom: 10px;
+  width: 100%;
+}
+
+.upload-btn:disabled {
+  opacity: 0.6;
+}
+
+.file-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+
+.file-item {
+  position: relative;
+  width: 100px;
+  height: 100px;
+}
+
+.uploaded-image {
+  width: 100%;
+  height: 100%;
+  border-radius: 4px;
+}
+
+.delete-btn {
+  position: absolute;
+  top: -8px;
+  right: -8px;
+  background-color: #ff4444;
+  color: white;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 12px;
+}
+
+/* 选择器样式 */
+.datetime-picker-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+
+.datetime-picker {
+  background-color: #fff;
+  border-radius: 12px;
+  width: 85%;
+  max-width: 420px;
+  overflow: hidden;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+}
+
+.picker-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 16px 20px;
+  border-bottom: 1px solid #f5f5f5;
+  font-size: 17px;
+  background-color: #fafafa;
+}
+
+.picker-header > span:first-child {
+  color: #666;
+  font-size: 16px;
+}
+
+.picker-header > span:last-child {
+  color: #1d64cf;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.picker-content {
+  max-height: 280px;
+  overflow-y: auto;
+}
+
+.picker-options {
+  padding: 5px 0;
+}
+
+.picker-options > div {
+  padding: 16px 20px;
+  font-size: 16px;
+  color: #333;
+  position: relative;
+  transition: all 0.2s ease;
+  display: flex;
+  align-items: center;
+}
+
+.picker-options > div:not(:last-child) {
+  border-bottom: 1px solid #f8f8f8;
+}
+
+.picker-options > div:active {
+  background-color: #f5f5f5;
+}
+
+.picker-options > div.selected {
+  background-color: #f0f7ff;
+  color: #1d64cf;
+  font-weight: 500;
+}
+
+/* 添加选中状态的对勾图标 */
+.picker-options > div.selected::after {
+  content: '✓';
+  position: absolute;
+  right: 20px;
+  font-size: 18px;
+  font-weight: bold;
+  color: #1d64cf;
+}
+
+/* 日期选择器样式 */
+.date-picker-wrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #fff;
+}
+
+.date-picker-wrapper.noValue {
+  background-color: #f9f9f9;
+}
+
+.date-value {
+  color: #333;
+}
+
+.icon-right {
+  color: #999;
+  font-size: 16px;
+}
+
+.noValue {
+  color: #c0c4cc;
+}
+
+.button-area {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 24rpx 32rpx;
+  background: #fff;
+  display: flex;
+  box-sizing: border-box;
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+  .btn {
+    line-height: 72rpx;
+    width: 176rpx;
+    margin-right: 16rpx;
+    font-size: 28rpx;
+    border: 1px solid #b8c5d4;
+    color: #282828;
+    text-align: center;
+    border-radius: 8rpx;
+  }
+
+  .save {
+    background: linear-gradient(103deg, #1d64cf 0%, #1590d4 99%);
+    color: #fff;
+    border: 0;
+    flex-grow: 1;
+  }
+}
+</style>
diff --git a/packageRc/pages/daiban/daiban.vue b/packageRc/pages/daiban/daiban.vue
new file mode 100644
index 0000000..c6ee16a
--- /dev/null
+++ b/packageRc/pages/daiban/daiban.vue
@@ -0,0 +1,617 @@
+<!--
+ * @Date: 2025-10-16 15:15:47
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 17:41:33
+-->
+<template>
+  <view>
+  <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
+  <scroll-view :scroll-y="true" class="container" style="background-image: url('../../../packageRc/static/pageBg.png');">
+    <view style="padding: 40rpx 28rpx;">
+      <view class="kinggang">
+        <view>
+          <view class="num-title" style="color: #1A62CE">重点毕业生数</view>
+          <view>1120</view>
+        </view>
+        <text style="color: #B5C1D1;">｜</text>
+        <view>
+          <view class="num-title" style="color: #16ACB7">累计需求数</view>
+          <view>1120</view>
+        </view>
+        <text style="color: #B5C1D1;">｜</text>
+        <view>
+          <view class="num-title" style="color: #6A57D1">累计服务数</view>
+          <view>1120</view>
+        </view>
+      </view>
+      <view class="trace-line">
+        <view class="trace">
+          <view class="title">
+            <image src="../../../packageRc/static/trace.png"/>
+            毕业生追踪
+          </view>
+          <view style="display: flex;justify-content: space-between;" @click="goPersonalList">
+            <view>点击查看</view>
+            <uni-icons color="#639AEB" type="arrow-right" size="16"></uni-icons>
+          </view>
+        </view>
+        <view class="sendManager">
+          <view class="title">
+            <image src="../../../packageRc/static/sendManager.png"/>
+            任务下发管理员
+          </view>
+          <view style="display: flex;justify-content: space-between;">
+            <view>点击查看</view>
+            <uni-icons color="#DBAA4E" type="arrow-right" size="16"></uni-icons>
+          </view>
+        </view>
+      </view>
+      <view class="titles">
+        <view class="title-item active"><view>待办需求预警列表</view></view>
+        <view>共 {{jobList1count}}条信息</view>
+      </view>
+      <view v-for="(item, index) in jobList1" :key="index" class="job-list">
+        <view class="title">{{ item.personName }} {{ item.deptName }}</view>
+        <view class="info">
+          {{getDictLabel(item.demandType, qcjy_xqlx)}}_{{ item.jobDescription }}
+        </view>
+        <view class="bottom-line">
+          <view>发起时间：{{item.createTime}}</view>
+          <view style="color: #EF7325;">{{getDictLabel(item.currentStatus, qcjy_xqlc)}}</view>
+        </view>
+      </view>
+      <view class="titles">
+        <view class="title-item active"><view>待服务毕业生列表</view></view>
+        <view>共 {{jobListcount}} 条信息</view>
+      </view>
+      <view v-for="(item, index) in jobList" :key="index" class="person-list">
+        <view class="top-info">
+          <image v-if="index%2==0" src="../../../packageRc/static/personIcon.png"/>
+          <image v-else src="../../../packageRc/static/personIconFe.png"/>
+          <view class="top-right">
+            <view class="name-line">
+              <view class="name">{{item.name}}<view   class="tag">{{item.zy}}</view></view>
+              <view class="service-status" v-if="item.fwzt == 0">•未服务</view>
+              <view class="service-status" v-if="item.fwzt == 1">•已服务</view>
+              <view class="service-status" v-if="item.fwzt == 2">•联系不上</view>
+              <view class="service-status" v-if="item.fwzt == 3">•拒绝服务</view>
+              <view class="service-status" v-if="item.isReturn == 1">•被退回</view>
+            </view>
+            <view class="info-line" style="display: flex;">
+              <view style="margin-right: 24rpx;"><text>年龄：</text>{{item.age}}岁</view>
+              <view><text>服务次数：</text>{{item.operateNum}}次</view>
+            </view>
+          </view>
+        </view>
+        <view class="info-line">
+          <view><text>联系电话：</text>{{item.phone || '--'}}</view>
+          <view><text>详细地址：</text>{{item.xxdz}}</view>
+        </view>
+        <view class="services">
+          <view @click="showReturnReasonPopup(item.id)">退回</view>
+          <view @click="tiao(item)">服务</view>
+        </view>
+      </view>
+    </view>
+  </scroll-view>
+    
+    <!-- 退回原因弹窗 -->
+    <uni-popup ref="returnReasonPopup" position="center"  round>
+      <view class="popup-content" style="background:rgb(248, 248, 248);">
+        
+        <textarea 
+          v-model="returnReason"
+          class="reason-textarea" 
+          placeholder="请输入退回原因"
+          placeholder-class="placeholder-style"
+          rows="5"
+          maxlength="200"
+        ></textarea>
+        <view class="popup-footer">
+          <button class="cancel-btn" @click="cancelReturn">取消</button>
+          <button class="confirm-btn" @click="confirmReturn">确认退回</button>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script setup>
+import { personInfoList,personAlertList } from '../../api/personinfo/index'
+import { returnPerson} from '@/packageRc/api/personinfo/index'
+import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
+let activeTab = ref(1)
+let activeTitle = ref(1)
+let jobList = ref([{},{},{},{},{}])
+let jobListcount = ref()
+let returnItemData = ref()
+let jobList1 = ref([{},{}])
+let jobList1count = ref()
+// 退回原因弹窗相关
+let returnReasonPopup = ref(null)
+let returnReason = ref('')
+let currentItemIndex = ref(-1)
+function goPersonalList() {
+  console.log('goPersonalList')
+  uni.navigateTo({
+    url: '/packageRc/pages/personalList/personalList'
+  });
+}
+function back() {
+  uni.navigateBack({
+    delta: 1
+  });
+ 
+};
+let qcjy_xqlx = ref([])
+let qcjy_xqlc = ref([])
+import {getDicts} from '@/apiRc/system/dict'
+onMounted(() => {
+  getlist();
+  getlistyujing();
+  getDicts('qcjy_xqlx').then(res => {
+    qcjy_xqlx.value = res.data
+  });
+  getDicts('qcjy_xqlc').then(res => {
+    qcjy_xqlc.value = res.data
+  });
+});
+function getDictLabel(value, list) {
+  const item = list.find(item => item.dictValue === value);
+  return item ? item.dictLabel : '';
+}
+async function getlist(){
+  
+  try {
+    const res = await personInfoList();
+    console.log("res", res);
+    jobList.value = res.rows || [];
+    jobListcount.value=res.total || 0
+  } catch (error) {
+    console.error("获取数据失败:", error);
+    jobList.value = [];
+  }
+};
+async function getlistyujing(){
+  
+  try {
+    const res = await personAlertList();
+    console.log("res", res);
+    jobList1.value = res.rows || [];
+    jobList1count.value=res.total || 0
+  } catch (error) {
+    console.error("获取数据失败:", error);
+    jobList1.value = [];
+  }
+};
+ 
+// 显示退回原因弹窗
+function showReturnReasonPopup(dd) {
+  this.returnItemData.id=dd
+    console.log("退回")
+  returnReason.value = '' 
+  // 使用 ref 控制弹窗显示
+  if (returnReasonPopup.value) {
+    returnReasonPopup.value.open()
+  }
+}
+
+function tiao(item){
+  console.log('尝试导航到待办详情页面，ID:', item.id, item.userId);
+  // 尝试直接使用uni.navigateTo，使用正确的格式并传递id参数
+  uni.navigateTo({
+    url: `/packageRc/pages/daiban/daibandetail?id=${item.id}&name=${item.name}&userId=${item.userId}`,
+    success: function() {
+      console.log('导航成功');
+    },
+    fail: function(err) {
+      console.error('导航失败:', err);
+    }
+  });
+}
+
+// 确认退回
+function confirmReturn() {
+  if (!returnReason.value.trim()) {
+    uni.showToast({
+      title: '请填写退回原因',
+      icon: 'none'
+    })
+    return
+  }
+   const params = {
+        id: this.returnItemData.id,
+        opinion: this.returnReason
+      }
+      const { code, msg } =  returnPerson(params);
+      if (code == 200) {
+        this.returnDialog = false;
+        this.$u.toast(msg);
+        this.getList(true);
+      }
+  
+  // 这里可以添加提交退回原因的API调用
+  console.log('退回原因:', returnReason.value, '项目索引:', currentItemIndex.value)
+  
+  // 模拟提交成功
+  uni.showToast({
+    title: '退回成功'
+  })
+  
+  // 使用 ref 控制弹窗关闭
+  if (returnReasonPopup.value) {
+    returnReasonPopup.value.close()
+  }
+}
+
+// 取消退回
+function cancelReturn() {
+  // 使用 ref 控制弹窗关闭
+  if (returnReasonPopup.value) {
+    returnReasonPopup.value.close()
+  }
+}
+function viewMore() {
+  // uni.navigateTo({
+  //   url: '/pages/jobList/jobList'
+  // })
+}
+</script>
+
+<style lang="less" scoped>
+view{box-sizing: border-box;display: block;}
+.container{
+  background-color: #F4F4F4;background-position: top center;background-size: 100% auto;
+  height: 100vh;
+  min-width: 100vw;
+  padding-bottom: 0;
+  background-repeat: no-repeat;
+  box-sizing: border-box;
+}
+.kinggang{ 
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  padding: 36rpx 32rpx 33rpx 32rpx;
+  background: #FFFFFF;
+  border-radius: 16rpx;
+  border: 3rpx solid #FFFFFF;
+  margin-bottom: 24rpx;background: linear-gradient(180deg, #EDF4FF 0%, #FFFFFF 52%);
+  >view{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    font-weight: bold;
+    >view{font-size: 50rpx;}
+    .num-title{
+      font-size: 28rpx;
+      margin-top: 16rpx;
+      font-weight: normal;
+    }
+
+    // text{
+    //   font-size: 28rpx;
+    // }
+  }
+  image{
+    width: 78rpx;
+    // margin-bottom: 15rpx;
+    height: 78rpx;
+  }
+  
+  /* 退回原因弹窗样式 */
+  .popup-content {
+    background: #FFFF;
+    border-radius: 24rpx;
+    padding: 48rpx;
+    width: 88%;
+    box-sizing: border-box;
+    box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.15);
+  }
+  
+  .popup-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-bottom: 36rpx;
+    text-align: center;
+  }
+  
+  .reason-textarea {
+    width: 100%;
+    border: 2rpx solid #D8D8D8;
+    border-radius: 12rpx;
+    padding: 24rpx;
+    min-height: 220rpx;
+    font-size: 30rpx;
+    color: #333333;
+    box-sizing: border-box;
+    background: #FAFAFA;
+  }
+  
+  .placeholder-style {
+    color: #999999;
+  }
+  
+  .popup-footer {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 40rpx;
+  }
+  
+  .cancel-btn,
+  .confirm-btn {
+    flex: 1;
+    height: 90rpx;
+    line-height: 90rpx;
+    border-radius: 16rpx;
+    font-size: 32rpx;
+    text-align: center;
+    margin: 0 15rpx;
+    font-weight: 500;
+  }
+  
+  .cancel-btn {
+    background: #F8F8F8;
+    color: #666666;
+    border: none;
+  }
+  
+  .confirm-btn {
+    background: #1A62CE;
+    color: #FFFFFF;
+    border: none;
+  }
+  
+  /* 弹窗背景遮罩层样式 */
+  ::v-deep(.uni-popup__wrapper) {
+    background-color: rgba(0, 0, 0, 0.5);
+  }
+}
+.trace-line{
+  width: 100%;
+  margin-bottom: 24rpx;
+  display: flex;
+  justify-content: space-between;
+  >view{
+    padding: 37.5rpx 32rpx;
+    width: calc(50% - 12rpx);
+    .title{
+      font-size: 28rpx;
+      font-weight: bold;
+      color: #1D6AD7;
+      margin-bottom: 16rpx;
+      display: flex;
+      image{
+        width: 46rpx;
+        height: 46rpx;
+        margin-right: 11rpx;
+      }
+    }
+    .more{
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+  .trace{
+    color: #2E77DF;
+    border: 2rpx solid #78ADFF;
+    background: linear-gradient(0deg, #FFFFFF 1%, #D0E1FF 100%);
+    box-shadow: inset 0px 4rpx 10rpx 0px rgba(255, 255, 255, 0.302);
+    .title{
+      color: #1D6AD7;
+    }
+  }
+  .sendManager{
+    border: 2rpx solid #FFC34B;
+    color: #C68412;
+    box-shadow: inset 0px 4px 10px 0px rgba(255, 255, 255, 0.302);
+    background: linear-gradient(0deg, #FFFFFF 0%, #FBF4D1 100%);
+    .title{color: #CE9523;}
+
+  }
+}
+.tabs{
+  margin-bottom: 29rpx;
+
+	border-radius: 16rpx;
+	display: flex;
+	background: #fff;
+	color: #878787;
+	text-align: center;
+	width: 100%;
+	.tab{
+		width: 50%;
+		border: 4rpx solid transparent;
+		border-radius: 16rpx;
+		line-height: 64rpx;
+		position: relative;
+		&.active{
+      border: 4rpx solid #fff;
+			color: #fff;
+			background: linear-gradient(180deg, #79AFFF 1%, #A2B3FE 100%);
+      box-shadow: 0px 4rpx 10rpx 0px rgba(40, 102, 194, 0.4);
+		}
+	}
+}
+.titles{
+  display: flex;
+  margin-bottom: 44rpx;
+    display: flex;
+    justify-content: space-between;
+  .title-item{
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-right: 32rpx;
+    position: relative;
+    >view{
+      position: relative;
+      z-index: 2;
+      padding: 0 16rpx;
+    }
+    &.active::after{
+      content: '';
+      position: absolute;
+      z-index: 1;
+      bottom: -12rpx;
+      left: 0;
+      width: 120%;
+      height: 24rpx;
+      border-radius: 50px 0px 0px 50px;
+      background: linear-gradient(90deg, #78AEFF 0%, rgba(120, 174, 255, 0.31) 52%, rgba(24, 116, 255, 0) 100%);
+    }
+  }
+}
+.job-list{
+  width: 100%;
+  margin: 0 auto;
+  color: #333333;
+  border-radius: 24rpx;
+  background: #FFFFFF;
+  padding: 32rpx;
+  margin-bottom: 24rpx;
+  position: relative;
+  .sign{
+    position: absolute;
+    font-size: 24rpx;
+    right: 0;
+    top: 0;
+    padding: 4rpx 14rpx;
+    border: 1rpx solid #EC4827;
+    background: rgba(227, 79, 49, 0.09);
+    border-top-right-radius: 24rpx;
+    border-bottom-left-radius: 24rpx;
+    color: #EC4827;
+  }
+  .top-line{
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #A2A2A2;
+    margin-bottom: 16rpx;
+    .salary{
+      font-size: 32rpx;
+      color: #4C6EFB;
+      font-weight: bold;
+    }
+  }
+  .title{
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-bottom: 16rpx;
+    display: flex;
+    image{
+      width: 46rpx;
+      height: 46rpx;
+      margin-right: 11rpx;
+    }
+  }
+  .info{
+    font-size: 24rpx;
+    margin-bottom: 16rpx;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+  .bottom-line{
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #A2A2A2;
+    margin-top: 12rpx;
+  }
+}
+.view-more-btn{ 
+  padding: 10rpx 56rpx;
+  background: #FFFFFF;
+  color: #4C6EFB;
+  border: 1rpx solid #4C6EFB;
+  text-align: center;
+  border-radius: 40rpx;
+  width: fit-content;
+  margin: 0 auto;
+  margin-bottom: 20rpx;
+}
+.person-list{
+  padding-top: 32rpx;
+  margin-bottom: 24rpx;
+  border-radius: 16rpx;
+  background: #FFFFFF;
+  .top-info{
+    padding: 0 32rpx;
+    margin-bottom: 24rpx;
+    display: flex;
+    image{
+      width: 86rpx;
+      height: 86rpx;
+      margin-right: 19rpx;
+      display: block;
+    }
+    .top-right{
+      flex-grow: 1;
+      flex-shrink: 1;
+      .name-line{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .name{
+          font-size: 32rpx;
+          display: flex;
+          margin-right: 15rpx;
+          margin-bottom: 3rpx;
+          align-items: center;
+          .tag{
+            font-size: 24rpx;
+            line-height: 32rpx;
+            padding: 0 12rpx;
+            margin-left: 15rpx;
+            border-radius: 4rpx;
+            background: #4D89E3;
+            color: #fff;
+            flex-shrink: 0;
+          }
+        }
+        .service-status{
+          color: #E0A61F;
+          font-weight: bold;
+          font-size: 26rpx;
+          flex-shrink: 0;
+        }
+      }
+      .info-line{
+        padding: 0;
+        border: 0;
+      }
+    }
+  }
+  .info-line{
+    padding: 0 32rpx 32rpx;
+    color: #3D3D3D;
+    border-bottom: 1px solid #E8E8E8;
+    >view{
+      text{
+        color: #8E8E8E;
+      }
+      font-size: 26rpx;
+    }
+  }
+  .services{
+    line-height: 40rpx;
+    padding: 28rpx 32rpx;
+    display: flex;
+    >view{
+      flex-grow: 1;
+      font-size: 26rpx;
+      color: #1A62CE;
+      text-align: center;
+      &:first-child{
+        color: #E04020;
+        border-right: 1px solid #D8D8D8;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/packageRc/pages/daiban/daibandetail.vue b/packageRc/pages/daiban/daibandetail.vue
new file mode 100644
index 0000000..a43bcd1
--- /dev/null
+++ b/packageRc/pages/daiban/daibandetail.vue
@@ -0,0 +1,1414 @@
+<template>
+  <view class="job-list" style="background-image: url('../../../packageRc/static/pageBg.png');">
+    <view class="job-list__content">
+      <image
+        class="top_box_bg_service"
+        src="/packageRc/static/images/serviceFrequency.png"
+        style="width:calc(100vw - 64rpx);height:80rpx;display: block;"
+        alt=""
+      />
+      <view class="serviceFrequency"     @tap="
+            $tab.navigateTo(
+              `/pages/community/serviceRecord?userId=${form.userId}`
+            )
+          ">
+        <view>服务次数 {{ serviceTotal }}</view>
+        <view
+      
+          style="font-size: 28rpx; font-weight: normal"
+          >{{'查看>'}}</view
+        >
+      </view>
+      <view class="content">
+        <view
+          class="personnelInformation"
+          @tap="
+            $tab.navigateTo(
+              `/pages/community/personEdit?id=${form.id}&type=edit`
+            )
+          "
+        >
+          <view class="left">
+            <view class="left_name">{{ form?.name || '' }}</view>
+            <view style="margin-top: 10rpx">
+              <text v-if="form.gender == 0">男</text>
+              <text v-if="form.gender == 1">女</text>
+              <text style="margin: 10rpx">· </text>
+              <text>{{ calculateAge(form.cardNumber) }}岁</text>
+            </view>
+            <view style="margin-top: 20rpx; color: #9fa0a6">
+              {{ form.phone }}
+            </view>
+          </view>
+          <view>
+            <img
+              src="/packageRc/static/images/person/malepng.png"
+              v-if="form.gender == 0"
+              width="70rpx"
+              alt=""
+            />
+            <img
+              src="/packageRc/static/images/person/femalepng.png"
+              v-if="form.gender == 1"
+              width="70rpx"
+              alt=""
+            />
+          </view>
+        </view>
+        <view class="visitAndInvestigate" @click="goAddServices">
+          <view class="text">服务</view>
+          <image
+            src="/packageRc/static/images/person/fillInRecords.png"
+            style="width:220rpx;height:60rpx;"
+            alt=""
+            srcset=""
+          />
+        </view>
+			<view class="xuqiushu-box">
+				<view style="width: 100%;display: flex;justify-content: space-between;">
+					<view class="xuqiushu-box-item" @click="activeType = 1">
+						<view class="xuqiushu-box-item-title">
+							<view :style="{color: activeType == 1 ? '#1A62CE' : '#3d3d3d'}">求职需求数</view>
+							<!-- <view style="color: #3D3D3D;">需求数</view> -->
+						</view>
+						<view class="xuqiushu-box-item-num">{{ jobSearchList.length }}</view>
+					</view>
+					<view class="xuqiushu-box-item" @click="activeType = 2">
+						<view class="xuqiushu-box-item-title">
+							<view :style="{color: activeType == 2 ? '#16ACB7' : '#3d3d3d'}">创业需求数</view>
+							<!-- <view style="color: #3D3D3D;">需求数</view> -->
+						</view>
+						<view class="xuqiushu-box-item-num">{{ listOfEntrepreneurialNeeds.length }}</view>
+					</view>
+					<view class="xuqiushu-box-item" @click="activeType = 3">
+						<view class="xuqiushu-box-item-title">
+							<view :style="{color: activeType == 3 ? '#6A57D1' : '#3d3d3d'}">培训需求数</view>
+							<!-- <view style="color: #3D3D3D;">需求数</view> -->
+						</view>
+						<view class="xuqiushu-box-item-num">{{ trainingList.length }}</view>
+					</view>
+					<view class="xuqiushu-box-item" @click="activeType = 4">
+						<view class="xuqiushu-box-item-title">
+							<view :style="{color: activeType == 4 ? '#1890ff' : '#3d3d3d'}">其他需求数</view>
+							<!-- <view style="color: #3D3D3D;">需求数</view> -->
+						</view>
+						<view class="xuqiushu-box-item-num">{{ otherList.length }}</view>
+					</view>
+				</view>
+			</view>
+        <!-- <view class="requirementTitle">
+          <text>求职需求</text>
+          <text class="text"
+            >共有<text style="color: #1a62ce">{{ jobSearchList.length }}</text
+            >条求职需求</text
+          >
+        </view> -->
+        <uni-swipe-action v-show="activeType == 1">
+          <uni-swipe-action-item
+            :right-options="[{ text: '删除' }]"
+            class="jobSearchListview"
+            v-for="item in jobSearchList"
+            :key="item.id"
+            @click="removeRowData(item)"
+          >
+            <view>
+              <view style="border-radius: 8rpx;margin-top: 16rpx;background: #fff;padding: 30rpx;" @click="goNeedsDetail(item, 1)">
+                <view class="jobSearchListview_name">{{
+                  getJobWorkTypeName(item.jobWorkType)
+                }}</view>
+                <view class="salaryExpectation">
+                  <text style="color: #8e8e8e">期望薪资：</text>
+                  <view class="salary">
+                    {{ item.minRecruitmentSalary}}-
+                    {{ item.highRecruitmentSalary}}
+                    /月
+                  </view>
+                </view>
+                <view class="salaryExpectation">
+                  <text style="color: #8e8e8e">希望工作地点：</text>
+                  <text>{{ item.addressDesc }}</text>
+                </view>
+                <view class="jobSearchListview_currentStatus">
+                  <text style="color: #e0a61f" v-if="item.currentStatus == 1"
+                    >待处理</text
+                  >
+                  <text style="color: #288ae6" v-if="item.currentStatus == 2"
+                    >处理中</text
+                  >
+                  <text style="color: #1ac88b" v-if="item.currentStatus == 3"
+                    >已完成</text
+                  >
+                </view>
+                <view v-if="item.currentStatus == 3" class="job-list__item-btn">
+                  <u-button
+                    type="primary"
+                    :plain="true"
+                    color="#1A62CE"
+                    text="服务追溯"
+                    @click.native.stop="serviceTraceButton(item, 1)"
+                    :customStyle="{ border: 'none' }"
+                  ></u-button>
+                </view>
+                <view class="job-list__item-btn" v-else>
+                  <view
+                    class="btn"
+                    @click.native.stop="requirementTraining(item, 1)"
+                    >推荐</view
+                  >
+                  <view
+                    class="btn"
+                    @click.native.stop="requirementHandling(item, 1)"
+                    >办结</view
+                  >
+                </view>
+              </view>
+            </view>
+          </uni-swipe-action-item>
+        </uni-swipe-action>
+        <!-- <view class="requirementTitle">
+          <text>创业需求</text>
+          <text class="text"
+            >共有<text style="color: #1a62ce">{{
+              listOfEntrepreneurialNeeds.length
+            }}</text
+            >条求职需求</text
+          >
+        </view> -->
+        <uni-swipe-action v-show="activeType == 2">
+          <uni-swipe-action-item
+            :right-options="[{ text: '删除' }]"
+            @click="removeRowData(item)"
+            class="entrepreneurialNeeds"
+            v-for="item in listOfEntrepreneurialNeeds"
+            :key="item.id"
+          >
+            <view style="border-radius: 8rpx;margin-top: 16rpx;background: #fff;padding: 30rpx" @click="goNeedsDetail(item, 3)">
+              <view class="entrepreneurialNeeds_name">
+                {{ item.personName }}的创业需求
+              </view>
+              <view class="entrepreneurialNeeds_row">
+                <text style="color: #8e8e8e">是否意有场地需求：</text>
+                <text>{{ item.ywcdxq }}</text>
+              </view>
+              <view class="entrepreneurialNeeds_row">
+                <text style="color: #8e8e8e">是否意向参加创业培训：</text>
+                <text>{{ item.ywcypxxq }}</text>
+              </view>
+              <view class="entrepreneurialNeeds_row">
+                <text style="color: #8e8e8e">是否有资金需求：</text>
+                <text>{{ item.ywzjxq }}</text>
+              </view>
+              <view class="jobSearchListview_currentStatus">
+                <text style="color: #e0a61f" v-if="item.currentStatus == 1"
+                  >待处理</text
+                >
+                <text style="color: #288ae6" v-if="item.currentStatus == 2"
+                  >处理中</text
+                >
+                <text style="color: #1ac88b" v-if="item.currentStatus == 3"
+                  >已完成</text
+                >
+              </view>
+              <view v-if="item.currentStatus == 3" class="job-list__item-btn">
+                <u-button
+                  type="primary"
+                  :plain="true"
+                  color="#1A62CE"
+                  text="服务追溯"
+                  @click.native.stop="serviceTraceButton(item, 3)"
+                  :customStyle="{ border: 'none' }"
+                ></u-button>
+              </view>
+              <view class="job-list__item-btn" v-else>
+                <view
+                  class="btn"
+                  style="width: 100%"
+                  @click.native.stop="requirementHandling(item, 3)"
+                  >办理</view
+                >
+              </view>
+            </view>
+          </uni-swipe-action-item>
+        </uni-swipe-action>
+        <!-- <view class="requirementTitle">
+          <text>培训需求</text>
+          <text class="text"
+            >共有<text style="color: #1a62ce">{{ trainingList.length }}</text
+            >条求职需求</text
+          >
+        </view> -->
+        <uni-swipe-action v-show="activeType == 3">
+          <uni-swipe-action-item
+            :right-options="[{ text: '删除' }]"
+            @click="removeRowData(item)"
+            class="entrepreneurialNeeds"
+            v-for="item in trainingList"
+            :key="item.id"
+          >
+            <view style="border-radius: 8rpx;margin-top: 16rpx;background: #fff;padding: 30rpx" @click="goNeedsDetail(item, 4)">
+              <view class="entrepreneurialNeeds_name">
+                {{ item.personName }}的培训需求
+              </view>
+              <view class="entrepreneurialNeeds_row">
+                <text style="color: #8e8e8e">培训意愿工种：</text>
+                <text>{{ getJobWorkTypeName(item.qwpxgz) }}</text>
+              </view>
+              <view class="entrepreneurialNeeds_row">
+                <text style="color: #8e8e8e">期望培训时间：</text>
+                <text>{{ item.qwpxsj }}</text>
+              </view>
+
+              <view class="jobSearchListview_currentStatus">
+                <text style="color: #e0a61f" v-if="item.currentStatus == 1"
+                  >待处理</text
+                >
+                <text style="color: #288ae6" v-if="item.currentStatus == 2"
+                  >处理中</text
+                >
+                <text style="color: #1ac88b" v-if="item.currentStatus == 3"
+                  >已完成</text
+                >
+              </view>
+              <view v-if="item.currentStatus == 3" class="job-list__item-btn">
+                <u-button
+                  type="primary"
+                  :plain="true"
+                  color="#1A62CE"
+                  text="服务追溯"
+                  @click.native.stop="serviceTraceButton(item, 4)"
+                  :customStyle="{ border: 'none' }"
+                ></u-button>
+              </view>
+              <view class="job-list__item-btn" v-else>
+                <!-- <view
+                  class="btn"
+                  @click.native.stop="requirementTraining(item, 4)"
+                  >推荐</view
+                > -->
+                <view
+                  style="width: 100%"
+                  class="btn"
+                  @click.native.stop="requirementHandling(item, 4)"
+                  >办理</view
+                >
+              </view>
+            </view>
+          </uni-swipe-action-item>
+        </uni-swipe-action>
+        <!-- <view class="requirementTitle">
+          <text>其他需求</text>
+          <text class="text"
+            >共有<text style="color: #1a62ce">{{ otherList.length }}</text
+            >条其他需求</text
+          >
+        </view> -->
+        <uni-swipe-action v-show="activeType == 4">
+          <uni-swipe-action-item
+            :options="[{ text: '删除' }]"
+            @click="removeRowData(item)"
+            class="entrepreneurialNeeds"
+            v-for="item in otherList"
+            :key="item.id"
+          >
+            <view style="border-radius: 8rpx;margin-top: 16rpx;background: #fff;padding: 30rpx" @click="goNeedsDetail(item, 5)">
+              <view class="entrepreneurialNeeds_name">
+                {{ item.personName }}的其他需求
+              </view>
+
+              <view class="entrepreneurialNeeds_row">
+                <text style="color: #8e8e8e">需求说明：</text>
+                <text>{{ item.jobDescription }}</text>
+              </view>
+
+              <view class="jobSearchListview_currentStatus">
+                <text style="color: #e0a61f" v-if="item.currentStatus == 1"
+                  >待处理</text
+                >
+                <text style="color: #288ae6" v-if="item.currentStatus == 2"
+                  >处理中</text
+                >
+                <text style="color: #1ac88b" v-if="item.currentStatus == 3"
+                  >已完成</text
+                >
+              </view>
+              <view v-if="item.currentStatus == 3" class="job-list__item-btn">
+                <u-button
+                  type="primary"
+                  :plain="true"
+                  color="#1A62CE"
+                  text="服务追溯"
+                  @click.native.stop="serviceTraceButton(item, 4)"
+                  :customStyle="{ border: 'none' }"
+                ></u-button>
+              </view>
+              <view class="job-list__item-btn" v-else>
+                <!-- <view
+                  class="btn"
+                  @click.native.stop="requirementTraining(item, 4)"
+                  >推荐</view
+                > -->
+                <view
+                  style="width: 100%"
+                  class="btn"
+                  @click.native.stop="requirementHandling(item, 4)"
+                  >办理</view
+                >
+              </view>
+            </view>
+          </uni-swipe-action-item>
+        </uni-swipe-action>
+      </view>
+    </view>
+    <view class="addNeeds" @click="goAddNeeds">
+      <img src="/packageRc/static/images/person/addNeeds.png" />
+    </view>
+  
+    <!-- <uni-popup  ref="show" @close="close" @open="open">
+      <view class="dialog_div">
+        <view class="dialog_div_item" @click="goAddNeeds(1)">
+          <img
+            src="/packageRc/static/person/entrepreneurialIcon.png"
+            style="margin-right: 10rpx"
+            width="18rpx"
+            alt=""
+            srcset=""
+          />
+          求职需求
+        </view>
+        <view class="dialog_div_item" @click="goAddNeeds(3)">
+          <img
+            src="/packageRc/static/person/jobSeekingIcon.png"
+            style="margin-right: 10rpx"
+            width="18rpx"
+            alt=""
+            srcset=""
+          />
+          创业需求
+        </view>
+        <view class="dialog_div_item" @click="goAddNeeds(4)">
+          <img
+            src="/packageRc/static/person/trainingIcon.png"
+            style="margin-right: 10rpx"
+            width="18rpx"
+            alt=""
+            srcset=""
+          />
+          培训需求
+        </view>
+        <view class="dialog_div_item" @click="goAddNeeds(5)">
+          <img
+            src="/packageRc/static/images/selected.png"
+            style="margin-right: 10rpx"
+            width="18rpx"
+            alt=""
+            srcset=""
+          />
+          其他需求
+        </view>
+        <view class="dialog_div_btn" @click="closeShow"> 取 消 </view>
+      </view>
+    </uni-popup> -->
+    <!-- <u-datetime-picker
+      style="position: relative; z-index: 100"
+      :show="showTime"
+      v-model="hopeSolveDate"
+      mode="datetime"
+      closeOnClickOverlay
+      @confirm="confirmDate"
+      @cancel="showTime = false"
+      @close="showTime = false"
+    ></u-datetime-picker> -->
+    <!-- 社区端 - 显示隐藏退出组件 -->
+    <exitPopup />
+  </view>
+</template>
+
+<script>
+
+import { getPersonInfo } from "../../api/company/index.js";
+   //   import { listJobService, serviceTraceability } from "@/api/needs/jobService";
+       import { listPersonDemand, delPersonDemand } from "../../api/needs/personDemand";
+    //   import { requirementCompletion } from "@/api/company";
+    //   import { listEntrepreneurshipService } from "@/api/needs/entrepreneurshipService";
+      // import { listTrainService, delTrainService } from "@/api/needs/trainService";
+       import { listJobType } from "../../api/jobType/index";
+     //  import ImageUpload from "@/components/ImageUpload";
+export default {
+  name: "serviceDetails",
+  components: {
+    //ImageUpload,
+  },
+
+  data() {
+    return {
+      form: {
+        name: '',
+        phone: '',
+        id: '',
+        userId: '',
+        gender: 0,
+        cardNumber: '',
+        status: 1,
+        address: '',
+        // 确保form对象完整初始化，避免访问undefined/null属性
+        current: null,
+        statusLabel: ''
+      },
+      formData: {},
+      fileList: [],
+      showTime: false,
+      jobTypeList: [],
+      otherList: [],
+      jobSearchList: [],
+      listOfEntrepreneurialNeeds: [],
+      listOfEntrepreneurialNeedsTotal: 0,
+      trainingList: [],
+      trainingTotal: 0,
+      jobTotal: 0,
+      serviceTotal: 0,
+      dict: {
+        personStatusList: []
+      },
+      show: false,
+      hopeSolveDate: Number(new Date()),
+      needsType: "",
+      rules: {
+        actualSolveDate: [
+          {
+            required: true,
+            message: "请选择实际解决时间",
+            trigger: ["blur", "change"],
+          },
+        ],
+        agentUserName: [
+          {
+            required: true,
+            message: "请填写经办人",
+            trigger: ["blur", "change"],
+          },
+        ],
+        solveDesc: [
+          {
+            required: true,
+            message: "请填写解决说明",
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
+      openDeal: false,
+      activeType: 1,
+      disabled: false,
+      showPersonStatusPicker: false,
+      personStatusLabel: '',
+    };
+  },
+  onLoad(options) {
+    this.form.id = options.id;
+    this.form.userId = options.name
+    this.form.userId = options.userId; // 确保userId被正确赋值
+    console.log("options", options);
+    this.getPersonInfo11();
+   
+  },
+  onShow() {
+    // 移除show重置，避免影响弹窗显示
+    this.getListPersonDemand();
+//    this.serviceTraceability();
+  },
+  created(){
+
+  },
+  mounted() {
+    
+    // 注释掉getDicts调用，避免运行时错误
+    /*
+    let arr = [
+      {
+        key: "qcjy_zgzpgz",
+        prop: "highRecruitmentSalary",
+      },
+      {
+        key: "qcjy_zgzpgz",
+        prop: "minRecruitmentSalary",
+      },
+      {
+        key: "qcjy_ryzt",
+        prop: "personStatusList",
+      },
+    ];
+    arr.forEach((ele, index) => {
+      this.getDicts(ele.key).then((res) => {
+        this.dict[ele.prop] = res.data;
+        this.$forceUpdate();
+      });
+    });
+    */
+    // 暂时注释掉workTypeRemoteMethod调用，避免listJobType未定义错误
+    // if (typeof this.workTypeRemoteMethod === 'function') {
+    //   this.workTypeRemoteMethod();
+    // }
+    // this.getListPersonDemand();
+    // this.getJobSearchList();
+    // this.getListOfEntrepreneurialNeeds();
+    // this.getTrainingList();
+  },
+
+  methods: {
+    // 返回上一页
+    goBack() {
+      uni.navigateBack();
+    },
+    
+    // 选择人员状态
+    selectPersonStatus(item) {
+      this.formData.personStatus = item.dictValue;
+      this.showPersonStatusPicker = false;
+    },
+    
+    // 确认人员状态选择
+    onPersonStatusConfirm() {
+      // 已在selectPersonStatus中处理
+    },
+    
+    getJobWorkTypeName(data) {
+      // 添加空值检查，避免访问null/undefined的属性
+      if (!data || !this.jobTypeList || this.jobTypeList.length === 0) {
+        return '';
+      }
+      let arr = this.jobTypeList.filter((ele) => ele && ele.id == data);
+      return arr && arr.length > 0 && arr[0] ? arr[0].workTypeName : '';
+    },
+    workTypeRemoteMethod(key) {
+      try {
+        // 检查listJobType是否存在，避免未定义错误
+        if (typeof listJobType === 'function') {
+          listJobType({
+            workTypeName: key,
+            pageNum: 1,
+            pageSize: 50,
+          }).then((res) => {
+            this.jobTypeList = res.rows;
+          });
+        } else {
+          console.log('listJobType 函数未定义');
+        }
+      } catch (error) {
+        console.error('workTypeRemoteMethod执行错误:', error);
+      }
+    },
+    open() {
+      // console.log('open');
+    },
+    closeShow() {
+      this.$refs.show.close();
+      // console.log('close');
+    },
+
+    goAddServices() {
+      console.log("服务按钮点击事件触发");
+      console.log("form数据:", this.form);
+      console.log("userId:", this.form?.userId);
+      console.log("name:", this.form?.name);
+      
+      try {
+    
+        const url = `/packageRc/pages/daiban/addbangfu?id=${this.form?.userId || ''}&name=${this.form.name}`;
+        console.log("导航URL:", url);
+        
+        uni.navigateTo({
+          url: url,
+          success: () => {
+            console.log("导航成功");
+          },
+          fail: (err) => {
+            console.error("导航失败:", err);
+            uni.showToast({
+              title: '导航失败: ' + JSON.stringify(err),
+              icon: 'none'
+            });
+          }
+        });
+      } catch (error) {
+        console.error("执行出错:", error);
+        uni.showToast({
+          title: '执行出错: ' + error.message,
+          icon: 'none'
+        });
+      }
+    },
+    goRecommend() {
+      this.$tab.navigateTo(
+        `/pages/services/serviceDetail?activeType=2&showTab=1&userId=${this.form.userId}&name=${this.form.name}`
+      );
+    },
+    goPush() {
+      this.$tab.navigateTo(
+        `/pages/services/serviceDetail?activeType=3&showTab=1&userId=${this.form.userId}&name=${this.form.name}`
+      );
+    },
+    goNeedsDetail(item, needsType) {
+      uni.navigateTo({
+        url: `/pages/needs/needDetail?id=${item.id}&type=${needsType}&showTab=1`,
+      });
+    },
+    calculateAge(data) {
+      if (data) {
+        // 根据身份号计算年龄
+        let birthday = data.substr(6, 8);
+        let year = birthday.substr(0, 4);
+        let month = birthday.substr(4, 2);
+        let day = birthday.substr(6, 2);
+        let now = new Date();
+        let nowYear = now.getFullYear();
+        let nowMonth = now.getMonth() + 1;
+        let nowDay = now.getDate();
+        if (nowMonth > month) {
+          return nowYear - year;
+        } else if (nowMonth == month) {
+          if (nowDay >= day) {
+            return nowYear - year;
+          } else {
+            return nowYear - year - 1;
+          }
+        } else {
+          return nowYear - year - 1;
+        }
+      }
+    },
+    confirmDate(e) {
+      this.showTime = false;
+      // 获取选中的日期
+      const date = e.value;
+      // 使用 uView 的 uTime 方法格式化日期，包含时分秒
+      const formattedDateTime = uni.$u.timeFormat(date, "yyyy-mm-dd hh:MM:ss");
+      // 设置表单数据
+      this.formData.actualSolveDate = formattedDateTime;
+    },
+    removeRowData(data) {
+      //确实要删除的提示
+      uni.showModal({
+        title: "提示",
+        content: "你确定要删除吗",
+        success: (res) => {
+          delPersonDemand(data.id).then((res) => {
+            if (res.code == 200) {
+              uni.showToast({
+                title: "删除成功",
+                icon: "none",
+              });
+              //刷新列表
+              this.getListPersonDemand();
+            } else {
+              uni.showToast({
+                title: "删除失败",
+                icon: "none",
+              });
+            }
+          });
+        },
+      });
+    },
+    goAddNeeds() {
+      uni.navigateTo({
+        url: `/packageRc/pages/demand/demandail?activeType=${1}&id=${this.form.userId}&name=${this.form.name}`,
+        success: function() {
+          console.log('导航成功')
+          
+        },
+        fail: function(err) {
+          console.error('导航失败:', err);
+        }
+      });
+    },
+    getDictLabel(value, list) {
+      if (list) {
+        let arr = list.filter((ele) => ele.dictValue == value);
+        if (arr.length) {
+          return arr[0].dictLabel;
+        } else {
+          return "--";
+        }
+      }
+    },
+    // 服务追溯
+    serviceTraceButton(item, needsType) {
+      // 定义需求类型与对应的字符串映射
+      const demandTypeMap = {
+        1: "job", // 求职需求
+        2: "assist", // 援助需求
+        3: "entrepreneurship", // 创业需求
+        4: "train", // 培训需求
+        5: "other", // 其他需求
+      };
+      // 获取当前的需求类型字符串
+      const demandType = demandTypeMap[needsType] || "other";
+      // 使用映射后的字符串构建URL并导航
+      this.$tab.navigateTo(
+        `/pages/services/serviceTraceability?id=${item.id}&demandType=${demandType}`
+      );
+    },
+    // 办结按钮
+    async finishJobRecommend(needsType) {
+      try {
+        // 先进行表单校验
+        await this.$refs.uForm.validate();
+
+        // 校验通过后再走后续逻辑
+        this.$showLoading();
+        const url = "/manage/personDemand/demandDone";
+        if (!url) {
+          throw new Error("无效的需求类型");
+        }
+        const { code, msg } = await requirementCompletion(url, this.formData);
+
+        if (code === 200) {
+          this.$u.toast('办结成功');
+          this.openDeal = false;
+          this.getListPersonDemand();
+          this.serviceTraceability();
+        }
+      } catch (error) {
+        let msg = '';
+        if (error && error[0] && error[0].message) {
+          msg = error[0].message;
+        } else if (error && error.message) {
+          msg = error.message;
+        } else if (typeof error === 'string') {
+          msg = error;
+        } else {
+          msg = '请检查必填项填写';
+        }
+        this.$u.toast(msg);
+      } finally {
+        this.$hideLoading();
+      }
+    },
+    // 需求推荐/培训
+    requirementTraining(item, index) {
+      if (index == 1) {
+        uni.navigateTo({
+          url: `/packageRc/pages/services/serviceDetail?personName=${item.personName}&personId=${item.personId}&jobDemandInfoId=${item.id}&jobWorkType=${item.jobWorkType}&type=3&showTab=1`
+        });
+      } else {
+        uni.navigateTo({
+          url: `/packageRc/pages/services/serviceDetail?personName=${item.personName}&personId=${item.personId}&skillTrainingId=${item.id}&personStatus=${item.personStatus}&type=4&showTab=1`
+        });
+      }
+    },
+    changeFile(e) {
+      // 清空当前的 fileUrl 数组
+      this.formData.fileUrl = [];
+      // 如果 e 有长度（即用户选择了文件）
+      if (e.length) {
+        // 遍历每个文件对象并获取其 url
+        for (let data of e) {
+          const url = data.data ? data.data.url : data.url;
+          this.formData.fileUrl.push(url);
+        }
+      }
+      this.formData.fileUrl = this.$arrayToString(this.formData.fileUrl);
+    },
+    // 需求办结
+    requirementHandling(item, needsType) {
+  this.openDeal = true;
+  this.needsType = needsType;
+  this.formData = {
+    id: item.id,
+    currentStatus: "3",
+    userId: item.userId,
+    personStatus: item.personStatus || (this.dict.personStatusList[0] && this.dict.personStatusList[0].dictValue),
+  };
+  console.log("item",item)
+  this.$nextTick(() => {
+    this.$forceUpdate();
+  });
+},
+    onPersonStatusConfirm(e) {
+      const item = e.value[0];
+      this.formData.personStatus = item.dictValue;
+      this.showPersonStatusPicker = false;
+    },
+    getListPersonDemand() {
+      this.jobSearchList = [];
+      this.listOfEntrepreneurialNeeds = [];
+      this.trainingList = [];
+      this.otherList = [];
+
+      listPersonDemand({
+        page: 1,
+        limit: 1000,
+        userId: this.form.userId,
+      }).then((res) => {
+        if (res.code == 200) {
+          res.rows.forEach((element) => {
+            if (element.demandType == 1) {
+              this.jobSearchList.push(element);
+            }
+            if (element.demandType == 2) {
+              this.listOfEntrepreneurialNeeds.push(element);
+            }
+            if (element.demandType == 3) {
+              this.trainingList.push(element);
+            }
+            if (element.demandType == 9) {
+              this.otherList.push(element);
+            }
+          });
+        }
+      });
+    },
+
+    getPersonInfo11() {
+      getPersonInfo(this.form.id).then((res) => {
+        if (res.code == 200) {
+          // 使用对象展开运算符，保留原有属性（特别是userId），同时更新其他属性
+          this.form = { ...this.form, ...res.data };
+          console.log('获取到的人员信息:', this.form);
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+/* 表单样式 */
+.self-form {
+  padding: 20rpx;
+}
+
+.form-item {
+  margin-bottom: 30rpx;
+}
+
+.form-item.required .form-label::after {
+  content: '*';
+  color: #ff4d4f;
+  margin-left: 4rpx;
+}
+
+.form-label {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 12rpx;
+}
+
+.form-content {
+  position: relative;
+}
+
+.form-input {
+  width: 100%;
+  padding: 20rpx;
+  border: 1rpx solid #d9d9d9;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  background-color: #fff;
+}
+
+.form-textarea {
+  width: 100%;
+  min-height: 200rpx;
+  padding: 20rpx;
+  border: 1rpx solid #d9d9d9;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  background-color: #fff;
+  resize: none;
+}
+
+/* 导航栏样式 */
+.navbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx 30rpx;
+  width: 100%;
+  box-sizing: border-box;
+  position: relative;
+}
+
+.navbar-left,
+.navbar-right {
+  width: 60rpx;
+  text-align: center;
+}
+
+.navbar-title {
+  flex: 1;
+  text-align: center;
+  font-size: 36rpx;
+  font-weight: 500;
+}
+
+/* 自定义picker样式 */
+.picker-container {
+  background-color: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  padding-bottom: 30rpx;
+}
+
+.picker-header {
+  display: flex;
+  justify-content: space-between;
+  padding: 20rpx 30rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.picker-header > view {
+  font-size: 32rpx;
+  color: #333;
+}
+
+.picker-header > view:first-child {
+  color: #999;
+}
+
+.picker-header > view:last-child {
+  color: #1A62CE;
+}
+
+.picker-content {
+  max-height: 500rpx;
+  overflow-y: auto;
+}
+
+.picker-item {
+  padding: 24rpx 30rpx;
+  font-size: 30rpx;
+  color: #333;
+  border-bottom: 1rpx solid #f5f5f5;
+}
+
+.picker-item:active {
+  background-color: #f5f5f5;
+}
+
+.job-list {
+  height: 100%;;
+  background-repeat: no-repeat;
+  background-color: #F4F4F4;
+
+  &__content {
+    position: relative;
+    padding: 32rpx;
+    z-index: 10;
+    background-color: #F4F4F4;
+    border-radius: 32rpx 32rpx 0 0;
+    border: 1px solid #fff;
+  }
+
+  &__scroll {
+    margin-top: 10rpx;
+    height: calc(100vh - 320rpx);
+  }
+
+  &__item {
+    position: relative;
+    padding: 32rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    font-size: 28rpx;
+
+    .tips {
+      position: absolute;
+      right: 0;
+      top: 0;
+      min-width: 40rpx;
+      padding: 0 24rpx;
+      height: 40rpx;
+      line-height: 40rpx;
+      color: #1ace62;
+      border-radius: 0px 16rpx 0px 16rpx;
+      background-color: #d9f9ed;
+      border: 1px solid #58e6a2;
+    }
+  }
+
+  &__item-detail {
+    margin-top: 20rpx;
+    color: #8e8e8e;
+
+    view,
+    text:last-child {
+      margin-left: 10rpx;
+      color: #333;
+    }
+  }
+
+  .tab_list {
+    margin-top: 30rpx;
+    height: 86rpx;
+    color: #ce6b1a;
+    border-top: 1px solid #eff2f6;
+  }
+
+  .items {
+    margin-top: 30rpx;
+    border-top: 1px solid #d0dcee;
+  }
+
+  .post_job_btn {
+    position: fixed;
+    bottom: 120rpx;
+    right: 16rpx;
+    width: 150rpx;
+    height: 150rpx;
+    border-radius: 50%;
+    z-index: 20;
+    background: url("@/packageRc/static/images/addPersonnel.png") no-repeat;
+    background-size: 100% 100%;
+  }
+
+  .dialog_form {
+    padding: 30rpx;
+    width: 80vw;
+
+    .tadio {
+      height: 100rpx;
+    }
+
+    .btn {
+      margin-top: 100rpx;
+    }
+  }
+}
+
+.job-list__content {
+  background-color: transparent;
+  border: 0px solid #fff;
+  position: relative;
+  padding: 1rpx;
+  .content {
+    padding: 0 32rpx;
+    margin-top: 100rpx;
+    height: calc(100vh - 64rpx);
+    overflow: auto;
+    z-index: 10;
+    // background-color: #d0dcee;
+    // border-radius: 17px 17px 0 0;
+    // border: 3px solid #fff !important;
+  }
+}
+.top_box_bg_service {
+  position: absolute;
+  top: 20rpx;
+  left: 40rpx;
+}
+.serviceFrequency {
+  position: absolute;
+  left: 260rpx;
+  top: 50rpx;
+  display: flex;
+  justify-content: space-between;
+  width: 55%;
+  color: #ffffff;
+  font-family: Source Han Sans;
+  font-size: 36rpx;
+  font-weight: bold;
+  line-height: 32rpx;
+}
+.visitAndInvestigate {
+  margin-top: 40rpx;
+  width: 100%;
+  height: 140rpx;
+  border-radius: 8px;
+  background: #ffffff;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .text {
+    font-size: 38rpx;
+    color: #282828;
+    font-weight: bold;
+  }
+}
+.visitAndInvestigate-vertical {
+  margin-top: 32rpx;
+  display: flex;
+  background: #fff;
+  border-radius: 8px;
+  padding: 30rpx;
+  align-items: center; // 让“服务”上下居中
+  .left {
+    min-width: 70rpx;
+    .text {
+      font-size: 38rpx;
+      color: #282828;
+      font-weight: bold;
+      margin-top: 8rpx;
+    }
+  }
+  .right {
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
+    margin-left: 80rpx;
+    flex: 1;
+    align-items: flex-end;
+    .service-btn-img {
+      width: 200rpx;   // 更大
+      height: 60rpx;
+      cursor: pointer;
+      display: block;
+    }
+  }
+}
+.visitAndInvestigate-row {
+  display: flex;
+  justify-content: space-between; // 两端对齐
+  align-items: center;
+  background: #fff;
+  border-radius: 16px;
+  padding: 30rpx 40rpx; // 上下30，左右40
+  margin-top: 32rpx;
+  gap: 32rpx; // 两个按钮之间的间距
+  .btn-col {
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .service-btn-img {
+    width: 100%;
+    height: 80rpx; // 按需调整高度
+    object-fit: contain; // 保证图片不变形
+    cursor: pointer;
+    display: block;
+  }
+}
+.personnelInformation {
+  width: 100%;
+  height: 205rpx;
+  border-radius: 8px;
+  border-top-right-radius: 0;
+  background: #ffffff;
+  padding: 30rpx;
+  box-sizing: border-box;
+  display: flex;
+  .left {
+    flex: 1;
+    .left_name {
+      color: #282828;
+      font-size: 38rpx;
+      font-weight: bold;
+    }
+  }
+}
+.requirementTitle {
+  padding-left: 12rpx;
+  height: 38rpx;
+  font-weight: 700;
+  font-size: 38rpx;
+  justify-content: space-between;
+  color: #3d3d3d;
+  border-left: 10rpx solid #1a62ce;
+  display: flex;
+  align-items: center;
+  margin-top: 40rpx;
+  .text {
+    font-size: 26rpx;
+    color: #282828;
+    font-weight: 500;
+  }
+}
+.trainingNeeds {
+  margin-top: 40rpx;
+  width: 100%;
+  border-radius: 8px;
+  background: #ffffff;
+  padding: 30rpx;
+  box-sizing: border-box;
+  position: relative;
+}
+.entrepreneurialNeeds {
+  margin-top: 40rpx;
+  width: 100%;
+  border-radius: 8px;
+  background: #ffffff;
+  box-sizing: border-box;
+  position: relative;
+  .jobSearchListview_currentStatus {
+    position: absolute;
+    right: 40rpx;
+    top: 40rpx;
+  }
+  .entrepreneurialNeeds_row {
+    margin-top: 20rpx;
+  }
+  .entrepreneurialNeeds_name {
+    font-weight: 700;
+    font-size: 38rpx;
+    width: 80%;
+    //超过一行隐藏
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+.jobSearchListview {
+  margin-top: 40rpx;
+  width: 100%;
+  border-radius: 8px;
+  background: #ffffff;
+  
+  //   padding: 30rpx;
+  box-sizing: border-box;
+  position: relative;
+  .jobSearchListview_currentStatus {
+    position: absolute;
+    right: 40rpx;
+    top: 40rpx;
+  }
+  .jobSearchListview_name {
+    font-size: 38rpx;
+    font-weight: bold;
+    color: #282828;
+  }
+  .salaryExpectation {
+    margin-top: 20rpx;
+    display: flex;
+    align-items: center;
+    .salary {
+      font-size: 38rpx;
+      font-weight: bold;
+      color: #fa6553;
+    }
+  }
+}
+.job-list__item-btn {
+  height: 60rpx;
+  margin-top: 40rpx;
+  border-top: 1px solid #eee;
+  display: flex;
+  justify-content: space-between;
+  color: #1a62ce;
+  font-size: 26rpx;
+  .btn {
+    width: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    margin-top: 10rpx;
+  }
+}
+.self-form {
+  padding: 32rpx;
+
+  .bordered {
+    border: 1rpx solid #dadbde;
+    padding: 9px;
+    border-radius: 4px;
+  }
+}
+.button-area {
+  padding: 24rpx 32rpx 68rpx;
+  background: #fff;
+  display: flex;
+  box-sizing: border-box;
+  border-radius: 16px 16px 0px 0px;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
+
+  .btn {
+    line-height: 72rpx;
+    width: 176rpx;
+    margin-right: 16rpx;
+    font-size: 28rpx;
+    border: 1px solid #b8c5d4;
+    color: #282828;
+    text-align: center;
+    border-radius: 8rpx;
+  }
+
+  .reset {
+    background: #dce2e9;
+  }
+
+  .save {
+    background: linear-gradient(103deg, #1d64cf 0%, #1590d4 99%);
+    color: #fff;
+    border: 0;
+    flex-grow: 1;
+  }
+}
+
+.addNeeds {
+  position: fixed;
+  right: 0;
+  bottom: 150rpx;
+  height:150rpx;
+  width: 150rpx;
+  overflow: hidden;
+  z-index: 10;
+  border-radius: 44rpx;
+  border-radius: 75rpx;
+
+  img {
+    display: block;
+    width: 100%;
+  }
+}
+.dialog_div {
+  .dialog_div_item {
+    height: 96rpx;
+    margin: 30rpx;
+    border: 1px solid #e6e6e6;
+    background: #f2f4f7;
+    display: flex;
+    justify-content: center;
+    font-size: 28rpx;
+    color: #282828;
+    align-items: center;
+  }
+
+  .dialog_div_btn {
+    display: flex;
+    margin: 40rpx;
+    border-top: 1px solid #e6e6e6;
+    height: 60rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding-top: 20rpx;
+    color: #1a62ce;
+  }
+}
+
+.xuqiushu-box {
+			color: #3D3D3D;
+			position: relative;
+			z-index: 10;
+			border-radius: 24rpx;
+			padding: 32rpx 40rpx;
+			border: 3rpx solid #FFFFFF;
+			background: linear-gradient(180deg, #FFFFFF 0%, #EDF4FF 100%);
+			margin-top: 24rpx;
+		}
+		.xuqiushu-box-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			.xuqiushu-box-item-title {
+				display: flex;
+				margin-bottom: 16rpx;
+			}
+			.xuqiushu-box-item-num {
+				font-size: 40rpx;
+				font-weight: 700;
+			}
+		}
+.person-status-select {
+  width: 100%;
+  border: 1rpx solid #dadbde;
+  border-radius: 4px;
+  padding: 9px 12px;
+  min-height: 40rpx;
+  background: #fff;
+  box-sizing: border-box;
+  font-size: 28rpx;
+  margin-bottom: 0;
+}
+</style>
diff --git a/packageRc/pages/demand/components/ImageUpload.vue b/packageRc/pages/demand/components/ImageUpload.vue
new file mode 100644
index 0000000..bffbea0
--- /dev/null
+++ b/packageRc/pages/demand/components/ImageUpload.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="upload-container">
+		<u-upload :disabled="disabled" :width="width" :height="height" :fileList="internalFileList" :name="name" :multiple="multiple"
+			:maxCount="maxCount" @afterRead="handleAfterRead" @delete="handleRemove">
+		</u-upload>
+	</view>
+</template>
+
+<script>
+//	import {
+//		uploadImg
+//	} from '@/api/company'
+	import config from '@/config'
+//	import {
+//		getToken
+//	} from '@/utils/auth'
+	export default {
+		props: {
+			maxSize: {
+				type: Number,
+				default: 5, // 最大文件大小（MB）
+			},
+			allowedFormats: {
+				type: Array,
+				default: () => [], // 允许的文件格式
+			},
+			maxImageSize: {
+				type: Object,
+				default: () => ({
+					width: 2048,
+					height: 2048
+				}), // 图片最大宽度和高度
+			},
+			width: {
+				type: String,
+				default: '100rpx', // 默认宽度
+			},
+			height: {
+				type: String,
+				default: '100rpx', // 默认高度
+			},
+			name: {
+				type: String,
+				default: 'file', // 默认name字段
+			},
+			multiple: {
+				type: Boolean,
+				default: false, // 是否允许多选，默认不允许
+			},
+			maxCount: {
+				type: Number,
+				default: 1, // 默认最大上传数量为1
+			},
+			fileList: {
+				type: Array,
+				default: () => [], // 默认的文件列表为空
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+
+		},
+		data() {
+			return {
+				internalFileList: Array.isArray(this.fileList) ? [...this.fileList] : [], // 内部的文件列表，确保与父组件的同步
+			};
+		},
+		watch: {
+			// 监听 fileList 的变化，确保内外部数据同步
+			fileList(newVal) {
+				this.internalFileList = Array.isArray(newVal) ? [...newVal] : [];
+			},
+		},
+		methods: {
+			// 新增图片
+			async handleAfterRead(event) {
+				let lists = [].concat(event.file);
+				let fileListLen = this.internalFileList.length;
+				lists.map((item) => {
+					this.internalFileList.push({
+						...item,
+						status: "uploading",
+						message: "上传中",
+					});
+				});
+				for (let i = 0; i < lists.length; i++) {
+					if (this.allowedFormats.length > 0) {
+						let fileType = lists[i].name.split('.').pop().toLowerCase();
+						if (!this.allowedFormats.includes(fileType)) {
+							// this.$emit('error', '不支持的文件格式');
+							uni.showToast({
+								title: '不支持的文件格式',
+								icon: 'none',
+							});
+							this.internalFileList.splice(fileListLen, 1);
+							this.$emit('update', this.internalFileList); // 通知父组件文件列表更新
+							return;
+						}
+					}
+					const result = await this.uploadFilePromise(lists[i].url);
+					let item = this.internalFileList[fileListLen];
+					this.internalFileList.splice(
+						fileListLen,
+						1,
+						Object.assign(item, {
+							status: "success",
+							message: "",
+							data: result,
+						})
+					);
+					fileListLen++;
+					this.$emit('update', this.internalFileList); // 通知父组件文件列表更新
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					uni.uploadFile({
+						url: config.baseUrl + '/system/oss/upload',
+						filePath: url,
+						name: "file",
+						header: {
+							Authorization: "Bearer " + getToken(),
+						},
+						success: (uploadFileRes) => {
+							let res = JSON.parse(uploadFileRes.data);
+							resolve(res.data);
+						},
+						fail: (err) => {
+							console.log(err);
+						},
+					});
+				});
+			},
+			handleRemove({file, index}) {
+				this.internalFileList.splice(index, 1); // 从文件列表中移除指定文件
+				this.$emit('update', this.internalFileList); // 通知父组件文件列表更新
+			},
+		},
+	};
+</script>
+
+<style scoped>
+	.upload-container {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.upload-slot {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border: 1px dashed #ccc;
+		border-radius: 4px;
+		padding: 20px;
+	}
+</style>
diff --git a/packageRc/pages/demand/components/choosePerson.vue b/packageRc/pages/demand/components/choosePerson.vue
new file mode 100644
index 0000000..c608a0f
--- /dev/null
+++ b/packageRc/pages/demand/components/choosePerson.vue
@@ -0,0 +1,133 @@
+<template>
+	<view>
+		<u-popup :show="showPersonChooser" closeOnClickOverlay @close="showPersonChooser=false">
+			<view style="padding: 32rpx 32rpx 0">
+				<u--input @change="searchChange" placeholder="搜索选择人员" v-model="searchPerson"></u--input>
+				<scroll-view style="height: 500rpx;" :scroll-y="true">
+					<view v-for="(item, index) in personList" :key="index" :label="item.name" :value="item.name"
+						@click="bindPerson(item)" class="person-list" :class="{active: activePerson.id == item.id}">
+						<view style="display: flex;justify-content: space-between;font-size: 32rpx;font-weight: bold;">
+							{{ item.name }}
+							<view style="color: #8492a6; font-size: 13px;width: 50%;text-align: right;">{{ item.phone }}
+							</view>
+						</view>
+						<view style="color: #8492a6;margin-top: 7rpx;">现居住地：{{item.currentResidentialAddress}}</view>
+					</view>
+				</scroll-view>
+				<view class="button-area">
+					<view class="btn" @click="showPersonChooser=false">取消</view>
+					<view class="btn reset" @click="resetData">重置</view>
+					<view class="btn save" @click="saveInfo">确定</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getPersonList
+	} from '../../../api/needs/person'
+	export default {
+		data() {
+			return {
+				showPersonChooser: false,
+				activePerson: {},
+				searchPerson: '',
+				personList: [],
+				searcher: '',
+			}
+		},
+		mounted() {
+			this.doSearch()
+		},
+		methods: {
+			open() {
+				this.showPersonChooser = true;
+				this.activePerson = {}
+			},
+			saveInfo() {
+				this.$emit('confirm', this.activePerson)
+				this.showPersonChooser = false
+			},
+			searchChange() {
+				if (this.searcher) {
+					clearTimeout(this.searcher)
+					this.doSearch()
+				} else {
+					this.doSearch()
+				}
+			},
+			doSearch() {
+				this.searcher = setTimeout(() => {
+					getPersonList({
+						name: this.searchPerson,
+						pageSize: 100,
+						pageNum: 1
+					}).then(res => {
+						this.personList = res.rows
+						console.log("人眼",res.row)
+						clearTimeout(this.searcher)
+					})
+				}, 200)
+			},
+			resetData(){
+				this.searchPerson = '';
+				this.personList = [];
+				this.activePerson = {}
+			},
+			bindPerson(item) {
+				this.activePerson = item;
+				this.$forceUpdate();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.person-list {
+		padding: 24rpx 32rpx;
+		border-radius: 8rpx;
+		box-sizing: border-box;
+		border: 1px solid #e4e4e4;
+		margin-top: 32rpx;
+
+		&.active {
+			border: 1px solid #1890ff;
+		}
+	}
+
+	.button-area {
+		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
+		padding: 24rpx 32rpx 68rpx;
+		width: calc(100% + 64rpx);
+		margin-left: -32rpx;
+		background: #fff;
+		display: flex;
+		box-sizing: border-box;
+		margin-top: 40rpx;
+		border-radius: 16px 16px 0px 0px;
+
+		.btn {
+			line-height: 72rpx;
+			width: 176rpx;
+			margin-right: 16rpx;
+			font-size: 28rpx;
+			border: 1px solid #B8C5D4;
+			color: #282828;
+			text-align: center;
+			border-radius: 8rpx;
+		}
+
+		.reset {
+			background: #DCE2E9;
+		}
+
+		.save {
+			background: linear-gradient(103deg, #1D64CF 0%, #1590D4 99%);
+			color: #fff;
+			border: 0;
+			flex-grow: 1;
+		}
+	}
+</style>
diff --git a/packageRc/pages/demand/components/entrepreneurshipService.vue b/packageRc/pages/demand/components/entrepreneurshipService.vue
new file mode 100644
index 0000000..9a64200
--- /dev/null
+++ b/packageRc/pages/demand/components/entrepreneurshipService.vue
@@ -0,0 +1,638 @@
+<!--
+ * @Date: 2024-10-08 14:29:36
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 15:43:51
+-->
+<template>
+	<view class="container">
+		<scroll-view scroll-y="true" :style="{height: edit?'calc(90vh - 150px)':'calc(100vh - 144px)'}">
+			<view class="inner">
+				<view class="part-title" style="display: flex;justify-content: space-between;">创业需求信息
+					<view v-if="!edit&&formData.id&&formData.currentStatus!=3" class="btn"
+						style="font-weight: normal;display: flex;" @click="edit=true">编辑<view class="icon-right">✏️</view></view>
+				</view>
+				<view class="inner-part">
+					<view class="self-form">
+						<view class="form-item">
+							<view class="form-label">姓名 <text class="required">*</text></view>
+							<view v-if="name" style="width: 100%;"
+								class="disabledLine">
+								{{ formData.personName || '请选择' }}
+							</view>
+							<view v-else style="width: 100%;" @click="openPersonChooser"
+								:class="{disabledLine: !edit||!canChoosePerson, noValue: !formData.personName}">
+								{{ formData.personName || '请选择' }}
+							</view>
+							<view class="icon-right">✏️</view>
+						</view>
+						<view class="form-item">
+							<view class="form-label">有无场地需求 <text class="required">*</text></view>
+							<view class="radio-group">
+								<view 
+									:class="['radio-item', { 'radio-disabled': !edit }]"
+									@click="formData.ywcdxq = '是'" 
+									v-if="edit">
+									<view :class="['radio', { 'radio-checked': formData.ywcdxq === '是' }]"></view>
+									<text>是</text>
+								</view>
+								<view 
+									:class="['radio-item', { 'radio-disabled': !edit }]"
+									@click="formData.ywcdxq = '否'" 
+									v-if="edit">
+									<view :class="['radio', { 'radio-checked': formData.ywcdxq === '否' }]"></view>
+									<text>否</text>
+								</view>
+								<view v-else>{{ formData.ywcdxq }}</view>
+							</view>
+						</view>
+						<view class="form-item">
+							<view class="form-label">场地面积</view>
+							
+							<input type="number" :disabled="!edit" v-model="formData.requiredOfficeSpace" placeholder="请输入" :class="['form-input', { 'form-input-disabled': !edit }]"/>
+							<view class="icon-right">✏️</view>
+						</view>
+						<view class="form-item">
+							<view class="form-label">办公人数</view>
+							<input type="number" :disabled="!edit" v-model="formData.bgrs" placeholder="请输入" :class="['form-input', { 'form-input-disabled': !edit }]"/>
+							<view class="icon-right">✏️</view>
+						</view>
+						<view class="form-item">
+							<view class="form-label">办公位置</view>
+							<input type="text" :disabled="!edit" v-model="formData.bgdd" placeholder="请输入" :class="['form-input', { 'form-input-disabled': !edit }]"/>
+							<view class="icon-right">✏️</view>
+						</view>
+						<view class="form-item">
+							<view class="form-label">有无创业培训需求 <text class="required">*</text></view>
+							<view class="radio-group">
+								<view 
+									:class="['radio-item', { 'radio-disabled': !edit }]"
+									@click="formData.ywcypxxq = '是'" 
+									v-if="edit">
+									<view :class="['radio', { 'radio-checked': formData.ywcypxxq === '是' }]"></view>
+									<text>是</text>
+								</view>
+								<view 
+									:class="['radio-item', { 'radio-disabled': !edit }]"
+									@click="formData.ywcypxxq = '否'" 
+									v-if="edit">
+									<view :class="['radio', { 'radio-checked': formData.ywcypxxq === '否' }]"></view>
+									<text>否</text>
+								</view>
+								<view v-else>{{ formData.ywcypxxq }}</view>
+							</view>
+						</view>
+<!--						<u-form-item label="是否意向接受创业培训" prop="isInterestedEntrepreneurshipGuidance" required>-->
+<!--							<u-radio-group :disabled="!edit" v-model="formData.isInterestedEntrepreneurshipGuidance"-->
+<!--								placement="row">-->
+<!--								<u-radio :customStyle="{marginRight: '16px'}" label="是" name="是"></u-radio>-->
+<!--								<u-radio :customStyle="{marginRight: '16px'}" label="否" name="否"></u-radio>-->
+<!--							</u-radio-group>-->
+<!--						</u-form-item>-->
+						<view class="form-item">
+							<view class="form-label">有无资金需求 <text class="required">*</text></view>
+							<view class="radio-group">
+								<view 
+									:class="['radio-item', { 'radio-disabled': !edit }]"
+									@click="formData.ywzjxq = '是'" 
+									v-if="edit">
+									<view :class="['radio', { 'radio-checked': formData.ywzjxq === '是' }]"></view>
+									<text>是</text>
+								</view>
+								<view 
+									:class="['radio-item', { 'radio-disabled': !edit }]"
+									@click="formData.ywzjxq = '否'" 
+									v-if="edit">
+									<view :class="['radio', { 'radio-checked': formData.ywzjxq === '否' }]"></view>
+									<text>否</text>
+								</view>
+								<view v-else>{{ formData.ywzjxq }}</view>
+							</view>
+						</view>
+						<view class="form-item">
+							<view class="form-label">需求说明 <text class="required">*</text></view>
+							<textarea :disabled="!edit" v-model="formData.jobDescription" placeholder="请输入" :class="['form-textarea', { 'form-textarea-disabled': !edit }]"></textarea>
+						</view>
+					</view>
+				</view>
+			</view>
+<!--			<view class="inner" style="margin-top: 32rpx;">-->
+<!--				<view class="inner-part">-->
+<!--					<u&#45;&#45;form labelPosition="left" class="self-form" labelWidth="110">-->
+<!--						<u-form-item label="需求说明" prop="qtxqsm">-->
+<!--							<u-textarea :disabled="!edit" v-model="formData.qtxqsm" placeholder="请输入"></u-textarea>-->
+<!--						</u-form-item>-->
+<!--					</u&#45;&#45;form>-->
+<!--				</view>-->
+<!--			</view>-->
+			<!-- 	<view class="inner">
+				<view class="part-title" style="margin-top: 32rpx;">附件信息</view>
+				<view class="inner-part">
+					<u--form labelPosition="left" class="self-form" labelWidth="110">
+						<u-form-item label="附件" prop="fileUrl">
+							<ImageUpload :fileList="fileList" @update="changeFile" :maxCount="6" />
+						</u-form-item>
+					</u--form>
+				</view>
+			</view> -->
+
+			<!-- 办理完成后 需求说明 -->
+			<req-comp :form="{
+				actualSolveDate: formData.actualSolveDate,
+				actualSolvePeople: formData.actualSolvePeople,
+				solveDesc: formData.solveDesc,
+				fileUrl: formData.fileUrl
+			}" />
+		</scroll-view>
+		<view class="button-area" v-if="edit">
+			<view class="btn" @click="cancelPage">取消</view>
+			<view class="btn reset" @click="formData.id ? getDetail(formData.id) : setDefaultValues()">重置</view>
+			<view class="btn save" @click="saveInfo">保存</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getPersonBase
+	} from "@/packageRc/api/personinfo/index";
+	import {
+		addPersonDemand,
+		updatePersonDemand,
+		getPersonDemand
+	} from "@/packageRc/api/needs/personDemand";
+	import ChoosePerson from './choosePerson';
+	 import dayjs from "dayjs";
+	export default {
+		components: {
+	//		ChoosePerson,
+		//	ImageUpload
+		},
+				props: {
+					needId: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				edit: true,
+				loading: false,
+				canChoosePerson: false,
+				formData: {
+					id: '',
+					personId: '',
+					userId: '',
+					personName: '',
+					ywcdxq: '',
+					requiredOfficeSpace: '',
+					bgrs: '',
+					bgdd: '',
+					ywcypxxq: '',
+					ywzjxq: '',
+					jobDescription: '',
+					actualSolveDate: '',
+					solveDesc: '',
+					actualSolvePeople: '',
+					fileUrl: '',
+					currentStatus: ''
+				}
+			}
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+		async created() {
+			this.loading = true;
+			// await this.$delay(600)
+			this.setDefaultValues()
+			setTimeout(() => {
+				this.setName()
+			}, 0);
+		},
+		methods: {
+			cancelPage() {
+				if (this.formData.id) {
+					this.edit = false;
+					this.getDetail(this.formData.id)
+				} else {
+					uni.navigateBack()
+				}
+			},
+			 			setName(){
+				// 只有在name有值时才设置人员信息
+				if(this.name) {
+					this.formData.personName = this.name
+					this.formData.personId = this.needId
+					this.formData.userId = this.needId
+				}
+				console.log("this",this)
+			},
+			openPersonChooser() {
+				if (this.edit && this.canChoosePerson) {
+					this.$refs.personChooser.open();
+				}
+			},
+			personNameConfirm(event) {
+				this.formData.personName = event.name
+				this.formData.personId = event.id
+				this.formData.userId = event.userId
+				this.formNameChange();
+				this.$forceUpdate();
+			},
+			changeFile(e) {
+				// 清空当前的 fileUrl 数组
+				this.formData.fileUrl = [];
+				// 如果 e 有长度（即用户选择了文件）
+				if (e.length) {
+					// 遍历每个文件对象并获取其 url
+					for (let data of e) {
+						const url = data.data ? data.data.url : data.url;
+						this.formData.fileUrl.push(url);
+					}
+				}
+				this.formData.fileUrl = this.$arrayToString(this.formData.fileUrl)
+			},
+			addOne() {
+				this.formData = {}
+				this.setDefaultValues()
+				this.getPersonInfo()
+				if(this.name){
+					this.formData.personName = this.name
+					this.formData.personId = this.needId
+					this.formData.userId = this.needId
+				}
+				this.edit = true
+			},
+			getDetail(id) {
+				getPersonDemand(id).then(res => {
+					this.formData = res.data;
+					this.edit = false
+					this.fileList = this.$processFileUrl(this.formData.fileUrl)
+				})
+			},
+			confirmDate(type, e) {
+				this.show[type] = false;
+				let date = new Date(e.value)
+				this.formData[type] =
+					`${date.getFullYear()}-${(date.getMonth()+1)>9?(date.getMonth()+1):('0'+(date.getMonth()+1))}-${date.getDate()>9?date.getDate():('0'+date.getDate())}`
+				this.$forceUpdate();
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+			cancelPicker(type) {
+				this.show[type] = false
+				this.$forceUpdate();
+			},
+			getDictLabel(value, list) {
+				if (list) {
+					let arr = list.filter(ele => ele.dictValue == value)
+					if (arr.length) {
+						return arr[0].dictLabel
+					} else {
+						return '请选择'
+					}
+				}
+			},
+			pickerConfirm(type, event) {
+				this.show[type] = false
+				this.formData[type] = event.value[0].dictValue
+				this.$forceUpdate();
+			},
+			showPicker(type) {
+				if (this.edit) {
+					this.show[type] = true
+					this.$forceUpdate()
+				}
+			},
+			getPersonInfo() {
+				this.loading = true;
+				this.$store.dispatch("GetInfo").then((res) => {
+					if (res.data.roles.indexOf('qunzhong') == -1) {
+						this.canChoosePerson = true;
+					} else {
+						this.canChoosePerson = false;
+						getPersonBase(res.data.user.userId).then(resp => {
+							this.formData.personId = resp.data.id
+							this.formData.userId = resp.data.userId
+							this.formData.personName = resp.data.name
+							this.formNameChange();
+							this.$forceUpdate();
+						})
+					}
+				})
+			},
+			formNameChange() {
+				let date = new Date()
+				// let day =
+				// 	`${date.getFullYear()}-${(date.getMonth()+1) + 1 > 9 ? (date.getMonth()+1) + 1: '0'+((date.getMonth()+1) + 1)}-${date.getDate() > 9 ? date.getDate(): '0'+date.getDate()}`
+				const dayNew = dayjs(date).format("YYYY-MM-DD");
+				this.formData.serviceRequirementTitle = `${this.formData.personName}_于${dayNew}_提出创业需求`
+			},
+			async saveInfo() {
+				this.setName()
+				try {
+					// 验证必填项
+					if (!this.formData.personName || this.formData.personName.trim() === '') {
+						uni.showToast({ title: '请选择姓名！', icon: 'none' });
+						return;
+					}
+					if (!this.formData.ywcdxq) {
+						uni.showToast({ title: '请选择有无场地需求！', icon: 'none' });
+						return;
+					}
+					if (!this.formData.ywcypxxq) {
+						uni.showToast({ title: '请选择有无创业培训需求！', icon: 'none' });
+						return;
+					}
+					if (!this.formData.ywzjxq) {
+						uni.showToast({ title: '请选择有无资金需求！', icon: 'none' });
+						return;
+					}
+					if (!this.formData.jobDescription || this.formData.jobDescription.trim() === '') {
+						uni.showToast({ title: '请填写需求说明！', icon: 'none' });
+						return;
+					}
+
+					// 显示全局加载
+					uni.showLoading({ title: '保存中...' });
+					// 根据 formData 是否有 id 来决定是更新还是新增
+					let response;
+					this.formData.demandType = 2;
+					let successMessage;
+					if (this.formData.id) {
+						response = await updatePersonDemand(this.formData);
+						successMessage = '修改成功';
+					} else {
+						response = await addPersonDemand(this.formData);
+						successMessage = '保存成功';
+					}
+
+					// 检查响应码是否为200
+					if (response.code === 200) {
+						uni.showToast({ title: successMessage, icon: 'success' });
+						// 如果是编辑模式，关闭编辑状态；否则返回上一页
+						if (this.formData.id) {
+							this.edit = false;
+						} else {
+							// 延迟1秒后返回上一页
+							setTimeout(() => {
+								uni.navigateBack();
+							}, 1000);
+						}
+					}
+				} catch (error) {
+					console.error('保存失败:', error);
+					uni.showToast({ title: '系统错误，请联系管理员！', icon: 'none' });
+				} finally {
+					// 确保加载页总是会被隐藏
+					uni.hideLoading();
+				}
+			},
+
+			// 设置默认选中
+			setDefaultValues(){
+				this.$set(this.formData, 'ywcdxq', '是')
+				this.$set(this.formData, 'ywcypxxq', '是')
+				this.$set(this.formData, 'isInterestedEntrepreneurshipGuidance', '是')
+				this.$set(this.formData, 'ywzjxq', '是')
+			},
+			// 获取详情数据
+			async getDetail(id) {
+				try {
+					this.loading = true;
+					const response = await getPersonDemand(id);
+					if (response.code === 200) {
+						this.formData = { ...response.data };
+					}
+				} catch (error) {
+					console.error('获取详情失败:', error);
+					uni.showToast({ title: '获取详情失败', icon: 'none' });
+				} finally {
+					this.loading = false;
+				}
+			}
+			// saveInfo() {
+			// 	this.$refs.uForm.validate().then(res => {
+			// 		if (this.formData.id) {
+			// 			updateEntrepreneurshipService(this.formData).then(res => {
+			// 				if (res.code == 200) {
+			// 					uni.showToast({
+			// 						title: '修改成功'
+			// 					})
+			// 					this.edit = false;
+			// 				}
+			// 			})
+			// 		} else {
+			// 			addEntrepreneurshipService(this.formData).then(res => {
+			// 				if (res.code == 200) {
+			// 					uni.showToast({
+			// 						title: '保存成功'
+			// 					})
+			// 					uni.navigateBack();
+			// 				}
+			// 			})
+			// 		}
+			// 	}).catch(() => {
+			// 		uni.showToast({
+			// 			title: '请检查必填项填写',
+			// 			icon: 'none'
+			// 		})
+			// 	})
+			// }
+		}
+	}
+</script>
+
+<style lang="scss">
+
+	.page ::v-deep .u-navbar__content {
+		background-color: transparent !important;
+	}
+
+	.page {
+		background-color: #3161c7;
+		height: 100vh;
+		background-image: url('https://rc.jinan.gov.cn/qcwjyH5/static/images/top.png');
+		background-repeat: no-repeat;
+		background-size: 100% auto;
+	}
+
+.inner {
+  background: #fff;
+	width: calc(100% - 64rpx);
+	box-sizing: border-box;
+	margin: 0 auto;
+  border-radius: 16rpx;
+  padding: 32rpx;
+  margin-bottom: 24rpx;
+
+}
+
+.inner-part {
+  width: 100%;
+}
+
+/* 为表单元素添加一些间距 */
+.self-form {
+  width: 100%;
+}
+
+/* 表单项目样式 */
+.form-item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+  padding: 24rpx 0;
+}
+
+.form-label {
+  width: 200rpx;
+  font-size: 28rpx;
+  color: #333;
+  flex-shrink: 0;
+  line-height: 48rpx;
+}
+
+.required {
+  color: #f56c6c;
+  margin-left: 4rpx;
+}
+
+.form-input {
+  flex: 1;
+  border: none;
+  outline: none;
+  font-size: 28rpx;
+  color: #333;
+  background: none;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+
+.form-input-disabled {
+  color: #909399;
+  background-color: #f5f7fa;
+}
+
+.form-textarea {
+  flex: 1;
+  border: none;
+  outline: none;
+  font-size: 28rpx;
+  color: #333;
+  background: none;
+  min-height: 120rpx;
+  line-height: 40rpx;
+}
+
+.form-textarea-disabled {
+  color: #909399;
+  background-color: #f5f7fa;
+}
+
+.icon-right {
+  width: 40rpx;
+  height: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #A6A6A6;
+  margin-left: 16rpx;
+}
+
+/* 单选框样式 */
+.radio-group {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 32rpx;
+  cursor: pointer;
+}
+
+.radio-item.radio-disabled {
+  cursor: not-allowed;
+}
+
+.radio {
+  width: 28rpx;
+  height: 28rpx;
+  border-radius: 50%;
+  border: 2rpx solid #dcdfe6;
+  margin-right: 12rpx;
+  position: relative;
+}
+
+.radio.radio-checked {
+  border-color: #409eff;
+  background-color: #409eff;
+}
+
+.radio.radio-checked::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 12rpx;
+  height: 12rpx;
+  border-radius: 50%;
+  background-color: #fff;
+}
+
+/* 调整按钮区域样式 */
+.button-area {
+  margin-top: 24rpx;
+}
+	.button-area {
+		padding: 24rpx 32rpx 68rpx;
+		width: 100%;
+		background: #fff;
+		display: flex;
+		box-sizing: border-box;
+		margin-top: 40rpx;
+		border-radius: 16px 16px 0px 0px;
+
+		.btn {
+			line-height: 72rpx;
+			width: 176rpx;
+			margin-right: 16rpx;
+			font-size: 28rpx;
+			border: 1px solid #B8C5D4;
+			color: #282828;
+			text-align: center;
+			border-radius: 8rpx;
+		}
+
+		.reset {
+			background: #DCE2E9;
+		}
+
+		.save {
+			background: linear-gradient(103deg, #1D64CF 0%, #1590D4 99%);
+			color: #fff;
+			border: 0;
+			flex-grow: 1;
+		}
+	}
+
+	.noValue {
+		color: rgb(192, 196, 204);
+	}
+
+	.disabledLine {
+		background: rgb(245, 247, 250);
+		cursor: not-allowed;
+	}
+</style>
diff --git a/packageRc/pages/demand/components/jobService.vue b/packageRc/pages/demand/components/jobService.vue
new file mode 100644
index 0000000..c994fff
--- /dev/null
+++ b/packageRc/pages/demand/components/jobService.vue
@@ -0,0 +1,910 @@
+<!--
+ * @Date: 2024-10-08 14:29:36
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 16:11:03
+-->
+<template>
+	<view class="container">
+		<scroll-view scroll-y="true" >
+			<view class="inner">
+				<view class="part-title" style="display: flex;justify-content: space-between;">求职需求信息
+					<view v-if="!edit&&formData.id&&formData.currentStatus!=3" class="btn"
+						style="font-weight: normal;display: flex;" @click="edit=true">编辑<view class="icon-right">✏️</view></view>
+				</view>
+				<view class="inner-part">
+					<view class="self-form">
+						<view class="form-item">
+							<view class="form-label">姓名 <text class="required">*</text></view>
+							<view v-if="name" style="width: 100%;"
+								class="disabledLine">
+								{{ formData.personName || '请选择' }}
+							</view>
+							<view v-else style="width: 100%;" @click="openPersonChooser"
+								:class="{disabledLine: !edit||!canChoosePerson, noValue: !formData.personName}">
+								{{ formData.personName || '请选择' }}
+							</view>
+							<view class="icon-right">✏️</view>
+						</view>
+                        <!-- <u-form-item label="姓名" prop="personName" required>
+							<u--input :disabled="!edit" v-model="formData.name" border="none"
+								placeholder="请输入"></u--input>
+							<view class="icon-right" style="width: 40rpx; height: 40rpx;">✏️</view>
+						</u-form-item> -->
+						<!-- <u-form-item label="求职工种" prop="jobWorkType" required>
+							<view style="width: 100%;" @click="showPicker('jobWorkType')"
+								:class="{disabledLine: !edit, noValue: !formData.jobWorkTypeName}">
+								{{ formData.jobWorkTypeName ||'请选择' }}
+							</view>
+							<u-icon slot="right" name="arrow-down" color="#A6A6A6"></u-icon>
+						</u-form-item> -->
+						<!-- 新增工种选择 -->
+                        <view class="form-item">
+							<view class="form-label">求职工种</view>
+							<picker
+								mode="multiSelector"
+								:range="workTypeColumns"
+								range-key="workTypeName"
+								:value="workTypeIndexes"
+								@change="onWorkTypePickerChange"
+								@columnchange="onWorkTypeColumnChange"
+								v-if="workTypeColumns[0] && workTypeColumns[0].length"
+							>
+								<view class="picker-view">
+									<view class="picker-view-text">{{ formData.jobWorkTypeName || '请选择工种' }}</view>
+									<view class="icon-right">▼</view>
+								</view>
+							</picker>
+							<view v-else class="picker-view">
+								<view class="picker-view-text">工种数据加载中...</view>
+							</view>
+						</view>
+                        <!-- <u-form-item label="工种选择" prop="selectedWorkType">
+							<uni-data-picker
+								v-model="selectedWorkType"
+								:localdata="workTypeTreeList"
+								:popup-title="'请选择工种'"
+								:clear-icon="false"
+								:map="{text:'label', value:'id', children:'children'}"
+								@change="onWorkTypeChange"
+								:placeholder="'请选择工种'"
+								:step-searh="false"
+								:popup="true"
+								:multiple="false"
+								:self-field="false"
+							/>
+						</u-form-item> -->
+						<!-- 	<u-form-item label="希望解决日期" prop="hopeSolveDate" required>
+							<view style="width: 100%;" @click="showPicker('hopeSolveDate')"
+								:class="{disabledLine: !edit, noValue: !formData.hopeSolveDate}">
+								{{ formData.hopeSolveDate||'请选择' }}
+							</view>
+							<u-icon slot="right" name="arrow-down" color="#A6A6A6"></u-icon>
+						</u-form-item> -->
+						<!-- <u-form-item label="从业年数" prop="emplymentYear" required>
+							<view style="width: 100%;" @click="showPicker('emplymentYear')"
+								:class="{disabledLine: !edit, noValue: getDictLabel(formData.emplymentYear, dict.emplymentYear)=='请选择'}">
+								{{ getDictLabel(formData.emplymentYear, dict.emplymentYear) }}
+							</view>
+							<u-icon slot="right" name="arrow-down" color="#A6A6A6"></u-icon>
+						</u-form-item>
+						<u-form-item label="工资类型" prop="salaryType" required>
+							<view style="width: 100%;" @click="showPicker('salaryType')"
+								:class="{disabledLine: !edit, noValue: getDictLabel(formData.salaryType, dict.salaryType)=='请选择'}">
+								{{ getDictLabel(formData.salaryType, dict.salaryType) }}
+							</view>
+							<u-icon slot="right" name="arrow-down" color="#A6A6A6"></u-icon>
+						</u-form-item> -->
+						<view class="form-item">
+							<view class="form-label">最低薪酬 <text class="required">*</text></view>
+							<input type="number" :disabled="!edit" v-model="formData.minRecruitmentSalary" placeholder="请输入" :class="['form-input', { 'form-input-disabled': !edit }]"/>
+							<view class="icon-right" style="width: 40rpx; height: 40rpx;">✏️</view>
+					</view>
+						<view class="form-item">
+							<view class="form-label">最高薪酬 <text class="required">*</text></view>
+							<input type="number" :disabled="!edit" v-model="formData.highRecruitmentSalary" placeholder="请输入" :class="['form-input', { 'form-input-disabled': !edit }]"/>
+							<view class="icon-right" style="width: 40rpx; height: 40rpx;">✏️</view>
+					</view>
+						<!-- 	<u-form-item label="单位性质" prop="unitNature" required>
+							<view style="width: 100%;" @click="showPicker('unitNature')"
+								:class="{disabledLine: !edit, noValue: getDictLabel(formData.unitNature, dict.unitNature)=='请选择'}">
+								{{ getDictLabel(formData.unitNature, dict.unitNature) }}
+							</view>
+							<u-icon slot="right" name="arrow-down" color="#A6A6A6"></u-icon>
+						</u-form-item> -->
+						<!-- 	<u-form-item label="用工形式" prop="employmentType" required>
+							<view style="width: 100%;" @click="showPicker('employmentType')"
+								:class="{disabledLine: !edit, noValue: getDictLabel(formData.employmentType, dict.employmentType)=='请选择'}">
+								{{ getDictLabel(formData.employmentType, dict.employmentType) }}
+							</view>
+							<u-icon slot="right" name="arrow-down" color="#A6A6A6"></u-icon>
+						</u-form-item> -->
+						<view class="form-item">
+							<view class="form-label">希望工作地点</view>
+							<input type="text" placeholder="请输入" v-model="formData.addressDesc" class="form-input ellipsis_1" @focus="$refs.placePicker.openDialog()"/>
+			</view>
+			<view class="form-item">
+							<view class="form-label">求职说明 <text class="required">*</text></view>
+							<textarea :disabled="!edit" v-model="formData.jobDescription" placeholder="请输入" :class="['form-textarea', { 'form-textarea-disabled': !edit }]"></textarea>
+						</view>
+						<!-- 		<u-form-item label="就业意愿" prop="employmentWillingness">
+							<view style="width: 100%;" @click="showPicker('employmentWillingness')"
+								:class="{disabledLine: !edit, noValue: getDictLabel(formData.employmentWillingness, dict.employmentWillingness)=='请选择'}">
+								{{ getDictLabel(formData.employmentWillingness, dict.employmentWillingness) }}
+							</view>
+							<u-icon slot="right" name="arrow-down" color="#A6A6A6"></u-icon>
+						</u-form-item> -->
+				</view>
+				</view>
+			</view>
+
+
+			<!-- 办理完成后 需求说明 -->
+			<req-comp :form="{
+				actualSolveDate: formData.actualSolveDate,
+				actualSolvePeople: formData.actualSolvePeople,
+				solveDesc: formData.solveDesc,
+				fileUrl: formData.fileUrl
+			}" />
+
+			<!-- 	<view class="inner">
+				<view class="part-title" style="margin-top: 32rpx;">附件信息</view>
+				<view class="inner-part">
+					<u--form labelPosition="left" class="self-form" labelWidth="110">
+						<u-form-item label="附件" prop="fileUrl">
+							<ImageUpload :fileList="fileList" @update="changeFile" :maxCount="6" />
+						</u-form-item>
+					</u--form>
+				</view>
+			</view>
+		<!-- 使用原生picker组件代替uView的选择器 -->
+		<!-- 工种选择器弹窗 -->
+	
+
+		</scroll-view>
+		<view class="button-area" v-if="edit">
+			<view class="btn" @click="cancelPage">取消</view>
+			<view class="btn reset" @click="getDetail(formData.id)">重置</view>
+			<view class="btn save" @click="saveInfo">保存</view>
+		</view>
+	</view>
+</template>
+<script>
+	import {
+		getPersonBase
+	} from "@/packageRc/api/personinfo/index";
+	import {
+		addPersonDemand,
+		updatePersonDemand,
+		getPersonDemand
+	} from "@/packageRc/api/needs/personDemand";
+	import {
+		listJobType
+	} from "@/packageRc/api/jobType/index";
+	import ImageUpload from './ImageUpload'
+	import ChoosePerson from './choosePerson';
+	import PlacePicker from "/packageRc/components/placePicker";
+
+	//import uPopup from 'uview-ui/components/u-popup/u-popup.vue'
+	export default {
+		components: {
+			ChoosePerson,
+			ImageUpload,
+			PlacePicker,
+	//		uPopup
+		},
+		props: {
+			needId: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				edit: true,
+				personBase: {},
+				dates: {},
+				currentCommunityId: '',
+				showPickerPicker: false,
+				canChoosePerson: true,
+				canChoosePerson: true,
+				formData: {
+					demandType:"1",
+						personName: '',
+					personId:"",
+					userId:"",
+					jobWorkType: '',
+					jobWorkTypeName: '',
+					selectedWorkType: '',
+					selectedWorkTypeName: '',
+					highRecruitmentSalary: '',
+					minRecruitmentSalary: '',
+					employmentType: '',
+					currentCommunity: '',
+					addressDesc: '',
+					jobDescription: '',
+					// fileUrl: []
+				},
+				bfnrzd:[],
+				rules: {
+					personName: [{
+						required: true,
+						message: '请填写姓名',
+						trigger: ['blur', 'change'],
+					}],
+					jobWorkType: [{
+						required: true,
+						message: '请选择求职工种',
+						trigger: ['blur', 'change'],
+						validator: (rule, value) => {
+							return (Array.isArray(value) && value.length > 0) || (!!value);
+						}
+					}],
+					highRecruitmentSalary: [{
+						required: true,
+						message: '请选择最高薪酬',
+						trigger: ['blur', 'change'],
+					}, ],
+					minRecruitmentSalary: [{
+						required: true,
+						message: '请选择最低薪酬',
+						trigger: ['blur', 'change'],
+					}, ],
+					jobDescription: [{
+						required: true,
+						message: '请填写求职说明',
+						trigger: ['blur', 'change'],
+					}, ]
+					// employmentType: [{
+					// 	required: true,
+					// 	message: '请选择用工形式',
+					// 	trigger: ['blur', 'change'],
+					// }, ],
+					// addressDesc: [{
+					// 	required: true,
+					// 	message: '请选择希望工作地点',
+					// 	trigger: ['blur', 'change'],
+					// }, ],
+				},
+				dict: {
+					emplymentYear: [],
+					salaryType: [],
+					highRecruitmentSalary: [],
+					minRecruitmentSalary: [],
+					unitNature: [],
+					employmentWillingness: []
+				},
+				show: {
+					hopeSolveDate: false,
+					jobWorkType: false,
+					emplymentYear: false,
+					salaryType: false,
+					highRecruitmentSalary: false,
+					minRecruitmentSalary: false,
+					unitNature: false,
+					employmentType: false,
+					employmentWillingness: false
+				},
+				currentCity: '请选择',
+				bysj: '',
+				loading: false,
+				jobTypeList: [],
+				route: {},
+				canChoosePerson: false,
+				fileList: [],
+				workTypeList: [],
+				workTypeColumns: [[], [], []],
+				workTypeIndexes: [0, 0, 0],
+			}
+		},
+		// 移除uView表单验证相关代码
+		created() {
+			this.workTypeRemoteMethod('');
+			console.log('qcjy_fwnr' );
+			this.$getDict('qcjy_fwnr').then(res => {
+				this.bfnrzd = res.data;
+			});
+			this.setName()
+			this.loading = true;
+			let arr = [{
+					key: 'qcjy_gznx',
+					prop: 'emplymentYear'
+				},
+				{
+					key: 'qcjy_gzlx',
+					prop: 'salaryType'
+				},
+				{
+					key: 'qcjy_zgzpgz',
+					prop: 'highRecruitmentSalary'
+				},
+				{
+					key: 'qcjy_zgzpgz',
+					prop: 'minRecruitmentSalary'
+				},
+				{
+					key: 'qcjy_dwxz',
+					prop: 'unitNature'
+				},
+				// {
+				// 	key: 'qcjy_ygxs',
+				// 	prop: 'employmentType'
+				// },
+				{
+					key: 'qcjt_jyyy',
+					prop: 'employmentWillingness'
+				},
+			]
+
+			// 使用 Promise.all 确保所有字典数据加载完成
+			Promise.all(arr.map(ele => this.getDicts(ele.key)))
+				.then(responses => {
+					responses.forEach((res, index) => {
+						this.dict[arr[index].prop] = res.data || [];
+					});
+					this.loading = false;
+				})
+				.catch(error => {
+					console.error('加载字典数据失败:', error);
+					// 设置默认空数组
+					arr.forEach(ele => {
+						this.dict[ele.prop] = [];
+					});
+					this.loading = false;
+				});
+
+		},
+		methods: {
+			// 获取字典数据
+			getDicts(dictType) {
+				return this.$getDict(dictType)
+				// .then(res => {
+				// 	this.dict[dictType] = res.data;
+				// });
+			},
+
+			cancelPage() {
+				if (this.formData.id) {
+					this.edit = false;
+					this.getDetail(this.formData.id)
+				} else {
+					uni.navigateBack()
+				}
+			},
+			openPersonChooser() {
+				if (this.edit && this.canChoosePerson) {
+					this.$refs.personChooser.open();
+				}
+			},
+			setName(){
+				// 只有在name有值时才设置人员信息，避免覆盖已有数据
+				if(this.name) {
+					this.formData.personName = this.name
+					this.formData.personId = this.needId
+					this.formData.userId = this.needId
+				}
+			},
+			personNameConfirm(event) {
+		//		this.formData.personName = event.name
+				this.formData.personId = event.id
+				this.formData.userId = event.userId
+
+			},
+			changeFile(e) {
+				// 清空当前的 fileUrl 数组
+				this.formData.fileUrl = [];
+				// 如果 e 有长度（即用户选择了文件）
+				if (e.length) {
+					// 遍历每个文件对象并获取其 url
+					for (let data of e) {
+						const url = data.data ? data.data.url : data.url;
+						this.formData.fileUrl.push(url);
+					}
+				}
+				this.formData.fileUrl = this.$arrayToString(this.formData.fileUrl)
+			},
+			addOne() {
+				this.formData = {}
+				this.getPersonInfo()
+				if(this.name){
+					this.formData.personName = this.name
+					this.formData.userId = this.needId
+				}
+				this.edit = true
+			},
+			getDetail(id) {
+				getPersonDemand(id).then(res => {
+					this.formData = res.data;
+					// 设置工种索引（需要等工种数据加载完成后）
+					if (this.formData.jobWorkType && this.workTypeColumns[0].length) {
+						this.setWorkTypeIndexes(this.formData.jobWorkType);
+					}
+					this.currentCommunityId = +res.data.currentCommunity
+					this.formData.currentCommunity = res.data.currentCommunity
+					this.edit = false;
+					this.fileList = this.$processFileUrl(this.formData.fileUrl)
+				}).catch(error => {
+					console.error('Error fetching job detail:', error);
+				});
+			},
+			confirmDate(type, e) {
+				this.show[type] = false;
+				let date = new Date(e.value)
+				this.formData[type] =
+					`${date.getFullYear()}-${(date.getMonth()+1)>9?(date.getMonth()+1):('0'+(date.getMonth()+1))}-${date.getDate()>9?date.getDate():('0'+date.getDate())}`
+			},
+			workTypeRemoteMethod(key) {
+				listJobType({
+					workTypeName: key,
+					pageNum: 1,
+					pageSize: 50
+				}).then(
+					(res) => {
+						console.log('工种数据加载成功:', res.rows);
+						this.jobTypeList = res.rows;
+						// 处理树形数据为级联选择器格式
+						this.processWorkTypeTree(res.rows);
+					}
+				).catch(error => {
+					console.error('获取工种列表失败:', error);
+					this.workTypeList = [];
+					this.workTypeColumns = [[], [], []];
+				});
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+			cancelPicker(type) {
+				this.show[type] = false
+			},
+			getCityOptis(data) {
+				if (data && data[0] && data[0].children) {
+					return [data].concat(this.getCityOptions(data[0].children))
+				} else {
+					return [data]
+				}
+			},
+
+			getDictLabel(value, list) {
+				if (list && Array.isArray(list)) {
+					let arr = list.filter(ele => ele.dictValue == value)
+					if (arr.length) {
+						return arr[0].dictLabel || '请选择'
+					} else {
+						return '请选择'
+					}
+				}
+				return '请选择'
+			},
+
+			pickerConfirm(type, event) {
+				this.show[type] = false
+				this.formData[type] = event.value[0].dictValue
+			},
+			jobTypeConfirm(type, event) {
+				this.show[type] = false
+				this.formData[type] = event.value[0].id
+				this.formData.jobWorkTypeName = event.value[0].workTypeName
+			},
+			showPicker(type) {
+				if (this.edit) {
+					if(type === 'workTypeTree') {
+						if (!this.workTypeTreeColumns[0] || !this.workTypeTreeColumns[0].length) {
+							this.$u.toast('工种数据未加载，请稍后重试');
+							return;
+						}
+						// 弹窗打开时，初始化临时columns和index
+						this.tempWorkTypeTreeColumns = JSON.parse(JSON.stringify(this.workTypeTreeColumns));
+						this.tempWorkTypeTreeIndex = [...this.workTypeTreeIndex];
+					}
+					this.show[type] = true;
+				}
+			},
+			getPersonInfo() {
+				this.loading = true;
+				this.$store.dispatch("GetInfo").then((res) => {
+					if (res.data.roles.indexOf('qunzhong') == -1) {
+						this.canChoosePerson = true;
+					} else {
+						this.canChoosePerson = false;
+						getPersonBase(res.data.user.userId).then(resp => {
+							this.formData.personId = resp.data.id
+							this.formData.userId = resp.data.userId
+							this.formData.personName = resp.data.name
+						})
+					}
+				})
+			},
+			async saveInfo() {
+				this.setName()
+				try {
+					console.log("this.formData.personName",this.formData.personName)
+					// 先检查求职说明是否为空，如果为空直接提示
+					if (!this.formData.jobDescription || this.formData.jobDescription.trim() === '') {
+						uni.showToast({ title: '请填写求职说明！', icon: 'none' });
+						return;
+					}
+
+					// 简单的表单验证
+					console.log(this.formData)
+					if (!this.formData.personName) {
+						uni.showToast({ title: '请填写姓名！', icon: 'none' });
+						return;
+					}
+					if (!this.formData.jobWorkType) {
+						uni.showToast({ title: '请选择求职工种！', icon: 'none' });
+						return;
+					}
+					if (!this.formData.minRecruitmentSalary) {
+						uni.showToast({ title: '请填写最低薪酬！', icon: 'none' });
+						return;
+					}
+					if (!this.formData.highRecruitmentSalary) {
+						uni.showToast({ title: '请填写最高薪酬！', icon: 'none' });
+						return;
+					}
+					// 显示全局加载
+					uni.showLoading({ title: '加载中...' });
+					this.formData.demandType = 1;
+					// this.formData.userId = this.formData.personId
+					// 根据 formData 是否有 id 来决定是更新还是新增
+					let response;
+					let successMessage;
+					if (this.formData.id) {
+						response = await updatePersonDemand(this.formData);
+						successMessage = '修改成功';
+					} else {
+						response = await addPersonDemand(this.formData);
+						successMessage = '保存成功';
+					}
+					// 检查响应码是否为200
+					if (response.code === 200) {
+						uni.showToast({ title: successMessage });
+						// 如果是编辑模式，关闭编辑状态；否则返回上一页
+						if (this.formData.id) {
+							this.edit = false;
+						} else {
+							// 延迟1秒后返回
+							setTimeout(() => {
+								uni.navigateBack();
+							}, 1000);
+						}
+					}
+				} catch (error) {
+					if(error && error.length){
+						uni.showToast({ title: '请填写完整信息！', icon: 'none' });
+					} else {
+						uni.showToast({ title: '系统错误,请联系管理员！', icon: 'none' });
+					}
+				}
+				finally {
+					// 确保加载页总是会被隐藏
+					uni.hideLoading();
+				}
+			},
+			popupclosed() {
+				this.showPickerPicker = false
+			},
+
+			onChange(e) {
+				const arr = e.detail.value
+				this.formData.currentCity = arr[0].value || "";
+				this.formData.currentArea = arr[1].value || "";
+				this.formData.currentStreet = arr[2].value || "";
+				this.formData.currentCommunity = arr[3].value + '' || "";
+				this.$forceUpdate();
+			},
+
+			// 接收地图数据
+			handleSelected(marker) {
+				this.$set(this.formData, "addressDesc", marker.address);
+				this.$set(this.formData, "latitude", marker.location.lat);
+				this.$set(this.formData, "longitude", marker.location.lng);
+			},
+
+			// 处理树形数据为级联选择器格式
+			processWorkTypeTree(treeData) {
+				if (!treeData || !Array.isArray(treeData)) {
+					this.workTypeColumns = [[], [], []];
+					return;
+				}
+
+				// 第一级
+				const level1 = treeData.filter(item => item.level === "1");
+				// 第二级
+				const level2 = treeData.filter(item => item.level === "2");
+				// 第三级
+				const level3 = treeData.filter(item => item.level === "3");
+
+				// 构建级联数据
+				const columns = [];
+				columns[0] = level1;
+
+				// 根据第一级选择，过滤第二级
+				if (level1.length > 0) {
+					const firstLevelId = level1[0].id;
+					columns[1] = level2.filter(item => item.parentId === firstLevelId);
+				} else {
+					columns[1] = [];
+				}
+
+				// 根据第二级选择，过滤第三级
+				if (columns[1].length > 0) {
+					const secondLevelId = columns[1][0].id;
+					columns[2] = level3.filter(item => item.parentId === secondLevelId);
+				} else {
+					columns[2] = [];
+				}
+
+				this.workTypeColumns = columns;
+				console.log('级联数据构建完成:', this.workTypeColumns);
+			},
+
+			// 级联选择器列变化事件
+			onWorkTypeColumnChange(e) {
+				const { column, value } = e.detail;
+				const newIndexes = [...this.workTypeIndexes];
+				newIndexes[column] = value;
+
+				// 重置后续列的数据
+				if (column === 0) {
+					// 第一列变化，重置第二、三列
+					const selectedLevel1 = this.workTypeColumns[0][value];
+					if (selectedLevel1) {
+						const level2 = this.jobTypeList.filter(item =>
+							item.level === "2" && item.parentId === selectedLevel1.id
+						);
+						this.workTypeColumns[1] = level2;
+						this.workTypeColumns[2] = [];
+						newIndexes[1] = 0;
+						newIndexes[2] = 0;
+					}
+				} else if (column === 1) {
+					// 第二列变化，重置第三列
+					const selectedLevel2 = this.workTypeColumns[1][value];
+					if (selectedLevel2) {
+						const level3 = this.jobTypeList.filter(item =>
+							item.level === "3" && item.parentId === selectedLevel2.id
+						);
+						this.workTypeColumns[2] = level3;
+						newIndexes[2] = 0;
+					}
+				}
+
+				this.workTypeIndexes = newIndexes;
+			},
+
+			// 级联选择器确认事件
+			onWorkTypePickerChange(e) {
+				const indexes = e.detail.value;
+				const selectedLevel1 = this.workTypeColumns[0][indexes[0]];
+				const selectedLevel2 = this.workTypeColumns[1][indexes[1]];
+				const selectedLevel3 = this.workTypeColumns[2][indexes[2]];
+
+				if (selectedLevel3) {
+					// 选择第三级
+					this.formData.jobWorkType = selectedLevel3.id;
+					this.formData.jobWorkTypeName = `${selectedLevel1.workTypeName}/${selectedLevel2.workTypeName}/${selectedLevel3.workTypeName}`;
+				} else if (selectedLevel2) {
+					// 选择第二级
+					this.formData.jobWorkType = selectedLevel2.id;
+					this.formData.jobWorkTypeName = `${selectedLevel1.workTypeName}/${selectedLevel2.workTypeName}`;
+				} else if (selectedLevel1) {
+					// 选择第一级
+					this.formData.jobWorkType = selectedLevel1.id;
+					this.formData.jobWorkTypeName = selectedLevel1.workTypeName;
+				}
+
+				this.workTypeIndexes = indexes;
+			},
+
+			// 根据工种ID设置索引
+			setWorkTypeIndexes(workTypeId) {
+				// 在工种列表中查找对应的工种
+				const targetWorkType = this.jobTypeList.find(item => item.id == workTypeId);
+				if (!targetWorkType) return;
+
+				// 根据level确定是哪一级
+				if (targetWorkType.level === "1") {
+					const index = this.workTypeColumns[0].findIndex(item => item.id == workTypeId);
+					if (index !== -1) {
+						this.workTypeIndexes = [index, 0, 0];
+					}
+				} else if (targetWorkType.level === "2") {
+					// 需要先找到父级
+					const parent = this.jobTypeList.find(item => item.id == targetWorkType.parentId);
+					if (parent) {
+						const parentIndex = this.workTypeColumns[0].findIndex(item => item.id == parent.id);
+						const childIndex = this.workTypeColumns[1].findIndex(item => item.id == workTypeId);
+						if (parentIndex !== -1 && childIndex !== -1) {
+							this.workTypeIndexes = [parentIndex, childIndex, 0];
+						}
+					}
+				} else if (targetWorkType.level === "3") {
+					// 需要找到祖父级和父级
+					const parent = this.jobTypeList.find(item => item.id == targetWorkType.parentId);
+					const grandparent = this.jobTypeList.find(item => item.id == parent.parentId);
+					if (parent && grandparent) {
+						const grandparentIndex = this.workTypeColumns[0].findIndex(item => item.id == grandparent.id);
+						const parentIndex = this.workTypeColumns[1].findIndex(item => item.id == parent.id);
+						const childIndex = this.workTypeColumns[2].findIndex(item => item.id == workTypeId);
+						if (grandparentIndex !== -1 && parentIndex !== -1 && childIndex !== -1) {
+							this.workTypeIndexes = [grandparentIndex, parentIndex, childIndex];
+						}
+					}
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss">
+
+.inner {
+  background: #fff;
+	width: calc(100% - 64rpx);
+	margin: 0 auto;
+	box-sizing: border-box;
+  border-radius: 16rpx;
+  padding: 32rpx;
+  margin-bottom: 24rpx;
+
+}
+
+.inner-part {
+  width: 100%;
+}
+
+/* 为表单元素添加一些间距 */
+.self-form {
+  width: 100%;
+}
+
+/* 表单项目样式 */
+.form-item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+  padding: 24rpx 0;
+}
+
+.form-label {
+  width: 200rpx;
+  font-size: 28rpx;
+  color: #333;
+  flex-shrink: 0;
+  line-height: 48rpx;
+}
+
+.required {
+  color: #f56c6c;
+  margin-left: 4rpx;
+}
+
+.form-input {
+  flex: 1;
+  border: none;
+  outline: none;
+  font-size: 28rpx;
+  color: #333;
+  background: none;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+
+.form-input-disabled {
+  color: #909399;
+  background-color: #f5f7fa;
+}
+
+.form-textarea {
+  flex: 1;
+  border: none;
+  outline: none;
+  font-size: 28rpx;
+  color: #333;
+  background: none;
+  min-height: 120rpx;
+  line-height: 40rpx;
+}
+
+.form-textarea-disabled {
+  color: #909399;
+  background-color: #f5f7fa;
+}
+
+.icon-right {
+  width: 40rpx;
+  height: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #A6A6A6;
+  margin-left: 16rpx;
+}
+
+.picker-view {
+  flex: 1;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: none;
+  outline: none;
+  font-size: 28rpx;
+  color: #333;
+  background: none;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+
+.picker-view-text {
+  font-size: 28rpx;
+  color: #333;
+}
+
+/* 按钮区域样式 */
+	.button-area {
+		padding: 24rpx 32rpx 68rpx;
+		width: 100%;
+		background: #fff;
+		display: flex;
+		box-sizing: border-box;
+		margin-top: 40rpx;
+		border-radius: 16px 16px 0px 0px;
+
+		.btn {
+			line-height: 72rpx;
+			width: 176rpx;
+			margin-right: 16rpx;
+			font-size: 28rpx;
+			border: 1px solid #B8C5D4;
+			color: #282828;
+			text-align: center;
+			border-radius: 8rpx;
+		}
+
+		.reset {
+			background: #DCE2E9;
+		}
+
+		.save {
+			background: linear-gradient(103deg, #1D64CF 0%, #1590D4 99%);
+			color: #fff;
+			border: 0;
+			flex-grow: 1;
+		}
+	}
+
+	.noValue {
+		color: rgb(192, 196, 204);
+	}
+
+	.disabledLine {
+		background: rgb(245, 247, 250);
+		cursor: not-allowed;
+	}
+
+.ellipsis_1 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+/* 图标样式优化 */
+.icon-right {
+	width: 40rpx;
+	height: 40rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: #A6A6A6;
+	margin-left: 16rpx;
+	}
+</style>
+
+
+
diff --git a/packageRc/pages/demand/components/otherService.vue b/packageRc/pages/demand/components/otherService.vue
new file mode 100644
index 0000000..bf9ef00
--- /dev/null
+++ b/packageRc/pages/demand/components/otherService.vue
@@ -0,0 +1,406 @@
+<!--
+ * @Date: 2024-10-08 14:29:36
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 16:07:40
+-->
+<template>
+	<view class="container">
+		<scroll-view scroll-y="true" >
+			<view class="inner">
+				<view class="part-title" style="display: flex;justify-content: space-between;">需求信息
+					<view v-if="!edit&&formData.id&&formData.currentStatus!=3" class="btn"
+						style="font-weight: normal;display: flex;" @click="edit=true">编辑<view class="icon-right">✏️</view></view>
+				</view>
+				<view class="inner-part">
+					<view class="self-form">
+						<view class="form-item">
+							<view class="form-label">姓名 <text class="required">*</text></view>
+							<view v-if="name" style="width: 100%;" class="disabledLine">
+								{{ formData.personName || '请选择' }}
+							</view>
+							<view v-else style="width: 100%;" @click="openPersonChooser"
+								:class="{disabledLine: !edit||!canChoosePerson, noValue: !formData.personName}">
+								{{ formData.personName || '请选择' }}
+							</view>
+							<view class="icon-right">✏️</view>
+						</view>
+
+						<view class="form-item">
+							<view class="form-label">需求说明 <text class="required">*</text></view>
+							<textarea :disabled="!edit" v-model="formData.jobDescription" placeholder="请输入" :class="['form-textarea', { 'form-textarea-disabled': !edit }]"></textarea>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 办理完成后 需求说明 -->
+			
+
+		</scroll-view>
+			
+		<choose-person ref="personChooser" @confirm="personNameConfirm" />
+		<view class="button-area" v-if="edit">
+			<view class="btn" @click="cancelPage">取消</view>
+			<view class="btn reset" @click="formData.id ? getDetail(formData.id) : setDefaultValues()">重置</view>
+			<view class="btn save" @click="saveInfo">保存</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getPersonBase } from "@/packageRc/api/personinfo/index";
+import { addPersonDemand, updatePersonDemand, getPersonDemand } from "@/packageRc/api/needs/personDemand";
+//import reqComp from './req-comp';
+
+	export default {
+		components: {
+	//	reqComp
+	},
+								props: {
+			needId: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				edit: true,
+				canChoosePerson: false,
+				formData: {
+					id: '',
+					personName: '',
+					personId: '',
+						demandType:"9",
+					userId: '',
+					demandTitle: '',
+					jobDescription: '',
+					actualSolveDate: '',
+					actualSolvePeople: '',
+					solveDesc: '',
+					fileUrl: '',
+					currentStatus: ''
+				}
+			}
+		},
+		onReady() {
+			// 组件已准备就绪
+		},
+		created() {
+			this.loading = true;
+			// 直接使用传入的参数设置姓名信息
+			if(this.name && this.needId) {
+				this.formData.personName = this.name;
+				this.formData.personId = this.needId;
+				this.formData.userId = this.needId;
+			}
+			// 如果需要获取详情
+			if (this.needId) {
+				this.getDetail(this.needId);
+			}
+		},
+		methods: {
+			cancelPage() {
+				if (!this.formData.id) {
+					this.$u.navigateBack();
+				} else {
+					this.edit = false;
+					this.getDetail(this.formData.id);
+				}
+			},
+			// workTypeRemoteMethod(key) {
+				// 	listJobType({
+				// 		workTypeName: key,
+				// 		pageNum: 1,
+				// 		pageSize: 50
+				// 	}).then(
+				// 		(res) => {
+							// this.jobTypeList = res.rows;
+				// 		}
+				// 	);
+				// },
+			openPersonChooser() {
+				if (this.edit && this.canChoosePerson) {
+					this.$refs.personChooser.open();
+				}
+			},
+			personNameConfirm(event) {
+				this.formData.personName = event.name
+				this.formData.personId = event.id
+				this.formData.userId = event.userId
+				this.$forceUpdate();
+			},
+			
+	
+				
+			getDetail(id) {
+				this.$request({
+					url: '/mini/demand/getPersonDemandById',
+					method: 'GET',
+					data: {
+						id: id
+					}
+				}).then(res => {
+					if (res.code == 200) {
+						this.formData = res.data;
+					}
+				}).catch(err => {
+					console.log(err);
+				});
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+			
+			setName() {
+				// 确保personName存在
+				if (!this.formData.personName) {
+					this.formData.personName = '未知用户';
+				}
+				let date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				month = month < 10 ? '0' + month : month;
+				let day = date.getDate();
+				day = day < 10 ? '0' + day : day;
+				this.formData.demandTitle = `${this.formData.personName}_于${year}-${month}-${day}_提出其他需求`;
+			},
+			saveInfo() {
+				console.log("执行")
+				try {
+					// 验证必填项
+					if (!this.formData.personName) {
+						uni.showToast({
+							title: '请选择姓名',
+							icon: 'none'
+						});
+						return;
+					}
+					if (!this.formData.jobDescription) {
+						uni.showToast({
+							title: '请输入需求说明',
+							icon: 'none'
+						});
+						return;
+					}
+					uni.showLoading({
+						title: '保存中...'
+					});
+					this.setName();
+					let params = {
+						...this.formData,
+						type: '3'
+					};
+					const requestFn = this.formData.id ? updatePersonDemand : addPersonDemand;
+					requestFn(params).then(res => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: '保存成功',
+								icon: 'success'
+							});
+							this.edit = false;
+							if (!this.formData.id) {
+								this.formData.id = res.data;
+							}
+						} else {
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							});
+						}
+					}).catch(err => {
+						if (err.message) {
+							uni.showToast({
+								title: err.message,
+								icon: 'none'
+							});
+						}
+					});
+				} catch (error) {
+					console.error('保存失败:', error);
+				} finally {
+					uni.hideLoading();
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.container {
+		height: 100vh;
+		overflow: hidden;
+		background-color: #f7f7f7;
+	}
+
+	.inner {
+		background: #fff;
+		width: calc(100% - 64rpx);
+		margin: 0 auto;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+		padding: 32rpx;
+		margin-bottom: 24rpx;
+	}
+
+	.inner-part {
+		width: 100%;
+	}
+
+	.self-form {
+		width: 100%;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: flex-start;
+		margin-bottom: 24rpx;
+		background-color: #fff;
+		border-radius: 8rpx;
+		padding: 24rpx 0;
+	}
+
+	.form-label {
+		width: 200rpx;
+		font-size: 28rpx;
+		color: #333;
+		flex-shrink: 0;
+		line-height: 48rpx;
+	}
+
+	.required {
+		color: #f56c6c;
+		margin-left: 4rpx;
+	}
+
+	.form-textarea {
+		flex: 1;
+		border: none;
+		outline: none;
+		font-size: 28rpx;
+		color: #333;
+		background: none;
+		min-height: 120rpx;
+		line-height: 40rpx;
+	}
+
+	.form-textarea-disabled {
+		color: #909399;
+		background-color: #f5f7fa;
+	}
+
+	.icon-right {
+		width: 40rpx;
+		height: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #A6A6A6;
+		margin-left: 16rpx;
+	}
+
+	.button-area {
+		padding: 24rpx 32rpx 68rpx;
+		width: 100%;
+		background: #fff;
+		display: flex;
+		box-sizing: border-box;
+		margin-top: 40rpx;
+		border-radius: 16px 16px 0px 0px;
+
+		.btn {
+			line-height: 72rpx;
+			width: 176rpx;
+			margin-right: 16rpx;
+			font-size: 28rpx;
+			border: 1px solid #B8C5D4;
+			color: #282828;
+			text-align: center;
+			border-radius: 8rpx;
+		}
+
+		.reset {
+			background: #DCE2E9;
+		}
+
+		.save {
+			background: linear-gradient(103deg, #1D64CF 0%, #1590D4 99%);
+			color: #fff;
+			border: 0;
+			flex-grow: 1;
+		}
+	}
+
+	.container {
+		background-color: #f7f7f7;
+	}
+
+	.inner {
+		background-color: #f7f7f7;
+		padding: 24rpx 32rpx;
+	}
+
+	.self-form {
+		width: 100%;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: flex-start;
+		margin-bottom: 24rpx;
+		background-color: #fff;
+		border-radius: 8rpx;
+		padding: 24rpx;
+	}
+
+	.form-label {
+		width: 200rpx;
+		font-size: 28rpx;
+		color: #333;
+		flex-shrink: 0;
+		line-height: 48rpx;
+	}
+
+	.required {
+		color: #f56c6c;
+		margin-left: 4rpx;
+	}
+
+	.form-textarea {
+		flex: 1;
+		border: none;
+		outline: none;
+		font-size: 28rpx;
+		color: #333;
+		background: none;
+		min-height: 120rpx;
+		line-height: 40rpx;
+	}
+
+	.form-textarea-disabled {
+		color: #909399;
+		background-color: #f5f7fa;
+	}
+
+	.icon-right {
+		width: 40rpx;
+		height: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #A6A6A6;
+		margin-left: 16rpx;
+	}
+
+	.noValue {
+		color: rgb(192, 196, 204);
+	}
+
+	.disabledLine {
+		background: rgb(245, 247, 250);
+		cursor: not-allowed;
+	}
+</style>
\ No newline at end of file
diff --git a/packageRc/pages/demand/components/trainService.vue b/packageRc/pages/demand/components/trainService.vue
new file mode 100644
index 0000000..04c369c
--- /dev/null
+++ b/packageRc/pages/demand/components/trainService.vue
@@ -0,0 +1,764 @@
+<!--
+ * @Date: 2024-10-08 14:29:36
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 16:07:22
+-->
+<template>
+	<view class="container">
+		<scroll-view scroll-y="true" :style="{height: edit?'calc(90vh - 150px)':'calc(100vh - 144px)'}">
+		
+			<view class="inner">
+				<view class="part-title" style="display: flex;justify-content: space-between;">培训需求信息
+					<view v-if="!edit&&formData.id&&formData.currentStatus!=3" class="btn"
+						style="font-weight: normal;display: flex;" @click="edit=true">编辑<view class="icon-right">✏️</view></view>
+				</view>
+				<view class="inner-part">
+					<view class="self-form">
+						<view class="form-item">
+							<view class="form-label">姓名 <text class="required">*</text></view>
+							<view v-if="name" style="width: 100%;"
+								class="disabledLine">
+								{{ formData.personName || '请选择' }}
+							</view>
+							<view v-else style="width: 100%;" @click="openPersonChooser"
+								:class="{disabledLine: !edit||!canChoosePerson, noValue: !formData.personName}">
+								{{ formData.personName || '请选择' }}
+							</view>
+							<view class="icon-right">✏️</view>
+						</view>
+						<view class="form-item">
+							<view class="form-label">培训意愿工种 <text class="required">*</text></view>
+							<picker
+								mode="multiSelector"
+								:range="workTypeColumns"
+								range-key="workTypeName"
+								:value="workTypeIndexes"
+								@change="onWorkTypePickerChange"
+								@columnchange="onWorkTypeColumnChange"
+								v-if="workTypeColumns[0] && workTypeColumns[0].length"
+							>
+								<view class="picker-view">
+									<view class="picker-view-text">{{ formData.qwpxgzName || '请选择工种' }}</view>
+									<view class="icon-right">▼</view>
+								</view>
+							</picker>
+							<view v-else class="picker-view">
+								<view class="picker-view-text">工种数据加载中...</view>
+							</view>
+						</view>
+						<view class="form-item">
+								<view class="form-label">期望培训时间 <text class="required">*</text></view>
+								<picker mode="date" :value="formData.qwpxsj" start="1900-01-01" end="2100-12-31" @change="onDateChange">
+									<view class="date-picker-wrapper" :class="{ noValue: !formData.qwpxsj }">
+										<view v-if="formData.qwpxsj" class="date-value">{{ formData.qwpxsj }}</view>
+										<view v-else>请选择</view>
+										<view class="icon-right">✏️</view>
+									</view>
+								</picker>
+							</view>
+						<view class="form-item">
+							<view class="form-label">需求说明 <text class="required">*</text></view>
+							<textarea :disabled="!edit" v-model="formData.jobDescription" placeholder="请输入" :class="['form-textarea', { 'form-textarea-disabled': !edit }]"></textarea>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			
+
+			<!-- 办理完成后 需求说明 -->
+			<req-comp :form="{
+				actualSolveDate: formData.actualSolveDate,
+				actualSolvePeople: formData.actualSolvePeople,
+				solveDesc: formData.solveDesc,
+				fileUrl: formData.fileUrl
+			}" />
+
+		</scroll-view>
+		<view class="button-area" v-if="edit">
+			<view class="btn" @click="cancelPage">取消</view>
+			<view class="btn reset" @click="getDetail(formData.id)">重置</view>
+			<view class="btn save" @click="saveInfo">保存</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getPersonBase } from "@/packageRc/api/personinfo/index";
+import { addPersonDemand, updatePersonDemand, getPersonDemand } from "@/packageRc/api/needs/personDemand";
+import { listJobType } from "@/packageRc/api/jobType/index";
+
+import uniDateformat from '@/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue';
+
+	export default {
+		components: {
+	//		ChoosePerson
+		},
+		props: {
+			needId: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				edit: true,
+				personBase: {},
+				formData: {
+					userId:"",
+					personName:"",
+					demandType: "3",
+					personName: '',
+					personId: "",
+					userId: "",
+					demandTitle: '',
+					qwpxsj: '',
+					qwpxgz: '',
+					qwpxgzName: '',
+					jobDescription: ''
+				},
+				rules: {
+					personName: [{
+						required: true,
+						message: '请填写姓名',
+						trigger: ['blur', 'change'],
+					}, ],
+					qwpxgz: [{
+						required: true,
+						message: '请选择培训意愿工种',
+						trigger: ['blur', 'change'],
+						validator: (rule, value) => {
+							// 允许数组且有值，或字符串有值
+							return (Array.isArray(value) && value.length > 0) || (!!value);
+						}
+					}, ],
+					qwpxsj: [{
+						required: true,
+						message: '请选择期望培训时间',
+						trigger: ['blur', 'change'],
+					}, ],
+
+
+				},
+				dict: {},
+				show: {},
+				currentCityArr: [],
+				originalDept: [],
+				currentCity: '请选择',
+				bysj: '',
+				loading: false,
+				jobTypeList: [],
+				route: {},
+				canChoosePerson: false,
+				workTypeTreeList: [],
+				searchKeyword: '',
+				workTypeList: [],
+				workTypeColumns: [[], [], []],
+				workTypeIndexes: [0, 0, 0],
+			}
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules)
+		},
+		created() {
+		this.setName();
+		this.loading = true;
+		this.workTypeRemoteMethod('');
+	},
+		methods: {
+				setName() {
+				// 直接设置人员信息
+				this.formData.personName = this.name;
+				this.formData.personId = this.needId;
+				this.formData.userId = this.needId;
+				
+				// 设置需求标题
+				if (this.formData.personName) {
+					const today = new Date();
+					const year = today.getFullYear();
+					const month = String(today.getMonth() + 1).padStart(2, '0');
+					const day = String(today.getDate()).padStart(2, '0');
+					const formattedDate = `${year}-${month}-${day}`;
+					this.formData.demandTitle = `${this.formData.personName}_于${formattedDate}_提出培训需求`;
+				}
+			},
+				cancelPage() {
+				if (this.formData.id) {
+					this.edit = false;
+					this.getDetail(this.formData.id)
+				} else {
+					uni.navigateBack()
+				}
+			},
+			openPersonChooser() {
+				if (this.edit && this.canChoosePerson) {
+					this.$refs.personChooser.open();
+				}
+			},
+			personNameConfirm(event) {
+				this.formData.personName = event.name
+				this.formData.personId = event.id
+				this.formData.userId = event.userId
+				this.formNameChange();
+				this.$forceUpdate();
+			},
+			// 使用picker组件的日期选择
+			onDateChange(e) {
+				this.formData.qwpxsj = e.detail.value;
+			},
+			changeFile(e) {
+				// 清空当前的 fileUrl 数组
+				this.formData.fileUrl = [];
+				// 如果 e 有长度（即用户选择了文件）
+				if (e.length) {
+					// 遍历每个文件对象并获取其 url
+					for (let data of e) {
+						const url = data.data ? data.data.url : data.url;
+						this.formData.fileUrl.push(url);
+					}
+				}
+				this.formData.fileUrl = this.$arrayToString(this.formData.fileUrl)
+			},
+			addOne() {
+			this.formData = {}
+			this.getPersonInfo()
+			if(this.name){
+				this.formData.personName = this.name
+				this.formData.userId = this.needId
+			}
+			this.edit = true
+		},
+			workTypeRemoteMethod(key) {
+				listJobType({
+					workTypeName: key,
+					pageNum: 1,
+					pageSize: 50
+				}).then(
+					(res) => {
+						console.log('工种数据加载成功:', res.rows);
+						this.jobTypeList = res.rows;
+						// 处理树形数据为级联选择器格式
+						this.processWorkTypeTree(res.rows);
+					}
+				).catch(error => {
+					console.error('获取工种列表失败:', error);
+					this.workTypeList = [];
+					this.workTypeColumns = [[], [], []];
+				});
+			},
+			jobTypeConfirm(type, event) {
+				this.show[type] = false
+				this.formData[type] = event.value[0].id
+				this.formData.qwpxgzName = event.value[0].workTypeName
+				this.$forceUpdate();
+			},
+			getDetail(id) {
+				getPersonDemand(id).then(res => {
+					this.formData = res.data;
+					// 设置工种索引（需要等工种数据加载完成后）
+					if (this.formData.qwpxgz && this.workTypeColumns[0].length) {
+						this.setWorkTypeIndexes(this.formData.qwpxgz);
+					}
+					this.edit = false;
+					
+				}).catch(error => {
+					console.error('Error fetching training detail:', error);
+				});
+			},
+
+			goBack() {
+				uni.navigateBack();
+			},
+			cancelPicker(type) {
+				this.$set(this.show, type, false)
+				this.$forceUpdate()
+			},
+			getDictLabel(value, list) {
+				if (list) {
+					let arr = list.filter(ele => ele.dictValue == value)
+					if (arr.length) {
+						return arr[0].dictLabel
+					} else {
+						return '请选择'
+					}
+				}
+			},
+			pickerConfirm(type, event) {
+				this.show[type] = false
+				this.formData[type] = event.value[0].dictValue
+				this.$forceUpdate();
+			},
+			showPicker(type) {
+				if (this.edit) {
+					this.show[type] = true
+					this.$forceUpdate()
+				}
+			},
+			getPersonInfo() {
+				this.loading = true;
+				this.$store.dispatch("GetInfo").then((res) => {
+					if (res.data.roles.indexOf('qunzhong') == -1) {
+						this.canChoosePerson = true;
+						this.setName() // 确保非群众角色也能获取姓名
+					} else {
+						this.canChoosePerson = false;
+						getPersonBase(res.data.user.userId).then(resp => {
+							this.formData.personId = resp.data.id
+							this.formData.userId = resp.data.userId
+							this.formData.personName = resp.data.name
+							this.formNameChange();
+							this.$forceUpdate();
+						})
+					}
+				})
+			},
+			setName() {
+					this.formData.personName = this.name;
+				this.formData.personId = this.needId;
+				this.formData.userId = this.needId;
+					let date = new Date();
+					const year = date.getFullYear();
+					const month = String(date.getMonth() + 1).padStart(2, '0');
+					const day = String(date.getDate()).padStart(2, '0');
+					const dayNew = `${year}-${month}-${day}`;
+					this.formData.demandTitle = `${this.formData.personName}_于${dayNew}_提出培训需求`;
+				},
+			async saveInfo() {
+				try {
+					this.setName();
+					console.log("执行保存，表单数据:", this.formData);
+					console.log("personName:", this.formData.personName);
+					console.log("personId:", this.formData.personId);
+					console.log("userId:", this.formData.userId);
+					// 手动检查培训意愿工种是否已选择
+					if (!this.formData.qwpxgz || (typeof this.formData.qwpxgz === 'string' && this.formData.qwpxgz.trim() === '')) {
+						uni.showToast({
+							title: '请选择培训意愿工种！',
+							icon: 'none'
+						});
+						return;
+					}
+
+					// 手动检查期望培训时间是否已选择
+					if (!this.formData.qwpxsj || (typeof this.formData.qwpxsj === 'string' && this.formData.qwpxsj.trim() === '')) {
+						uni.showToast({
+							title: '请选择期望培训时间！',
+							icon: 'none'
+						});
+						return;
+					}
+
+					// 表单字段已通过手动检查，无需额外验证
+					uni.showLoading({
+						title: '加载中...'
+					});
+					let response;
+					let successMessage;
+					this.formData.demandType = 3;
+					if (this.formData.id) {
+						response = await updatePersonDemand(this.formData);
+						successMessage = '修改成功';
+					} else {
+						response = await addPersonDemand(this.formData);
+						successMessage = '保存成功';
+					}
+					// 检查响应码是否为200
+					if (response.code === 200) {
+						uni.showToast({
+							title: successMessage,
+							icon: 'success'
+						});
+						// 如果是编辑模式，关闭编辑状态；否则返回上一页
+						if (this.formData.id) {
+							this.edit = false;
+						} else {
+							setTimeout(() => {
+								uni.navigateBack();
+							}, 1000);
+						}
+					} else {
+						// 响应码不为200时，显示服务器返回的错误信息或默认错误信息
+						uni.showToast({
+							title: response.msg || '操作失败，请重试！',
+							icon: 'none'
+						});
+					}
+				} catch (error) {
+					console.error('保存失败:', error);
+					// 检查错误是否为字符串类型或有特定消息
+					if(typeof error === 'string' || (error && error.message && error.message.includes('请检查'))){
+						uni.showToast({
+							title: '请填写完整信息！',
+							icon: 'none'
+						});
+					} else {
+						uni.showToast({
+							title: '系统错误,请联系管理员！',
+							icon: 'none'
+						});
+					}
+				} finally {
+					// 确保加载页总是会被隐藏
+					uni.hideLoading();
+				}
+			},
+			// getWorkTypeTree() {
+			// 	listJobType({
+			// 		workTypeName: '',
+			// 		pageNum: 1,
+			// 		pageSize: 9999
+			// 	}).then(res => {
+			// 		console.log("11111",this.workTypeTreeList)
+			// 		this.workTypeTreeList = Array.isArray(res.rows) ? res.rows : [];
+			// 	});
+			// },
+
+
+			// 处理树形数据为级联选择器格式
+			processWorkTypeTree(treeData) {
+				if (!treeData || !Array.isArray(treeData)) {
+					this.workTypeColumns = [[], [], []];
+					return;
+				}
+
+				// 第一级
+				const level1 = treeData.filter(item => item.level === "1");
+				// 第二级
+				const level2 = treeData.filter(item => item.level === "2");
+				// 第三级
+				const level3 = treeData.filter(item => item.level === "3");
+
+				// 构建级联数据
+				const columns = [];
+				columns[0] = level1;
+
+				// 根据第一级选择，过滤第二级
+				if (level1.length > 0) {
+					const firstLevelId = level1[0].id;
+					columns[1] = level2.filter(item => item.parentId === firstLevelId);
+				} else {
+					columns[1] = [];
+				}
+
+				// 根据第二级选择，过滤第三级
+				if (columns[1].length > 0) {
+					const secondLevelId = columns[1][0].id;
+					columns[2] = level3.filter(item => item.parentId === secondLevelId);
+				} else {
+					columns[2] = [];
+				}
+
+				this.workTypeColumns = columns;
+				console.log('级联数据构建完成:', this.workTypeColumns);
+			},
+			// 级联选择器列变化事件
+			onWorkTypeColumnChange(e) {
+				const { column, value } = e.detail;
+				const newIndexes = [...this.workTypeIndexes];
+				newIndexes[column] = value;
+
+				// 重置后续列的数据
+				if (column === 0) {
+					// 第一列变化，重置第二、三列
+					const selectedLevel1 = this.workTypeColumns[0][value];
+					if (selectedLevel1) {
+						const level2 = this.jobTypeList.filter(item =>
+							item.level === "2" && item.parentId === selectedLevel1.id
+						);
+						this.workTypeColumns[1] = level2;
+						this.workTypeColumns[2] = [];
+						newIndexes[1] = 0;
+						newIndexes[2] = 0;
+					}
+				} else if (column === 1) {
+					// 第二列变化，重置第三列
+					const selectedLevel2 = this.workTypeColumns[1][value];
+					if (selectedLevel2) {
+						const level3 = this.jobTypeList.filter(item =>
+							item.level === "3" && item.parentId === selectedLevel2.id
+						);
+						this.workTypeColumns[2] = level3;
+						newIndexes[2] = 0;
+					}
+				}
+
+				this.workTypeIndexes = newIndexes;
+			},
+
+			// 级联选择器确认事件
+			onWorkTypePickerChange(e) {
+				const indexes = e.detail.value;
+				const selectedLevel1 = this.workTypeColumns[0][indexes[0]];
+				const selectedLevel2 = this.workTypeColumns[1][indexes[1]];
+				const selectedLevel3 = this.workTypeColumns[2][indexes[2]];
+
+				// 直接赋值确保响应式更新
+					if (selectedLevel3) {
+						// 选择第三级
+						this.formData.qwpxgz = selectedLevel3.id;
+						this.formData.qwpxgzName = `${selectedLevel1.workTypeName}/${selectedLevel2.workTypeName}/${selectedLevel3.workTypeName}`;
+					} else if (selectedLevel2) {
+						// 选择第二级
+						this.formData.qwpxgz = selectedLevel2.id;
+						this.formData.qwpxgzName = `${selectedLevel1.workTypeName}/${selectedLevel2.workTypeName}`;
+					} else if (selectedLevel1) {
+						// 选择第一级
+						this.formData.qwpxgz = selectedLevel1.id;
+						this.formData.qwpxgzName = selectedLevel1.workTypeName;
+					}
+
+				this.workTypeIndexes = indexes;
+
+				// 强制重新渲染组件
+				this.$forceUpdate();
+			},
+
+			// 根据工种ID设置索引
+			setWorkTypeIndexes(workTypeId) {
+				// 在工种列表中查找对应的工种
+				const targetWorkType = this.jobTypeList.find(item => item.id == workTypeId);
+				if (!targetWorkType) return;
+
+				// 根据level确定是哪一级
+				if (targetWorkType.level === "1") {
+					const index = this.workTypeColumns[0].findIndex(item => item.id == workTypeId);
+					if (index !== -1) {
+						this.workTypeIndexes = [index, 0, 0];
+					}
+				} else if (targetWorkType.level === "2") {
+					// 需要先找到父级
+					const parent = this.jobTypeList.find(item => item.id == targetWorkType.parentId);
+					if (parent) {
+						const parentIndex = this.workTypeColumns[0].findIndex(item => item.id == parent.id);
+						const childIndex = this.workTypeColumns[1].findIndex(item => item.id == workTypeId);
+						if (parentIndex !== -1 && childIndex !== -1) {
+							this.workTypeIndexes = [parentIndex, childIndex, 0];
+						}
+					}
+				} else if (targetWorkType.level === "3") {
+					// 需要找到祖父级和父级
+					const parent = this.jobTypeList.find(item => item.id == targetWorkType.parentId);
+					const grandparent = this.jobTypeList.find(item => item.id == parent.parentId);
+					if (parent && grandparent) {
+						const grandparentIndex = this.workTypeColumns[0].findIndex(item => item.id == grandparent.id);
+						const parentIndex = this.workTypeColumns[1].findIndex(item => item.id == parent.id);
+						const childIndex = this.workTypeColumns[2].findIndex(item => item.id == workTypeId);
+						if (grandparentIndex !== -1 && parentIndex !== -1 && childIndex !== -1) {
+							this.workTypeIndexes = [grandparentIndex, parentIndex, childIndex];
+						}
+					}
+				}
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+.inner {
+  background: #fff;
+	width: calc(100% - 64rpx);
+	margin: 0 auto;
+	box-sizing: border-box;
+  border-radius: 16rpx;
+  padding: 32rpx;
+  margin-bottom: 24rpx;
+}
+.inner-part {
+  width: 100%;
+}
+
+/* 为表单元素添加一些间距 */
+.self-form {
+  width: 100%;
+}
+
+/* 表单项目样式 */
+.form-item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+  padding: 24rpx 0;
+}
+
+.form-label {
+  width: 200rpx;
+  font-size: 28rpx;
+  color: #333;
+  flex-shrink: 0;
+  line-height: 48rpx;
+}
+
+.required {
+  color: #f56c6c;
+  margin-left: 4rpx;
+}
+
+.form-input {
+  flex: 1;
+  border: none;
+  outline: none;
+  font-size: 28rpx;
+  color: #333;
+  background: none;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+
+.form-input-disabled {
+  color: #909399;
+  background-color: #f5f7fa;
+}
+
+.form-textarea {
+  flex: 1;
+  border: none;
+  outline: none;
+  font-size: 28rpx;
+  color: #333;
+  background: none;
+  min-height: 120rpx;
+  line-height: 40rpx;
+}
+
+.form-textarea-disabled {
+  color: #909399;
+  background-color: #f5f7fa;
+}
+
+.icon-right {
+  width: 40rpx;
+  height: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #A6A6A6;
+  margin-left: 16rpx;
+}
+
+/* 单选框样式 */
+.radio-group {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 32rpx;
+  cursor: pointer;
+}
+
+.radio-item.radio-disabled {
+  cursor: not-allowed;
+}
+
+.radio {
+  width: 28rpx;
+  height: 28rpx;
+  border-radius: 50%;
+  border: 2rpx solid #dcdfe6;
+  margin-right: 12rpx;
+  position: relative;
+}
+
+.radio.radio-checked {
+  border-color: #409eff;
+  background-color: #409eff;
+}
+
+.radio.radio-checked::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 12rpx;
+  height: 12rpx;
+  border-radius: 50%;
+  background-color: #fff;
+}
+
+/* 调整按钮区域样式 */
+.button-area {
+  margin-top: 24rpx;
+}
+	.picker-cover {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 99;
+	}
+	
+	.button-area {
+		padding: 24rpx 32rpx 68rpx;
+		width: 100%;
+		background: #fff;
+		display: flex;
+		box-sizing: border-box;
+		margin-top: 40rpx;
+		border-radius: 16px 16px 0px 0px;
+
+		.btn {
+			line-height: 72rpx;
+			width: 176rpx;
+			margin-right: 16rpx;
+			font-size: 28rpx;
+			border: 1px solid #B8C5D4;
+			color: #282828;
+			text-align: center;
+			border-radius: 8rpx;
+		}
+
+		.reset {
+			background: #DCE2E9;
+		}
+
+		.save {
+			background: linear-gradient(103deg, #1D64CF 0%, #1590D4 99%);
+			color: #fff;
+			border: 0;
+			flex-grow: 1;
+		}
+	}
+
+	.noValue {
+		color: rgb(192, 196, 204);
+	}
+
+	.disabledLine {
+		background: rgb(245, 247, 250);
+		cursor: not-allowed;
+	}
+	
+	.bordered {
+		border: 1rpx solid #dadbde;
+		padding: 9px;
+		border-radius: 4px;
+	}
+
+	.picker-view {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+	}
+
+	.picker-view-text {
+		color: #333333;
+		flex: 1;
+		text-align: left;		font-size: 28rpx;
+		flex: 1;
+	}
+</style>
diff --git a/packageRc/pages/demand/demandail.vue b/packageRc/pages/demand/demandail.vue
new file mode 100644
index 0000000..0428e4f
--- /dev/null
+++ b/packageRc/pages/demand/demandail.vue
@@ -0,0 +1,188 @@
+<!--
+ * @Date: 2024-10-08 14:29:36
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 16:29:26
+-->
+<template>
+	<view class="page" style="background-image: url('../../../packageRc/static/pageBg.png');">
+		<view class="page-header df_flex" style="display:flex;align-items:center;justify-content:space-between;padding:20rpx 0rpx;">
+			<u-icon class="back-icon" name="arrow-left" color="#fff" size="16" @click="goBack()"></u-icon>
+			<view class="title df_flex_1" style="padding-left: 32rpx;" >{{isAdd ? '需求新增' : '需求维护'}}</view>
+			<u-icon  style="margin-right: 32rpx;" @tap="$store.commit('SET_SHOWEXITPOPUP', true)" name="list"  size="44rpx" color="#fff"></u-icon>
+		</view>
+		<view class="tab-list" v-if="showTab != 1">
+			<view class="tab" :class="{active: activeType == 1}" @click="canChangeType ? changeType(1) : ''">求职<br>需求
+			</view>
+			<view class="tab" :class="{active: activeType == 3}" @click="canChangeType ? changeType(3) : ''">创业<br>需求
+			</view>
+			<view class="tab" :class="{active: activeType == 4}" @click="canChangeType ? changeType(4) : ''">培训<br>需求
+			</view>
+			<view class="tab" :class="{active: activeType == 5}" @click="canChangeType ? changeType(5) : ''">其他<br>需求
+			</view>
+		</view>	
+		<jobService v-if="activeType == 1" :needId="id" :name="name" ref="type1" />
+		<entrepreneurshipService :needId="id" :name="name" v-if="activeType == 3" ref="type3" />
+		<trainService v-if="activeType == 4" :needId="id" :name="name" ref="type4" />
+		<otherService v-if="activeType == 5" :needId="id" :name="name" ref="type5" />
+		<!-- 社区端 - 显示隐藏退出组件 -->
+		<exitPopup />
+	</view>
+</template>
+
+<script>
+	import jobService from './components/jobService.vue';
+	import entrepreneurshipService from './components/entrepreneurshipService.vue';
+	import trainService from './components/trainService.vue';
+	import otherService from './components/otherService.vue';
+	export default {
+		components: {
+			jobService,
+			entrepreneurshipService,
+			trainService,
+			otherService,
+		},
+		data() {
+			return {
+				isAdd: true,
+				activeType: 1,
+				canChangeType: true,
+				id: '',
+				name:"",
+			}
+		},
+		onLoad(options) {
+			this.showTab = options.showTab
+			this.id = options.id
+			console.log("this.id",this.id)
+			this.name = options.name
+			if (options.id && options.type) {
+				this.isAdd = false
+				this.activeType = options.type
+				this.canChangeType = false;
+				this.$nextTick(() => {
+					this.$refs['type' + options.type].getDetail(options.id)
+				})
+			} else {
+				// 添加需求的时候根据传入的类型 判断对应的表单
+				this.changeType(options.activeType || 1)
+			}
+
+		},
+		methods: {
+			changeType(type) {
+				this.activeType = type
+				this.$nextTick(() => {
+					this.$refs['type' + type].addOne()
+				})
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+
+
+	.page {
+		background-color: #F4F4F4 !important;
+		height: 100vh;
+		background-repeat: no-repeat;
+		background-size: 100% auto;
+
+	}
+
+	.button-area {
+		padding: 24rpx 32rpx 68rpx;
+		width: 100%;
+		background: #fff;
+		display: flex;
+		box-sizing: border-box;
+		margin-top: 40rpx;
+		border-radius: 16px 16px 0px 0px;
+
+		.btn {
+			line-height: 72rpx;
+			width: 176rpx;
+			margin-right: 16rpx;
+			font-size: 28rpx;
+			border: 1px solid #B8C5D4;
+			color: #282828;
+			text-align: center;
+			border-radius: 8rpx;
+		}
+
+		.reset {
+			background: #DCE2E9;
+		}
+
+		.save {
+			background: linear-gradient(103deg, #1D64CF 0%, #1590D4 99%);
+			color: #fff;
+			border: 0;
+			flex-grow: 1;
+		}
+	}
+
+	.noValue {
+		color: rgb(192, 196, 204);
+	}
+
+	.disabledLine {
+		background: rgb(245, 247, 250);
+		cursor: not-allowed;
+	}
+
+	.tab-list {
+		display: flex;
+		width: calc(100% - 64rpx);
+		margin: 16rpx auto 30rpx;
+		text-align: center;
+		border-radius: 16rpx;
+		background: #fff;
+		;
+
+		.tab {
+			width: 25%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border: 4rpx solid #FFFFFF;
+			background: #fff;
+			border-radius: 16rpx;
+			font-size: 28rpx;
+			color: #878787;
+			height: 106rpx;
+
+			&.active {
+				background: #1A62CE;
+				color: #fff;
+				position: relative;
+				font-weight: bold;
+
+				&::before {
+					content: '';
+					position: absolute;
+					bottom: -13rpx;
+					border-top: 14rpx solid #1A62CE;
+					border-left: 12rpx solid transparent;
+					border-right: 12rpx solid transparent;
+					left: calc(50% - 7rpx);
+					z-index: 2;
+				}
+
+				&::after {
+					content: '';
+					position: absolute;
+					z-index: 1;
+					bottom: -18rpx;
+					border-top: 14rpx solid #fff;
+					border-left: 12rpx solid transparent;
+					border-right: 12rpx solid transparent;
+					left: calc(50% - 7rpx);
+				}
+			}
+		}
+	}
+</style>
diff --git a/packageRc/pages/index/index.vue b/packageRc/pages/index/index.vue
new file mode 100644
index 0000000..7990425
--- /dev/null
+++ b/packageRc/pages/index/index.vue
@@ -0,0 +1,332 @@
+<!--
+ * @Date: 2025-10-16 15:15:47
+ * @LastEditors: lip
+ * @LastEditTime: 2025-11-04 11:50:05
+-->
+<template>
+  <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
+  <scroll-view :scroll-y="true" class="container" style="background-image: url('../../../packageRc/static/pageBg.png');">
+    <view style="padding: 40rpx 28rpx;">
+      <view class="kinggang">
+        <view>
+          <image src="../../../packageRc/static/kinggang1.png"/>
+          <view>信息维护</view>
+        </view>
+        <view>
+          <image src="../../../packageRc/static/kinggang5.png"/>
+          <view>投递记录</view>
+        </view>
+        <view @click="tiao()">
+          <image src="../../../packageRc/static/kinggang2.png"/>
+          <view>需求上报</view>
+        </view>
+        <view>
+          <image src="../../../packageRc/static/kinggang3.png"/>
+          <view>虚拟面试</view>
+        </view>
+        <view>
+          <image src="../../../packageRc/static/kinggang4.png"/>
+          <view>素质测评</view>
+        </view>
+      </view>
+      <view class="tabs">
+        <view class="tab" :class="{active: pageState.type == ''}" @click="changeJobType('')">岗位列表</view>
+        <view class="tab" :class="{active: pageState.type == 2}" @click="changeJobType(2)">实习实训</view>
+        <view class="tab" :class="{active: pageState.type == 3}" @click="changeJobType(3)">社区实践</view>
+      </view>
+      <view class="titles">
+        <view class="title-item" :class="{active: activeTitle == 1}" @click="activeTitle = 1,getJobRecommed()"><view>推荐岗位</view></view>
+        <view class="title-item" :class="{active: activeTitle == 2}" @click="activeTitle = 2,getJobList()"><view>热门岗位</view></view>
+      </view>
+        <view v-for="(item, index) in jobList" :key="index" class="job-list">
+        <view class="top-line">
+          <view class="salary">{{item.minSalary}}-{{item.maxSalary}}/月</view>
+          <view class="time"><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：{{ item.postingDate }}</view>
+        </view>
+        <view class="title">{{ item.jobTitle }}</view>
+        <view class="infos">
+          <view>
+             <dict-Label dictType="education" :value="item.education"></dict-Label>
+          </view>
+          <view>
+            <dict-Label dictType="experience" :value="item.experience"></dict-Label>
+          </view>
+          <view>{{ item.jobLocation }}</view>
+        </view>
+        <view class="bottom-line">
+          <view><uni-icons color="#A2A2A2" type="person" size="12"></uni-icons>{{item.vacancies}}人</view>
+          <view>{{ item.companyName }}</view>
+        </view>
+       </view>
+      
+      <view class="view-more-btn" @click="viewMore">查看更多内容</view>
+      <view class="titles" style="justify-content: space-between;">
+        <view class="title-item active"><view>政策专区</view></view>
+        <view>{{'查看更多 >'}}</view>
+      </view>
+      <view v-for="(item, index) in jobList" :key="index" class="job-list">
+        <view class="sign">推荐</view>
+        <view class="title">
+          <image src="../../../packageRc/static/zcLeft.png"/>
+          销售顾问</view>
+        <view class="infos">
+          <view>大专</view>
+          <view>1-3年</view>
+          <view>喀什 市南区</view>
+        </view>
+        <view class="bottom-line">
+          <view><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：2025-10-20</view>
+          <view>浏览数<text style="color: #6AA7E8">99+</text></view>
+        </view>
+      </view>
+    </view>
+  </scroll-view>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
+const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
+let activeTab = ref(1)
+let activeTitle = ref(1)
+
+function back() {
+  uni.navigateBack({
+    delta: 1
+  })
+}
+onMounted(()=>{
+  getJobRecommed()
+})
+
+function viewMore() {
+  // uni.navigateTo({
+  //   url: '/pages/jobList/jobList'
+  // })
+}
+function tiao(){
+  console.log('尝试导航到待办详情页面');
+  // 尝试直接使用uni.navigateTo，使用正确的格式
+  uni.navigateTo({
+    url: '/packageRc/pages/demand/index',
+    success: function() {
+      console.log('导航成功');
+    },
+    fail: function(err) {
+      console.error('导航失败:', err);
+    }
+  });
+}
+import useUserStore from '@/stores/useUserStore';
+const conditionSearch = ref({});
+const pageState = reactive({
+    page: 0,
+    total: 0,
+    maxPage: 2,
+    pageSize: 10,
+    search: {
+        order: 0,
+    },
+    type:'',
+});
+let jobList = ref([])
+// 获取推荐岗位
+function getJobRecommed(){
+    let params = {
+        pageSize: pageState.pageSize,
+        sessionId: useUserStore().seesionId,
+        ...pageState.search,
+        ...conditionSearch.value,
+        isPublish: 1,
+        type:pageState.type
+    };
+    $api.createRequest('/app/job/recommend', params).then((resData) => {
+        jobList.value = resData.data
+        pageState.total = 0;
+    });
+}
+
+// 获取岗位列表
+function getJobList(){
+  let params = {
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+        ...pageState.search,
+        // ...conditionSearch.value,
+        type:pageState.type
+    };
+  $api.createRequest('/app/job/list', params).then((resData) => {
+        jobList.value = resData.rows
+        pageState.total = 0;
+    });
+}
+// 更改实习实训等
+function changeJobType(val){
+  pageState.type = val
+  if(activeTitle.value == 1){
+    getJobRecommed()
+  }else{
+    getJobList()
+  }
+}
+
+
+</script>
+
+<style lang="less" scoped>
+view{box-sizing: border-box;display: block;}
+.container{
+  background-color: #F4F4F4;background-position: top center;background-size: 100% auto;
+  height: 100vh;
+  min-width: 100vw;
+  padding-bottom: 0;
+  background-repeat: no-repeat;
+  box-sizing: border-box;
+}
+.kinggang{ 
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  padding: 16rpx 16rpx 32rpx 16rpx;
+  font-size: 24rpx;
+  background: #FFFFFF;
+  border-radius: 16rpx;
+  margin-bottom: 24rpx;
+  >view{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+  }
+  image{
+    width: 78rpx;
+    // margin-bottom: 15rpx;
+    height: 78rpx;
+  }
+}
+.tabs{
+  margin-bottom: 29rpx;
+
+	border-radius: 16rpx;
+	display: flex;
+	background: #fff;
+	color: #878787;
+	text-align: center;
+	width: 100%;
+	.tab{
+		width: 50%;
+		border: 4rpx solid transparent;
+		border-radius: 16rpx;
+		line-height: 64rpx;
+		position: relative;
+		&.active{
+      border: 4rpx solid #fff;
+			color: #fff;
+			background: linear-gradient(180deg, #79AFFF 1%, #A2B3FE 100%);
+      box-shadow: 0px 4rpx 10rpx 0px rgba(40, 102, 194, 0.4);
+		}
+	}
+}
+.titles{
+  display: flex;
+  margin-bottom: 44rpx;
+  .title-item{
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-right: 32rpx;
+    position: relative;
+    >view{
+      position: relative;
+      z-index: 2;
+      padding: 0 16rpx;
+    }
+    &.active::after{
+      content: '';
+      position: absolute;
+      z-index: 1;
+      bottom: -12rpx;
+      left: 0;
+      width: 120%;
+      height: 24rpx;
+      border-radius: 50px 0px 0px 50px;
+      background: linear-gradient(90deg, #78AEFF 0%, rgba(120, 174, 255, 0.31) 52%, rgba(24, 116, 255, 0) 100%);
+    }
+  }
+}
+.job-list{
+  width: 100%;
+  margin: 0 auto;
+  color: #333333;
+  border-radius: 24rpx;
+  background: #FFFFFF;
+  padding: 32rpx;
+  margin-bottom: 24rpx;
+  position: relative;
+  .sign{
+    position: absolute;
+    font-size: 24rpx;
+    right: 0;
+    top: 0;
+    padding: 4rpx 14rpx;
+    border: 1rpx solid #EC4827;
+    background: rgba(227, 79, 49, 0.09);
+    border-top-right-radius: 24rpx;
+    border-bottom-left-radius: 24rpx;
+    color: #EC4827;
+  }
+  .top-line{
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #A2A2A2;
+    margin-bottom: 16rpx;
+    .salary{
+      font-size: 32rpx;
+      color: #4C6EFB;
+      font-weight: bold;
+    }
+  }
+  .title{
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-bottom: 16rpx;
+    display: flex;
+    image{
+      width: 46rpx;
+      height: 46rpx;
+      margin-right: 11rpx;
+    }
+  }
+  .infos{
+    display: flex;
+    flex-wrap: wrap;
+    font-size: 24rpx;
+    margin-bottom: 16rpx;
+    line-height: 42rpx;
+    view{
+      padding: 0 16rpx;
+      margin-right: 10rpx;
+      background: #F2F2F2;
+    }
+  }
+  .bottom-line{
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #A2A2A2;
+    margin-top: 12rpx;
+  }
+}
+.view-more-btn{ 
+  padding: 10rpx 56rpx;
+  background: #FFFFFF;
+  color: #4C6EFB;
+  border: 1rpx solid #4C6EFB;
+  text-align: center;
+  border-radius: 40rpx;
+  width: fit-content;
+  margin: 0 auto;
+  margin-bottom: 20rpx;
+}
+</style>
\ No newline at end of file
diff --git a/packageRc/pages/personalList/personalList.vue b/packageRc/pages/personalList/personalList.vue
new file mode 100644
index 0000000..9f631dc
--- /dev/null
+++ b/packageRc/pages/personalList/personalList.vue
@@ -0,0 +1,1004 @@
+<template>
+  <view class="job-list" style="background-image: url('../../../packageRc/static/pageBg.png');">
+    <!-- 固定导航栏 -->
+    <!-- <view class="fixed-navbar" v-if="true">
+      <u-navbar 
+        title="重点群体服务" 
+        :autoBack="true" 
+        bgColor="#1a62ce" 
+        leftIconColor="#fff"
+        
+        :placeholder="true"
+       
+      >
+        <uni-icons v-show="$store.getters.roles.includes('shequn')" @tap="$store.commit('SET_SHOWEXITPOPUP', true)"
+          name="list" slot="right" color="#fff"></uni-icons>
+      </u-navbar>
+    </view> -->
+    
+    <!-- 顶部背景图 -->
+    <!-- <view class="top_box_bg">
+      <u-image src="../../../packageRc/static/pageBg.png" width="750rpx" height="130rpx" />
+    </view> -->
+    <view class="search-filter-container">
+      <view class="search-input-wrapper">
+        <input
+          placeholder="输入姓名进行搜索"
+          border="surround"
+          v-model="queryParams.name"
+          shape="circle"
+          :customStyle="customInputStyle"
+        />
+      <view slot="suffix">
+        <uni-icons @tap="handleSearch" name="search" color="#2979ff" size="28"></uni-icons>
+      </view>
+      </view>
+      <view class="filter-button-wrapper">
+        <button
+          class="filter-button"
+          @click="openFilter"
+        >{{ filterTotal > 0 ? '筛选+' + filterTotal : '筛选' }}</button>
+      </view>
+    </view>
+    <view
+      style="position: relative; padding-top: 16px; color: #000;display: flex;align-items: center;justify-content: space-between;">
+      <view v-if="total">
+        <text style="color:font-size:12rpx;margin-left:10rpx;">共{{ total }}条信息</text>
+      </view>
+      <view style="display: flex;width: 200rpx" class="sort-type">
+        <!-- <view class="sort-type" @click="showSortPicker=true">{{ sortType ? sortType : '排序方式' }}</view> -->
+        <uni-data-select :clear="false" mode="none"
+          v-model="queryParams.pxlx"
+          :localdata="sortRange"
+          @change="sortTypeChange"
+        ></uni-data-select>
+        <view @click="changeSortLx" style="display: flex;align-items: center;margin-left: 8rpx;">
+          <uni-icons v-if="queryParams.pxfs == 'desc'" type="up" color="#2979ff" size="14"></uni-icons>
+          <uni-icons v-if="queryParams.pxfs == 'asc'" type="down" color="#2979ff" size="14"></uni-icons>
+        </view>
+        <!-- <uni-picker
+        @confirm="sortTypeChange"
+        :show="showSortPicker"
+        @cancel="cancelSortPicker"
+        :columns="[]" keyName="label"></u-picker> -->
+      </view>
+    </view>
+    <view class="tab-bar">
+    <view
+      v-for="item in serviceTabList"
+      :key="item.value"
+      :class="['tab-item', cxlx === item.value ? 'active' : '']"
+      @click="changeTab(item.value)"
+    >
+      {{ item.label }}
+    </view>
+  </view>
+    <!-- <uni-loading v-if="loading" mode="circle" size="40" color="#2979ff" :show="loading" /> -->
+    <scroll-view class="job-list__scroll" scroll-y="true" @scrolltolower="loadMoreJobs">
+      <view>
+        <view  v-for="(job,index) in perlist" :key="index"
+          class="swipe_action_item">
+          <view class="job-list__item" :style="{ paddingBottom: job.auditStatus == 1 ? '0' : '32rpx' }" @tap="toPage(`/packageRc/pages/community/personEdit?id=${job.id}&type=edit`)">
+            <view class="job-list__item-top">
+              <img src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/malepng.png" v-if="job.gender == 0" class="gender-img" alt="" />
+              <img src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/femalepng.png" v-else class="gender-img" alt="" />
+              <view class="job-list__item-top-info">
+                <view class="job-list__item-top-info-name">{{
+                  job.name || "-"
+                  }}</view>
+                <view style="margin-top: 10rpx">
+                  <text style="color: #8e8e8e">年龄：</text>
+                  <text>{{
+                    job.age || "--"
+                    }}岁</text>
+                  <text style="color: #8e8e8e;padding-left: 20rpx;">服务次数：</text>
+                  <text>{{
+                    job.operateNum
+                    }}次</text>
+
+                </view>
+              </view>
+              <view class="job-list__item-top-info-fwzt">
+                <text style="color: #e0a61f" v-if="job.fwzt == 0">•未服务</text>
+                <text style="color: #1ac88b" v-if="job.fwzt == 1">•已服务</text>
+          <text style="color: #fa6553" v-if="job.fwzt == 2">•联系不上</text>
+                <text style="color: #fa6553" v-if="job.fwzt == 3">•拒绝服务</text>
+                <text style="color: #fa6553;margin-top: 10rpx;" v-if="job.isReturn == 1">•被退回</text>
+              </view>
+            </view>
+            <view class="job-list__item-detail">
+              <text>证件号：</text>
+              <text v-if="job.isEye">{{ job.cardNumber }}</text>
+              <text v-else>{{ encryptIdCard(job.cardNumber) }}</text>
+
+              <uni-icons name="eye-fill" v-if="job.isEye" @click.native.stop="changeEys(job)" size="20"></uni-icons>
+              <uni-icons name="eye-off" v-else @click.native.stop="changeEys(job)" size="20"></uni-icons>
+            </view>
+            <view class="job-list__item-detail">
+              <text>联系电话:</text>
+              <text>{{ job.phone }}</text>
+            </view>
+            <view class="job-list__item-detail">
+              <text>详细地址:</text>
+              <text>{{ job.currentResidentialAddress || "--" }}</text>
+            </view>
+            <view class="job-list__item-btn">
+              <view v-show="$store.getters.roles.includes('shequn')" class="btn" style="color: #f56c6c;"
+                @click.native.stop="handleReturn(job)">退回</view>
+              <view class="btn" @click.native.stop="toPage(
+                `/packageRc/pages/community/serviceDetails?id=${job.id}&userId=${job.userId}`
+              )">服务</view>
+              <view
+                v-if=" job.personType == 3"
+                class="btn"
+                style="color: #1a62ce;"
+                @click.native.stop="goEmploymentRegister(job)"
+              >就业登记</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <u-loadmore :status="status" />
+    </scroll-view>
+
+    <!-- <view class="post_job_btn" @tap.stop="$tab.navigateTo('/pages/community/personEdit?type=add')">
+    </view> -->
+    <uni-popup :show="show" ref="show" @close="close" @open="open">
+      <view class="dialog_div">
+        <view class="dialog_div_top">
+          <view @click="close">取消</view>
+          <view @click="handleSearch">确定</view>
+        </view>
+        <view>
+          <view class="df_flex">
+            <view class="text">服务状态：</view>
+            <view class="df_flex_items">
+              <view class="item" @click="handleServiceStatus('fwzt', item)"
+                :class="item.dictValue == queryParams.fwzt ? 'item-active' : ''" v-for="item in serviceStatusList"
+                :key="item.dictValue">{{ item.dictLabel }}</view>
+            </view>
+          </view>
+          <view class="df_flex">
+            <view class="text">性别：</view>
+            <view class="df_flex_items">
+              <view class="item" @click="handleServiceStatus('gender', item)" :class="item.dictValue == queryParams.gender ? 'item-active' : ''
+                " v-for="item in genderList" :key="item.dictValue">{{ item.dictLabel }}</view>
+            </view>
+          </view>
+          <view class="df_flex">
+            <view class="text">学历：</view>
+            <view class="df_flex_items">
+              <view class="item" @click="handleServiceStatus('educationLevel', item)" :class="item.dictValue == queryParams.educationLevel ? 'item-active' : ''
+                " v-for="item in educationLevelList" :key="item.dictValue">{{ item.dictLabel }}</view>
+            </view>
+          </view>
+          <view class="df_flex">
+            <view class="text">人员类型：</view>
+            <view class="df_flex_items">
+              <view class="item" @click="handleServiceStatus('personType', item)" :class="item.dictValue == queryParams.personType ? 'item-active' : ''
+                " v-for="item in personTypeList" :key="item.dictValue">{{ item.dictLabel }}</view>
+            </view>
+          </view>
+          <view class="df_flex">
+            <view class="text">人员状态：</view>
+            <view class="df_flex_items">
+              <view class="item" @click="handleServiceStatus('personStatus', item)" :class="item.dictValue == queryParams.personStatus ? 'item-active' : ''
+                " v-for="item in ryztList" :key="item.dictValue">{{ item.dictLabel }}</view>
+            </view>
+          </view>
+          <!-- 非社区人员可以筛选 -->
+          <view class="df_flex" v-show="!$store.getters.roles.includes('shequn')">
+            <view class="text">是否退回：</view>
+            <view class="df_flex_items">
+              <view class="item" @click="handleServiceStatus('isReturn', item)" :class="item.dictValue == queryParams.isReturn ? 'item-active' : ''
+                " v-for="item in returnTypeList" :key="item.dictValue">{{ item.dictLabel }}</view>
+            </view>
+          </view>
+        </view>
+        <view class="dialog_div_btn">
+          <u-button class="reset-style" text="重 置" @click="reset"></u-button>
+          <u-button class="sure-style" text="确 定" @click="handleSearch"></u-button>
+        </view>
+      </view>
+    </uni-popup>
+    <uni-popup :show="show1" ref="show1" @close="close" @open="open">
+      <view class="dialog_div">
+        <view>
+          <view class="df_flex">
+            <view class="text">服务状态：</view>
+            <view class="df_flex_items">
+              <view class="item" @click="handleStatus('fwzt', item)"
+                :class="item.dictValue == talentInformation.fwzt ? 'item-active' : ''" v-for="item in serviceList"
+                :key="item.dictValue">{{ item.dictLabel }}</view>
+            </view>
+          </view>
+        </view>
+        <view class="dialog_div_btn">
+          <u-button class="reset-style" text="取 消" @click="reset"></u-button>
+          <u-button class="sure-style" text="确 定" @click="markPersonnelStatus"></u-button>
+        </view>
+      </view>
+    </uni-popup>
+    <uni-popup :show="openDialog" ref="openDialog" mode="center" closeOnClickOverlay @close="
+      openDialog = false;
+    resetInfo();
+    " :round="10">
+      <view class="dialog_form">
+        <view class="tadio df_flex df_align_center">
+          <u-radio-group v-model="auditInfo.auditStatus">
+            <u-radio :customStyle="{ marginLeft: '30rpx' }" name="2">
+              通过
+            </u-radio>
+            <u-radio :customStyle="{ marginLeft: '30rpx' }" name="3">
+              不通过
+            </u-radio>
+          </u-radio-group>
+        </view>
+        <view class="textarea" v-if="auditInfo.auditStatus == 3">
+          <u--textarea v-model="auditInfo.auditReason" placeholder="请填写审核不通过原因"></u--textarea>
+        </view>
+        <view class="btn">
+          <u-button :plain="true" color="#BF5818" text="确定" @tap="submitAudit"></u-button>
+        </view>
+      </view>
+    </uni-popup>
+    <!-- 退回 -->
+    <uni-popup :show="returnDialog" ref="returnDialog" mode="center" closeOnClickOverlay @close="returnClose" :round="10">
+      <view class="dialog_form">
+        <view class="return-dialog-title">
+          退回
+        </view>
+        <view class="textarea">
+          <u--textarea v-model="returnReason" placeholder="请填写退回原因"></u--textarea>
+        </view>
+        <view class="btn">
+          <u-button :plain="true" color="#BF5818" text="确定" @tap="returnSubmit"></u-button>
+        </view>
+      </view>
+    </uni-popup>
+
+    <!-- 社区端 - 显示隐藏退出组件 -->
+    <exitPopup />
+  </view>
+</template>
+
+<script>
+import {
+  // 人员基本信息 // 1 失业中 2 就业困难 3 离校生 4 其他人员
+  personInfoList,
+  recordLookIdCard, //记录日志
+  personInfoAudit,
+  delPersonInfo,
+  returnPerson,
+  updatePersonInfo,
+} from "../../api/company/index.js";
+import exitPopup from "../../components/exitPopup.vue";
+import {
+	getDicts
+} from '@/apiRc/system/dict.js'
+import PopupList from "../../components/PopupLists.vue";
+export default {
+  name: "personnelList",
+  components: {
+    PopupList,
+    exitPopup,
+  },
+  data() {
+    return {
+      validType: [
+        {
+          label: "是",
+          value: "1",
+        },
+        {
+          label: "否",
+          value: "0",
+        },
+      ],
+      sortRange: [{text: '年龄', value: 'AGE'},{text: '服务次数', value: 'OPERATE_NUM'},{text: '服务时间', value: 'OPERATE_TIME'},{text: '提出时间', value: 'DEMAND_TIME'},{text: '登录时间', value: 'LOGIN_TIME'},],
+      show: false,
+      show1: false,
+      filterTotal: 0,
+      total: 0,
+      status: "more", // 加载更多状态
+      searchKeyword: "",
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: "",
+        fwzt: "",
+        personType: "",
+        personStatus: "",
+        gender: "",
+        educationLevel: "",
+        isReturn: '',
+        pxfs: 'asc',
+        pxlx: 'DEMAND_TIME',
+        cxlx:"wfw"
+      },
+      perlist: [],
+      loading: false,
+      customInputStyle: {
+        background: "#fff",
+        height: "70rpx",
+        borderRadius: "35rpx",
+        padding: "0 40rpx",
+        fontSize: "28rpx",
+        boxShadow: "0 2rpx 8rpx rgba(0,0,0,0.1)",
+        width: "100%",
+      },
+      serviceStatusList: [
+        {
+          dictLabel: "全部",
+          dictValue: "",
+        },
+      ],
+      serviceList: [],
+      genderList: [
+        {
+          dictLabel: "不限",
+          dictValue: "",
+        },
+      ],
+      personTypeList: [
+        {
+          dictLabel: "全部",
+          dictValue: "",
+        },
+      ],
+      returnTypeList: [
+        {
+          dictLabel: "不限",
+          dictValue: "",
+        },
+        {
+          dictLabel: "是",
+          dictValue: "1",
+        },
+        {
+          dictLabel: "否",
+          dictValue: "0",
+        },
+      ],
+      educationLevelList: [
+        {
+          dictLabel: "不限",
+          dictValue: "",
+        },
+      ],
+      talentInformation: {
+        id: "",
+        fwzt: ""
+      },
+      ryztList: [
+        {
+          dictLabel: "不限",
+          dictValue: "",
+        },
+      ],
+      userSexList: [],
+      lcztList: [],
+      tabList: ["失业人员", "就业困难", "离校未就业", "其他人员"],
+      auditInfo: {
+        idList: [],
+        // 2 通过 3 不通过
+        auditStatus: "",
+        // 不通过原因
+        auditReason: "",
+      },
+      openDialog: false,
+      returnDialog: false,
+      returnReason: '',
+      returnItemData: {},
+      sortType: "DEMAND_TIME",
+      showSortPicker: false,
+      cxlx: 'wfw', // 默认全部
+      serviceTabList: [
+        { label: '全部', value: 'all' },
+        { label: '未服务', value: 'wfw' },
+        { label: '服务中', value: 'fwz' },
+        { label: '已就业', value: 'yjy' }
+      ],
+    };
+  },
+  onShow() {
+    this.getList(true);
+  },
+  onLoad() {
+    getDicts("qcjy_ryzt").then((res) => {
+      this.ryztList = res.data;
+    });
+    getDicts("sys_user_sex").then((res) => {
+      this.userSexList = res.data;
+    });
+    // 流程状态 0 暂存 1 待审核 2 审核通过 3 退回修改
+    getDicts("qcjy_lczt").then((res) => {
+      this.lcztList = res.data;
+    });
+
+    getDicts("sys_user_sex").then((res) => {
+      this.genderList = this.genderList.concat(res.data);
+    });
+    getDicts("qcjy_rylx").then((res) => {
+      this.personTypeList = this.personTypeList.concat(res.data);
+    });
+    getDicts("qcjy_fwzt").then((res) => {
+      this.serviceList = res.data;
+      this.serviceStatusList = this.serviceStatusList.concat(res.data);
+    });
+    getDicts("qcjy_jycd").then((res) => {
+      this.educationLevelList = this.educationLevelList.concat(res.data);
+    });
+  },
+  methods: {
+    openFilter() {
+
+      this.$refs.show.open()
+    },
+    toPage(url) {
+      uni.navigateTo(
+        url
+      )
+    },
+    cancelSortPicker() {
+      this.showSortPicker = false
+      this.$forceUpdate();
+    },
+    changeSortLx(){
+      this.queryParams.pxfs = this.queryParams.pxfs == 'asc' ? 'desc' : 'asc'
+      this.getList(true)
+    },
+    sortTypeChange(e) {
+      this.sortType = this.sortRange.filter(item => item.value === e)[0].text
+      this.queryParams.pxlx = e
+      this.queryParams.pxfs = 'asc'
+      this.showSortPicker = false
+      this.getList(true)
+    },
+    reset() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        name: "",
+        fwzt: "",
+        personType: "",
+        educationLevel: "",
+        personStatus: "",
+        gender: "",
+        isReturn: '',
+        pxfs: 'asc',
+        pxlx: 'DEMAND_TIME',
+        cxlx:""
+      };
+      this.$refs.show1.close()
+      this.show1 = false;
+      this.filterTotal = 0
+    },
+    open() {
+      // console.log('open');
+    },
+    close() {
+      this.$refs.show.close()
+      this.show = false;
+      this.$refs.show1.close()
+      this.show1 = false;
+      // console.log('close');
+    },
+    checked(data) {
+      this.$refs.show1.open()
+      this.show1 = true;
+      this.talentInformation.id = data.id;
+      this.talentInformation.fwzt = data.fwzt;
+
+    },
+    // 退回
+    handleReturn(data) {
+      this.$refs.returnDialog.open()
+      this.returnDialog = true
+      this.returnItemData = data || {}
+    },
+    // 退回关闭
+    returnClose() {
+      this.$refs.returnDialog.close()
+      this.returnDialog = false
+      this.returnReason = ''
+    },
+    // 退回提交
+    async returnSubmit() {
+      if (!this.returnReason) return this.$u.toast("请填写退回原因");
+      const params = {
+        id: this.returnItemData.id,
+        opinion: this.returnReason
+      }
+      returnPerson(params).then(res => {
+        if (res.code == 200) {
+          this.$refs.returnDialog.close()
+          this.returnDialog = false;
+          uni.showToast({title: res.msg, icon: "none"});
+          this.getList(true);
+        }
+      })
+    },
+    handleServiceStatus(label, item) {
+      this.filterTotal = 0
+      this.queryParams[label] = item.dictValue;
+      for (const key in this.queryParams) {
+        if (key == 'fwzt' || key == 'personType' || key == 'gender' || key == 'isReturn' || key == 'personStatus' || key == 'educationLevel') {
+          this.filterTotal += this.queryParams[key] ? 1 : 0
+
+        }
+      }
+
+    },
+    handleStatus(label, item) {
+      this.talentInformation[label] = item.dictValue;
+    },
+
+    // 获取列表
+    async getList(reset) {
+      if (this.loading) return;
+      this.loading = true;
+      uni.showLoading({
+        title: "加载中...",
+      });
+      
+      // 重置数据
+      if (reset) {
+        this.perlist = [];
+        this.queryParams.pageNum = 1;
+      }
+    
+      const start = Date.now();
+      console.log('接口');
+      personInfoList(this.queryParams).then(res => {
+        console.log('接口返回数据:', res);
+        console.log('接口耗时', Date.now() - start, 'ms');
+        if (res.code === 200) {
+          this.perlist = [...this.perlist, ...res.rows];
+          this.perlist.forEach((element) => {
+            this.$set(element, "isEye", false);
+          });
+          console.log("数据列表",this.perlist)
+          this.total = res.total;
+          this.status = this.perlist.length >= this.total ? "noMore" : "more";
+        }
+      }).finally(() => {
+        this.loading = false;
+        uni.hideLoading();
+      });
+    },
+    // 加载更多人员
+    loadMoreJobs() {
+      console.log(919191);
+      if (this.perlist.length >= this.total || this.status === "noMore") return;
+      this.queryParams.pageNum += 1;
+      this.getList();
+    },
+    // 搜索功能处理
+    handleSearch() {
+      this.$refs.show.close()
+      this.show = false;
+      this.getList(true);
+    },
+    markPersonnelStatus() {
+      updatePersonInfo(this.talentInformation).then((res) => {
+        if (res.code == 200) {
+          uni.showToast({title: "标记成功", icon: 'none'});
+          this.show1 = false;
+          this.getList(true);
+        } else {
+          uni.showToast({title: "标记失败", icon: 'none'});
+        }
+      });
+    },
+    // 根据 value 查找 label
+    getLabelByValue(list, value) {
+      const found = list.find((item) => item.value === value);
+      return found ? found.label : "-";
+    },
+    getDictLabel(list, dictValue) {
+      let arr = list.filter((ele) => ele.dictValue == dictValue);
+      if (arr.length) {
+        return arr[0].dictLabel;
+      } else {
+        return "--";
+      }
+    },
+    changeEys(data) {
+      if (data.isEye) {
+        data.isEye = false;
+      } else {
+        data.isEye = true;
+	    recordLookIdCard(data); //增加点击身份记录
+      }
+    },
+    encryptIdCard(idCard) {
+      const carNo =
+        idCard.substr(0, 4) + "********" + idCard.substr(idCard.length - 4, 4);
+      return carNo;
+    },
+    handleReview({ id }) {
+      this.auditInfo.idList = [id];
+      this.$refs.openDialog.open()
+      this.openDialog = true;
+    },
+    // 审核
+    async submitAudit() {
+      if (!this.auditInfo.auditStatus) return uni.showToast({title: "请选择是否通过", icon: 'none'});
+      personInfoAudit(this.auditInfo).then((res) => {
+        if (res.code == 200) {
+      this.$refs.openDialog.close()
+          this.openDialog = false;
+          uni.showToast({title: res.msg, icon: 'none'});
+          this.getList(true);
+        }
+      })
+    },
+    // 重置
+    resetInfo() {
+      this.auditInfo = {
+        idList: [],
+        // 2 通过 3 不通过
+        auditStatus: "",
+        // 不通过原因
+        auditReason: "",
+      };
+    },
+    goEmploymentRegister(job) {
+      uni.navigateTo({url: `/pages/community/sq_jydj?id=${job.id}`})
+    },
+    async changeTab(val) {
+      this.queryParams.cxlx = val;
+      this.cxlx = val;
+
+      this.getList(true);
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.job-list {
+  position: relative;
+  background-repeat: no-repeat;
+  padding: 24rpx 32rpx;
+  background-color: #F4F4F4;
+  .fixed-navbar {
+    position: relative;
+    z-index: 999;
+    background: transparent;
+  }
+
+  &__navbar {
+    height: 50rpx;
+  }
+
+  &__content {
+    position: relative;
+    padding: 24rpx;
+    padding-top: 30rpx; // 减少顶部内边距
+    z-index: 10;
+    background-color: #d0dcee;
+    border-radius: 32rpx 32rpx 0 0;
+    border: 1px solid #fff;
+  }
+
+  &__scroll {
+    margin-top: 10rpx;
+    height: calc(100vh - 300rpx);
+  }
+
+  &__item {
+    position: relative;
+    padding: 32rpx;
+    margin: 20rpx 0;
+    background-color: #fff;
+    border-radius: 16rpx;
+    font-size: 28rpx;
+
+    .tips {
+      position: absolute;
+      right: 0;
+      top: 0;
+      min-width: 40rpx;
+      padding: 0 24rpx;
+      height: 40rpx;
+      line-height: 40rpx;
+      color: #1ace62;
+      border-radius: 0px 16rpx 0px 16rpx;
+      background-color: #d9f9ed;
+      border: 1px solid #58e6a2;
+    }
+  }
+
+  &__item-detail {
+    margin-top: 20rpx;
+    color: #8e8e8e;
+
+    view,
+    text:last-child {
+      margin-left: 10rpx;
+      color: #333;
+    }
+  }
+
+  .tab_list {
+    margin-top: 30rpx;
+    height: 86rpx;
+    color: #ce6b1a;
+    border-top: 1px solid #eff2f6;
+  }
+
+  .items {
+    margin-top: 30rpx;
+    border-top: 1px solid #d0dcee;
+  }
+
+  .post_job_btn {
+    position: fixed;
+    bottom: 120rpx;
+    right: 16rpx;
+    width: 150rpx;
+    height: 150rpx;
+    border-radius: 50%;
+    z-index: 20;
+    background: url("https://rc.jinan.gov.cn/qcwjyH5/static/images/addPersonnel.png") no-repeat;
+    background-size: 100% 100%;
+  }
+
+  .dialog_form {
+    padding: 30rpx;
+    width: 80vw;
+
+    .tadio {
+      height: 100rpx;
+    }
+
+    .btn {
+      margin-top: 100rpx;
+    }
+  }
+}
+
+.job-list__item-detail {
+  display: flex;
+  align-items: center;
+}
+
+.job-list__item-btn {
+  height: 60rpx;
+  margin-top: 40rpx;
+  border-top: 1px solid #eee;
+  display: flex;
+  justify-content: space-between;
+  color: #1a62ce;
+  font-size: 26rpx;
+
+  .btn {
+    width: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    margin-top: 10rpx;
+    flex-grow: 1;
+  }
+}
+
+.job-list__item-top {
+  display: flex;
+  position: relative;
+  width: 100%;
+
+  .job-list__item-top-info {
+    margin-left: 40rpx;
+
+    .job-list__item-top-info-name {
+      color: #3d3d3d;
+      font-family: Source Han Sans;
+      font-size: 40rpx;
+      font-weight: bold;
+    }
+  }
+
+  .job-list__item-top-info-fwzt {
+    position: absolute;
+    right: 0;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.search-filter-container {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+
+.search-input-wrapper {
+  flex: 8;
+  min-width: 0;
+  background: #fff;
+  border-radius: 80rpx;
+  padding: 0 30rpx;
+  flex-grow: 1;
+  input{
+    height: 70rpx;
+    line-height: 70rpx;
+  }
+}
+
+.filter-button-wrapper {
+  width: 100rpx;
+  margin-left:24rpx;
+  
+}
+
+.filter-button {
+  background: linear-gradient(135deg, #2979ff 0%, #1a62ce 100%);
+  color: #fff;
+  border-radius: 80rpx;
+  padding: 0 24rpx;
+  height: 70rpx;
+  font-size: 28rpx;
+  font-weight: 500;
+  border: none;
+  box-shadow: 0 4rpx 12rpx rgba(41, 121, 255, 0.3);
+  width: 100%;
+  white-space: nowrap;
+}
+
+.custom-style {
+  background-color: #4d89e3;
+  width: 5rpx;
+  color: #fff;
+  margin-left: 30rpx;
+  border: 1px solid #1a62ce;
+  border-radius: 50rpx;
+}
+
+.dialog_div {
+  .dialog_div_top {
+    height: 100rpx;
+    border-bottom: 1px solid #e6e6e6;
+    padding: 30rpx;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    color: #077dfe;
+  }
+
+  .df_flex_items {
+    display: flex;
+    flex-wrap: wrap;
+    flex: 1;
+  }
+
+  .df_flex {
+    display: flex;
+    margin-top: 30rpx;
+    margin-left: 30rpx;
+
+    .text {
+      width: 140rpx;
+      display: flex;
+      justify-content: flex-end;
+    }
+
+    .item-active {
+      background: linear-gradient(90deg, #1a62ce 0%, #1d8ace 100%) !important;
+      color: #fff;
+    }
+
+    .item {
+      background: #f2f4f7;
+      margin: 0 20rpx;
+      margin-bottom: 10rpx;
+      padding: 10rpx 20rpx;
+      border-radius: 8px;
+    }
+  }
+
+  .dialog_div_btn {
+    display: flex;
+    margin: 40rpx;
+
+    .reset-style {
+      width: 200rpx;
+      background: #ffffff;
+      margin-right: 40rpx;
+      color: #3d3d3d;
+    }
+
+    .sure-style {
+      background: linear-gradient(270deg, #4370e5 0%, #53a0ea 100%);
+      color: #ffffff;
+    }
+  }
+}
+
+::v-deep {
+  .return-dialog-title {
+    text-align: center;
+    padding: 20rpx 0 32rpx 0;
+    font-size: 36rpx;
+    font-weight: bold;
+  }
+}
+
+::v-deep .sort-type {
+  // background: #f2f4f7;
+  // border: 1rpx solid #e4e4e4;
+  border-radius: 16rpx;
+  // padding: 4rpx 18rpx;
+  // color: rgb(255,134,13);
+  .uni-icons.uniui-bottom, .uni-icons.uniui-top{
+    display: none;
+  }
+  .uni-select__input-box.align-left{
+    text-align: right;
+  }
+  .uni-stat-box {
+    background: transparent;
+  }
+}
+
+.tab-bar {
+  display: flex;
+  background: transparent;
+  padding: 16rpx 0;
+  
+  justify-content: space-between;
+}
+
+.tab-item {
+  flex: 1;
+  text-align: center;
+  padding: 12rpx 0;
+  margin: 0 12rpx;
+  color: #333;
+  font-size: 28rpx;
+  background: #fff;
+  border-radius: 12rpx;
+  transition: background 0.2s, color 0.2s;
+  font-weight: 500;
+  
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+}
+
+.tab-item.active {
+  background: #2979ff;
+  color: #fff;
+  font-weight: bold;
+}
+
+.gender-img {
+  width: 88rpx;
+  height: 88rpx;
+  display: block;
+}
+.u-status-bar {
+  height: 44px;
+}
+// 在style标签末尾添加
+::v-deep {
+  .u-navbar__placeholder {
+    /* 控制高度 */
+    height: 88rpx;/* 根据需要调整高度 */
+    
+  
+    /* 控制其他样式 */
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 998;
+  }
+}
+::v-deep {
+.u-navbar__content{
+  color:#ffffff;
+}
+}
+
+</style>
diff --git a/packageRc/pages/service/serviceDetail.vue b/packageRc/pages/service/serviceDetail.vue
new file mode 100644
index 0000000..e69de29
diff --git a/packageRc/static/images/addPersonnel.png b/packageRc/static/images/addPersonnel.png
new file mode 100644
index 0000000..06501aa
Binary files /dev/null and b/packageRc/static/images/addPersonnel.png differ
diff --git a/packageRc/static/images/person/addNeeds.png b/packageRc/static/images/person/addNeeds.png
new file mode 100644
index 0000000..cfbf318
Binary files /dev/null and b/packageRc/static/images/person/addNeeds.png differ
diff --git a/packageRc/static/images/person/femalepng.png b/packageRc/static/images/person/femalepng.png
new file mode 100644
index 0000000..360adc6
Binary files /dev/null and b/packageRc/static/images/person/femalepng.png differ
diff --git a/packageRc/static/images/person/fillInRecords.png b/packageRc/static/images/person/fillInRecords.png
new file mode 100644
index 0000000..1fdabad
Binary files /dev/null and b/packageRc/static/images/person/fillInRecords.png differ
diff --git a/packageRc/static/images/person/malepng.png b/packageRc/static/images/person/malepng.png
new file mode 100644
index 0000000..fc72c52
Binary files /dev/null and b/packageRc/static/images/person/malepng.png differ
diff --git a/packageRc/static/images/selected.png b/packageRc/static/images/selected.png
new file mode 100644
index 0000000..8efaa33
Binary files /dev/null and b/packageRc/static/images/selected.png differ
diff --git a/packageRc/static/images/serviceFrequency.png b/packageRc/static/images/serviceFrequency.png
new file mode 100644
index 0000000..977d7e0
Binary files /dev/null and b/packageRc/static/images/serviceFrequency.png differ
diff --git a/packageRc/static/images/top.png b/packageRc/static/images/top.png
new file mode 100644
index 0000000..e403e6c
Binary files /dev/null and b/packageRc/static/images/top.png differ
diff --git a/packageRc/static/kinggang1.png b/packageRc/static/kinggang1.png
new file mode 100644
index 0000000..1f483d0
Binary files /dev/null and b/packageRc/static/kinggang1.png differ
diff --git a/packageRc/static/kinggang2.png b/packageRc/static/kinggang2.png
new file mode 100644
index 0000000..aa71fba
Binary files /dev/null and b/packageRc/static/kinggang2.png differ
diff --git a/packageRc/static/kinggang3.png b/packageRc/static/kinggang3.png
new file mode 100644
index 0000000..a63dd78
Binary files /dev/null and b/packageRc/static/kinggang3.png differ
diff --git a/packageRc/static/kinggang4.png b/packageRc/static/kinggang4.png
new file mode 100644
index 0000000..58f7e42
Binary files /dev/null and b/packageRc/static/kinggang4.png differ
diff --git a/packageRc/static/kinggang5.png b/packageRc/static/kinggang5.png
new file mode 100644
index 0000000..4778133
Binary files /dev/null and b/packageRc/static/kinggang5.png differ
diff --git a/packageRc/static/pageBg.png b/packageRc/static/pageBg.png
new file mode 100644
index 0000000..21f5378
Binary files /dev/null and b/packageRc/static/pageBg.png differ
diff --git a/packageRc/static/person/addEnterprise.png b/packageRc/static/person/addEnterprise.png
new file mode 100644
index 0000000..3f8c52c
Binary files /dev/null and b/packageRc/static/person/addEnterprise.png differ
diff --git a/packageRc/static/person/addNeeds.png b/packageRc/static/person/addNeeds.png
new file mode 100644
index 0000000..cfbf318
Binary files /dev/null and b/packageRc/static/person/addNeeds.png differ
diff --git a/packageRc/static/person/addNeeds1.png b/packageRc/static/person/addNeeds1.png
new file mode 100644
index 0000000..73a60a5
Binary files /dev/null and b/packageRc/static/person/addNeeds1.png differ
diff --git a/packageRc/static/person/bannerCard-old.png b/packageRc/static/person/bannerCard-old.png
new file mode 100644
index 0000000..41baa13
Binary files /dev/null and b/packageRc/static/person/bannerCard-old.png differ
diff --git a/packageRc/static/person/bannerCard.png b/packageRc/static/person/bannerCard.png
new file mode 100644
index 0000000..46a6169
Binary files /dev/null and b/packageRc/static/person/bannerCard.png differ
diff --git a/packageRc/static/person/bannerCard_chu.png b/packageRc/static/person/bannerCard_chu.png
new file mode 100644
index 0000000..e69de29
diff --git a/packageRc/static/person/bannerCard_old.png b/packageRc/static/person/bannerCard_old.png
new file mode 100644
index 0000000..e69de29
diff --git a/packageRc/static/person/ditu.png b/packageRc/static/person/ditu.png
new file mode 100644
index 0000000..055334e
Binary files /dev/null and b/packageRc/static/person/ditu.png differ
diff --git a/packageRc/static/person/empty.png b/packageRc/static/person/empty.png
new file mode 100644
index 0000000..4f040fe
Binary files /dev/null and b/packageRc/static/person/empty.png differ
diff --git a/packageRc/static/person/enterprise.png b/packageRc/static/person/enterprise.png
new file mode 100644
index 0000000..aa6db83
Binary files /dev/null and b/packageRc/static/person/enterprise.png differ
diff --git a/packageRc/static/person/enterpriseIcon.png b/packageRc/static/person/enterpriseIcon.png
new file mode 100644
index 0000000..0872690
Binary files /dev/null and b/packageRc/static/person/enterpriseIcon.png differ
diff --git a/packageRc/static/person/entrepreneurialIcon.png b/packageRc/static/person/entrepreneurialIcon.png
new file mode 100644
index 0000000..7c5c987
Binary files /dev/null and b/packageRc/static/person/entrepreneurialIcon.png differ
diff --git a/packageRc/static/person/femalepng.png b/packageRc/static/person/femalepng.png
new file mode 100644
index 0000000..360adc6
Binary files /dev/null and b/packageRc/static/person/femalepng.png differ
diff --git a/packageRc/static/person/fillInRecords.png b/packageRc/static/person/fillInRecords.png
new file mode 100644
index 0000000..1fdabad
Binary files /dev/null and b/packageRc/static/person/fillInRecords.png differ
diff --git a/packageRc/static/person/fillInRecords2.png b/packageRc/static/person/fillInRecords2.png
new file mode 100644
index 0000000..8d16aad
Binary files /dev/null and b/packageRc/static/person/fillInRecords2.png differ
diff --git a/packageRc/static/person/firstTop.png b/packageRc/static/person/firstTop.png
new file mode 100644
index 0000000..2305b0e
Binary files /dev/null and b/packageRc/static/person/firstTop.png differ
diff --git a/packageRc/static/person/header-botom.png b/packageRc/static/person/header-botom.png
new file mode 100644
index 0000000..7d6a9b4
Binary files /dev/null and b/packageRc/static/person/header-botom.png differ
diff --git a/packageRc/static/person/information.png b/packageRc/static/person/information.png
new file mode 100644
index 0000000..cda168d
Binary files /dev/null and b/packageRc/static/person/information.png differ
diff --git a/packageRc/static/person/jiaofei.png b/packageRc/static/person/jiaofei.png
new file mode 100644
index 0000000..ef3ff83
Binary files /dev/null and b/packageRc/static/person/jiaofei.png differ
diff --git a/packageRc/static/person/jiazheng.png b/packageRc/static/person/jiazheng.png
new file mode 100644
index 0000000..2c7be94
Binary files /dev/null and b/packageRc/static/person/jiazheng.png differ
diff --git a/packageRc/static/person/jiuye.png b/packageRc/static/person/jiuye.png
new file mode 100644
index 0000000..d1eee78
Binary files /dev/null and b/packageRc/static/person/jiuye.png differ
diff --git a/packageRc/static/person/jobSeekingIcon.png b/packageRc/static/person/jobSeekingIcon.png
new file mode 100644
index 0000000..7ca7c06
Binary files /dev/null and b/packageRc/static/person/jobSeekingIcon.png differ
diff --git a/packageRc/static/person/keynote.png b/packageRc/static/person/keynote.png
new file mode 100644
index 0000000..d574b2b
Binary files /dev/null and b/packageRc/static/person/keynote.png differ
diff --git a/packageRc/static/person/location.png b/packageRc/static/person/location.png
new file mode 100644
index 0000000..abeac72
Binary files /dev/null and b/packageRc/static/person/location.png differ
diff --git a/packageRc/static/person/malepng.png b/packageRc/static/person/malepng.png
new file mode 100644
index 0000000..fc72c52
Binary files /dev/null and b/packageRc/static/person/malepng.png differ
diff --git a/packageRc/static/person/quanzi.png b/packageRc/static/person/quanzi.png
new file mode 100644
index 0000000..6014794
Binary files /dev/null and b/packageRc/static/person/quanzi.png differ
diff --git a/packageRc/static/person/qxwq.png b/packageRc/static/person/qxwq.png
new file mode 100644
index 0000000..b2f2c03
Binary files /dev/null and b/packageRc/static/person/qxwq.png differ
diff --git a/packageRc/static/person/search.png b/packageRc/static/person/search.png
new file mode 100644
index 0000000..9d1c865
Binary files /dev/null and b/packageRc/static/person/search.png differ
diff --git a/packageRc/static/person/serviceFrequency.png b/packageRc/static/person/serviceFrequency.png
new file mode 100644
index 0000000..977d7e0
Binary files /dev/null and b/packageRc/static/person/serviceFrequency.png differ
diff --git a/packageRc/static/person/sheequ.png b/packageRc/static/person/sheequ.png
new file mode 100644
index 0000000..2753254
Binary files /dev/null and b/packageRc/static/person/sheequ.png differ
diff --git a/packageRc/static/person/staff.png b/packageRc/static/person/staff.png
new file mode 100644
index 0000000..585ad6a
Binary files /dev/null and b/packageRc/static/person/staff.png differ
diff --git a/packageRc/static/person/summary.png b/packageRc/static/person/summary.png
new file mode 100644
index 0000000..d266db3
Binary files /dev/null and b/packageRc/static/person/summary.png differ
diff --git a/packageRc/static/person/summaryStatistics.png b/packageRc/static/person/summaryStatistics.png
new file mode 100644
index 0000000..f8bd157
Binary files /dev/null and b/packageRc/static/person/summaryStatistics.png differ
diff --git a/packageRc/static/person/title-left.png b/packageRc/static/person/title-left.png
new file mode 100644
index 0000000..73e302e
Binary files /dev/null and b/packageRc/static/person/title-left.png differ
diff --git a/packageRc/static/person/tongzhi.png b/packageRc/static/person/tongzhi.png
new file mode 100644
index 0000000..be2fc33
Binary files /dev/null and b/packageRc/static/person/tongzhi.png differ
diff --git a/packageRc/static/person/toudi-icon.png b/packageRc/static/person/toudi-icon.png
new file mode 100644
index 0000000..4143167
Binary files /dev/null and b/packageRc/static/person/toudi-icon.png differ
diff --git a/packageRc/static/person/trainingIcon.png b/packageRc/static/person/trainingIcon.png
new file mode 100644
index 0000000..64c5076
Binary files /dev/null and b/packageRc/static/person/trainingIcon.png differ
diff --git a/packageRc/static/person/unread.png b/packageRc/static/person/unread.png
new file mode 100644
index 0000000..44caeed
Binary files /dev/null and b/packageRc/static/person/unread.png differ
diff --git a/packageRc/static/person/zct.png b/packageRc/static/person/zct.png
new file mode 100644
index 0000000..91b9cfd
Binary files /dev/null and b/packageRc/static/person/zct.png differ
diff --git a/packageRc/static/personIcon.png b/packageRc/static/personIcon.png
new file mode 100644
index 0000000..29df64e
Binary files /dev/null and b/packageRc/static/personIcon.png differ
diff --git a/packageRc/static/personIconFe.png b/packageRc/static/personIconFe.png
new file mode 100644
index 0000000..40aa250
Binary files /dev/null and b/packageRc/static/personIconFe.png differ
diff --git a/packageRc/static/sendManager.png b/packageRc/static/sendManager.png
new file mode 100644
index 0000000..874dad2
Binary files /dev/null and b/packageRc/static/sendManager.png differ
diff --git a/packageRc/static/trace.png b/packageRc/static/trace.png
new file mode 100644
index 0000000..8d4279d
Binary files /dev/null and b/packageRc/static/trace.png differ
diff --git a/packageRc/static/zcLeft.png b/packageRc/static/zcLeft.png
new file mode 100644
index 0000000..ad4f93d
Binary files /dev/null and b/packageRc/static/zcLeft.png differ
diff --git a/pages.json b/pages.json
index e638521..245dfe7 100644
--- a/pages.json
+++ b/pages.json
@@ -411,9 +411,58 @@
 			        "navigationBarTitleTextSize": "30rpx"
 			        // "navigationStyle": "custom"
 			    }
+			},
+			{
+			    "path" : "train/mockExam/viewGrades",
+			    "style" :
+			    {
+			        "navigationBarTitleText" : "查看成绩",
+			        "navigationBarTitleTextSize": "30rpx"
+			        // "navigationStyle": "custom"
+			    }
 			}
 	    ]
-	}],
+	},
+    {
+        "root": "packageRc",
+        "pages": [
+            {
+                "path" : "pages/index/index",
+                "style" : 
+                {
+                    "navigationBarTitleText" : "高校毕业生智慧就业"
+                }
+            }  , {
+                "path": "pages/personalList/personalList",
+                "style": {
+                    "navigationBarTitleText": "添加帮扶"
+                }
+            },{
+                "path": "pages/daiban/daiban",
+                "style": {
+                    "navigationBarTitleText": "待办任务"
+                }
+            },
+            {
+                "path": "pages/daiban/daibandetail",
+                "style": {
+                    "navigationBarTitleText": "待办详情"
+                }
+            },
+             
+              {
+                "path": "pages/demand/demandail",
+                "style": {
+                    "navigationBarTitleText": "新增需求"
+                }
+            }  , {
+                "path": "pages/daiban/addbangfu",
+                "style": {
+                    "navigationBarTitleText": "添加帮扶"
+                }
+            }
+        ]
+    }],
     // "tabBar": {
     //     "custom": true,
     //     "color": "#5E5F60",
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index e22e5fa..2b49310 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -47,23 +47,6 @@
             v-model="pageState.jobFairTitle"
           />
         </view>
-        <!-- <view class="header-date">
-                    <view class="data-week">
-                        <view
-                            class="weel-days button-click"
-                            :class="{ active: currentDay.fullDate === item.fullDate }"
-                            v-for="(item, index) in weekList"
-                            :key="index"
-                            @click="selectDate(item)"
-                        >
-                            <view class="label">{{ item.day }}</view>
-                            <view class="day">{{ item.date }}</view>
-                        </view>
-                    </view>
-                    <view class="data-all">
-                        <image class="allimg button-click" @click="toSelectDate" src="/static/icon/date1.png"></image>
-                    </view>
-                </view> -->
       </view>
 
       <!-- 主体内容区域 -->
@@ -85,17 +68,14 @@
                 )
               "
             >
-              <view class="card-title">{{ item.jobFairTitle }}</view>
+              <view class="card-title">
+                {{ item.jobFairTitle }}
+                <view class="center-date" :style="{ color: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color }">
+                  {{ getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).statusText }}
+                </view>
+              </view>
               <view class="card-row">
                 <text class="">{{ item.jobFairAddress }}</text>
-                <text class="">
-                  <convert-distance
-                    :alat="item.latitude"
-                    :along="item.longitude"
-                    :blat="latitudeVal"
-                    :blong="longitudeVal"
-                  ></convert-distance>
-                </text>
               </view>
               <view class="card-times">
                 <view class="time-left">
@@ -108,12 +88,6 @@
                 </view>
                 <view class="line"></view>
                 <view class="time-center">
-                  <view class="center-date">
-                    {{
-                      getTimeStatus(item.jobFairStartTime, item.jobFairEndTime)
-                        .statusText
-                    }}
-                  </view>
                   <view class="center-dateDay">
                     {{
                       getHoursBetween(
@@ -161,6 +135,7 @@ import useLocationStore from "@/stores/useLocationStore";
 import { storeToRefs } from "pinia";
 import { tabbarManager } from "@/utils/tabbarManager";
 import WxAuthLogin from "@/components/WxAuthLogin/WxAuthLogin.vue";
+import config from "@/config.js";
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
 const wxAuthLoginRef = ref(null);
 const { $api, navTo, cloneDeep } = inject("globalFunction");
@@ -180,6 +155,7 @@ const pageState = reactive({
   pageSize: 10,
   jobFairTitle: "",
 });
+const baseUrl = config.imgBaseUrl;
 
 onLoad(() => {
   // const today = new Date();
@@ -246,7 +222,7 @@ function changeSwiperMsgType(e) {
 
 function seemsg(index) {
   state.current = index;
-  console.log(index, 'index');
+  console.log(index, "index");
 
   if (index != 3) {
     getFair("refresh");
@@ -276,7 +252,7 @@ const handleScrollToLower = () => {
     } else {
       this.$nextTick(() => {
         getMyFair();
-      })
+      });
     }
   }
 };
@@ -337,16 +313,18 @@ function getMyFair(type = "add") {
       params.personId = userInfo.value.info.userId;
     }
   }
-  $api.myRequest("/jobfair/public/jobfair/enterprise/my-sign-up-job-fair", params).then((resData) => {
-    if (type === "add") {
-      const reslist = resData.data.list;
-      fairList.value = fairList.value.concat(reslist);
-    } else {
-      fairList.value = resData.data.list;
-    }
-    pageState.total = resData.data.total;
-    pageState.maxPage = resData.data.pages;
-  });
+  $api
+    .myRequest("/jobfair/public/jobfair/enterprise/my-sign-up-job-fair", params)
+    .then((resData) => {
+      if (type === "add") {
+        const reslist = resData.data.list;
+        fairList.value = fairList.value.concat(reslist);
+      } else {
+        fairList.value = resData.data.list;
+      }
+      pageState.total = resData.data.total;
+      pageState.maxPage = resData.data.pages;
+    });
 }
 function getFair(type = "add") {
   if (type === "refresh") {
@@ -384,18 +362,18 @@ function getFair(type = "add") {
 function toIOSDate(input) {
   if (!input) return null;
   if (input instanceof Date) return isNaN(input.getTime()) ? null : input;
-  if (typeof input === 'number') {
+  if (typeof input === "number") {
     const d = new Date(input);
     return isNaN(d.getTime()) ? null : d;
   }
-  if (typeof input !== 'string') return null;
+  if (typeof input !== "string") return null;
   let s = input.trim();
   // "YYYY-MM-DD HH:mm[:ss]" -> "YYYY-MM-DDTHH:mm[:ss]"
   if (/^\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}(:\d{2})?$/.test(s)) {
-    s = s.replace(' ', 'T');
+    s = s.replace(" ", "T");
     // 仅到分钟则补秒
     if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/.test(s)) {
-      s = s + ':00';
+      s = s + ":00";
     }
   }
   // 其余已是 iOS 可解析格式："YYYY/MM/DD[ HH:mm:ss]"、"YYYY-MM-DD"、ISO 8601 等
@@ -406,23 +384,23 @@ function toIOSDate(input) {
 function parseDateTime(datetimeStr) {
   if (!datetimeStr)
     return {
-      time: '',
-      date: '',
+      time: "",
+      date: "",
     };
 
   const dateObj = toIOSDate(datetimeStr);
 
   if (!dateObj)
     return {
-      time: '',
-      date: '',
+      time: "",
+      date: "",
     }; // 无效时间
 
   const year = dateObj.getFullYear();
-  const month = String(dateObj.getMonth() + 1).padStart(2, '0');
-  const day = String(dateObj.getDate()).padStart(2, '0');
-  const hours = String(dateObj.getHours()).padStart(2, '0');
-  const minutes = String(dateObj.getMinutes()).padStart(2, '0');
+  const month = String(dateObj.getMonth() + 1).padStart(2, "0");
+  const day = String(dateObj.getDate()).padStart(2, "0");
+  const hours = String(dateObj.getHours()).padStart(2, "0");
+  const minutes = String(dateObj.getMinutes()).padStart(2, "0");
 
   return {
     time: `${hours}:${minutes}`,
@@ -436,25 +414,30 @@ function getTimeStatus(startTimeStr, endTimeStr) {
   const endTime = toIOSDate(endTimeStr);
 
   if (!startTime || !endTime) {
-    return { status: 1, statusText: '时间异常' };
+    return { status: 1, statusText: "时间异常", color: "#999999" };
   }
 
-  // 判断状态：0 开始中，1 过期，2 待开始
+  // 判断状态：0 开始中，1 过期，2 未开始
   let status = 0;
-  let statusText = '开始中';
+  let statusText = "开始中";
+  let color = "#13C57C"; // 进行中 - 绿色
   if (now < startTime) {
-    status = 2; // 待开始
-    statusText = '待开始';
+    status = 2; // 未开始
+    statusText = "未开始";
+    color = "#015EEA"; // 未开始 - 蓝色
   } else if (now > endTime) {
     status = 1; // 已过期
-    statusText = '已过期';
+    statusText = "已过期";
+    color = "#999999"; // 已过期 - 灰色
   } else {
     status = 0; // 进行中
-    statusText = '进行中';
+    statusText = "进行中";
+    color = "#13C57C"; // 进行中 - 绿色
   }
   return {
-    status, // 0: 进行中，1: 已过期，2: 待开始
+    status, // 0: 进行中，1: 已过期，2: 未开始
     statusText,
+    color
   };
 }
 
@@ -481,7 +464,7 @@ const selectDate = (item) => {
 };
 
 function getNextDates({ startDate = "", count = 6 }) {
-  const baseDate = startDate ? (toIOSDate(startDate) || new Date()) : new Date(); // 指定起点或今天
+  const baseDate = startDate ? toIOSDate(startDate) || new Date() : new Date(); // 指定起点或今天
   const dates = [];
   const dayNames = ["日", "一", "二", "三", "四", "五", "六"];
 
@@ -507,7 +490,7 @@ function getNextDates({ startDate = "", count = 6 }) {
 }
 </script>
 
-<style scoped>
+<style scoped lang="stylus">
 .app-custom-root {
   position: fixed;
   z-index: 10;
@@ -659,7 +642,7 @@ function getNextDates({ startDate = "", count = 6 }) {
 .cards .card {
   margin-top: 28rpx;
   padding: 32rpx;
-  background: #ffffff;
+  background: linear-gradient(to bottom, #e3efff 0%, #fbfdff 100%);
   box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
   border-radius: 20rpx;
 }
@@ -667,18 +650,36 @@ function getNextDates({ startDate = "", count = 6 }) {
 .cards .card-title {
   font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
     Arial, "Microsoft YaHei", sans-serif;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #333333;
+  font-weight: 600;
+  font-size: 34rpx;
+  color: #005eb6;
+  text-align: center;
+  position relative
+  &::after {
+    content: "";
+    width: 120rpx;
+    height: 4rpx;
+    background: linear-gradient(to right, #015EEA 0%, #00C0FA 100%);
+    position: absolute;
+    left: 50%;
+    bottom: -14rpx;
+    transform: translate(-50%, -50%);
+  }
+  .center-date {
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #ff881a;
+    position: absolute;
+    right: 0;
+  }
 }
 
 .cards .card-row {
   display: flex;
-  justify-content: space-between;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #495265;
-  margin-top: 4rpx;
+  justify-content: center;
+  font-size: 26rpx;
+  color: #3e8ff3;
+  margin-top: 23rpx;
 }
 
 .cards .card-times {
@@ -694,11 +695,13 @@ function getNextDates({ startDate = "", count = 6 }) {
 }
 
 .cards .card-times .left-date {
-  font-weight: 500;
+  font-weight: 600;
   font-size: 48rpx;
-  color: #333333;
   font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
     Arial, "Microsoft YaHei", sans-serif;
+    background: linear-gradient(180deg, #015EEA 0%, #00C0FA 100%);
+-webkit-background-clip: text;
+-webkit-text-fill-color: transparent;
 }
 
 .cards .card-times .left-dateDay {
@@ -710,8 +713,8 @@ function getNextDates({ startDate = "", count = 6 }) {
 
 .cards .card-times .line {
   width: 40rpx;
-  height: 0;
-  border: 2rpx solid #d4d4d4;
+  height: 2rpx;
+  background: #7BB6FF;
   margin-top: 64rpx;
 }
 
@@ -723,30 +726,25 @@ function getNextDates({ startDate = "", count = 6 }) {
   align-items: center;
 }
 
-.cards .card-times .time-center .center-date {
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #ff881a;
-  padding-top: 10rpx;
-}
 
 .cards .card-times .time-center .center-dateDay {
   font-weight: 400;
   font-size: 24rpx;
-  color: #333333;
+  color: #fff;
   margin-top: 6rpx;
   line-height: 48rpx;
-  width: 104rpx;
+  width: max-content;
   height: 48rpx;
-  background: #f9f9f9;
+  background: #71B1FF;
   border-radius: 8rpx;
+  padding: 0 30rpx;
 }
 
 .cards .recommend-card-line {
   width: 100%;
   height: 0;
   border-radius: 0;
-  border: 2rpx dashed rgba(0, 0, 0, 0.14);
+  border-bottom: 2rpx dashed rgba(0, 0, 0, 0.14);
   margin-top: 32rpx;
   position: relative;
 }
@@ -781,6 +779,7 @@ function getNextDates({ startDate = "", count = 6 }) {
   font-weight: 400;
   font-size: 28rpx;
   color: #6c7282;
+  text-align: center;
 }
 
 .cards .card:first-child {
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index a402b9e..2dff06c 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -118,11 +118,11 @@
                     </view>
                     <view class="service-title">AI智能面试</view>
                 </view>
-                <view class="service-item press-button" @click="handleServiceClick('ai-interview')">
+                <view class="service-item press-button" style="justify-content:normal" @click="goRc()">
                     <view class="service-icon service-icon-9">
                         <IconfontIcon name="Graduation-simple-" :size="32" color="#FFFFFF" />
                     </view>
-                    <view class="service-title" style="overflow:none">高校毕业生<br/>智慧就业服务</view>
+                    <view class="service-title" style="overflow:unset">高校毕业生<br/>智慧就业服务</view>
                 </view>
                 <view class="service-item press-button" @click="navToTestPage">
                     <view class="service-icon service-icon-10">
@@ -1000,6 +1000,21 @@ function dataToImg(data) {
     return result;
 }
 
+// import { loginRc } from '@/apiRc/login/login.js';
+// import storeRc from '@/utilsRc/store/index.js';
+// 跳转到高校毕业页面
+function goRc(){
+    if (checkLogin()) {
+        // let userInfo = uni.getStorageSync('userInfo')
+        // console.log(uni.getStorageSync('userInfo'), "uni.getStorageSync('userInfo')");
+        // storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
+            // console.log(res, "'res");
+            navTo('/packageRc/pages/index/index');
+        // });
+    }
+}
+
+
 defineExpose({ loadData });
 </script>
 
diff --git a/uni_modules/uni-data-select/changelog.md b/uni_modules/uni-data-select/changelog.md
new file mode 100644
index 0000000..1681eae
--- /dev/null
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,51 @@
+## 1.1.0（2025-08-19）
+- 新增 插槽 selected empty option
+- 新增 mutiple 属性,支持多选功能
+- 新增 wrap 属性,支持选中的文字超过一行显示
+- 新增 align 属性,支持修改选中的文字显示的位置
+- 新增 hideRight 属性,支持隐藏右侧所有按钮
+- 新增 mode 属性,支持修改边框样式
+- 新增 事件 open close clear
+## 1.0.10（2025-04-14）
+- 修复 清除按钮不展示问题
+## 1.0.9（2025-03-26）
+- 优化 默认背景为白色与整体组件保持风格统一
+## 1.0.8（2024-03-28）
+- 修复 在vue2下:style动态绑定导致编译失败的bug
+## 1.0.7（2024-01-20）
+- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
new file mode 100644
index 0000000..85b2d7b
--- /dev/null
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,837 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled, 'uni-select--wrap': shouldWrap , 'border-default': mode == 'default','border-bottom': mode == 'underline'}">
+				<view class="uni-select__input-box" @click="toggleSelector" :class="{'uni-select__input-box--wrap': shouldWrap}">
+          <view v-if="slotSelected" class="slot-content padding-top-bottom" :class="{'uni-select__input-text--wrap': shouldWrap}">
+            <slot name="selected" :selectedItems="getSelectedItems()"></slot>
+          </view>
+          <template v-else>
+            <view v-if="textShow" class="uni-select__input-text" :class="{'uni-select__input-text--wrap': shouldWrap}">
+              <view class="padding-top-bottom" :class="'align-'+align">{{textShow}}</view>
+            </view>
+            <view v-else class="uni-select__input-text uni-select__input-placeholder" :class="'align-'+align">{{typePlaceholder}}</view>
+          </template>
+					<view key="clear-button" v-if="!hideRight && shouldShowClear && clear && !disabled" @click.stop="clearVal">
+						<uni-icons type="clear" color="#c0c4cc" size="24" />
+					</view>
+					<view key="arrow-button" v-else-if="!hideRight">
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+					<view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
+						<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
+						<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+							<template v-if="slotEmpty && mixinDatacomResData.length === 0">
+								<view class="uni-select__selector-empty">
+									<slot name="empty" :empty="emptyTips"></slot>
+								</view>
+							</template>
+							<template v-else>
+								<view v-if="mixinDatacomResData.length === 0" class="uni-select__selector-empty">
+									<text>{{emptyTips}}</text>
+								</view>
+							</template>
+							<template v-if="slotOption">
+								<view v-for="(itemData,index) in mixinDatacomResData" :key="index" @click="change(itemData)">
+									<slot name="option" :item="itemData" :itemSelected="multiple? getCurrentValues().includes(itemData.value):getCurrentValues() == itemData.value"></slot>
+								</view>
+							</template>
+							<template v-else>
+								<view v-if="!multiple && mixinDatacomResData.length > 0" class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+									@click="change(item)">
+									<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+								</view>
+								<view v-if="multiple && mixinDatacomResData.length > 0" >
+									<checkbox-group @change="checkBoxChange">
+										<label class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index" >
+											<checkbox :value="index+''" :checked="getCurrentValues().includes(item.value)" :disabled="item.disable"></checkbox>
+											<view :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</view>
+										</label>
+									</checkbox-group>
+								</view>
+							</template>
+						</scroll-view>
+					</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String|Array} value 默认值，多选时为数组
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @property {Boolean} multiple 是否多选模式
+	 * @property {Boolean} wrap 是否允许选中文本换行显示
+	 * @property {String} placement 弹出位置
+	 * 	@value top   		顶部弹出
+	 * 	@value bottom		底部弹出（default)
+	 * @property {String} align 选择文字的位置
+	 *  @value left 显示左侧
+	 *  @value center 显示中间
+	 *  @value right 显示 右侧
+	 * @property {Boolean} hideRight 是否隐藏右侧按钮
+	 * @property {String} mode 边框样式
+	 *  @value default 四周边框
+	 *  @value underline 下边框
+	 *  @value none 无边框
+	 * @event {Function} change  选中发生变化触发
+	 * @event {Function} open  选择框开启时触发
+	 * @event {Function} close  选择框关闭时触发
+	 * @event {Function} clear  点击清除按钮之后触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		emits: [
+			'open',
+			'close',
+			'update:modelValue',
+			'input',
+			'clear',
+			'change'
+		],
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number, Array],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+			placement: {
+				type: String,
+				default: 'bottom'
+			},
+      multiple: {
+				type: Boolean,
+				default: false
+			},
+			wrap: {
+				type: Boolean,
+				default: false
+			},
+			align:{
+				type: String,
+				default: "left"
+			},
+			hideRight: {
+				type: Boolean,
+				default: false
+			},
+      mode:{
+        type: String,
+        default: 'default'
+      }
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom() {
+        if (this.value === '') return this.modelValue
+				if (this.modelValue === '') return this.value
+				return this.value
+			},
+			textShow() {
+				// 长文本显示
+				if (this.multiple) {
+					const currentValues = this.getCurrentValues();
+					if (Array.isArray(currentValues) && currentValues.length > 0) {
+						const selectedItems = this.mixinDatacomResData.filter(item => currentValues.includes(item.value));
+						return selectedItems.map(item => this.formatItemName(item)).join(', ');
+					} else {
+						return ''; // 空数组时返回空字符串，显示占位符
+					}
+				} else {
+					return this.current;
+				}
+			},
+			shouldShowClear() {
+				if (this.multiple) {
+					const currentValues = this.getCurrentValues();
+					return Array.isArray(currentValues) && currentValues.length > 0;
+				} else {
+					return !!this.current;
+				}
+			},
+			shouldWrap() {
+				// 只有在多选模式、开启换行、且有内容时才应用换行样式
+				return this.multiple && this.wrap && !!this.textShow;
+			},
+			getOffsetByPlacement() {
+				switch (this.placement) {
+					case 'top':
+						return "bottom:calc(100% + 12px);";
+					case 'bottom':
+						return "top:calc(100% + 12px);";
+				}
+			},
+      slotSelected(){
+        // #ifdef VUE2
+        return this.$scopedSlots ? this.$scopedSlots.selected : false
+        // #endif
+        // #ifdef VUE3
+        return this.$slots ? this.$slots.selected : false
+        // #endif
+      },
+      slotEmpty(){
+        // #ifdef VUE2
+        return this.$scopedSlots ? this.$scopedSlots.empty : false
+        // #endif
+        // #ifdef VUE3
+        return this.$slots ? this.$slots.empty : false
+        // #endif
+      },
+			slotOption(){
+				// #ifdef VUE2
+				return this.$scopedSlots ? this.$scopedSlots.option : false
+				// #endif
+				// #ifdef VUE3
+				return this.$slots ? this.$slots.option : false
+				// #endif
+			}
+		},
+		watch: {
+			showSelector:{
+				handler(val,old){
+					val ? this.$emit('open') : this.$emit('close')
+				}
+			},
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			},
+		},
+		methods: {
+			getSelectedItems() {
+				const currentValues = this.getCurrentValues();
+				let _minxData = this.mixinDatacomResData
+				// #ifdef MP-WEIXIN || MP-TOUTIAO
+				_minxData = JSON.parse(JSON.stringify(this.mixinDatacomResData))
+				// #endif
+				if (this.multiple) {
+					return _minxData.filter(item => currentValues.includes(item.value)) || [];
+				} else {
+					return _minxData.filter(item => item.value === currentValues) || [];
+				}
+			},
+			debounce(fn, time = 100) {
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 检查项目是否已选中
+			isSelected(item) {
+				if (this.multiple) {
+					const currentValues = this.getCurrentValues();
+					return Array.isArray(currentValues) && currentValues.includes(item.value);
+				} else {
+					return this.getCurrentValues() === item.value;
+				}
+			},
+			// 获取当前选中的值
+			getCurrentValues() {
+				if (this.multiple) {
+					return Array.isArray(this.valueCom) ? this.valueCom : (this.valueCom ? [this.valueCom] : []);
+				} else {
+					return this.valueCom;
+				}
+			},
+			// 执行数据库查询
+			query() {
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange() {
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = this.multiple ? [] : ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = this.multiple ? [] : ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.multiple ? [this.mixinDatacomResData[this.defItem - 1].value] : this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					if (defValue || defValue === 0 || (this.multiple && Array.isArray(defValue) && defValue.length > 0)) {
+						this.emit(defValue)
+					}
+				}
+
+				if (this.multiple) {
+					const selectedValues = Array.isArray(defValue) ? defValue : (defValue ? [defValue] : []);
+					const selectedItems = this.mixinDatacomResData.filter(item => selectedValues.includes(item.value));
+					this.current = selectedItems.map(item => this.formatItemName(item));
+				} else {
+					const def = this.mixinDatacomResData.find(item => item.value === defValue)
+					this.current = def ? this.formatItemName(def) : ''
+				}
+			},
+
+			/**
+			 * @param {[String, Number, Array]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				if (Array.isArray(value)) {
+					// 对于数组，如果任意一个值被禁用，则认为整体被禁用
+					return value.some(val => {
+						return this.mixinDatacomResData.some(item => item.value === val && item.disable);
+					});
+				} else {
+					let isDisabled = false;
+					this.mixinDatacomResData.forEach(item => {
+						if (item.value === value) {
+							isDisabled = item.disable
+						}
+					})
+					return isDisabled;
+				}
+			},
+			clearVal() {
+				const emptyValue = this.multiple ? [] : '';
+				this.emit(emptyValue)
+				this.current = this.multiple ? [] : ''
+				if (this.collection) {
+					this.removeCache()
+				}
+				this.$emit('clear')
+			},
+			checkBoxChange(res){
+				let range = res.detail.value
+
+				let currentValues = range && range.length > 0? range.map((item)=>{
+					const index = parseInt(item, 10);
+
+					if (isNaN(index)) {
+						console.error(`无效索引: ${item}`);
+					}
+
+					if (index < 0 || index >= this.mixinDatacomResData.length) {
+						console.error(`索引越界: ${index}`);
+					}
+
+					return this.mixinDatacomResData[index].value;
+				}) : []
+				const selectedItems = this.mixinDatacomResData.filter(dataItem => currentValues.includes(dataItem.value));
+				this.current = selectedItems.map(dataItem => this.formatItemName(dataItem));
+
+				this.emit(currentValues);
+			},
+			change(item) {
+				if (!item.disable) {
+					if (this.multiple) {
+						// 多选模式
+						let currentValues = this.getCurrentValues();
+						if (!Array.isArray(currentValues)) {
+							currentValues = currentValues ? [currentValues] : [];
+						}
+
+						const itemValue = item.value;
+						const index = currentValues.indexOf(itemValue);
+
+						if (index > -1) {
+							currentValues.splice(index, 1);
+						} else {
+							currentValues.push(itemValue);
+						}
+
+						const selectedItems = this.mixinDatacomResData.filter(dataItem => currentValues.includes(dataItem.value));
+						this.current = selectedItems.map(dataItem => this.formatItemName(dataItem));
+
+						this.emit(currentValues);
+					} else {
+						// 单选模式
+						this.showSelector = false
+						this.current = this.formatItemName(item)
+						this.emit(item.value)
+					}
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData() {
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey() {
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+  $uni-primary: #2979ff !default;
+	$uni-success: #4cd964 !default;
+	$uni-warning: #f0ad4e !default;
+	$uni-error: #dd524d !default;
+	$uni-info: #909399 !default;
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		background-color: #fff;
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+  .border-bottom {
+    border-bottom: solid 1px $uni-border-3;
+  }
+
+  .border-default {
+    border: 1px solid $uni-border-3;
+  }
+
+	.uni-select {
+		font-size: 14px;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		width: 100%;
+		flex: 1;
+		min-height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+
+		&--wrap {
+			height: auto;
+			min-height: 35px;
+			// align-items: flex-start;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		// height: 35px;
+		width: 0px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+
+		&--wrap {
+			.uni-select__input-text {
+				margin-right: 8px;
+			}
+		}
+
+    .padding-top-bottom {
+      padding-top: 5px;
+      padding-bottom: 5px;
+    }
+
+    .slot-content {
+      width: 100%;
+      display: flex;
+      flex-direction: row;
+			flex-wrap: wrap;
+    }
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		line-height: 35px;
+		font-size: 14px;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+
+
+	.uni-select__selector-item-check {
+		margin-left: auto;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow_bottom,
+	.uni-popper__arrow_bottom::after,
+	.uni-popper__arrow_top,
+	.uni-popper__arrow_top::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow_bottom {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_bottom::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-popper__arrow_top {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		bottom: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-width: 0;
+		border-top-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_top::after {
+		content: " ";
+		bottom: 1px;
+		margin-left: -6px;
+		border-bottom-width: 0;
+		border-top-color: #fff;
+	}
+
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+
+		&--wrap {
+			white-space: normal;
+			text-overflow: initial;
+			-o-text-overflow: initial;
+			overflow: visible;
+			word-wrap: break-word;
+			word-break: break-all;
+			// line-height: 1.5;
+		}
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+    margin: 1px 0;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+
+  .align-left {
+    text-align: left;
+  }
+
+  .align-center {
+    text-align: center;
+  }
+
+  .align-right {
+    text-align: right;
+  }
+
+</style>
diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json
new file mode 100644
index 0000000..4033502
--- /dev/null
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,106 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.1.0",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1",
+    "uni-app": "^4.45",
+    "uni-app-x": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-load-more"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "√",
+        "aliyun": "√",
+        "alipay": "√"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "-",
+            "android": "√",
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "-",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-data-select/readme.md b/uni_modules/uni-data-select/readme.md
new file mode 100644
index 0000000..eb58de3
--- /dev/null
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-dateformat/changelog.md b/uni_modules/uni-dateformat/changelog.md
new file mode 100644
index 0000000..d551d7b
--- /dev/null
+++ b/uni_modules/uni-dateformat/changelog.md
@@ -0,0 +1,10 @@
+## 1.0.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-dateformat](https://uniapp.dcloud.io/component/uniui/uni-dateformat)
+## 0.0.5（2021-07-08）
+- 调整 默认时间不再是当前时间，而是显示'-'字符
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-02-04）
+- 调整为uni_modules目录规范
+- 修复 iOS 平台日期格式化出错的问题
diff --git a/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js b/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
new file mode 100644
index 0000000..e00d559
--- /dev/null
+++ b/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
@@ -0,0 +1,200 @@
+// yyyy-MM-dd hh:mm:ss.SSS 所有支持的类型
+function pad(str, length = 2) {
+	str += ''
+	while (str.length < length) {
+		str = '0' + str
+	}
+	return str.slice(-length)
+}
+
+const parser = {
+	yyyy: (dateObj) => {
+		return pad(dateObj.year, 4)
+	},
+	yy: (dateObj) => {
+		return pad(dateObj.year)
+	},
+	MM: (dateObj) => {
+		return pad(dateObj.month)
+	},
+	M: (dateObj) => {
+		return dateObj.month
+	},
+	dd: (dateObj) => {
+		return pad(dateObj.day)
+	},
+	d: (dateObj) => {
+		return dateObj.day
+	},
+	hh: (dateObj) => {
+		return pad(dateObj.hour)
+	},
+	h: (dateObj) => {
+		return dateObj.hour
+	},
+	mm: (dateObj) => {
+		return pad(dateObj.minute)
+	},
+	m: (dateObj) => {
+		return dateObj.minute
+	},
+	ss: (dateObj) => {
+		return pad(dateObj.second)
+	},
+	s: (dateObj) => {
+		return dateObj.second
+	},
+	SSS: (dateObj) => {
+		return pad(dateObj.millisecond, 3)
+	},
+	S: (dateObj) => {
+		return dateObj.millisecond
+	},
+}
+
+// 这都n年了iOS依然不认识2020-12-12，需要转换为2020/12/12
+function getDate(time) {
+	if (time instanceof Date) {
+		return time
+	}
+	switch (typeof time) {
+		case 'string':
+			{
+				// 2020-12-12T12:12:12.000Z、2020-12-12T12:12:12.000
+				if (time.indexOf('T') > -1) {
+					return new Date(time)
+				}
+				return new Date(time.replace(/-/g, '/'))
+			}
+		default:
+			return new Date(time)
+	}
+}
+
+export function formatDate(date, format = 'yyyy/MM/dd hh:mm:ss') {
+	if (!date && date !== 0) {
+		return ''
+	}
+	date = getDate(date)
+	const dateObj = {
+		year: date.getFullYear(),
+		month: date.getMonth() + 1,
+		day: date.getDate(),
+		hour: date.getHours(),
+		minute: date.getMinutes(),
+		second: date.getSeconds(),
+		millisecond: date.getMilliseconds()
+	}
+	const tokenRegExp = /yyyy|yy|MM|M|dd|d|hh|h|mm|m|ss|s|SSS|SS|S/
+	let flag = true
+	let result = format
+	while (flag) {
+		flag = false
+		result = result.replace(tokenRegExp, function(matched) {
+			flag = true
+			return parser[matched](dateObj)
+		})
+	}
+	return result
+}
+
+export function friendlyDate(time, {
+	locale = 'zh',
+	threshold = [60000, 3600000],
+	format = 'yyyy/MM/dd hh:mm:ss'
+}) {
+	if (time === '-') {
+		return time
+	}
+	if (!time && time !== 0) {
+		return ''
+	}
+	const localeText = {
+		zh: {
+			year: '年',
+			month: '月',
+			day: '天',
+			hour: '小时',
+			minute: '分钟',
+			second: '秒',
+			ago: '前',
+			later: '后',
+			justNow: '刚刚',
+			soon: '马上',
+			template: '{num}{unit}{suffix}'
+		},
+		en: {
+			year: 'year',
+			month: 'month',
+			day: 'day',
+			hour: 'hour',
+			minute: 'minute',
+			second: 'second',
+			ago: 'ago',
+			later: 'later',
+			justNow: 'just now',
+			soon: 'soon',
+			template: '{num} {unit} {suffix}'
+		}
+	}
+	const text = localeText[locale] || localeText.zh
+	let date = getDate(time)
+	let ms = date.getTime() - Date.now()
+	let absMs = Math.abs(ms)
+	if (absMs < threshold[0]) {
+		return ms < 0 ? text.justNow : text.soon
+	}
+	if (absMs >= threshold[1]) {
+		return formatDate(date, format)
+	}
+	let num
+	let unit
+	let suffix = text.later
+	if (ms < 0) {
+		suffix = text.ago
+		ms = -ms
+	}
+	const seconds = Math.floor((ms) / 1000)
+	const minutes = Math.floor(seconds / 60)
+	const hours = Math.floor(minutes / 60)
+	const days = Math.floor(hours / 24)
+	const months = Math.floor(days / 30)
+	const years = Math.floor(months / 12)
+	switch (true) {
+		case years > 0:
+			num = years
+			unit = text.year
+			break
+		case months > 0:
+			num = months
+			unit = text.month
+			break
+		case days > 0:
+			num = days
+			unit = text.day
+			break
+		case hours > 0:
+			num = hours
+			unit = text.hour
+			break
+		case minutes > 0:
+			num = minutes
+			unit = text.minute
+			break
+		default:
+			num = seconds
+			unit = text.second
+			break
+	}
+
+	if (locale === 'en') {
+		if (num === 1) {
+			num = 'a'
+		} else {
+			unit += 's'
+		}
+	}
+
+	return text.template.replace(/{\s*num\s*}/g, num + '').replace(/{\s*unit\s*}/g, unit).replace(/{\s*suffix\s*}/g,
+		suffix)
+}
diff --git a/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue b/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
new file mode 100644
index 0000000..c5ed030
--- /dev/null
+++ b/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
@@ -0,0 +1,88 @@
+<template>
+	<text>{{dateShow}}</text>
+</template>
+
+<script>
+	import {friendlyDate} from './date-format.js'
+	/**
+	 * Dateformat 日期格式化
+	 * @description 日期格式化组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3279
+	 * @property {Object|String|Number} date 日期对象/日期字符串/时间戳
+	 * @property {String} locale 格式化使用的语言
+	 * 	@value zh 中文
+	 * 	@value en 英文
+	 * @property {Array} threshold 应用不同类型格式化的阈值
+	 * @property {String} format 输出日期字符串时的格式
+	 */
+	export default {
+		name: 'uniDateformat',
+		props: {
+			date: {
+				type: [Object, String, Number],
+				default () {
+					return '-'
+				}
+			},
+			locale: {
+				type: String,
+				default: 'zh',
+			},
+			threshold: {
+				type: Array,
+				default () {
+					return [0, 0]
+				}
+			},
+			format: {
+				type: String,
+				default: 'yyyy/MM/dd hh:mm:ss'
+			},
+			// refreshRate使用不当可能导致性能问题，谨慎使用
+			refreshRate: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		data() {
+			return {
+				refreshMark: 0
+			}
+		},
+		computed: {
+			dateShow() {
+				this.refreshMark
+				return friendlyDate(this.date, {
+					locale: this.locale,
+					threshold: this.threshold,
+					format: this.format
+				})
+			}
+		},
+		watch: {
+			refreshRate: {
+				handler() {
+					this.setAutoRefresh()
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			refresh() {
+				this.refreshMark++
+			},
+			setAutoRefresh() {
+				clearInterval(this.refreshInterval)
+				if (this.refreshRate) {
+					this.refreshInterval = setInterval(() => {
+						this.refresh()
+					}, parseInt(this.refreshRate))
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/uni_modules/uni-dateformat/package.json b/uni_modules/uni-dateformat/package.json
new file mode 100644
index 0000000..786a670
--- /dev/null
+++ b/uni_modules/uni-dateformat/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-dateformat",
+  "displayName": "uni-dateformat 日期格式化",
+  "version": "1.0.0",
+  "description": "日期格式化组件，可以将日期格式化为1分钟前、刚刚等形式",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "日期格式化",
+    "时间格式化",
+    "格式化时间",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-dateformat/readme.md b/uni_modules/uni-dateformat/readme.md
new file mode 100644
index 0000000..37ddb6e
--- /dev/null
+++ b/uni_modules/uni-dateformat/readme.md
@@ -0,0 +1,11 @@
+
+
+### DateFormat 日期格式化
+> **组件名：uni-dateformat**
+> 代码块： `uDateformat`
+
+
+日期格式化组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-dateformat)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-swipe-action/changelog.md b/uni_modules/uni-swipe-action/changelog.md
new file mode 100644
index 0000000..998e476
--- /dev/null
+++ b/uni_modules/uni-swipe-action/changelog.md
@@ -0,0 +1,58 @@
+## 1.3.16（2025-06-11）
+- 修复 鸿蒙 next 浏览器上无法滑动的问题
+## 1.3.14（2025-06-09）
+- 优化 更新示例项目
+## 1.3.13（2025-04-15）
+- 修复 app 端 缺少leftOptions 或 rightOptions 时无法滑动的问题
+## 1.3.12（2025-04-14）
+- 修复 由上一个兼容版本引发的 安卓运行报错且无法回弹的问题
+## 1.3.11（2025-04-08）
+- 优化 兼容鸿蒙平台
+- 修复 WEB 平台控制台报错
+## 1.3.10（2024-01-17）
+- 修复 点击按钮时，按钮会被点击穿透导致自动收缩的 bug(兼容阿里/百度/抖音小程序)
+## 1.3.9（2024-01-17）
+- 修复 点击按钮时，按钮会被点击穿透导致自动收缩的 bug
+## 1.3.8（2023-04-13）
+- 修复`uni-swipe-action`和`uni-swipe-action-item`不同时使用导致 closeOther 方法报错的 bug
+## 1.3.7（2022-06-06）
+- 修复 vue3 下使用组件不能正常运行的Bug
+## 1.3.6（2022-05-31）
+- 修复 h5端点击click触发两次的Bug
+## 1.3.5（2022-05-23）
+- 修复 isPC 找不到的Bug
+## 1.3.4（2022-05-19）
+-  修复 在 nvue 下 disabled 失效的bug
+## 1.3.3（2022-03-31）
+- 修复 按钮字体大小不能设置的bug
+## 1.3.2（2022-03-16）
+- 修复 h5和app端下报el错误的bug
+## 1.3.1（2022-03-07）
+- 修复 HBuilderX 1.4.X 版本中，h5和app端下报错的bug
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-swipe-action](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+## 1.2.4（2021-08-20）
+- 优化 close-all 方法
+## 1.2.3（2021-08-20）
+- 新增 close-all 方法，关闭所有已打开的组件
+## 1.2.2（2021-08-17）
+- 新增 resize() 方法，在非微信小程序、h5、app-vue端出现不能滑动的问题的时候，重置组件
+- 修复 app 端偶尔出现类似 Page[x][-x,xx;-x,xx,x,x-x] 的问题 
+- 优化 微信小程序、h5、app-vue 滑动逻辑，避免出现动态新增组件后不能滑动的问题
+## 1.2.1（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+- 修复 跨页面修改组件数据 ，导致不能滑动的问题
+## 1.1.10（2021-06-17）
+- 修复 按钮点击执行两次的bug
+## 1.1.9（2021-05-12）
+- 新增 项目示例地址
+## 1.1.8（2021-03-26）
+- 修复 微信小程序 nv_navigator is not defined 报错的bug
+## 1.1.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 左侧滑动
+- 新增 插槽使用方式
+- 新增 threshold 属性，可以控制滑动缺省值
+- 优化 长列表滚动性能
+- 修复 滚动页面时触发组件滑动的Bug
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
new file mode 100644
index 0000000..707e432
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
@@ -0,0 +1,302 @@
+let bindIngXMixins = {}
+
+// #ifdef APP-NVUE
+const BindingX = uni.requireNativePlugin('bindingx');
+const dom = uni.requireNativePlugin('dom');
+const animation = uni.requireNativePlugin('animation');
+
+bindIngXMixins = {
+	data() {
+		return {}
+	},
+
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			if (this.stop) return
+			this.stop = true
+			if (newVal) {
+				this.open(newVal)
+			} else {
+				this.close()
+			}
+		},
+		leftOptions() {
+			this.getSelectorQuery()
+			this.init()
+		},
+		rightOptions(newVal) {
+			this.init()
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction && Array.isArray(this.swipeaction.children)) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.box = this.getEl(this.$refs['selector-box--hock'])
+		this.selector = this.getEl(this.$refs['selector-content--hock']);
+		this.leftButton = this.getEl(this.$refs['selector-left-button--hock']);
+		this.rightButton = this.getEl(this.$refs['selector-right-button--hock']);
+		this.init()
+	},
+	// beforeDestroy() {
+	// 	this.swipeaction.children.forEach((item, index) => {
+	// 		if (item === this) {
+	// 			this.swipeaction.children.splice(index, 1)
+	// 		}
+	// 	})
+	// },
+	methods: {
+		init() {
+			this.$nextTick(() => {
+				this.x = 0
+				this.button = {
+					show: false
+				}
+				setTimeout(() => {
+					this.getSelectorQuery()
+				}, 200)
+			})
+		},
+		onClick(index, item, position) {
+			this.$emit('click', {
+				content: item,
+				index,
+				position
+			})
+		},
+		touchstart(e) {
+			// fix by mehaotian 禁止滑动
+			if (this.disabled) return
+			// 每次只触发一次，避免多次监听造成闪烁
+			if (this.stop) return
+			this.stop = true
+			if (this.autoClose && this.swipeaction) {
+				this.swipeaction.closeOther(this)
+			}
+
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			let expression = this.range(this.x, -rightWidth, leftWidth)
+			let leftExpression = this.range(this.x - leftWidth, -leftWidth, 0)
+			let rightExpression = this.range(this.x + rightWidth, 0, rightWidth)
+
+			this.eventpan = BindingX.bind({
+				anchor: this.box,
+				eventType: 'pan',
+				props: [{
+					element: this.selector,
+					property: 'transform.translateX',
+					expression
+				}, {
+					element: this.leftButton,
+					property: 'transform.translateX',
+					expression: leftExpression
+				}, {
+					element: this.rightButton,
+					property: 'transform.translateX',
+					expression: rightExpression
+				}, ]
+			}, (e) => {
+				// nope
+				if (e.state === 'end') {
+					this.x = e.deltaX + this.x;
+					this.isclick = true
+					this.bindTiming(e.deltaX)
+				}
+			});
+		},
+		touchend(e) {
+			if (this.isopen !== 'none' && !this.isclick) {
+				this.open('none')
+			}
+		},
+		bindTiming(x) {
+			const left = this.x
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			const threshold = this.threshold
+			if (!this.isopen || this.isopen === 'none') {
+				if (left > threshold) {
+					this.open('left')
+				} else if (left < -threshold) {
+					this.open('right')
+				} else {
+					this.open('none')
+				}
+			} else {
+				if ((x > -leftWidth && x < 0) || x > rightWidth) {
+					if ((x > -threshold && x < 0) || (x - rightWidth > threshold)) {
+						this.open('left')
+					} else {
+						this.open('none')
+					}
+				} else {
+					if ((x < threshold && x > 0) || (x + leftWidth < -threshold)) {
+						this.open('right')
+					} else {
+						this.open('none')
+					}
+				}
+			}
+		},
+
+		/**
+		 * 移动范围
+		 * @param {Object} num
+		 * @param {Object} mix
+		 * @param {Object} max
+		 */
+		range(num, mix, max) {
+			return `min(max(x+${num}, ${mix}), ${max})`
+		},
+
+		/**
+		 * 开启swipe
+		 */
+		open(type) {
+			this.animation(type)
+		},
+
+		/**
+		 * 关闭swipe
+		 */
+		close() {
+			this.animation('none')
+		},
+
+		/**
+		 * 开启关闭动画
+		 * @param {Object} type
+		 */
+		animation(type) {
+			const time = 300
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			if (this.eventpan && this.eventpan.token) {
+				BindingX.unbind({
+					token: this.eventpan.token,
+					eventType: 'pan'
+				})
+			}
+
+			switch (type) {
+				case 'left':
+					Promise.all([
+						this.move(this.selector, leftWidth),
+						this.move(this.leftButton, 0),
+						this.move(this.rightButton, rightWidth * 2)
+					]).then(() => {
+						this.setEmit(leftWidth, type)
+					})
+					break
+				case 'right':
+					Promise.all([
+						this.move(this.selector, -rightWidth),
+						this.move(this.leftButton, -leftWidth * 2),
+						this.move(this.rightButton, 0)
+					]).then(() => {
+						this.setEmit(-rightWidth, type)
+					})
+					break
+				default:
+					Promise.all([
+						this.move(this.selector, 0),
+						this.move(this.leftButton, -leftWidth),
+						this.move(this.rightButton, rightWidth)
+					]).then(() => {
+						this.setEmit(0, type)
+					})
+
+			}
+		},
+		setEmit(x, type) {
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			this.isopen = this.isopen || 'none'
+			this.stop = false
+			this.isclick = false
+			// 只有状态不一致才会返回结果
+			if (this.isopen !== type && this.x !== x) {
+				if (type === 'left' && leftWidth > 0) {
+					this.$emit('change', 'left')
+				}
+				if (type === 'right' && rightWidth > 0) {
+					this.$emit('change', 'right')
+				}
+				if (type === 'none') {
+					this.$emit('change', 'none')
+				}
+			}
+			this.x = x
+			this.isopen = type
+		},
+		move(ref, value) {
+			return new Promise((resolve, reject) => {
+				animation.transition(ref, {
+					styles: {
+						transform: `translateX(${value})`,
+					},
+					duration: 150, //ms
+					timingFunction: 'linear',
+					needLayout: false,
+					delay: 0 //ms
+				}, function(res) {
+					resolve(res)
+				})
+			})
+
+		},
+
+		/**
+		 * 获取ref
+		 * @param {Object} el
+		 */
+		getEl(el) {
+			return el.ref
+		},
+		/**
+		 * 获取节点信息
+		 */
+		getSelectorQuery() {
+			Promise.all([
+				this.getDom('left'),
+				this.getDom('right'),
+			]).then((data) => {
+				let show = 'none'
+				if (this.autoClose) {
+					show = 'none'
+				} else {
+					show = this.show
+				}
+
+				if (show === 'none') {
+					// this.close()
+				} else {
+					this.open(show)
+				}
+
+			})
+
+		},
+		getDom(str) {
+			return new Promise((resolve, reject) => {
+				dom.getComponentRect(this.$refs[`selector-${str}-button--hock`], (data) => {
+					if (data) {
+						this.button[str] = data.size
+						resolve(data)
+					} else {
+						reject()
+					}
+				})
+			})
+		}
+	}
+}
+
+// #endif
+
+export default bindIngXMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
new file mode 100644
index 0000000..917cb48
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
@@ -0,0 +1,12 @@
+export function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (let v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+	return flag;
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
new file mode 100644
index 0000000..35c796b
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
@@ -0,0 +1,195 @@
+export default {
+	data() {
+		return {
+			x: 0,
+			transition: false,
+			width: 0,
+			viewWidth: 0,
+			swipeShow: 0
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			if (newVal && newVal !== 'none') {
+				this.transition = true
+				this.open(newVal)
+			} else {
+				this.close()
+			}
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction && Array.isArray(this.swipeaction.children)) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.isopen = false
+		setTimeout(() => {
+			this.getQuerySelect()
+		}, 50)
+	},
+	methods: {
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		/**
+		 * 移动触发
+		 * @param {Object} e
+		 */
+		onChange(e) {
+			this.moveX = e.detail.x
+			this.isclose = false
+		},
+		touchstart(e) {
+			this.transition = false
+			this.isclose = true
+			if (this.autoClose && this.swipeaction) {
+				this.swipeaction.closeOther(this)
+			}
+		},
+		touchmove(e) {},
+		touchend(e) {
+			// 0的位置什么都不执行
+			if (this.isclose && this.isopen === 'none') return
+			if (this.isclose && this.isopen !== 'none') {
+				this.transition = true
+				this.close()
+			} else {
+				this.move(this.moveX + this.leftWidth)
+			}
+		},
+
+		/**
+		 * 移动
+		 * @param {Object} moveX
+		 */
+		move(moveX) {
+			// 打开关闭的处理逻辑不太一样
+			this.transition = true
+			// 未打开状态
+			if (!this.isopen || this.isopen === 'none') {
+				if (moveX > this.threshold) {
+					this.open('left')
+				} else if (moveX < -this.threshold) {
+					this.open('right')
+				} else {
+					this.close()
+				}
+			} else {
+				if (moveX < 0 && moveX < this.rightWidth) {
+					const rightX = this.rightWidth + moveX
+					if (rightX < this.threshold) {
+						this.open('right')
+					} else {
+						this.close()
+					}
+				} else if (moveX > 0 && moveX < this.leftWidth) {
+					const leftX = this.leftWidth - moveX
+					if (leftX < this.threshold) {
+						this.open('left')
+					} else {
+						this.close()
+					}
+				}
+
+			}
+
+		},
+
+		/**
+		 * 打开
+		 */
+		open(type) {
+			this.x = this.moveX
+			this.animation(type)
+		},
+
+		/**
+		 * 关闭
+		 */
+		close() {
+			this.x = this.moveX
+			// TODO 解决 x 值不更新的问题，所以会多触发一次 nextTick ，待优化
+			this.$nextTick(() => {
+				this.x = -this.leftWidth
+				if (this.isopen !== 'none') {
+					this.$emit('change', 'none')
+				}
+				this.isopen = 'none'
+			})
+		},
+
+		/**
+		 * 执行结束动画
+		 * @param {Object} type
+		 */
+		animation(type) {
+			this.$nextTick(() => {
+				if (type === 'left') {
+					this.x = 0
+				} else {
+					this.x = -this.rightWidth - this.leftWidth
+				}
+
+				if (this.isopen !== type) {
+					this.$emit('change', type)
+				}
+				this.isopen = type
+			})
+
+		},
+		getSlide(x) {},
+		getQuerySelect() {
+			const query = uni.createSelectorQuery().in(this);
+			query.selectAll('.movable-view--hock').boundingClientRect(data => {
+				this.leftWidth = data[1].width
+				this.rightWidth = data[2].width
+				this.width = data[0].width
+				this.viewWidth = this.width + this.rightWidth + this.leftWidth
+				if (this.leftWidth === 0) {
+					// TODO 疑似bug ,初始化的时候如果x 是0，会导致移动位置错误，所以让元素超出一点
+					this.x = -0.1
+				} else {
+					this.x = -this.leftWidth
+				}
+				this.moveX = this.x
+				this.$nextTick(() => {
+					this.swipeShow = 1
+				})
+
+				if (!this.buttonWidth) {
+					this.disabledView = true
+				}
+
+				if (this.autoClose) return
+				if (this.show !== 'none') {
+					this.transition = true
+					this.open(this.shows)
+				}
+			}).exec();
+
+		}
+	}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
new file mode 100644
index 0000000..d389bce
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
@@ -0,0 +1,260 @@
+let otherMixins = {}
+
+// #ifndef APP-PLUS|| MP-WEIXIN  ||  H5
+const MIN_DISTANCE = 10;
+otherMixins = {
+	data() {
+		// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+		const elClass = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+		return {
+			uniShow: false,
+			left: 0,
+			buttonShow: 'none',
+			ani: false,
+			moveLeft: '',
+			elClass
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		left() {
+			this.moveLeft = `translateX(${this.left}px)`
+		},
+		buttonShow(newVal) {
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		leftOptions() {
+			this.init()
+		},
+		rightOptions() {
+			this.init()
+		}
+	},
+	mounted() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction && Array.isArray(this.swipeaction.children)) {
+			this.swipeaction.children.push(this)
+		}
+		this.init()
+	},
+	methods: {
+		init() {
+			clearTimeout(this.timer)
+			this.timer = setTimeout(() => {
+				this.getSelectorQuery()
+			}, 100)
+			// 移动距离
+			this.left = 0
+			this.x = 0
+		},
+
+		closeSwipe(e) {
+			if (this.autoClose && this.swipeaction) {
+				this.swipeaction.closeOther(this)
+			}
+		},
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		touchstart(e) {
+			if (this.disabled) return
+			this.ani = false
+			this.x = this.left || 0
+			this.stopTouchStart(e)
+			this.autoClose && this.closeSwipe()
+		},
+		touchmove(e) {
+			if (this.disabled) return
+			// 是否可以滑动页面
+			this.stopTouchMove(e);
+			if (this.direction !== 'horizontal') {
+				return;
+			}
+			this.move(this.x + this.deltaX)
+			return false
+		},
+		touchend() {
+			if (this.disabled) return
+			this.moveDirection(this.left)
+		},
+		/**
+		 * 设置移动距离
+		 * @param {Object} value
+		 */
+		move(value) {
+			value = value || 0
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			// 获取可滑动范围
+			this.left = this.range(value, -rightWidth, leftWidth);
+		},
+
+		/**
+		 * 获取范围
+		 * @param {Object} num
+		 * @param {Object} min
+		 * @param {Object} max
+		 */
+		range(num, min, max) {
+			return Math.min(Math.max(num, min), max);
+		},
+		/**
+		 * 移动方向判断
+		 * @param {Object} left
+		 * @param {Object} value
+		 */
+		moveDirection(left) {
+			const threshold = this.threshold
+			const isopen = this.isopen || 'none'
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			if (this.deltaX === 0) {
+				this.openState('none')
+				return
+			}
+			if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth >
+					0 && rightWidth +
+					left < threshold)) {
+				// right
+				this.openState('right')
+			} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth >
+					0 &&
+					leftWidth - left < threshold)) {
+				// left
+				this.openState('left')
+			} else {
+				// default
+				this.openState('none')
+			}
+		},
+
+		/**
+		 * 开启状态
+		 * @param {Boolean} type
+		 */
+		openState(type) {
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			let left = ''
+			this.isopen = this.isopen ? this.isopen : 'none'
+			switch (type) {
+				case "left":
+					left = leftWidth
+					break
+				case "right":
+					left = -rightWidth
+					break
+				default:
+					left = 0
+			}
+
+
+			if (this.isopen !== type) {
+				this.throttle = true
+				this.$emit('change', type)
+			}
+
+			this.isopen = type
+			// 添加动画类
+			this.ani = true
+			this.$nextTick(() => {
+				this.move(left)
+			})
+			// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+		},
+		close() {
+			this.openState('none')
+		},
+		getDirection(x, y) {
+			if (x > y && x > MIN_DISTANCE) {
+				return 'horizontal';
+			}
+			if (y > x && y > MIN_DISTANCE) {
+				return 'vertical';
+			}
+			return '';
+		},
+
+		/**
+		 * 重置滑动状态
+		 * @param {Object} event
+		 */
+		resetTouchStatus() {
+			this.direction = '';
+			this.deltaX = 0;
+			this.deltaY = 0;
+			this.offsetX = 0;
+			this.offsetY = 0;
+		},
+
+		/**
+		 * 设置滑动开始位置
+		 * @param {Object} event
+		 */
+		stopTouchStart(event) {
+			this.resetTouchStatus();
+			const touch = event.touches[0];
+			this.startX = touch.clientX;
+			this.startY = touch.clientY;
+		},
+
+		/**
+		 * 滑动中，是否禁止打开
+		 * @param {Object} event
+		 */
+		stopTouchMove(event) {
+			const touch = event.touches[0];
+			this.deltaX = touch.clientX - this.startX;
+			this.deltaY = touch.clientY - this.startY;
+			this.offsetX = Math.abs(this.deltaX);
+			this.offsetY = Math.abs(this.deltaY);
+			this.direction = this.direction || this.getDirection(this.offsetX, this.offsetY);
+		},
+
+		getSelectorQuery() {
+			const views = uni.createSelectorQuery().in(this)
+			views
+				.selectAll('.' + this.elClass)
+				.boundingClientRect(data => {
+					if (data.length === 0) return
+					let show = 'none'
+					if (this.autoClose) {
+						show = 'none'
+					} else {
+						show = this.show
+					}
+					this.leftWidth = data[0].width || 0
+					this.rightWidth = data[1].width || 0
+					this.buttonShow = show
+				})
+				.exec()
+		}
+	}
+}
+
+// #endif
+
+export default otherMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
new file mode 100644
index 0000000..0b5de88
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
@@ -0,0 +1,84 @@
+let mpMixins = {}
+let is_pc = null
+// #ifdef H5
+import {
+	isPC
+} from "./isPC"
+is_pc = isPC()
+// #endif
+// #ifdef APP-VUE || APP-HARMONY || MP-WEIXIN || H5
+
+mpMixins = {
+	data() {
+		return {
+			is_show: 'none'
+		}
+	},
+	watch: {
+		show(newVal) {
+			this.is_show = this.show
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction && Array.isArray(this.swipeaction.children)) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.is_show = this.show
+	},
+	methods: {
+		// wxs 中调用
+		closeSwipe(e) {
+			if (this.autoClose && this.swipeaction) {
+				this.swipeaction.closeOther(this)
+			}
+		},
+
+		change(e) {
+			this.$emit('change', e.open)
+			if (this.is_show !== e.open) {
+				this.is_show = e.open
+			}
+		},
+
+		appTouchStart(e) {
+			if (is_pc) return
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			if (is_pc) return
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		onClickForPC(index, item, position) {
+			if (!is_pc) return
+			// #ifdef H5
+			this.$emit('click', {
+				content: item,
+				index,
+				position
+			})
+			// #endif
+		}
+	}
+}
+
+// #endif
+export default mpMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
new file mode 100644
index 0000000..218cb41
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
@@ -0,0 +1,277 @@
+const MIN_DISTANCE = 10;
+export default {
+	showWatch(newVal, oldVal, ownerInstance, instance, self) {
+		var state = self.state || {}
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		if (!$el) return
+		this.getDom(instance, ownerInstance, self)
+		if (newVal && newVal !== 'none') {
+			this.openState(newVal, instance, ownerInstance, self)
+			return
+		}
+
+		if (state.left) {
+			this.openState('none', instance, ownerInstance, self)
+		}
+		this.resetTouchStatus(instance, self)
+	},
+
+	/**
+	 * 开始触摸操作
+	 * @param {Object} e
+	 * @param {Object} ins
+	 */
+	touchstart(e, ownerInstance, self) {
+		let instance = e.instance;
+		let disabled = instance.getDataset().disabled
+		let state = self.state || {};
+		this.getDom(instance, ownerInstance, self)
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+		if (disabled) return
+		// 开始触摸时移除动画类
+		instance.requestAnimationFrame(function() {
+			instance.removeClass('ani');
+			ownerInstance.callMethod('closeSwipe');
+		})
+
+		// 记录上次的位置
+		state.x = state.left || 0
+		// 计算滑动开始位置
+		this.stopTouchStart(e, ownerInstance, self)
+	},
+
+	/**
+	 * 开始滑动操作
+	 * @param {Object} e
+	 * @param {Object} ownerInstance
+	 */
+	touchmove(e, ownerInstance, self) {
+		let instance = e.instance;
+		// 删除之后已经那不到实例了
+		if (!instance) return;
+		let disabled = instance.getDataset().disabled
+		let state = self.state || {}
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+		if (disabled) return
+		// 是否可以滑动页面
+		this.stopTouchMove(e, self);
+		if (state.direction !== 'horizontal') {
+			return;
+		}
+		if (e.preventDefault) {
+			// 阻止页面滚动
+			e.preventDefault()
+		}
+		let x = state.x + state.deltaX
+		this.move(x, instance, ownerInstance, self)
+	},
+
+	/**
+	 * 结束触摸操作
+	 * @param {Object} e
+	 * @param {Object} ownerInstance
+	 */
+	touchend(e, ownerInstance, self) {
+		let instance = e.instance;
+		let disabled = instance.getDataset().disabled
+		let state = self.state || {}
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+
+		if (disabled) return
+		// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+		// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+		this.moveDirection(state.left, instance, ownerInstance, self)
+
+	},
+
+	/**
+	 * 设置移动距离
+	 * @param {Object} value
+	 * @param {Object} instance
+	 * @param {Object} ownerInstance
+	 */
+	move(value, instance, ownerInstance, self) {
+		value = value || 0
+		let state = self.state || {}
+		let leftWidth = state.leftWidth
+		let rightWidth = state.rightWidth
+		// 获取可滑动范围
+		state.left = this.range(value, -rightWidth, leftWidth);
+		instance.requestAnimationFrame(function() {
+			instance.setStyle({
+				transform: 'translateX(' + state.left + 'px)',
+				'-webkit-transform': 'translateX(' + state.left + 'px)'
+			})
+		})
+
+	},
+
+	/**
+	 * 获取元素信息
+	 * @param {Object} instance
+	 * @param {Object} ownerInstance
+	 */
+	getDom(instance, ownerInstance, self) {
+		var state = self.state || {}
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		var leftDom = $el.querySelector('.button-group--left')
+		var rightDom = $el.querySelector('.button-group--right')
+		if (leftDom && leftDom.offsetWidth) {
+			state.leftWidth = leftDom.offsetWidth || 0
+		} else {
+			state.leftWidth = 0
+		}
+		if (rightDom && rightDom.offsetWidth) {
+			state.rightWidth = rightDom.offsetWidth || 0
+		} else {
+			state.rightWidth = 0
+		}
+		state.threshold = instance.getDataset().threshold
+	},
+
+	getDisabledType(value) {
+		return (typeof(value) === 'string' ? JSON.parse(value) : value) || false;
+	},
+
+	/**
+	 * 获取范围
+	 * @param {Object} num
+	 * @param {Object} min
+	 * @param {Object} max
+	 */
+	range(num, min, max) {
+		return Math.min(Math.max(num, min), max);
+	},
+
+
+	/**
+	 * 移动方向判断
+	 * @param {Object} left
+	 * @param {Object} value
+	 * @param {Object} ownerInstance
+	 * @param {Object} ins
+	 */
+	moveDirection(left, ins, ownerInstance, self) {
+		var state = self.state || {}
+		var threshold = state.threshold
+		var position = state.position
+		var isopen = state.isopen || 'none'
+		var leftWidth = state.leftWidth
+		var rightWidth = state.rightWidth
+		if (state.deltaX === 0) {
+			this.openState('none', ins, ownerInstance, self)
+			return
+		}
+		if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+				rightWidth +
+				left < threshold)) {
+			// right
+			this.openState('right', ins, ownerInstance, self)
+		} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+				leftWidth - left < threshold)) {
+			// left
+			this.openState('left', ins, ownerInstance, self)
+		} else {
+			// default
+			this.openState('none', ins, ownerInstance, self)
+		}
+	},
+
+
+	/**
+	 * 开启状态
+	 * @param {Boolean} type
+	 * @param {Object} ins
+	 * @param {Object} ownerInstance
+	 */
+	openState(type, ins, ownerInstance, self) {
+		let state = self.state || {}
+		let leftWidth = state.leftWidth
+		let rightWidth = state.rightWidth
+		let left = ''
+		state.isopen = state.isopen ? state.isopen : 'none'
+		switch (type) {
+			case "left":
+				left = leftWidth
+				break
+			case "right":
+				left = -rightWidth
+				break
+			default:
+				left = 0
+		}
+
+		// && !state.throttle
+
+		if (state.isopen !== type) {
+			state.throttle = true
+			ownerInstance.callMethod('change', {
+				open: type
+			})
+
+		}
+
+		state.isopen = type
+		// 添加动画类
+		ins.requestAnimationFrame(() => {
+			ins.addClass('ani');
+			this.move(left, ins, ownerInstance, self)
+		})
+	},
+
+
+	getDirection(x, y) {
+		if (x > y && x > MIN_DISTANCE) {
+			return 'horizontal';
+		}
+		if (y > x && y > MIN_DISTANCE) {
+			return 'vertical';
+		}
+		return '';
+	},
+
+	/**
+	 * 重置滑动状态
+	 * @param {Object} event
+	 */
+	resetTouchStatus(instance, self) {
+		let state = self.state || {};
+		state.direction = '';
+		state.deltaX = 0;
+		state.deltaY = 0;
+		state.offsetX = 0;
+		state.offsetY = 0;
+	},
+
+	/**
+	 * 设置滑动开始位置
+	 * @param {Object} event
+	 */
+	stopTouchStart(event, ownerInstance, self) {
+		let instance = event.instance;
+		let state = self.state || {}
+		this.resetTouchStatus(instance, self);
+		var touch = event.touches[0];
+		state.startX = touch.clientX;
+		state.startY = touch.clientY;
+	},
+
+	/**
+	 * 滑动中，是否禁止打开
+	 * @param {Object} event
+	 */
+	stopTouchMove(event, self) {
+		let instance = event.instance;
+		let state = self.state || {};
+		let touch = event.touches[0];
+
+		state.deltaX = touch.clientX - state.startX;
+		state.deltaY = touch.clientY - state.startY;
+		state.offsetY = Math.abs(state.deltaY);
+		state.offsetX = Math.abs(state.deltaX);
+		state.direction = state.direction || this.getDirection(state.offsetX, state.offsetY);
+	}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
new file mode 100644
index 0000000..0096f10
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
@@ -0,0 +1,348 @@
+<template>
+	<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+	<!-- #ifdef APP-VUE || APP-HARMONY || MP-WEIXIN || H5 -->
+	<view class="uni-swipe">
+		<!--  #ifdef MP-WEIXIN || H5 -->
+		<view class="uni-swipe_box" :change:prop="wxsswipe.showWatch" :prop="is_show" :data-threshold="threshold"
+			:data-disabled="disabled" @touchstart="wxsswipe.touchstart" @touchmove="wxsswipe.touchmove"
+			@touchend="wxsswipe.touchend">
+			<!-- #endif -->
+			<!--  #ifndef MP-WEIXIN || H5 -->
+			<view class="uni-swipe_box" :change:prop="renderswipe.showWatch" :prop="is_show" :data-threshold="threshold"
+				:data-disabled="disabled+''" @touchstart="renderswipe.touchstart" @touchmove="renderswipe.touchmove"
+				@touchend="renderswipe.touchend">
+			<!-- #endif -->
+				<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+				<view class="uni-swipe_button-group button-group--left">
+					<slot name="left">
+						<view v-for="(item,index) in leftOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart.stop="appTouchStart"
+							@touchend.stop="appTouchEnd($event,index,item,'left')" @click.stop="onClickForPC(index,item,'left')">
+							<text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+				<view class="uni-swipe_text--center">
+					<slot></slot>
+				</view>
+				<view class="uni-swipe_button-group button-group--right">
+					<slot name="right">
+						<view v-for="(item,index) in rightOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart.stop="appTouchStart"
+							@touchend.stop="appTouchEnd($event,index,item,'right')" @click.stop="onClickForPC(index,item,'right')"><text
+								class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- app nvue端 使用 bindingx -->
+		<!-- #ifdef APP-NVUE -->
+		<view ref="selector-box--hock" class="uni-swipe" @horizontalpan="touchstart" @touchend="touchend">
+			<view ref='selector-left-button--hock' class="uni-swipe_button-group button-group--left">
+				<slot name="left">
+					<view v-for="(item,index) in leftOptions" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')">
+						<text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF', fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">
+							{{ item.text }}
+						</text>
+					</view>
+				</slot>
+			</view>
+			<view ref='selector-right-button--hock' class="uni-swipe_button-group button-group--right">
+				<slot name="right">
+					<view v-for="(item,index) in rightOptions" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'right')"><text
+							class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+			<view ref='selector-content--hock' class="uni-swipe_box">
+				<slot></slot>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- 其他平台使用 js ，长列表性能可能会有影响-->
+		<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ || MP-HARMONY -->
+		<view class="uni-swipe">
+			<view class="uni-swipe_box" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"
+				:style="{transform:moveLeft}" :class="{ani:ani}">
+				<view class="uni-swipe_button-group button-group--left" :class="[elClass]">
+					<slot name="left">
+						<view v-for="(item,index) in leftOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
+					}" class="uni-swipe_button button-hock" @touchstart.stop="appTouchStart"
+							@touchend.stop="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+				<slot></slot>
+				<view class="uni-swipe_button-group button-group--right" :class="[elClass]">
+					<slot name="right">
+						<view v-for="(item,index) in rightOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
+					}" @touchstart.stop="appTouchStart" @touchend.stop="appTouchEnd($event,index,item,'right')"
+							class="uni-swipe_button button-hock"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<!-- #endif -->
+
+</template>
+<script src="./wx.wxs" module="wxsswipe" lang="wxs"></script>
+
+<script module="renderswipe" lang="renderjs">
+	import render from './render.js'
+	export default {
+		mounted(e, ins, owner) {
+			this.state = {}
+		},
+		methods: {
+			showWatch(newVal, oldVal, ownerInstance, instance) {
+				render.showWatch(newVal, oldVal, ownerInstance, instance, this)
+			},
+			touchstart(e, ownerInstance) {
+				render.touchstart(e, ownerInstance, this)
+			},
+			touchmove(e, ownerInstance) {
+				render.touchmove(e, ownerInstance, this)
+			},
+			touchend(e, ownerInstance) {
+				render.touchend(e, ownerInstance, this)
+			}
+		}
+	}
+</script>
+<script>
+	import mpwxs from './mpwxs'
+	import bindingx from './bindingx.js'
+	import mpother from './mpother'
+
+	/**
+	 * SwipeActionItem 滑动操作子组件
+	 * @description 通过滑动触发选项的容器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+	 * @property {Boolean} show = [left|right｜none] 	开启关闭组件，auto-close = false 时生效
+	 * @property {Boolean} disabled = [true|false] 		是否禁止滑动
+	 * @property {Boolean} autoClose = [true|false] 	滑动打开当前组件，是否关闭其他组件
+	 * @property {Number}  threshold 					滑动缺省值
+	 * @property {Array} leftOptions 					左侧选项内容及样式
+	 * @property {Array} rightOptions 					右侧选项内容及样式
+	 * @event {Function} click 							点击选项按钮时触发事件，e = {content,index} ，content（点击内容）、index（下标)
+	 * @event {Function} change 						组件打开或关闭时触发，left\right\none
+	 */
+
+	export default {
+		mixins: [mpwxs, bindingx, mpother],
+		emits: ['click', 'change'],
+		props: {
+			// 控制开关
+			show: {
+				type: String,
+				default: 'none'
+			},
+
+			// 禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+
+			// 是否自动关闭
+			autoClose: {
+				type: Boolean,
+				default: true
+			},
+
+			// 滑动缺省距离
+			threshold: {
+				type: Number,
+				default: 20
+			},
+
+			// 左侧按钮内容
+			leftOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+
+			// 右侧按钮内容
+			rightOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+
+		methods: {
+			uninstall() {
+				if (this.swipeaction) {
+					this.swipeaction.children.forEach((item, index) => {
+						if (item === this) {
+							this.swipeaction.children.splice(index, 1)
+						}
+					})
+				}
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getSwipeAction(name = 'uniSwipeAction') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-swipe {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-swipe_box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-shrink: 0;
+		// touch-action: none;
+		/* #endif */
+		position: relative;
+	}
+
+	.uni-swipe_content {
+		// border: 1px red solid;
+	}
+
+	.uni-swipe_text--center {
+		width: 100%;
+		/* #ifndef APP-NVUE */
+		cursor: grab;
+		/* #endif */
+	}
+
+	.uni-swipe_button-group {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.button-group--left {
+		left: 0;
+		transform: translateX(-100%)
+	}
+
+	.button-group--right {
+		right: 0;
+		transform: translateX(100%)
+	}
+
+	.uni-swipe_button {
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 0 20px;
+	}
+
+	.uni-swipe_button-text {
+		/* #ifndef APP-NVUE */
+		flex-shrink: 0;
+		/* #endif */
+		font-size: 14px;
+	}
+
+	.ani {
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
+	}
+
+	/* #ifdef MP-ALIPAY */
+	.movable-area {
+		/* width: 100%; */
+		height: 45px;
+	}
+
+	.movable-view {
+		display: flex;
+		/* justify-content: center; */
+		position: relative;
+		flex: 1;
+		height: 45px;
+		z-index: 2;
+	}
+
+	.movable-view-button {
+		display: flex;
+		flex-shrink: 0;
+		flex-direction: row;
+		height: 100%;
+		background: #C0C0C0;
+	}
+
+	/* .transition {
+		transition: all 0.3s;
+	} */
+
+	.movable-view-box {
+		flex-shrink: 0;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
new file mode 100644
index 0000000..5e5e1ee
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
@@ -0,0 +1,349 @@
+var MIN_DISTANCE = 10;
+
+/**
+ * 判断当前是否为H5、app-vue
+ */
+var IS_HTML5 = false
+if (typeof window === 'object') IS_HTML5 = true
+
+/**
+ * 监听页面内值的变化,主要用于动态开关swipe-action
+ * @param {Object} newValue
+ * @param {Object} oldValue
+ * @param {Object} ownerInstance
+ * @param {Object} instance
+ */
+function showWatch(newVal, oldVal, ownerInstance, instance) {
+	var state = instance.getState()
+	getDom(instance, ownerInstance)
+	if (newVal && newVal !== 'none') {
+		openState(newVal, instance, ownerInstance)
+		return
+	}
+
+	if (state.left) {
+		openState('none', instance, ownerInstance)
+	}
+	resetTouchStatus(instance)
+}
+
+/**
+ * 开始触摸操作
+ * @param {Object} e
+ * @param {Object} ins
+ */
+function touchstart(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState();
+	getDom(instance, ownerInstance)
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 开始触摸时移除动画类
+	instance.requestAnimationFrame(function() {
+		instance.removeClass('ani');
+		ownerInstance.callMethod('closeSwipe');
+	})
+
+	// 记录上次的位置
+	state.x = state.left || 0
+	// 计算滑动开始位置
+	stopTouchStart(e, ownerInstance)
+}
+
+/**
+ * 开始滑动操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchmove(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 是否可以滑动页面
+	stopTouchMove(e);
+	if (state.direction !== 'horizontal') {
+		return;
+	}
+
+	if (e.preventDefault) {
+		// 阻止页面滚动
+		e.preventDefault()
+	}
+
+	move(state.x + state.deltaX, instance, ownerInstance)
+}
+
+/**
+ * 结束触摸操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchend(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+
+	if (disabled) return
+	// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+	// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+	moveDirection(state.left, instance, ownerInstance)
+
+}
+
+/**
+ * 设置移动距离
+ * @param {Object} value
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function move(value, instance, ownerInstance) {
+	value = value || 0
+	var state = instance.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	// 获取可滑动范围
+	state.left = range(value, -rightWidth, leftWidth);
+	instance.requestAnimationFrame(function() {
+		instance.setStyle({
+			transform: 'translateX(' + state.left + 'px)',
+			'-webkit-transform': 'translateX(' + state.left + 'px)'
+		})
+	})
+
+}
+
+/**
+ * 获取元素信息
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function getDom(instance, ownerInstance) {
+	var state = instance.getState()
+	var leftDom = ownerInstance.selectComponent('.button-group--left')
+	var rightDom = ownerInstance.selectComponent('.button-group--right')
+	var leftStyles = {
+		width: 0
+	}
+	var rightStyles = {
+		width: 0
+	}
+
+	if (leftDom) {
+		leftStyles = leftDom.getBoundingClientRect()
+	}
+
+	if (rightDom) {
+		rightStyles = rightDom.getBoundingClientRect()
+	}
+	state.leftWidth = leftStyles.width || 0
+	state.rightWidth = rightStyles.width || 0
+	state.threshold = instance.getDataset().threshold
+}
+
+/**
+ * 获取范围
+ * @param {Object} num
+ * @param {Object} min
+ * @param {Object} max
+ */
+function range(num, min, max) {
+	return Math.min(Math.max(num, min), max);
+}
+
+
+/**
+ * 移动方向判断
+ * @param {Object} left
+ * @param {Object} value
+ * @param {Object} ownerInstance
+ * @param {Object} ins
+ */
+function moveDirection(left, ins, ownerInstance) {
+	var state = ins.getState()
+	var threshold = state.threshold
+	var position = state.position
+	var isopen = state.isopen || 'none'
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	if (state.deltaX === 0) {
+		openState('none', ins, ownerInstance)
+		return
+	}
+	if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+			rightWidth +
+			left < threshold)) {
+		// right
+		openState('right', ins, ownerInstance)
+	} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+			leftWidth - left < threshold)) {
+		// left
+		openState('left', ins, ownerInstance)
+	} else {
+		// default
+		openState('none', ins, ownerInstance)
+	}
+}
+
+
+/**
+ * 开启状态
+ * @param {Boolean} type
+ * @param {Object} ins
+ * @param {Object} ownerInstance
+ */
+function openState(type, ins, ownerInstance) {
+	var state = ins.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	var left = ''
+	state.isopen = state.isopen ? state.isopen : 'none'
+	switch (type) {
+		case "left":
+			left = leftWidth
+			break
+		case "right":
+			left = -rightWidth
+			break
+		default:
+			left = 0
+	}
+
+	// && !state.throttle
+
+	if (state.isopen !== type) {
+		state.throttle = true
+		ownerInstance.callMethod('change', {
+			open: type
+		})
+
+	}
+
+	state.isopen = type
+	// 添加动画类
+	ins.requestAnimationFrame(function() {
+		ins.addClass('ani');
+		move(left, ins, ownerInstance)
+	})
+	// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+}
+
+
+function getDirection(x, y) {
+	if (x > y && x > MIN_DISTANCE) {
+		return 'horizontal';
+	}
+	if (y > x && y > MIN_DISTANCE) {
+		return 'vertical';
+	}
+	return '';
+}
+
+/**
+ * 重置滑动状态
+ * @param {Object} event
+ */
+function resetTouchStatus(instance) {
+	var state = instance.getState();
+	state.direction = '';
+	state.deltaX = 0;
+	state.deltaY = 0;
+	state.offsetX = 0;
+	state.offsetY = 0;
+}
+
+/**
+ * 设置滑动开始位置
+ * @param {Object} event
+ */
+function stopTouchStart(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	resetTouchStatus(instance);
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.startX = touch.clientX;
+	state.startY = touch.clientY;
+}
+
+/**
+ * 滑动中，是否禁止打开
+ * @param {Object} event
+ */
+function stopTouchMove(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.deltaX = touch.clientX - state.startX;
+	state.deltaY = touch.clientY - state.startY;
+	state.offsetY = Math.abs(state.deltaY);
+	state.offsetX = Math.abs(state.deltaX);
+	state.direction = state.direction || getDirection(state.offsetX, state.offsetY);
+}
+
+function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (var v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+  if(userAgentInfo.indexOf('Phone') > 0 && userAgentInfo.indexOf('Harmony') > 0){
+    flag = false;
+  }
+	return flag;
+}
+
+var movable = false
+
+function mousedown(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchstart(e, ins)
+	movable = true
+}
+
+function mousemove(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	if (!movable) return
+	touchmove(e, ins)
+}
+
+function mouseup(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchend(e, ins)
+	movable = false
+}
+
+function mouseleave(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	movable = false
+}
+
+module.exports = {
+	showWatch: showWatch,
+	touchstart: touchstart,
+	touchmove: touchmove,
+	touchend: touchend,
+	mousedown: mousedown,
+	mousemove: mousemove,
+	mouseup: mouseup,
+	mouseleave: mouseleave
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
new file mode 100644
index 0000000..9b32b3d
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
@@ -0,0 +1,60 @@
+<template>
+	<view>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SwipeAction 滑动操作
+	 * @description 通过滑动触发选项的容器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+	 */
+	export default {
+		name:"uniSwipeAction",
+		data() {
+			return {};
+		},
+		created() {
+			this.children = [];
+		},
+		methods: {
+			// 公开给用户使用，重制组件样式
+			resize(){
+				// wxs 会自己计算组件大小，所以无需执行下面代码
+				// #ifndef APP-VUE || H5 || MP-WEIXIN || MP-HARMONY
+				this.children.forEach(vm=>{
+					vm.init()
+				})
+				// #endif
+			},
+			// 公开给用户使用，关闭全部 已经打开的组件
+			closeAll(){
+				this.children.forEach(vm=>{
+					// #ifdef APP-VUE || H5 || MP-WEIXIN || MP-HARMONY
+					vm.is_show = 'none'
+					// #endif
+
+					// #ifndef APP-VUE || H5 || MP-WEIXIN || MP-HARMONY
+					vm.close()
+					// #endif
+				})
+			},
+			closeOther(vm) {
+				if (this.openItem && this.openItem !== vm) {
+					// #ifdef APP-VUE || H5 || MP-WEIXIN || MP-HARMONY
+					this.openItem.is_show = 'none'
+					// #endif
+
+					// #ifndef APP-VUE || H5 || MP-WEIXIN || MP-HARMONY
+					this.openItem.close()
+					// #endif
+				}
+				// 记录上一个打开的 swipe-action-item ,用于 auto-close
+				this.openItem = vm
+			}
+		}
+	};
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-swipe-action/package.json b/uni_modules/uni-swipe-action/package.json
new file mode 100644
index 0000000..fb1df50
--- /dev/null
+++ b/uni_modules/uni-swipe-action/package.json
@@ -0,0 +1,112 @@
+{
+  "id": "uni-swipe-action",
+  "displayName": "uni-swipe-action 滑动操作",
+  "version": "1.3.16",
+  "description": "SwipeAction 滑动操作操作组件",
+  "keywords": [
+    "",
+    "uni-ui",
+    "uniui",
+    "滑动删除",
+    "侧滑删除"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "",
+    "uni-app": "^4.27",
+    "uni-app-x": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": {
+                "extVersion": "1.3.14",
+                "minVersion": ""
+            },
+            "vue3": {
+                "extVersion": "1.3.14",
+                "minVersion": ""
+            }
+          },
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "vue": "-",
+            "nvue": "-",
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-",
+            "alipay": "-",
+            "toutiao": "-",
+            "baidu": "-",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-swipe-action/readme.md b/uni_modules/uni-swipe-action/readme.md
new file mode 100644
index 0000000..93a5cac
--- /dev/null
+++ b/uni_modules/uni-swipe-action/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwipeAction 滑动操作
+> **组件名：uni-swipe-action**
+> 代码块： `uSwipeAction`、`uSwipeActionItem`
+
+
+通过滑动触发选项的容器
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/utilsRc/auth.js b/utilsRc/auth.js
new file mode 100644
index 0000000..1f5bb72
--- /dev/null
+++ b/utilsRc/auth.js
@@ -0,0 +1,19 @@
+/*
+ * @Descripttion: 
+ * @Author: lip
+ * @Date: 2023-07-27 15:55:08
+ * @LastEditors: lip
+ */
+const TokenKey = 'App-Token'
+
+export function getToken() {
+  return uni.getStorageSync(TokenKey)
+}
+
+export function setToken(token) {
+  return uni.setStorageSync(TokenKey, token)
+}
+
+export function removeToken() {
+  return uni.removeStorageSync(TokenKey)
+}
diff --git a/utilsRc/common.js b/utilsRc/common.js
new file mode 100644
index 0000000..9d635c5
--- /dev/null
+++ b/utilsRc/common.js
@@ -0,0 +1,248 @@
+/*
+ * @Descripttion:
+ * @Author: lip
+ * @Date: 2023-07-27 15:56:06
+ * @LastEditors: shirlwang
+ */
+import {
+	getPersonBase
+} from '@/apiRc/person';
+import store from '@/utilsRc/store';
+import tab from '@/utilsRc/plugins/tab.js'
+/**
+ * 显示消息提示框
+ * @param content 提示的标题
+ */
+export function toast(content) {
+	uni.showToast({
+		icon: 'none',
+		title: content
+	})
+}
+
+/**
+ * 显示模态弹窗
+ * @param content 提示的标题
+ */
+export function showConfirm(content, cancelText, confirmText, showCancel) {
+	return new Promise((resolve, reject) => {
+		uni.showModal({
+			title: '提示',
+			content: content,
+			cancelText: cancelText || '取消',
+			confirmText: confirmText || '确定',
+			showCancel: showCancel === false ? false : true,
+			success: function(res) {
+				resolve(res)
+			}
+		})
+	})
+}
+// 修改后的 checkPersonBase 方法
+export function checkPersonBase() {
+    return new Promise((resolve) => {
+        const roles = store.getters.roles;
+        const userId = store.getters.userId;
+        const isRole = (role) => roles.includes(role);
+
+        if (isRole('qunzhong')) {
+            getPersonBase(userId).then(resp => {
+                const shouldGoToPersonInfo = resp.data.auditStatus === '0';
+                if (shouldGoToPersonInfo) {
+                    uni.showModal({
+                        title: '提示',
+                        content: '您的个人信息尚未维护，请前往维护个人信息。',
+                        confirmText: '去维护',
+                        cancelText: '取消',
+                        success: function(res) {
+                            if (res.confirm) {
+                                tab.navigateTo('/pages/personInfo/index');
+                            }
+                            resolve(false); // 需要维护，返回 false
+                        }
+                    });
+                } else {
+                    resolve(true); // 不需要维护，返回 true
+                }
+            });
+        } else {
+            resolve(true); // 非群众角色直接放行
+        }
+    });
+}
+/**
+ * 参数处理
+ * @param params 参数
+ */
+export function tansParams(params) {
+	let result = ''
+	for (const propName of Object.keys(params)) {
+		const value = params[propName]
+		var part = encodeURIComponent(propName) + "="
+		if (value !== null && value !== "" && typeof(value) !== "undefined") {
+			if (typeof value === 'object') {
+				for (const key of Object.keys(value)) {
+					if (value[key] !== null && value[key] !== "" && typeof(value[key]) !== 'undefined') {
+						let params = propName + '[' + key + ']'
+						var subPart = encodeURIComponent(params) + "="
+						result += subPart + encodeURIComponent(value[key]) + "&"
+					}
+				}
+			} else {
+				result += part + encodeURIComponent(value) + "&"
+			}
+		}
+	}
+	return result
+}
+/**
+ * 姓名、手机、邮箱、身份证脱敏
+ * @param str 姓名或手机或邮箱或身份证
+ * @param type 数据类型
+ */
+export function publicEncrypt(str, type) {
+	if (!str) {
+		return ''
+	} else if (type == 'name') {
+		return str.substr(0, 1) + '*'
+	} else if (type == 'idCard') {
+		return str.replace(/^(.{6})(?:\d+)(.{4})$/, '$1********$2')
+	} else if (type == 'phone') {
+		return str.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
+	} else if (type == 'email') {
+		let count, emailArr, emailFront, emailBack;
+		emailArr = str.split('@');
+		emailFront = emailArr[0];
+		count = emailFront.length / 2;
+		emailFront = emailFront.substring(0, emailFront.length - count);
+		emailBack = emailArr[1];
+		return emailFront + '***@' + emailBack;
+	}
+}
+
+
+/**
+ * 根据value值筛选对应的label
+ * @param {Array} options - 原数组
+ * @param {string | Number} value - 表示
+ * @returns {string} - 返回后的汉字
+ */
+export function getLabelByValue(options = [], value, valueKey = 'value', labelKey = 'label') {
+	for (let i = 0; i < options.length; i++) {
+		// 动态使用传入的 valueKey 和 labelKey
+		if (options[i][valueKey] === value) {
+			return options[i][labelKey];
+		}
+	}
+	return null;
+}
+/**
+ * 将数组转换为字符串
+ * @param {Array} arr - 要转换的数组
+ * @param {string} delimiter - 用于连接数组元素的分隔符，默认为逗号
+ * @returns {string} - 转换后的字符串
+ */
+export function arrayToString(arr, delimiter = ',') {
+	return arr.join(delimiter);
+}
+
+/* 延时函数 */
+export function delay(ms) {
+	return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+/* 获取当前年月日 时分秒 */
+export function getCurrentDate() {
+	const date = new Date();
+	const year = date.getFullYear();
+	const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1
+	const day = String(date.getDate()).padStart(2, '0'); // 使用padStart补零
+	const hours = String(date.getHours()).padStart(2, '0'); // 补零
+	const minutes = String(date.getMinutes()).padStart(2, '0'); // 补零
+	const seconds = String(date.getSeconds()).padStart(2, '0'); // 补零
+
+	return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+
+export function processFileUrl(fileUrl) {
+	let fileList = [];
+	if (typeof fileUrl === 'string' && fileUrl) {
+		// 如果 fileUrl 是一个字符串，则按照逗号分割成数组
+		const urls = fileUrl.split(',').map(url => url.trim()); // 去除每个 URL 前后的空白字符
+		fileList = urls.map(url => ({
+			url,
+			success: 'success',
+			name: 'fileUrl'
+		}));
+	}
+	return fileList;
+}
+
+// 密码强校验
+export function isPasswordComplex(password) {
+  // 长度在8位以上，并且包含大小写字母、数字和特殊符号
+    return /^(?=.*[A-Za-z])(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@#$%^&*!])[A-Za-z\d@#$%^&*!]{8,}$/.test(password);
+}
+
+// 手机号码校验
+export function isPhoneNumberValid(phoneNumber) {
+  // 匹配国内常见的手机号格式
+  return /^1[3-9]\d{9}$/.test(phoneNumber);
+}
+
+
+// 身份证校验函数
+export function isValidIdCard (idCard) {
+  if (typeof idCard !== 'string') {
+    return false;
+  }
+
+  // 定义省份代码
+  const provinceCodes = {
+    11: "北京", 12: "天津", 13: "河北", 14: "山西", 15: "内蒙古",
+    21: "辽宁", 22: "吉林", 23: "黑龙江",
+    31: "上海", 32: "江苏", 33: "浙江", 34: "安徽", 35: "福建", 36: "江西", 37: "山东",
+    41: "河南", 42: "湖北", 43: "湖南", 44: "广东", 45: "广西", 46: "海南",
+    50: "重庆", 51: "四川", 52: "贵州", 53: "云南", 54: "西藏",
+    61: "陕西", 62: "甘肃", 63: "青海", 64: "宁夏", 65: "新疆",
+    71: "台湾", 81: "香港", 82: "澳门", 91: "国外"
+  };
+
+  // 检查长度
+  if (!/^\d{17}(\d|X|x)$/.test(idCard)) {
+    return false;
+  }
+
+  // 验证省份代码
+  const provinceCode = idCard.substring(0, 2);
+  if (!provinceCodes[provinceCode]) {
+    return false;
+  }
+  // 验证出生日期
+  const birthDate = idCard.substring(6, 14);
+  const birthYear = parseInt(birthDate.substring(0, 4), 10);
+  const birthMonth = parseInt(birthDate.substring(4, 6), 10);
+  const birthDay = parseInt(birthDate.substring(6, 8), 10);
+  const birthDateObject = new Date(birthYear, birthMonth - 1, birthDay);
+
+  if (
+    birthDateObject.getFullYear() !== birthYear ||
+    birthDateObject.getMonth() + 1 !== birthMonth ||
+    birthDateObject.getDate() !== birthDay
+  ) {
+    return false;
+  }
+  // 验证校验码
+  const weightFactors = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+  const checkCodes = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'];
+
+  const sum = idCard
+    .substring(0, 17)
+    .split('')
+    .reduce((acc, num, index) => acc + parseInt(num, 10) * weightFactors[index], 0);
+
+  const checkCode = checkCodes[sum % 11];
+  return checkCode === idCard[17].toUpperCase();
+};
+
diff --git a/utilsRc/config.js b/utilsRc/config.js
new file mode 100644
index 0000000..1de7816
--- /dev/null
+++ b/utilsRc/config.js
@@ -0,0 +1,23 @@
+/*
+ * @Descripttion:
+ * @Author: lip
+ * @Date: 2022-12-28 13:59:09
+ * @LastEditors: shirlwang
+ */
+// 应用全局配置
+let exports = {
+	 baseUrl: 'http://10.160.0.5:8907', // 正式环境在济南人才上部署（不要轻易连接）
+	// baseUrl: 'http://172.20.0.177:8903', // 正式环境在济南人才上部署（不要轻易连接）
+
+	// 应用信息
+	appInfo: {
+	  // 应用名称
+	  name: "泉就业H5",
+	  // 应用版本
+	  version: "1.1.0",
+	  // 应用logo
+	  logo: "/static/logo.png",
+	}
+  }
+
+export default exports
\ No newline at end of file
diff --git a/utilsRc/constant.js b/utilsRc/constant.js
new file mode 100644
index 0000000..5fadd14
--- /dev/null
+++ b/utilsRc/constant.js
@@ -0,0 +1,19 @@
+/*
+ * @Descripttion:
+ * @Author: lip
+ * @Date: 2023-07-27 15:53:48
+ * @LastEditors: lip
+ */
+const constant = {
+	avatar: 'vuex_avatar',
+	name: 'vuex_name',
+	roles: 'vuex_roles',
+	permissions: 'vuex_permissions',
+	type: 'vuex_type',
+	phonenumber: 'vuex_phonenumber',
+	nick: 'vuex_nick',
+	userId: 'vuex_userId',
+	handlerData: 'vuex_handlerData',
+  }
+
+  export default constant
diff --git a/utilsRc/errorCode.js b/utilsRc/errorCode.js
new file mode 100644
index 0000000..8849d23
--- /dev/null
+++ b/utilsRc/errorCode.js
@@ -0,0 +1,13 @@
+/*
+ * @Descripttion: 
+ * @Author: lip
+ * @Date: 2023-07-27 15:56:30
+ * @LastEditors: lip
+ */
+export default {
+	'401': '您的登录状态已过期，请重新登录',
+	'403': '当前操作没有权限',
+	'404': '访问资源不存在',
+	'default': '系统未知错误，请反馈给管理员'
+  }
+  
\ No newline at end of file
diff --git a/utilsRc/plugins/auth.js b/utilsRc/plugins/auth.js
new file mode 100644
index 0000000..57ac0a8
--- /dev/null
+++ b/utilsRc/plugins/auth.js
@@ -0,0 +1,60 @@
+import store from '@/store'
+
+function authPermission(permission) {
+  const all_permission = "*:*:*"
+  const permissions = store.getters && store.getters.permissions
+  if (permission && permission.length > 0) {
+    return permissions.some(v => {
+      return all_permission === v || v === permission
+    })
+  } else {
+    return false
+  }
+}
+
+function authRole(role) {
+  const super_admin = "shequn"
+  const roles = store.getters && store.getters.roles
+  if (role && role.length > 0) {
+    return roles.some(v => {
+      return super_admin === v || v === role
+    })
+  } else {
+    return false
+  }
+}
+
+export default {
+  // 验证用户是否具备某权限
+  hasPermi(permission) {
+    return authPermission(permission)
+  },
+  // 验证用户是否含有指定权限，只需包含其中一个
+  hasPermiOr(permissions) {
+    return permissions.some(item => {
+      return authPermission(item)
+    })
+  },
+  // 验证用户是否含有指定权限，必须全部拥有
+  hasPermiAnd(permissions) {
+    return permissions.every(item => {
+      return authPermission(item)
+    })
+  },
+  // 验证用户是否具备某角色
+  hasRole(role) {
+    return authRole(role)
+  },
+  // 验证用户是否含有指定角色，只需包含其中一个
+  hasRoleOr(roles) {
+    return roles.some(item => {
+      return authRole(item)
+    })
+  },
+  // 验证用户是否含有指定角色，必须全部拥有
+  hasRoleAnd(roles) {
+    return roles.every(item => {
+      return authRole(item)
+    })
+  }
+}
diff --git a/utilsRc/plugins/index.js b/utilsRc/plugins/index.js
new file mode 100644
index 0000000..efbae15
--- /dev/null
+++ b/utilsRc/plugins/index.js
@@ -0,0 +1,14 @@
+import tab from './tab'
+import auth from './auth'
+import modal from './modal'
+
+export default {
+  install(Vue) {
+    // 页签操作
+    Vue.prototype.$tab = tab
+    // 认证对象
+    Vue.prototype.$auth = auth
+    // 模态框对象
+    Vue.prototype.$modal = modal
+  }
+}
diff --git a/utilsRc/plugins/loadingPlugin.js b/utilsRc/plugins/loadingPlugin.js
new file mode 100644
index 0000000..c20d9b6
--- /dev/null
+++ b/utilsRc/plugins/loadingPlugin.js
@@ -0,0 +1,50 @@
+import ULoadingPage from 'uview-ui/components/u-loading-page/u-loading-page'; // 确保正确引入组件
+
+export default {
+  install(Vue) {
+    // 注册 u-loading-page 组件为全局组件
+    Vue.component('u-loading-page', ULoadingPage);
+
+    // 用于存储全局的 loading 组件实例
+    let loadingInstance = null;
+
+    // 创建一个全局的显示 loading 的方法
+    Vue.prototype.$showLoading = function () {
+      // 如果没有创建过实例，则创建一个
+      if (!loadingInstance) {
+        const LoadingConstructor = Vue.extend({
+          data() {
+            return {
+              loading: true, // 控制 loading 显示的状态
+            };
+          },
+          render(h) {
+            return h('u-loading-page', {
+              props: {
+                loading: this.loading,
+                loadingText: '',
+                loadingColor: "#000",
+                iconSize: '58rpx',
+              },
+              style: {
+                zIndex: '200',
+                opacity: 0.7
+              }
+            });
+          }
+        });
+        loadingInstance = new LoadingConstructor();
+        loadingInstance.$mount(); // 手动挂载实例
+        document.body.appendChild(loadingInstance.$el); // 将组件挂载到 body
+      }
+      loadingInstance.loading = true; // 显示 loading
+    };
+
+    // 创建一个全局的隐藏 loading 的方法
+    Vue.prototype.$hideLoading = function () {
+      if (loadingInstance) {
+        loadingInstance.loading = false; // 隐藏 loading
+      }
+    };
+  },
+};
diff --git a/utilsRc/plugins/modal.js b/utilsRc/plugins/modal.js
new file mode 100644
index 0000000..87960fd
--- /dev/null
+++ b/utilsRc/plugins/modal.js
@@ -0,0 +1,74 @@
+export default {
+  // 消息提示
+  msg(content) {
+    uni.showToast({
+      title: content,
+      icon: 'none'
+    })
+  },
+  // 错误消息
+  msgError(content) {
+    uni.showToast({
+      title: content,
+      icon: 'error'
+    })
+  },
+  // 成功消息
+  msgSuccess(content) {
+    uni.showToast({
+      title: content,
+      icon: 'success'
+    })
+  },
+  // 隐藏消息
+  hideMsg(content) {
+    uni.hideToast()
+  },
+  // 弹出提示
+  alert(content) {
+    uni.showModal({
+      title: '提示',
+      content: content,
+      showCancel: false
+    })
+  },
+  // 确认窗体
+  confirm(content) {
+    return new Promise((resolve, reject) => {
+      uni.showModal({
+        title: '系统提示',
+        content: content,
+        cancelText: '取消',
+        confirmText: '确定',
+        success: function(res) {
+          if (res.confirm) {
+            resolve(res.confirm)
+          }
+        }
+      })
+    })
+  },
+  // 提示信息
+  showToast(option) {
+    if (typeof option === "object") {
+      uni.showToast(option)
+    } else {
+      uni.showToast({
+        title: option,
+        icon: "none",
+        duration: 2500
+      })
+    }
+  },
+  // 打开遮罩层
+  loading(content) {
+    uni.showLoading({
+      title: content,
+      icon: 'none'
+    })
+  },
+  // 关闭遮罩层
+  closeLoading() {
+    uni.hideLoading()
+  }
+}
diff --git a/utilsRc/plugins/tab.js b/utilsRc/plugins/tab.js
new file mode 100644
index 0000000..5d1b305
--- /dev/null
+++ b/utilsRc/plugins/tab.js
@@ -0,0 +1,30 @@
+export default {
+  // 关闭所有页面，打开到应用内的某个页面
+  reLaunch(url) {
+    return uni.reLaunch({
+      url: url
+    })
+  },
+  // 跳转到tabBar页面，并关闭其他所有非tabBar页面
+  switchTab(url) {
+    return uni.switchTab({
+      url: url
+    })
+  },
+  // 关闭当前页面，跳转到应用内的某个页面
+  redirectTo(url) {
+    return uni.redirectTo({
+      url: url
+    })
+  },
+  // 保留当前页面，跳转到应用内的某个页面
+  navigateTo(url) {
+    return uni.navigateTo({
+      url: url
+    })
+  },
+  // 关闭当前页面，返回上一页面或多级页面
+  navigateBack() {
+    return uni.navigateBack()
+  }
+}
diff --git a/utilsRc/request.js b/utilsRc/request.js
new file mode 100644
index 0000000..47c2ad5
--- /dev/null
+++ b/utilsRc/request.js
@@ -0,0 +1,107 @@
+/*
+ * @Descripttion:
+ * @Author: lip
+ * @Date: 2023-05-12 08:44:49
+ * @LastEditors: shirlwang
+ */
+import store from './store/index.js'
+import configRc from './config.js'
+import { getToken } from '@/utilsRc/auth'
+import errorCode from '@/utilsRc/errorCode'
+import { toast, showConfirm, tansParams } from '@/utilsRc/common'
+
+let timeout = 10000
+const baseUrl = configRc.baseUrl
+
+const request = config => {
+  // 是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  config.header = config.header || {}
+  if (getToken() && !isToken) {
+    config.header['Authorization'] = 'Bearer ' + getToken()
+  }
+  config.header['Authorization'] = 'Bearer ' + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJVMDRocERSZjdZMXJUbUxXb05uOUpzYUdDZzBNazJJQSIsInVzZXJJZCI6MX0.LZ29vvA4tK3b9Hki4nU9Jb1himXZM2AEOue3CMRY95w'
+  // get请求映射params参数
+  if (config.params) {
+    let url = config.url + '?' + tansParams(config.params)
+    url = url.slice(0, -1)
+    config.url = url
+  }
+  return new Promise((resolve, reject) => {
+    uni.request({
+      method: config.method || 'get',
+      timeout: config.timeout ||  timeout,
+      url: baseUrl + config.url,
+      // url: 'https://gccrcdh.sd-talent.cn:80/zhq' + config.url,
+      data: config.data,
+      header: config.header,
+      dataType: 'json'
+    }).then(response => {
+      let res = response.data
+      let error = response.errMsg!='request:ok'
+      if (error) {
+          toast('网络出小差，请稍后再试')
+          reject('网络出小差，请稍后再试')
+          return
+        }
+        const code = res.code || 200
+        console.log(code, 'const code = res.code || 200')
+        const msg = errorCode[code] || res.msg || errorCode['default']
+		const isShowModel = getApp().globalData.isShowModel
+		if (code === 200) {
+      resolve(res)
+    }else if (code === 401) {
+			if(isShowModel === false) {
+				getApp().globalData.isShowModel = true
+				showConfirm('您好！登录后，您才可以继续操作。', '取消', '去登录').then(res => {
+					if (res.confirm) {
+						getApp().globalData.isShowModel = false
+						store.dispatch('LogOut').then(res => {
+							uni.reLaunch({ url: '/pages/login/login-one' })
+						})
+					} else if(res.cancel) {
+						getApp().globalData.isShowModel = false
+						uni.navigateBack()
+					}
+
+				})
+			}
+			// reject(code)
+		}
+        // if (code === 401) {
+        //   showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
+        //     if (res.confirm) {
+        //       store.dispatch('LogOut').then(res => {
+        //         uni.reLaunch({ url: '/page_other/login/index' })
+        //       })
+        //     }
+        //   })
+          // reject('无效的会话，或者会话已过期，请重新登录。')
+        // } else
+		else if (code === 500) {
+          toast(msg)
+          reject('500')
+        } else if (code !== 200 && code !== 9999) {
+          // 9999是正常的业务状态码，不应该被当作错误处理
+          toast(msg)
+          reject(code)
+        }
+        resolve(res.data)
+      })
+      .catch(error => {
+        console.log(error, 'error')
+        let message = error.errMsg
+        if (message === 'Network Error') {
+          message = '网络出小差，请稍后再试'
+        } else if (message.includes('timeout')) {
+          message = '系统接口请求超时'
+        } else if (message.includes('Request failed with status code')) {
+          message = '系统接口' + message.substr(message.length - 3) + '异常'
+        }
+        toast(message)
+        reject(error)
+      })
+  })
+}
+
+export default request
diff --git a/utilsRc/storage.js b/utilsRc/storage.js
new file mode 100644
index 0000000..c3bf5db
--- /dev/null
+++ b/utilsRc/storage.js
@@ -0,0 +1,44 @@
+/*
+ * @Descripttion:
+ * @Author: lip
+ * @Date: 2023-07-27 15:56:55
+ * @LastEditors: lip
+ */
+import constant from './constant'
+
+// 存储变量名
+let storageKey = 'storage_data'
+
+// 存储节点变量名
+let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions, constant.type, constant
+	.phonenumber,
+	constant.userId,
+	constant.handlerData,
+	constant.nick
+]
+
+// 存储的数据
+let storageData = uni.getStorageSync(storageKey) || {}
+
+const storage = {
+	set: function(key, value) {
+		if (storageNodeKeys.indexOf(key) != -1) {
+			let tmp = uni.getStorageSync(storageKey)
+			tmp = tmp ? tmp : {}
+			tmp[key] = value
+			uni.setStorageSync(storageKey, tmp)
+		}
+	},
+	get: function(key) {
+		return storageData[key] || ""
+	},
+	remove: function(key) {
+		delete storageData[key]
+		uni.setStorageSync(storageKey, storageData)
+	},
+	clean: function() {
+		uni.removeStorageSync(storageKey)
+	}
+}
+
+export default storage
diff --git a/utilsRc/store/getters.js b/utilsRc/store/getters.js
new file mode 100644
index 0000000..14ab276
--- /dev/null
+++ b/utilsRc/store/getters.js
@@ -0,0 +1,19 @@
+/*
+ * @Descripttion:
+ * @Author: lip
+ * @Date: 2023-07-27 15:59:34
+ * @LastEditors: lip
+ */
+const getters = {
+	token: state => state.user.token,
+	avatar: state => state.user.avatar,
+	name: state => state.user.name,
+	roles: state => state.user.roles,
+	permissions: state => state.user.permissions,
+	userId: state => state.user.userId,
+	handlerData: state => state.user.handlerData,
+	nick: state => state.user.nick,
+	showExitPopup: state => state.user.showExitPopup,
+	publicKey: state => state.user.publicKey
+  }
+  export default getters
diff --git a/utilsRc/store/index.js b/utilsRc/store/index.js
new file mode 100644
index 0000000..f3475ea
--- /dev/null
+++ b/utilsRc/store/index.js
@@ -0,0 +1,18 @@
+/*
+ * @Descripttion: 
+ * @Author: lip
+ * @Date: 2023-07-27 09:04:34
+ * @LastEditors: shirlwang
+ */
+import user from '@/utilsRc/store/modules/user'
+import getters from './getters'
+
+// src/store/index.js
+import { createStore } from 'vuex';
+let store = createStore({
+  modules: {
+    user
+  },
+  getters
+});
+export default store;
diff --git a/utilsRc/store/modules/user.js b/utilsRc/store/modules/user.js
new file mode 100644
index 0000000..190968c
--- /dev/null
+++ b/utilsRc/store/modules/user.js
@@ -0,0 +1,253 @@
+import config from '@/config'
+import storage from '@/utilsRc/storage'
+import constant from '@/utilsRc/constant'
+import {
+	login,
+	// logout,
+	getInfo,
+	// register,
+	// smsLogin,
+	// wechatLogin
+} from '@/apiRc/login'
+import {
+	getToken,
+	setToken,
+	removeToken
+} from '@/utilsRc/auth'
+
+import {sm2} from 'sm-crypto'
+// const sm2 = require('sm-crypto').sm2
+const baseUrl = config.baseUrl
+
+const user = {
+	state: {
+		token: getToken(),
+		name: storage.get(constant.name),
+		avatar: storage.get(constant.avatar),
+		roles: storage.get(constant.roles),
+		permissions: storage.get(constant.permissions),
+		type: storage.get(constant.type),
+		phonenumber: storage.get(constant.phonenumber),
+		nick: storage.get(constant.nick),
+		userId: storage.get(constant.userId),
+		handlerData: storage.get(constant.handlerData),
+		showExitPopup: false,
+		publicKey: '04970A174A090FCCD2B2503DD978152ACB906919245E4C8F237BE290E6E72334DDD89B857177A11C609FAA62CC62AD75D4BB1395E2A22F2663357A5D3EF9B1C1B8',
+
+	},
+
+
+	mutations: {
+		SET_TOKEN: (state, token) => {
+			state.token = token
+			// 同时更新存储中的token
+			setToken(token)
+		},
+		SET_NAME: (state, name) => {
+			state.name = name
+			storage.set(constant.name, name)
+		},
+		SET_AVATAR: (state, avatar) => {
+			state.avatar = avatar
+			storage.set(constant.avatar, avatar)
+		},
+		SET_ROLES: (state, roles) => {
+			state.roles = roles
+			storage.set(constant.roles, roles)
+		},
+		SET_PERMISSIONS: (state, permissions) => {
+			state.permissions = permissions
+			storage.set(constant.permissions, permissions)
+		},
+		SET_TYPE: (state, type) => {
+			state.type = type
+			storage.set(constant.type, type)
+		},
+		SET_PHONENUMBER: (state, phonenumber) => {
+			state.phonenumber = phonenumber
+			storage.set(constant.phonenumber, phonenumber)
+		},
+		SET_NICK: (state, nick) => {
+			state.nick = nick
+			storage.set(constant.nick, nick)
+		},
+		SET_USER_ID: (state, userId) => {
+			state.userId = userId
+			storage.set(constant.userId, userId)
+		},
+
+		// 存储经办人信息
+		SET_HAND_LER(state, data) {
+			state.handlerData = data
+			storage.set(constant.handlerData, data)
+		},
+
+		SET_SHOWEXITPOPUP(state, type) {
+			state.showExitPopup = type
+		}
+	},
+
+	actions: {
+		// 登录
+		LoginByUserInfo({
+			commit,
+			// state
+		}, userInfo) {
+
+			return new Promise((resolve, reject) => {
+				// const info = JSON.parse(JSON.stringify(userInfo))
+				// info.password = '04' + sm2.doEncrypt(info.password, state.publicKey, 0)
+				// info.username = '04' + sm2.doEncrypt(info.username, state.publicKey, 0)
+				login(userInfo).then(res => {
+					console.log('登录接口返回:', res);
+					setToken(res.data.token)
+					commit('SET_TOKEN', res.data.token)
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+		// 登录
+		Login({
+			commit,
+			state
+		}, userInfo) {
+
+			return new Promise((resolve, reject) => {
+				const info = JSON.parse(JSON.stringify(userInfo))
+				info.password = '04' + sm2.doEncrypt(info.password, state.publicKey, 0)
+				info.username = '04' + sm2.doEncrypt(info.username, state.publicKey, 0)
+				login(info).then(res => {
+					console.log('登录接口返回:', res);
+					setToken(res.data.token)
+					commit('SET_TOKEN', res.data.token)
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+		// 登录
+		SMSLogin({
+			commit
+		}, userInfo) {
+			return new Promise((resolve, reject) => {
+				smsLogin(userInfo).then(res => {
+					setToken(res.data.token)
+					commit('SET_TOKEN', res.data.token)
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+		// 登录
+		WXLogin({
+			commit
+		}, userInfo) {
+			return new Promise((resolve, reject) => {
+				wechatLogin(userInfo).then(res => {
+					setToken(res.data.token)
+					commit('SET_TOKEN', res.data.token)
+					resolve()
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+		// 注册
+		Register({
+			commit
+		}, userInfo) {
+			const username = userInfo.username
+			const password = userInfo.password
+			const code = userInfo.code
+			const uuid = userInfo.uuid
+			const userType = userInfo.userType
+			const userNumber = userInfo.userNumber
+			return new Promise((resolve, reject) => {
+				register(username, password, code, uuid, userType, userNumber).then(res => {
+					uni.showToast({
+						title: `账号${username}注册成功`,
+						icon: 'none'
+					})
+					resolve()
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+
+		// 获取用户信息
+		GetInfo({
+			commit,
+			state
+		}) {
+			return new Promise((resolve, reject) => {
+				getInfo().then(res => {
+					const user = res.data.user
+					const avatar = (user == null || user.avatar == "" || user.avatar == null) ?
+						"https://rc.jinan.gov.cn/qcwjyH5/static/icon/my.png" : user.avatar
+					const username = (user == null || user.userName == "" || user.userName ==
+						null) ? "" : user.userName
+					const usertype = (user == null || user.userType == "" || user.userType ==
+						null) ? "" : user.userType
+					const usernumber = (user == null || user.phonenumber == "" || user
+						.phonenumber == null) ? "" : user.phonenumber
+					const nick = (user == null || user.nickName == "" || user.nickName == null) ?
+						"" : user.nickName
+					const userId = (user == null || user.userId == "" || user.userId == null) ? "" :
+						user.userId
+					if (res.data.roles && res.data.roles.length > 0) {
+						commit('SET_ROLES', res.data.roles)
+						commit('SET_PERMISSIONS', res.data.permissions)
+					} else {
+						commit('SET_ROLES', ['ROLE_DEFAULT'])
+					}
+					commit('SET_NAME', username)
+					commit('SET_AVATAR', avatar)
+					commit('SET_TYPE', usertype)
+					commit('SET_PHONENUMBER', usernumber)
+					commit('SET_NICK', nick)
+					commit('SET_USER_ID', userId)
+
+					// commit('SET_HAND_LER', {
+					// 	deptName: user.dept.deptName,
+					// 	nickName: user.nickName
+					// })
+
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
+
+		// 退出系统
+		LogOut({
+			commit,
+			state
+		}) {
+			return new Promise((resolve, reject) => {
+				logout(state.token).then(() => {
+					commit('SET_TOKEN', '')
+					commit('SET_ROLES', [])
+					commit('SET_PERMISSIONS', [])
+					commit('SET_TYPE', '')
+					commit('SET_NICK', '')
+					commit('SET_PHONENUMBER', '')
+					commit('SET_USER_ID', '')
+					commit('SET_SHOWEXITPOPUP', false)
+					removeToken()
+					storage.clean()
+					resolve()
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		}
+	}
+}
+
+export default user