diff --git a/src/router/index.js b/src/router/index.js index 16d146e..4ca2321 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,13 +60,13 @@ export const constantRoutes = [ { path: '', component: Layout, - redirect: 'index', + redirect: 'search', children: [ { - path: '/index', - component: () => import('@/views/index.vue'), - name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true } + path: '/search', + component: () => import('@/views/order/intention/search.vue'), + name: 'Search', + // meta: { title: '首页', icon: 'dashboard', affix: true } } ] }, @@ -99,10 +99,8 @@ export const constantRoutes = [ } ] } - // 业务路由(订单管理、系统管理等)将从后端动态获取 ]; -// 动态路由将从后端接口获取,不再在此处定义 const router = createRouter({ history: createWebHistory(), diff --git a/src/utils/request.js b/src/utils/request.js index 00b910f..d71ea25 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,5 +1,5 @@ import axios from 'axios' -import { ElNotification , ElMessageBox, ElMessage, ElLoading } from 'element-plus' +import { ElNotification, ElMessageBox, ElMessage, ElLoading } from 'element-plus' import { getToken } from '@/utils/auth' import errorCode from '@/utils/errorCode' import { tansParams, blobValidate } from '@/utils/ruoyi' @@ -67,46 +67,46 @@ service.interceptors.request.use(config => { } return config }, error => { - console.log(error) - Promise.reject(error) + console.log(error) + Promise.reject(error) }) // 响应拦截器 service.interceptors.response.use(res => { - // 未设置状态码则默认成功状态 - const code = res.data.code || 200; - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - // 二进制数据则直接返回 - if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { - return res.data - } - if (code === 401) { - if (!isRelogin.show) { - isRelogin.show = true; - ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { - isRelogin.show = false; - useUserStore().logOut().then(() => { - location.href = '/index'; - }) + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + // 二进制数据则直接返回 + if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { + return res.data + } + if (code === 401) { + if (!isRelogin.show) { + isRelogin.show = true; + ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { + isRelogin.show = false; + useUserStore().logOut().then(() => { + location.href = ''; + }) }).catch(() => { isRelogin.show = false; }); } - return Promise.reject('无效的会话,或者会话已过期,请重新登录。') - } else if (code === 500) { - ElMessage({ message: msg, type: 'error' }) - return Promise.reject(new Error(msg)) - } else if (code === 601) { - ElMessage({ message: msg, type: 'warning' }) - return Promise.reject(new Error(msg)) - } else if (code !== 200) { - ElNotification.error({ title: msg }) - return Promise.reject('error') - } else { - return Promise.resolve(res.data) - } - }, + return Promise.reject('无效的会话,或者会话已过期,请重新登录。') + } else if (code === 500) { + ElMessage({ message: msg, type: 'error' }) + return Promise.reject(new Error(msg)) + } else if (code === 601) { + ElMessage({ message: msg, type: 'warning' }) + return Promise.reject(new Error(msg)) + } else if (code !== 200) { + ElNotification.error({ title: msg }) + return Promise.reject('error') + } else { + return Promise.resolve(res.data) + } +}, error => { console.log('err' + error) let { message } = error; diff --git a/src/views/error/404.vue b/src/views/error/404.vue index 08a617a..0466dc6 100644 --- a/src/views/error/404.vue +++ b/src/views/error/404.vue @@ -2,22 +2,36 @@
-
-
-
+
+
+
+