Browse Source

统一登录校验 误删用户登陆菜单后不再白屏

main
蒋吉兆 3 years ago
parent
commit
278635bf4c
  1. 4
      web/src/main.js
  2. 20
      web/src/permission.js
  3. 4
      web/src/view/login/login.vue
  4. 2
      web/src/view/superAdmin/user/user.vue

4
web/src/main.js

@ -151,7 +151,7 @@ console.log(`
欢迎使用 Gin-Vue-Admin
当前版本:V2.4.1
加群方式:微信shouzi_1994 QQ群622360840
默认自动化文档地址:http://127.0.0.1:` + process.env.VUE_APP_SERVER_PORT + `/swagger/index.html
默认前端文件运行地址:http://127.0.0.1:`+ process.env.VUE_APP_CLI_PORT`
默认自动化文档地址:http://127.0.0.1:${process.env.VUE_APP_SERVER_PORT}/swagger/index.html
默认前端文件运行地址:http://127.0.0.1:${process.env.VUE_APP_CLI_PORT}
如果项目让您获得了收益希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee
`)

20
web/src/permission.js

@ -4,11 +4,11 @@ import getPageTitle from '@/utils/page'
let asyncRouterFlag = 0
const whiteList = ['login','init']
router.beforeEach(async(to, from, next) => {
const whiteList = ['login', 'init']
router.beforeEach(async (to, from, next) => {
const token = store.getters['user/token']
// 在白名单中的判断情况
//修改网页标签名称
// 在白名单中的判断情况
//修改网页标签名称
document.title = getPageTitle(to.meta.title)
if (whiteList.indexOf(to.name) > -1) {
if (token) {
@ -24,10 +24,16 @@ router.beforeEach(async(to, from, next) => {
asyncRouterFlag++
await store.dispatch('router/SetAsyncRouter')
const asyncRouters = store.getters['router/asyncRouters']
router.addRoutes(asyncRouters)
next({...to, replace: true })
asyncRouters.forEach(item => {
router.addRoute(item)
})
next({ ...to, replace: true })
} else {
next()
if (to.matched.length) {
next()
} else {
next({ path: "/layout/404" })
}
}
}
// 不在白名单中并且未登陆的时候

4
web/src/view/login/login.vue

@ -90,14 +90,14 @@ export default {
name: "Login",
data() {
const checkUsername = (rule, value, callback) => {
if (value.length < 5 || value.length > 12) {
if (value.length < 5) {
return callback(new Error("请输入正确的用户名"));
} else {
callback();
}
};
const checkPassword = (rule, value, callback) => {
if (value.length < 6 || value.length > 12) {
if (value.length < 6) {
return callback(new Error("请输入正确的密码"));
} else {
callback();

2
web/src/view/superAdmin/user/user.vue

@ -121,7 +121,7 @@ export default {
rules: {
username: [
{ required: true, message: "请输入用户名", trigger: "blur" },
{ min: 6, message: "最低6位字符", trigger: "blur" }
{ min: 5, message: "最低5位字符", trigger: "blur" }
],
password: [
{ required: true, message: "请输入用户密码", trigger: "blur" },

Loading…
Cancel
Save