diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue index ba7533d..6ca78cb 100644 --- a/packageA/pages/exhibitors/exhibitors.vue +++ b/packageA/pages/exhibitors/exhibitors.vue @@ -294,11 +294,11 @@ } } else { $api.msg('请先登录'); - setTimeout(() => { - uni.redirectTo({ - url: '/packageB/login' - }) - }, 1000) + // setTimeout(() => { + // uni.redirectTo({ + // url: '/packageB/login' + // }) + // }, 1000) } }); } diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue index f6f9e7d..7230dc7 100644 --- a/pages/careerfair/careerfair.vue +++ b/pages/careerfair/careerfair.vue @@ -187,6 +187,7 @@ var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100); if (resLogin.code=='200') { uni.setStorageSync('Padmin-Token', resLogin.data.access_token) + isLogin.value = true; return true; }else{ uni.showToast({ @@ -215,20 +216,20 @@ }; async function goDetail(jobFairId){ - if(await thirdLogin('1')){ - if(state.current != 3){ + if(state.current != 3 ){ + await thirdLogin() navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId) }else{ - console.log(userInfo.value, 'userInfo'); - if(userInfo.value){ - if(userInfo.value.userType=='ent'){ - navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId) - }else{ - navTo('/packageB/jobFair/detailPerson?jobFairId=' + jobFairId) + if(await thirdLogin('1')){ + if(userInfo.value){ + if(userInfo.value.userType=='ent'){ + navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId) + }else{ + navTo('/packageB/jobFair/detailPerson?jobFairId=' + jobFairId) + } } } } - } } function toSelectDate() { @@ -259,17 +260,16 @@ } async function seemsg(index) { - - state.current = index; if (index != 3) { + state.current = index; getFair("refresh"); } else { - if(await thirdLogin('1')){ if (!isLogin.value) { getHeart(); return; } + state.current = index; // 确保获取到用户信息后再请求“我参与的”列表 if (!userInfo.value?.info?.userId) { getUser().then(() => { @@ -279,7 +279,6 @@ getMyFair("refresh"); } } - } }