大屏页面初始化

screen-vue/src/utils/request.js

@@ -12,11 +12,11 @@ const service = axios.create({
 
 service.interceptors.request.use(
   (config) => {
-    // 登录接口不添加token
-    if (!config.url?.includes('/userLogin')) {
+    const excludePaths = ['/userLogin', '/register'];
+    if (!excludePaths.some(path => config.url?.includes(path))) {
       const token = localStorage.getItem('token');
       if (token) {
-        config.headers.Authorization = token;
+        config.headers.Authorization = `Bearer ${token}`;
       }
     }
     return config
@@ -33,8 +33,7 @@ service.interceptors.response.use(
     if (res.code !== 200) {
       ElMessage.error(res.msg || '接口请求失败');
       if (res.code === 401) {
-        localStorage.removeItem('token');
-        router.push('/login').catch(err => console.warn('路由跳转失败', err));
+        handleLoginExpired();
       }
       return Promise.reject(res);
     }
@@ -42,8 +41,55 @@ service.interceptors.response.use(
   },
   (error) => {
     console.error('【响应拦截器错误】', error);
+    
+    if (isLoginExpiredError(error)) {
+      handleLoginExpired();
+      return Promise.reject(new Error('登录状态已失效，请重新登录'));
+    }
+    
+    if (!error.response) {
+      if (error.message.includes('Network Error') || error.message.includes('timeout')) {
+        ElMessage.error('网络异常，请检查网络连接或稍后重试');
+      } else {
+        ElMessage.error('请求失败，请稍后重试');
+      }
+      return Promise.reject(error);
+    }
+    
+    ElMessage.error(error.response.data?.msg || error.message || '接口请求失败');
     return Promise.reject(error);
   }
 )
 
+function isLoginExpiredError(error) {
+  if (error.response && error.response.status === 401) {
+    return true;
+  }
+  
+  const errorMsg = error.message.toLowerCase();
+  const expiredKeywords = [
+    'token expired', 'invalid token', '未授权', 
+    '登录失效', '认证失败', '401'
+  ];
+  const networkKeywords = ['network error', 'timeout', '网络'];
+  
+  return (
+    expiredKeywords.some(keyword => errorMsg.includes(keyword.toLowerCase())) &&
+    !networkKeywords.some(keyword => errorMsg.includes(keyword.toLowerCase()))
+  );
+}
+
+function handleLoginExpired() {
+  localStorage.removeItem('token');
+  
+  if (router.currentRoute.path !== '/login') {
+    const redirect = encodeURIComponent(router.currentRoute.fullPath);
+    router.push(`/login?redirect=${redirect}`).catch(err => {
+      console.warn('路由跳转失败', err);
+    });
+    
+    ElMessage.error('登录状态已失效，请重新登录');
+  }
+}
+
 export default service