From a88b3a84eba59f281ee45c2bd0351bee8374caea Mon Sep 17 00:00:00 2001 From: lijie_ycrj <1540286404@qq.com> Date: Mon, 15 Dec 2025 16:27:23 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=B8=AE=E6=89=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageB/login2.vue | 301 +++++++++++++++++++++++++++ packageB/priority/helpFilter.vue | 29 ++- pages.json | 6 + pages/index/components/index-one.vue | 13 +- 4 files changed, 342 insertions(+), 7 deletions(-) create mode 100644 packageB/login2.vue diff --git a/packageB/login2.vue b/packageB/login2.vue new file mode 100644 index 0000000..2c8ece3 --- /dev/null +++ b/packageB/login2.vue @@ -0,0 +1,301 @@ + + + + + \ No newline at end of file diff --git a/packageB/priority/helpFilter.vue b/packageB/priority/helpFilter.vue index 948a7d8..03fa8e6 100644 --- a/packageB/priority/helpFilter.vue +++ b/packageB/priority/helpFilter.vue @@ -226,12 +226,31 @@ const handleReset = () =>{ getDataList('refresh') } onMounted(async () => { - await loadLevelData('201'); + // await loadLevelData('201'); }); -onLoad(() => { - getDictionary() - // getDeptOptions() - getDataList('refresh'); +onLoad(async () => { + let token=uni.getStorageSync('Padmin-Token') + console.log("token",token) + if(token){ + await loadLevelData('201'); + getDictionary() + getDataList('refresh'); + }else{ + navTo('/packageB/login2'); + } + // if (resLogin.code=='200') { + // uni.setStorageSync('Padmin-Token', resLogin.data.access_token) + // return true; + // }else{ + // uni.showToast({ + // icon: 'none', + // title: '单点异常' + // }) + // return false; + // } + // getDictionary() + // // getDeptOptions() + // getDataList('refresh'); }); function getDictionary(){ $api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => { diff --git a/pages.json b/pages.json index e9d6d62..cfd1e79 100644 --- a/pages.json +++ b/pages.json @@ -322,6 +322,12 @@ "navigationBarTitleText": "登录" } }, + { + "path": "login2", + "style": { + "navigationBarTitleText": "登录" + } + }, { "path": "train/index", "style": { diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index f34e090..bc5c333 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -154,12 +154,18 @@ 薪酬信息 - + 招聘会 + + + + + 帮扶 + @@ -773,7 +779,10 @@ const handleH5SalaryClick = () => { const salaryUrl = "https://www.mohrss.gov.cn/SYrlzyhshbzb/laodongguanxi_/fwyd/202506/t20250627_544623.html"; window.location.assign(salaryUrl); }; - +// 处理帮扶 +const helpClick = () => { + navTo('/packageB/priority/helpFilter'); +}; async function loadData() { try { if (isLoaded.value) return; From 6d912df3ef57c1fc1bc99c73c0fefc15a8624cd8 Mon Sep 17 00:00:00 2001 From: xuchao <1151716571@qq.com> Date: Mon, 15 Dec 2025 18:14:10 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B8=AE=E6=89=B6?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=20=E5=8F=8A=E5=8D=95=E7=82=B9token=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/components/index-one.vue | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index bc5c333..91012f3 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -160,7 +160,7 @@ 招聘会 - + @@ -696,6 +696,8 @@ onUnmounted(() => { onShow(() => { // 获取最新的企业信息 getCompanyInfo(); + //四级联动单点及权限 + getIsFourLevelLinkagePurview() }); // 监听用户信息变化，当登录状态改变时重新获取企业信息 @@ -723,6 +725,8 @@ const handleLoginSuccess = () => { // 重新获取企业信息 getCompanyInfo(); + //四级联动单点及权限 + getIsFourLevelLinkagePurview() }; // 处理附近工作点击 @@ -1065,7 +1069,21 @@ function getJobList(type = 'add') { } }); } - +const isFourLevelLinkagePurview=ref(false) +const getIsFourLevelLinkagePurview=()=>{ + let userInfo = uni.getStorageSync('userInfo') + if(userInfo){ + $api.myRequest('/auth/login2/ks',{userid: userInfo.dwUserid, idcardno: userInfo.idCard},"POST",'9100',{}).then(res=>{ + if(res.code == 200){ + uni.setStorageSync('fourLevelLinkage-token',res.data.access_token) + let roleIdList= ['103','106','107'] + if(res.data.roleIdList.some(item=>roleIdList.includes(item))){ + isFourLevelLinkagePurview.value=true + } + } + }) + } +} function dataToImg(data) { const result = data.map((item) => ({ ...item, From 4fbd32156d47a9d0cac7b3da5ddd2525cf203c3b Mon Sep 17 00:00:00 2001 From: lijie_ycrj <1540286404@qq.com> Date: Tue, 16 Dec 2025 08:59:13 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=B8=AE=E6=89=B6token=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageB/priority/helpFilter.vue | 22 ++++------------------ packageB/priority/helpFollow.vue | 4 ++-- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/packageB/priority/helpFilter.vue b/packageB/priority/helpFilter.vue index 03fa8e6..68edf64 100644 --- a/packageB/priority/helpFilter.vue +++ b/packageB/priority/helpFilter.vue @@ -229,8 +229,7 @@ onMounted(async () => { // await loadLevelData('201'); }); onLoad(async () => { - let token=uni.getStorageSync('Padmin-Token') - console.log("token",token) + let token=uni.getStorageSync('fourLevelLinkage-token') if(token){ await loadLevelData('201'); getDictionary() @@ -238,19 +237,6 @@ onLoad(async () => { }else{ navTo('/packageB/login2'); } - // if (resLogin.code=='200') { - // uni.setStorageSync('Padmin-Token', resLogin.data.access_token) - // return true; - // }else{ - // uni.showToast({ - // icon: 'none', - // title: '单点异常' - // }) - // return false; - // } - // getDictionary() - // // getDeptOptions() - // getDataList('refresh'); }); function getDictionary(){ $api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => { @@ -275,7 +261,7 @@ function getTaskTypeLabelByValue(value) { // 加载某一级的数据（parentId 为空表示根） async function loadLevelData(parentId) { let header = { - 'Authorization': uni.getStorageSync('Padmin-Token'), + 'Authorization': uni.getStorageSync('fourLevelLinkage-token'), 'Content-Type': "application/x-www-form-urlencoded" }; let params = { parentId }; @@ -355,7 +341,7 @@ function findNodeByValue(nodes, value) { } function getDeptOptions(){ let header={ - 'Authorization':uni.getStorageSync('Padmin-Token'), + 'Authorization':uni.getStorageSync('fourLevelLinkage-token'), 'Content-Type': "application/x-www-form-urlencoded" } let params={ @@ -368,7 +354,7 @@ function getDataList(type = 'add') { let maxPage=Math.ceil(totalNum.value/pageSize.value) let params=({...formData}) let header={ - 'Authorization':uni.getStorageSync('Padmin-Token'), + 'Authorization':uni.getStorageSync('fourLevelLinkage-token'), 'Content-Type': "application/x-www-form-urlencoded" } if (type === 'refresh') { diff --git a/packageB/priority/helpFollow.vue b/packageB/priority/helpFollow.vue index f1adc0a..6539c79 100644 --- a/packageB/priority/helpFollow.vue +++ b/packageB/priority/helpFollow.vue @@ -161,7 +161,7 @@ const onDateChange = ( e) => { } function getFollowList(){ let header={ - 'Authorization':uni.getStorageSync('Padmin-Token'), + 'Authorization':uni.getStorageSync('fourLevelLinkage-token'), 'Content-Type': "application/x-www-form-urlencoded" } let params={ @@ -209,7 +209,7 @@ const handleSubmit = () => { formRef.value?.validate() .then(() => { let header={ - 'Authorization':uni.getStorageSync('Padmin-Token') + 'Authorization':uni.getStorageSync('fourLevelLinkage-token') } formData.goalPersonId=personInfo.value.goalPersonId $api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => { From 4ef77b225157805de45f477c82e0b51dbdc5b45d Mon Sep 17 00:00:00 2001 From: shirlwang <15254118591@163.com> Date: Tue, 16 Dec 2025 17:40:00 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apiRc/login.js | 10 +++++++++- apiRc/user/user.js | 6 +++--- pages/index/components/index-one.vue | 18 ++++++++++++++---- utilsRc/config.js | 8 ++++---- utilsRc/store/modules/user.js | 20 ++++++++++++++++++++ 5 files changed, 50 insertions(+), 12 deletions(-) diff --git a/apiRc/login.js b/apiRc/login.js index c085b13..eb70902 100644 --- a/apiRc/login.js +++ b/apiRc/login.js @@ -1,7 +1,7 @@ /* * @Date: 2025-10-31 11:06:15 * @LastEditors: shirlwang - * @LastEditTime: 2025-11-03 15:51:28 + * @LastEditTime: 2025-12-16 16:29:33 */ import request from '@/utilsRc/request' @@ -13,6 +13,14 @@ export function login(data) { params: data, }) } +// 登录方法 +export function loginByUserId(data) { + return request({ + method: 'get', + url: '/ksSso/getTjmhTokenById?userId='+data, + // params: data, + }) +} export function smsLogin(data) { return request({ method: 'post', diff --git a/apiRc/user/user.js b/apiRc/user/user.js index a40ac31..7e9279b 100644 --- a/apiRc/user/user.js +++ b/apiRc/user/user.js @@ -1,14 +1,14 @@ /* * @Date: 2025-01-XX - * @LastEditors: - * @LastEditTime: + * @LastEditors: shirlwang + * @LastEditTime: 2025-12-16 16:35:06 */ import request from '@/utilsRc/request' // 获取用户信息（职业规划推荐用） export function appUserInfo() { return request({ - fullUrl: 'http://222.80.110.161:11111/api/ks/app/user/appUserInfo', + fullUrl: 'http://222.80.110.161:80/api/ks/app/user/appUserInfo', method: 'get' }) } diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index 91012f3..6f7933f 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -1099,10 +1099,20 @@ import storeRc from '@/utilsRc/store/index.js'; function goRc(){ if (checkLogin()) { let userInfo = uni.getStorageSync('userInfo') - storeRc.dispatch('LoginByUserInfo', userInfo).then(res => { - // console.log(res, "'res"); - navTo('/packageRc/pages/index/index'); - }); + if(userInfo.isCompanyUser == 2){ + storeRc.dispatch('LoginByID', userInfo.userId).then(res => { + storeRc.dispatch('GetInfo').then(res => { + navTo('/packageRc/pages/daiban/daiban'); + }); + }); + }else if(userInfo.isCompanyUser == 1){ + storeRc.dispatch('LoginByUserInfo', userInfo).then(res => { + navTo('/packageRc/pages/index/index'); + }) + }else{ + showToast('企业账号无法查看此模块～'); + } + // storeRc.dispatch('LoginByID', userInfo.userId).then(res => { } } // 跳转到素质测评 diff --git a/utilsRc/config.js b/utilsRc/config.js index c29333e..c500ebb 100644 --- a/utilsRc/config.js +++ b/utilsRc/config.js @@ -2,7 +2,7 @@ * @Descripttion: * @Author: lip * @Date: 2022-12-28 13:59:09 - * @LastEditors: lip + * @LastEditors: shirlwang */ // 应用全局配置 import config from '@/config.js' @@ -10,7 +10,7 @@ import config from '@/config.js' let exports = { // ========== baseUrl 配置方式选择 ========== // 方式1：硬编码baseUrl（main分支使用，合并到main时不会影响现有功能） - baseUrl: 'http://222.80.110.161:11111/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接） + baseUrl: 'http://222.80.110.161:80/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接） // 方式2：引用根目录config.js的baseUrl（CareerMap分支可选方式，如需使用请注释掉方式1，取消注释此方式） // baseUrl: config.baseUrl, // 引用根目录config.js的baseUrl，避免重复配置 @@ -26,13 +26,13 @@ let exports = { // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 已从根目录config.js引用，不再重复配置 // ========== 职业图谱专用baseUrl ========== - zytpBaseUrl: 'http://222.80.110.161:11111/career-map/api/ks_zytp/admin-api/zytp', + zytpBaseUrl: 'http://222.80.110.161:80/career-map/api/ks_zytp/admin-api/zytp', // ========== 用户接口专用baseUrl（其他用户接口使用） ========== userBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 用户相关接口使用根目录config.js的baseUrl // ========== appUserInfo接口专用baseUrl ========== - appUserInfoBaseUrl: 'http://222.80.110.161:11111/api/ks', // appUserInfo接口专用，与其他接口路径不一致 + appUserInfoBaseUrl: 'http://222.80.110.161:80/api/ks', // appUserInfo接口专用，与其他接口路径不一致 diff --git a/utilsRc/store/modules/user.js b/utilsRc/store/modules/user.js index b3a0f55..1b39a00 100644 --- a/utilsRc/store/modules/user.js +++ b/utilsRc/store/modules/user.js @@ -4,6 +4,7 @@ import constant from '@/utilsRc/constant' import { login, // logout, + loginByUserId, getInfo, register, smsLogin, @@ -107,6 +108,25 @@ const user = { }) }) }, + // 网格员登录 + LoginByID({ + 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) + loginByUserId(userInfo).then(res => { + setToken(res.token) + commit('SET_TOKEN', res.token) + resolve(res) + }).catch(error => { + reject(error) + }) + }) + }, // 登录 Login({ commit, From 65795492b3fd9c0f54912b1422efc1e0923c1860 Mon Sep 17 00:00:00 2001 From: xuchao <1151716571@qq.com> Date: Tue, 16 Dec 2025 17:52:49 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E5=B8=AE=E6=89=B6?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageB/priority/helpFilter.vue | 2 +- packageB/priority/helpFollow.vue | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packageB/priority/helpFilter.vue b/packageB/priority/helpFilter.vue index 68edf64..780199e 100644 --- a/packageB/priority/helpFilter.vue +++ b/packageB/priority/helpFilter.vue @@ -379,7 +379,7 @@ function getDataList(type = 'add') { } } function goFollow(item) { - navTo(`/packageB/priority/helpFollow?id=${item.goal_person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`); + navTo(`/packageB/priority/helpFollow?task_id=${item.task_id}&person_id=${item.person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`); } diff --git a/packageB/priority/helpFollow.vue b/packageB/priority/helpFollow.vue index 6539c79..7546523 100644 --- a/packageB/priority/helpFollow.vue +++ b/packageB/priority/helpFollow.vue @@ -105,7 +105,8 @@ const formData = reactive({ const personInfo=ref({ goalPersonId:'', name:'', - taskType:'' + taskType:'', + task_id:'' }) const followWays = ref([]) const followList = ref([]) @@ -165,7 +166,8 @@ function getFollowList(){ 'Content-Type': "application/x-www-form-urlencoded" } let params={ - goalPersonId:personInfo.value.goalPersonId + personId:personInfo.value.person_id, + taskId:personInfo.value.task_id } $api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => { console.log("resData",resData) @@ -245,9 +247,10 @@ const handleReset = () => { formData.nextContactDate = ''; } onLoad((options) => { - personInfo.value.goalPersonId=options.id + personInfo.value.person_id=options.person_id personInfo.value.name=options.name personInfo.value.taskType=options.taskType + personInfo.value.task_id=options.task_id getDictionary() getFollowList() }); From c666b909615b99fd4d4ef0fb6b6c76508ef02dc7 Mon Sep 17 00:00:00 2001 From: shirlwang <15254118591@163.com> Date: Tue, 16 Dec 2025 17:53:19 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=80=80=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageRc/pages/daiban/daibandetail.vue | 2 +- packageRc/pages/demand/demandail.vue | 4 ++-- packageRc/pages/needs/needDetail.vue | 4 ++-- packageRc/pages/needs/needsList.vue | 2 +- packageRc/pages/personalList/personalList.vue | 4 ++-- pages/index/components/index-one.vue | 4 ++++ 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packageRc/pages/daiban/daibandetail.vue b/packageRc/pages/daiban/daibandetail.vue index 7e9f3c0..3fc4d5e 100644 --- a/packageRc/pages/daiban/daibandetail.vue +++ b/packageRc/pages/daiban/daibandetail.vue @@ -412,7 +412,7 @@ @close="showTime = false" > --> - + diff --git a/packageRc/pages/needs/needDetail.vue b/packageRc/pages/needs/needDetail.vue index 4291010..0b00eef 100644 --- a/packageRc/pages/needs/needDetail.vue +++ b/packageRc/pages/needs/needDetail.vue @@ -1,7 +1,7 @@ diff --git a/packageRc/pages/needs/needsList.vue b/packageRc/pages/needs/needsList.vue index a636ab1..ae9d9fe 100644 --- a/packageRc/pages/needs/needsList.vue +++ b/packageRc/pages/needs/needsList.vue @@ -153,7 +153,7 @@ - + \ No newline at end of file diff --git a/pages.json b/pages.json index cfd1e79..2c80a27 100644 --- a/pages.json +++ b/pages.json @@ -138,18 +138,18 @@ "navigationBarTitleText": "简历示例" } }, - { - "path": "pages/service/salary-info", - "style": { - "navigationBarTitleText": "薪酬信息" - } - }, - { - "path": "pages/service/guidance", - "style": { - "navigationBarTitleText": "服务指导" - } - } + { + "path": "pages/service/salary-info", + "style": { + "navigationBarTitleText": "薪酬信息" + } + }, + { + "path": "pages/service/guidance", + "style": { + "navigationBarTitleText": "服务指导" + } + } ], "subpackages": [ { @@ -387,6 +387,12 @@ "style": { "navigationBarTitleText": "跟进" } + }, + { + "path": "priority/recommend", + "style": { + "navigationBarTitleText": "推荐" + } }, { "path": "train/wrongAnswer/mistakeNotebook", diff --git a/utils/request.js b/utils/request.js index 85bf0da..c41e10a 100644 --- a/utils/request.js +++ b/utils/request.js @@ -73,7 +73,7 @@ export function request({ * @param header Object，headers，默认：{} * @returns promise **/ -export function createRequest(url, data = {}, method = 'GET', loading = false, headers = {}) { +export function createRequest(url, data = {}, method = 'GET', loading = false, headers = {},needHeader = true) { if (loading) { uni.showLoading({ title: '请稍后', @@ -86,7 +86,9 @@ export function createRequest(url, data = {}, method = 'GET', loading = false, h } const header = headers || {}; - header["Authorization"] = encodeURIComponent(Authorization); + if(needHeader){ + header["Authorization"] = encodeURIComponent(Authorization); + } return new Promise((resolve, reject) => { uni.request({ url: config.baseUrl + url, @@ -215,34 +217,34 @@ export function myRequest(url, data = {}, method = 'GET', port = 9100, headers = resolve(resData.data) return } - // 处理业务错误 - if (resData.data?.code === 401 || resData.data?.code === 402) { - const pages = getCurrentPages(); - if (pages.length >= 10) { - // 页面栈已满，使用redirectTo替代 - uni.redirectTo({ - url:'/packageB/login?flag=nw', - fail: (err) => { - console.error('页面跳转失败:', err); - } - }); - } else { - uni.navigateTo({ - url:'/packageB/login?flag=nw', - fail: (err) => { - console.error('页面跳转失败:', err); - // 失败后尝试redirectTo - uni.redirectTo({ - url:'/packageB/login?flag=nw', - fail: (err2) => { - console.error('redirectTo也失败:', err2); - } - }); - } - }); - } - useUserStore().logOut() - + // 处理业务错误 + if (resData.data?.code === 401 || resData.data?.code === 402) { + const pages = getCurrentPages(); + if (pages.length >= 10) { + // 页面栈已满，使用redirectTo替代 + uni.redirectTo({ + url:'/packageB/login?flag=nw', + fail: (err) => { + console.error('页面跳转失败:', err); + } + }); + } else { + uni.navigateTo({ + url:'/packageB/login?flag=nw', + fail: (err) => { + console.error('页面跳转失败:', err); + // 失败后尝试redirectTo + uni.redirectTo({ + url:'/packageB/login?flag=nw', + fail: (err2) => { + console.error('redirectTo也失败:', err2); + } + }); + } + }); + } + useUserStore().logOut() + } // 显示具体的错误信息 const errorMsg = msg || '请求出现异常，请联系工作人员' From 4e5fa2a39ba9ed9002022d6aabf6c7d59d812e21 Mon Sep 17 00:00:00 2001 From: xuchao <1151716571@qq.com> Date: Thu, 18 Dec 2025 17:28:27 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=9B=9B=E7=BA=A7=E8=81=94=E5=8A=A8=20?= =?UTF-8?q?=E5=B8=AE=E6=89=B6=E5=8D=95=E7=82=B9=E5=85=A5=E5=8F=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/components/index-one.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index 252c66a..d1eddb2 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -1073,7 +1073,7 @@ const isFourLevelLinkagePurview=ref(false) const getIsFourLevelLinkagePurview=()=>{ let userInfo = uni.getStorageSync('userInfo') if(userInfo){ - $api.myRequest('/auth/login2/ks',{userid: userInfo.dwUserid, idcardno: userInfo.idCard},"POST",'9100',{}).then(res=>{ + $api.myRequest('/auth/login2/ks',{userid: userInfo.dwUserid, idcardno: userInfo.idCard},"POST",9100,{}).then(res=>{ if(res.code == 200){ uni.setStorageSync('fourLevelLinkage-token',res.data.access_token) let roleIdList= ['103','106','107'] From 38313ee63b42ae3b442cce56ae28835cc3df3f3a Mon Sep 17 00:00:00 2001 From: hanguangpu01 Date: Thu, 18 Dec 2025 18:02:26 +0800 Subject: [PATCH 10/10] 123 --- pages/careerfair/careerfair.vue | 57 ++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue index 1c8e896..f6f9e7d 100644 --- a/pages/careerfair/careerfair.vue +++ b/pages/careerfair/careerfair.vue @@ -153,9 +153,9 @@ - async function thirdLogin(){ + async function thirdLogin(needToast){ let form={} - if (uni.getStorageSync('userInfo').isCompanyUser=='1') { + if (uni.getStorageSync('userInfo') && uni.getStorageSync('userInfo').isCompanyUser=='1') { form={ usertype: '1', idno: uni.getStorageSync('userInfo').idCard, @@ -165,7 +165,7 @@ contactperson: "", contactphone: "", } - }else if (uni.getStorageSync('userInfo').isCompanyUser=='0') { + }else if (uni.getStorageSync('userInfo') && uni.getStorageSync('userInfo').isCompanyUser=='0') { form={ usertype: "2", enterprisecode: uni.getStorageSync('userInfo').idCard, @@ -176,10 +176,12 @@ name: "" } }else{ - uni.showToast({ - icon: 'none', - title: '请先登录' - }) + if(needToast){ + uni.showToast({ + icon: 'none', + title: '请先登录' + }) + } return false; } var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100); @@ -213,7 +215,7 @@ }; async function goDetail(jobFairId){ - if(await thirdLogin()){ + if(await thirdLogin('1')){ if(state.current != 3){ navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId) }else{ @@ -256,23 +258,28 @@ state.current = currented; } - function seemsg(index) { + async function seemsg(index) { + state.current = index; if (index != 3) { getFair("refresh"); } else { - if (!isLogin.value) { - getHeart(); - return; - } - // 确保获取到用户信息后再请求“我参与的”列表 - if (!userInfo.value?.info?.userId) { - getUser().then(() => { + + if(await thirdLogin('1')){ + if (!isLogin.value) { + getHeart(); + return; + } + // 确保获取到用户信息后再请求“我参与的”列表 + if (!userInfo.value?.info?.userId) { + getUser().then(() => { + getMyFair("refresh"); + }); + } else { getMyFair("refresh"); - }); - } else { - getMyFair("refresh"); + } } + } } @@ -290,15 +297,21 @@ } }; - function getHeart() { + async function getHeart() { + + const raw = uni.getStorageSync("Padmin-Token"); const token = typeof raw === "string" ? raw.trim() : ""; + + var isLogins = await thirdLogin(); + const headers = token ? { Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` } : {}; - + + $api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => { - if (resData.code == 200) { + if (isLogins) { isLogin.value = true; getUser(); } else {