From 030183ceb6c1fefb854afcfd2edf883d2e9f0824 Mon Sep 17 00:00:00 2001 From: francis_fh <13935151924@163.com> Date: Tue, 3 Feb 2026 13:46:13 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=9C=80=E5=B0=8F=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageA/pages/job/publishJob.vue | 49 +++++++++++++++++++- packageA/pages/personalInfo/personalInfo.vue | 2 +- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/packageA/pages/job/publishJob.vue b/packageA/pages/job/publishJob.vue index 977e0b6..d373ace 100644 --- a/packageA/pages/job/publishJob.vue +++ b/packageA/pages/job/publishJob.vue @@ -50,9 +50,11 @@ 最小薪资 (元/月) @@ -285,7 +287,7 @@ From bfdc358c24b845985cdf334d505bf46ac1902b56 Mon Sep 17 00:00:00 2001 From: xuchao <1151716571@qq.com> Date: Tue, 3 Feb 2026 17:25:10 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E7=AE=80=E5=8E=86=E5=9B=BE=E7=89=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageB/jobFair/detailCom.vue | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/packageB/jobFair/detailCom.vue b/packageB/jobFair/detailCom.vue index b7bf8a0..7f07e21 100644 --- a/packageB/jobFair/detailCom.vue +++ b/packageB/jobFair/detailCom.vue @@ -206,6 +206,14 @@ {{detailObj.politicalAffiliation}} + + 简历图片: + + + 查看简历图片 + + + @@ -302,6 +310,7 @@ $api } = inject("globalFunction"); const imgBaseUrl = config.imgBaseUrl; + const trainVideoImgUrl = config.trainVideoImgUrl; const router = useRouter(); const route = useRoute(); const interviewPopup = ref(null); @@ -311,7 +320,15 @@ const jobFairId = ref(""); const userInfo = ref({}); const isExpanded = ref(false); - + //预览简历照片 + const previewResume = (url) => { + if(url){ + uni.previewImage({ + urls: [trainVideoImgUrl+url], + current: 0 + }); + } + }; const publicUrl = config.LCBaseUrl; onLoad((option) => { jobFairId.value = option.jobFairId; @@ -940,6 +957,9 @@ height: 80%; .flexBox{ display: flex; + .previewResume{ + color:#0088ff + } } .detail-item1 { // display: flex; From 58a113b34d5880dcad10993d592be98f45c1d9b6 Mon Sep 17 00:00:00 2001 From: francis_fh <13935151924@163.com> Date: Tue, 3 Feb 2026 18:51:50 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=85=AC=E4=BA=A4=E5=91=A8=E8=BE=B9?= =?UTF-8?q?=E5=9C=B0=E9=93=81=E7=BA=BF=E8=B7=AF=E4=B8=8D=E8=83=BD=E9=80=89?= =?UTF-8?q?=E6=8B=A9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageA/pages/nearby/components/three.vue | 46 +++++++++++++++++++--- pages/index/components/index-one.vue | 2 +- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/packageA/pages/nearby/components/three.vue b/packageA/pages/nearby/components/three.vue index 1126a62..779c511 100644 --- a/packageA/pages/nearby/components/three.vue +++ b/packageA/pages/nearby/components/three.vue @@ -110,6 +110,10 @@ + + + + @@ -117,7 +121,28 @@ import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue'; import { onLoad, onShow } from '@dcloudio/uni-app'; const { $api, navTo, debounce, customSystem } = inject('globalFunction'); -const openSelectPopup = inject('openSelectPopup'); +// #ifdef H5 +const injectedOpenSelectPopup = inject('openSelectPopup', null); +// #endif + +// #ifdef MP-WEIXIN +const selectPopupRef = ref(); +// #endif + +// 创建本地的 openSelectPopup 函数,兼容 H5 和微信小程序 +const openSelectPopup = (config) => { + // #ifdef MP-WEIXIN + if (selectPopupRef.value) { + selectPopupRef.value.open(config); + } + // #endif + + // #ifdef H5 + if (injectedOpenSelectPopup) { + injectedOpenSelectPopup(config); + } + // #endif +}; import { storeToRefs } from 'pinia'; import useLocationStore from '@/stores/useLocationStore'; import useUserStore from '@/stores/useUserStore'; @@ -128,6 +153,9 @@ const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore()); import point2 from '@/static/icon/point2.png'; import LocationPng from '@/static/icon/Location.png'; import selectFilter from '@/components/selectFilter/selectFilter.vue'; +// #ifdef MP-WEIXIN +import selectPopup from '@/components/selectPopup/selectPopup.vue'; +// #endif const emit = defineEmits(['onFilter']); // status const showFiltersubway = ref(false); @@ -205,18 +233,21 @@ function openFilter() { } function openFilterSubway() { + showFiltersubway.value = true; const diti = state.subwayList.map((item) => ({ ...item, label: item.lineName, value: item.lineId })); openSelectPopup({ title: '地铁', maskClick: true, data: [diti], success: (_, [value]) => { + showFiltersubway.value = false; + if (!value) return; subwayCurrent.value = value; state.subwayId = value.value; state.value = value.value; const points = value.subwayStationList; state.downup = true; - if (points.length) { + if (points && points.length) { state.dont = 0; state.dontObj = points[0]; state.subwayStart = points[0]; @@ -224,6 +255,9 @@ function openFilterSubway() { getJobList('refresh'); } }, + cancel: () => { + showFiltersubway.value = false; + }, }); } @@ -251,8 +285,8 @@ function selectSubwayStation(point, index) { function inputText(id) { if (id) { - const text = range.value.filter((item) => item.value === id)[0].text; - return text; + const foundItem = range.value.filter((item) => item.value === id)[0]; + return foundItem ? foundItem.text : ''; } else { return ''; } @@ -260,13 +294,15 @@ function inputText(id) { function bindPickerChange(e) { const lineId = range.value[e.detail.value]; + if (!lineId) return; const value = state.subwayList.filter((iv) => iv.lineId === lineId.value)[0]; + if (!value) return; subwayCurrent.value = value; state.value = e.detail.value; state.subwayId = value.lineId; const points = value.subwayStationList; state.downup = true; - if (points.length) { + if (points && points.length) { state.dont = 0; state.dontObj = points[0]; state.subwayStart = points[0]; diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index cdd8b45..b790abe 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -680,7 +680,7 @@ const rangeOptions = ref([ { value: 0, text: '推荐' }, { value: 1, text: '最热' }, { value: 2, text: '最新发布' }, - { value: 3, text: '疆外' }, + // { value: 3, text: '疆外' }, { value: 4, text: '零工市场' } ]); const isLoaded = ref(false); From 2a5d15b7701549299296e94178498124337fe0d9 Mon Sep 17 00:00:00 2001 From: FengHui Date: Wed, 4 Feb 2026 10:49:25 +0800 Subject: [PATCH 05/16] =?UTF-8?q?tabbar=20AI=20=E5=9B=BE=E6=A0=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/CustomTabBar/CustomTabBar.vue | 84 +++++++++++++++++------ pages/mine/company-mine.vue | 14 ++++ pages/mine/mine.vue | 14 ++++ static/tabbar/robot2.png | Bin 0 -> 48408 bytes 4 files changed, 92 insertions(+), 20 deletions(-) create mode 100644 static/tabbar/robot2.png diff --git a/components/CustomTabBar/CustomTabBar.vue b/components/CustomTabBar/CustomTabBar.vue index a393352..87f988e 100644 --- a/components/CustomTabBar/CustomTabBar.vue +++ b/components/CustomTabBar/CustomTabBar.vue @@ -4,14 +4,17 @@ class="tabbar-item" v-for="(item, index) in tabbarList" :key="index" + :class="{ 'center-item': item.centerItem }" @click.stop="switchTab(item, index)" @tap.stop="switchTab(item, index)" > - + + + {{ item.badge }} @@ -59,22 +62,13 @@ const generateTabbarList = () => { }, { id: 2, - text: '智能客服', + text: '', path: '/pages/chat/chat', - iconPath: '/static/tabbar/logo3.png', - selectedIconPath: '/static/tabbar/logo3.png', + iconPath: '/static/tabbar/robot2.png', + selectedIconPath: '/static/tabbar/robot2.png', centerItem: true, badge: readMsg.badges[2]?.count || 0, }, - { - id: 3, - text: '消息', - path: '/pages/msglog/msglog', - iconPath: '/static/tabbar/chat4.png', - selectedIconPath: '/static/tabbar/chat4ed.png', - centerItem: false, - badge: readMsg.badges[3]?.count || 0, - }, { id: 4, text: '我的', @@ -275,6 +269,34 @@ onMounted(() => { diff --git a/pages/mine/company-mine.vue b/pages/mine/company-mine.vue index dc075ec..5794734 100644 --- a/pages/mine/company-mine.vue +++ b/pages/mine/company-mine.vue @@ -34,6 +34,15 @@ {{ companyInfo.isVerified ? '已通过' : '未认证' }} + + + + 消息 + + + + + @@ -83,6 +92,11 @@ function goToCompanyInfo() { navTo('/pages/mine/company-info'); } +// 跳转到消息页面 +function goToMessage() { + navTo('/pages/msglog/msglog'); +} + function logOut() { popup.value.open(); } diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 041a4ad..ee7bcba 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -96,6 +96,15 @@ + + + + 消息 + + + + + @@ -218,6 +227,11 @@ function goCaAI(){ navTo(`/packageCa/search/AIAudition?name=${userInfo.name}&userId=${userInfo.idCard}`); } +// 跳转到消息页面 +function goToMessage(){ + navTo('/pages/msglog/msglog'); +} + \ No newline at end of file diff --git a/packageA/pages/agreement/user.vue b/packageA/pages/agreement/user.vue new file mode 100644 index 0000000..7f5e211 --- /dev/null +++ b/packageA/pages/agreement/user.vue @@ -0,0 +1,322 @@ + + + + + diff --git a/pages.json b/pages.json index 58fc301..ceeaa6a 100644 --- a/pages.json +++ b/pages.json @@ -319,6 +319,18 @@ "navigationBarTitleText": "取消投递", "navigationBarBackgroundColor": "#FFFFFF" } + }, + { + "path": "pages/agreement/user", + "style": { + "navigationBarTitleText": "隐私协议" + } + }, + { + "path": "pages/agreement/privacy", + "style": { + "navigationBarTitleText": "隐私政策" + } } ] }, diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue index 1c42cab..56adf5c 100644 --- a/pages/chat/chat.vue +++ b/pages/chat/chat.vue @@ -60,8 +60,8 @@
- {{ config.appInfo.areaName }}岗位推荐 - + +
From 7f0a11be843487014913048b83e16e71a728df11 Mon Sep 17 00:00:00 2001 From: FengHui Date: Wed, 4 Feb 2026 13:22:59 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/wxAuthLogin/WxAuthLogin.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/wxAuthLogin/WxAuthLogin.vue b/components/wxAuthLogin/WxAuthLogin.vue index ff748a3..754bea6 100644 --- a/components/wxAuthLogin/WxAuthLogin.vue +++ b/components/wxAuthLogin/WxAuthLogin.vue @@ -205,7 +205,7 @@ const validateRole = () => { // 验证是否同意用户协议 if (!agreedToAgreement.value) { - $api.msg('请先阅读并同意用户协议'); + $api.msg('请先阅读并同意隐私协议'); return false; } @@ -216,7 +216,7 @@ const getPhoneNumber = (e) => { console.log('获取手机号:', e); console.log('userType.value', userType.value) - // 验证角色、机构类型和用户协议 + // 验证角色、机构类型和隐私协议 if (!validateRole()) { return; } @@ -374,7 +374,7 @@ const wxLogin = () => { // 测试账号登录(仅开发环境) const testLogin = () => { - // 验证角色、机构类型和用户协议 + // 验证角色、机构类型和隐私协议 if (!validateRole()) { return; } From f85f4873a826ac6f3c67d6e7230945595c3528e6 Mon Sep 17 00:00:00 2001 From: lijie_ycrj <1540286404@qq.com> Date: Thu, 5 Feb 2026 17:04:15 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=B8=AE=E6=89=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageB/priority/index.vue | 181 ++++++++ packageB/priority/recordsManagement.vue | 526 ++++++++++++++++++++++++ packageB/priority/taskAssignment.vue | 526 ++++++++++++++++++++++++ packageB/priority/taskIssue.vue | 526 ++++++++++++++++++++++++ pages.json | 24 ++ pages/index/components/index-one.vue | 9 + 6 files changed, 1792 insertions(+) create mode 100644 packageB/priority/index.vue create mode 100644 packageB/priority/recordsManagement.vue create mode 100644 packageB/priority/taskAssignment.vue create mode 100644 packageB/priority/taskIssue.vue diff --git a/packageB/priority/index.vue b/packageB/priority/index.vue new file mode 100644 index 0000000..2e01cc7 --- /dev/null +++ b/packageB/priority/index.vue @@ -0,0 +1,181 @@ + + + + + + diff --git a/packageB/priority/recordsManagement.vue b/packageB/priority/recordsManagement.vue new file mode 100644 index 0000000..a8a68b0 --- /dev/null +++ b/packageB/priority/recordsManagement.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/packageB/priority/taskAssignment.vue b/packageB/priority/taskAssignment.vue new file mode 100644 index 0000000..a8a68b0 --- /dev/null +++ b/packageB/priority/taskAssignment.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/packageB/priority/taskIssue.vue b/packageB/priority/taskIssue.vue new file mode 100644 index 0000000..a8a68b0 --- /dev/null +++ b/packageB/priority/taskIssue.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/pages.json b/pages.json index ceeaa6a..ef6621f 100644 --- a/pages.json +++ b/pages.json @@ -433,6 +433,30 @@ "navigationBarTitleText": "推荐" } }, + { + "path": "priority/index", + "style": { + "navigationBarTitleText": "帮扶任务" + } + }, + { + "path": "priority/taskAssignment", + "style": { + "navigationBarTitleText": "帮扶任务分配" + } + }, + { + "path": "priority/taskIssue", + "style": { + "navigationBarTitleText": "帮扶任务下发" + } + }, + { + "path": "priority/recordsManagement", + "style": { + "navigationBarTitleText": "帮扶记录管理" + } + }, { "path": "train/wrongAnswer/mistakeNotebook", "style": { diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index b790abe..f8aceb1 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -161,6 +161,12 @@
帮扶
+ + + + + 帮扶任务 + @@ -656,6 +662,9 @@ const state = reactive({ const helpClick = () => { navTo('/packageB/priority/helpFilter'); }; +const helpTaskClick = () =>{ + navTo('/packageB/priority/index'); +} //招聘会模块跳转 const handleJobFairClick = () => { navTo('/pages/careerfair/careerfair'); From 60435d0e2b2a6183d68d5f0ea9d7b3721f88721e Mon Sep 17 00:00:00 2001 From: xuchao <1151716571@qq.com> Date: Thu, 5 Feb 2026 18:32:08 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E6=8B=9B=E8=81=98=E4=BC=9A=20=E5=B2=97=E4=BD=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=8A=95=E9=80=92=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageA/pages/exhibitors/exhibitors.vue | 1401 +++++++++++++--------- 1 file changed, 853 insertions(+), 548 deletions(-) diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue index cedbc34..f8b2124 100644 --- a/packageA/pages/exhibitors/exhibitors.vue +++ b/packageA/pages/exhibitors/exhibitors.vue @@ -62,11 +62,12 @@ - - - + + + 参会单位({{ companyList.length }}) - + + @@ -100,8 +101,71 @@ - - + + + + + + + + {{ item1.companyName }} + + + + + + {{ job.jobTitle }} + + {{ job.minSalary }}-{{ job.maxSalary }}元 + + + + + {{ job.industry }} + {{ job.scale }} + + + + + + + {{ + getStatusText(job.jobFairPersonJob?.status).text + }} + + + + + + + + + + +