Merge remote-tracking branch 'origin/main'

This commit is contained in:
2025-11-06 15:15:24 +08:00
24 changed files with 4266 additions and 410 deletions

View File

@@ -1047,14 +1047,14 @@ import { getToken } from '@/utilsRc/auth.js';
// 跳转到高校毕业页面
function goRc(){
if (checkLogin()) {
navTo('/packageRc/pages/index/index');
let token = getToken();
if( token != null ){
if( token != null && token != '' && token != undefined ){
if(storeRc.state.user.type == 'person'){
navTo('/packageRc/pages/index/index');
}else{
navTo('/packageRc/pages/daiban/daiban');
}
console.log(storeRc.state.user.roles, storeRc.state.user.type, 'state')
}else{
let userInfo = uni.getStorageSync('userInfo')
storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {