diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html index 983c8211..3c6eb5b5 100644 --- a/ruoyi-ui/public/index.html +++ b/ruoyi-ui/public/index.html @@ -1,16 +1,20 @@ - - - - - - - - - <%= webpackConfig.name %> - - - - -
-
-
-
-
-
正在加载系统资源，请耐心等待
-
-
- - + + + +
+
+
+
+
+
正在加载系统资源，请耐心等待
+
+
+ + + \ No newline at end of file diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index 43c65cda..f185c13a 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -8,8 +8,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register'] - +const whiteList = ['/login', '/register', '/wxbuild', '/wxbinding'] router.beforeEach((to, from, next) => { NProgress.start() if (getToken()) { @@ -20,6 +19,7 @@ router.beforeEach((to, from, next) => { NProgress.done() } else { if (store.getters.roles.length === 0) { + isRelogin.show = true // 判断当前用户是否已拉取完user_info信息 store.dispatch('GetInfo').then(() => { diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 95b51f4c..55f55a46 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -61,6 +61,16 @@ export const constantRoutes = [ component: () => import('@/views/error/401'), hidden: true }, + { + path: '/wxbuild', + component: () => import('@/views/wxsetting/wxInit/build'), + hidden: true + }, + { + path: '/wxbinding', + component: () => import('@/views/wxsetting/wxInit/binding'), + hidden: true + }, { path: '', component: Layout, diff --git a/ruoyi-ui/src/views/wxsetting/wxInit/binding.vue b/ruoyi-ui/src/views/wxsetting/wxInit/binding.vue new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-ui/src/views/wxsetting/wxInit/build.vue b/ruoyi-ui/src/views/wxsetting/wxInit/build.vue new file mode 100644 index 00000000..8c141d7b --- /dev/null +++ b/ruoyi-ui/src/views/wxsetting/wxInit/build.vue @@ -0,0 +1,97 @@ + + + +