-
{{ tag.title }}
-
+
diff --git a/src/permission.ts b/src/permission.ts
index e3ecf4d..10b15d1 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -43,17 +43,17 @@ router.beforeEach(async(to, from, next) => {
} catch (error) {
next(`/login?redirect=${to.path}`)
}
+ NProgress.done()
}
}else{
if (whiteList.indexOf(to.path) !== -1) {
next()
} else {
next(`/login?redirect=${to.path}`)
- NProgress.done()
+
}
+ NProgress.done()
}
})
-router.afterEach(() => {
- NProgress.done()
-})
+
diff --git a/src/router/modules/excel.ts b/src/router/modules/excel.ts
index b2fe387..6575ce3 100644
--- a/src/router/modules/excel.ts
+++ b/src/router/modules/excel.ts
@@ -18,7 +18,7 @@ const excelRouter = {
path: 'export-excel',
component: () => import('@/views/excel/export-excel.vue'),
name: 'export-excel',
- meta: { title: '导出 Excel', }
+ meta: { title: '导出 Excel', }
},
{
path: 'export-merge-header',
@@ -30,13 +30,13 @@ const excelRouter = {
path: 'upload-excel',
component: () => import('@/views/excel/upload-excel.vue'),
name: 'upload-excel',
- meta: { title: '上传 Excel', }
+ meta: { title: '上传 Excel', }
},
{
path: 'upload-style-excel',
component: () => import('@/views/excel/export-style-excel.vue'),
name: 'upload-style-excel',
- meta: { title: '自定义样式导出 Excel', }
+ meta: { title: '自定义样式导出 Excel' }
},
]
}
diff --git a/src/router/modules/other.ts b/src/router/modules/other.ts
index 38b5339..32f69b0 100644
--- a/src/router/modules/other.ts
+++ b/src/router/modules/other.ts
@@ -16,7 +16,7 @@ const othersRouter = {
path: 'editor',
component: () => import('@/views/other/editor.vue'),
name: 'editor',
- meta: { title: '富文本编辑器', roles:['other'] }
+ meta: { title: '富文本编辑器', roles:['other'] }
},
{
path: 'mark-down',
@@ -28,43 +28,43 @@ const othersRouter = {
path: 'print',
component: () => import('@/views/other/print.vue'),
name: 'print',
- meta: { title: '打印', }
+ meta: { title: '打印', }
},
{
path: 'cropper',
component: () => import('@/views/other/cropper/index.vue'),
name: 'cropper',
- meta: { title: '头像裁剪' }
+ meta: { title: '头像裁剪' , }
},
{
path: 'grid-sorter',
component: () => import('@/views/other/grid-sorter.vue'),
name: 'grid-sorter',
- meta: { title: '卡片拖拽', }
+ meta: { title: '卡片拖拽', }
},
{
path: 'splitpane',
component: () => import('@/views/other/splitpane.vue'),
name: 'splitpane',
- meta: { title: '分割模块', }
+ meta: { title: '分割模块',}
},
{
path: 'qrcode',
component: () => import('@/views/other/qrcode.vue'),
name: 'qrcode',
- meta: { title: '生成二维码', }
+ meta: { title: '生成二维码', }
},
{
path: 'right-menu',
component: () => import('@/views/other/right-menu.vue'),
name: 'right-menu',
- meta: { title: '右键菜单', }
+ meta: { title: '右键菜单',}
},
{
path: 'count',
component: () => import('@/views/other/count.vue'),
name: 'count',
- meta: { title: '数字自增长', }
+ meta: { title: '数字自增长',}
},
]
}
diff --git a/src/router/modules/permission.ts b/src/router/modules/permission.ts
index 75576f1..f0eb210 100644
--- a/src/router/modules/permission.ts
+++ b/src/router/modules/permission.ts
@@ -17,7 +17,7 @@ const permissionRouter = {
path: 'page',
component: () => import('@/views/permission/page.vue'),
name: 'page',
- meta: { title: '页面权限', icon: 'trend-charts', roles:['other'] }
+ meta: { title: '页面权限', icon: 'trend-charts', roles:['other'] }
},
]
}
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 6d46ea5..16d7200 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -4,6 +4,7 @@ const state = {
isCollapse: true,
withoutAnimation:false,
device: 'desktop',
+ isReload:true,
}
const mutations = {
@@ -21,6 +22,14 @@ const mutations = {
state.isCollapse = false
state.withoutAnimation = withoutAnimation
},
+
+ SET_RELOAD:(state) => {
+ state.isReload = false
+ setTimeout(()=>{
+ state.isReload = true
+ },50)
+ },
+
}
const actions = {
toggleDevice({ commit }, device) {
@@ -29,6 +38,9 @@ const actions = {
closeSideBar({ commit }, { withoutAnimation }) {
commit('CLOSE_SIDEBAR', withoutAnimation)
},
+ setReload({commit}){
+ commit('SET_RELOAD')
+ }
}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index e92f0c0..5c461ae 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -32,9 +32,8 @@
最喜欢的一句话
---------- 开心最重要
-
-
如果对你有帮助的话,可以麻烦点一颗 star!
+
如果对你有帮助的话,可以麻烦点一颗 star! 你的鼓励是我继续优化的动力~~
diff --git a/yarn.lock b/yarn.lock
index 0a4fe2d..0994cb7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -940,6 +940,18 @@
"@babel/helper-validator-identifier" "^7.16.7"
to-fast-properties "^2.0.0"
+"@better-scroll/core@^2.4.2":
+ version "2.4.2"
+ resolved "https://registry.npmmirror.com/@better-scroll/core/-/core-2.4.2.tgz#e69470012d79923a18034c3e4931720fbb06eae5"
+ integrity sha512-IqVZLnh04YpaEAy9wJDxtFK/stxVQjB9A9Wcr3Uwkj7Av1TtFpin+t/TObl53diNDG5ZJ+vck/OAthphpuugLA==
+ dependencies:
+ "@better-scroll/shared-utils" "^2.4.2"
+
+"@better-scroll/shared-utils@^2.4.2":
+ version "2.4.2"
+ resolved "https://registry.npmmirror.com/@better-scroll/shared-utils/-/shared-utils-2.4.2.tgz#1ac5c97495727093a22a8009560795dd5e3c18da"
+ integrity sha512-Gy/Jfbpu+hq0u+PcjkTqyXGqAf+0dexTzEZ5IDXEVwJVLmd3cx8A73oTcAZ8QZgk4wSHvlMjXecSaptkhnNPEw==
+
"@ctrl/tinycolor@^3.4.0":
version "3.4.0"
resolved "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f"