diff --git a/admin-fe/src/assets/app.css b/admin-fe/src/assets/app.css index ab97519..7e78338 100644 --- a/admin-fe/src/assets/app.css +++ b/admin-fe/src/assets/app.css @@ -123,9 +123,10 @@ table{ width: 100%; border-left: solid 1px #eee; border-top: solid 1px #eee; + border-collapse: collapse; } td,th { border-right: solid 1px #eee; border-bottom: solid 1px #eee; - padding:2px 4px; + padding:6px; } \ No newline at end of file diff --git a/admin-fe/src/components/pager/Pager.vue b/admin-fe/src/components/pager/Pager.vue new file mode 100644 index 0000000..a69b55a --- /dev/null +++ b/admin-fe/src/components/pager/Pager.vue @@ -0,0 +1,101 @@ + + + + + \ No newline at end of file diff --git a/admin-fe/src/components/pager/index.ts b/admin-fe/src/components/pager/index.ts new file mode 100644 index 0000000..5518c80 --- /dev/null +++ b/admin-fe/src/components/pager/index.ts @@ -0,0 +1,4 @@ +import PagerComponent from './Pager.vue' + +const Pager = PagerComponent +export default Pager \ No newline at end of file diff --git a/admin-fe/src/util/http.ts b/admin-fe/src/util/http.ts index 88f6ea6..2db7227 100644 --- a/admin-fe/src/util/http.ts +++ b/admin-fe/src/util/http.ts @@ -1,5 +1,6 @@ import {toast} from "../components/message"; import {useUserStore} from "../service/store"; +import router from '../router' export type HttpMethod = 'get' | 'post' | 'delete' | 'put' @@ -99,9 +100,11 @@ class Http { // 需要统一处理数据 if (code === 403) { toast("登录凭证无效或者已过期") - // if (r.fullPath != '/login') { - // router.replace('/login'); - // } + // 通过router获取当前路由 + const route = router.currentRoute; + if (route.fullPath != '/login') { + router.replace('/login'); + } return; } else if (err) { toast(httpConfig.globalErrorHandler[code]) diff --git a/admin-fe/src/views/user/index.vue b/admin-fe/src/views/user/index.vue index 21eaa0d..82622aa 100644 --- a/admin-fe/src/views/user/index.vue +++ b/admin-fe/src/views/user/index.vue @@ -1,35 +1,38 @@