diff --git a/src/main/services/windowManager.js b/src/main/services/windowManager.js index 1bfd93c..16cef5f 100644 --- a/src/main/services/windowManager.js +++ b/src/main/services/windowManager.js @@ -49,7 +49,6 @@ function createAdminWindow() { adminWindow.webContents.once('dom-ready', () => { adminWindow.show() - mainWindow.hide() if (process.env.NODE_ENV === 'development' || openDevTools) adminWindow.webContents.openDevTools(true) }) adminWindow.on('maximize', () => { diff --git a/src/renderer/assets/logo-title.png b/src/renderer/assets/logo-title.png new file mode 100644 index 0000000..85da192 Binary files /dev/null and b/src/renderer/assets/logo-title.png differ diff --git a/src/renderer/icons/svg/addressBook.svg b/src/renderer/icons/svg/addressBook.svg new file mode 100644 index 0000000..91e9ca5 --- /dev/null +++ b/src/renderer/icons/svg/addressBook.svg @@ -0,0 +1 @@ + diff --git a/src/renderer/icons/svg/adminManage.svg b/src/renderer/icons/svg/adminManage.svg new file mode 100644 index 0000000..ac19489 --- /dev/null +++ b/src/renderer/icons/svg/adminManage.svg @@ -0,0 +1 @@ + diff --git a/src/renderer/icons/svg/notice.svg b/src/renderer/icons/svg/notice.svg new file mode 100644 index 0000000..7d8b947 --- /dev/null +++ b/src/renderer/icons/svg/notice.svg @@ -0,0 +1,2 @@ + + diff --git a/src/renderer/layout/components/Sidebar/index.vue b/src/renderer/layout/components/Sidebar/index.vue index 61ac1c5..e39e269 100644 --- a/src/renderer/layout/components/Sidebar/index.vue +++ b/src/renderer/layout/components/Sidebar/index.vue @@ -4,30 +4,36 @@ - + + + 后台管理 + \ No newline at end of file + diff --git a/src/renderer/permission.js b/src/renderer/permission.js index 90f9992..62f6240 100644 --- a/src/renderer/permission.js +++ b/src/renderer/permission.js @@ -14,25 +14,7 @@ export function usePermission() { if (to.path === '/login') { next({ path: '/' }) } else { - const hasRoles = roles && roles.length > 0; - if (hasRoles) { - next() - } else { - try { - const roles = await getUserInfo() - next({ ...to, replace: true }) - } catch (error) { - await logOut() - console.error(error) - await ipcRenderer.invoke("toggle-main-window-resizable",false) - await ipcRenderer.invoke("main-window-resize",{ - width: 320, - height: 504 - }) - next('/login') - } - } - + next() } } else { if (whiteList.includes(to.path)) { diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js index 8b54d38..90a6af1 100644 --- a/src/renderer/router/index.js +++ b/src/renderer/router/index.js @@ -8,12 +8,36 @@ export const constantRouterMap = [{ component: Layout, redirect: '/dashboard', name: '主页', - hidden: false, + hidden: true, children: [{ path: 'dashboard', name: '总览', component: () => import('@/components/LandingPage') }] +},{ + path: '/addressBook', + component: Layout, + meta: { title: '通讯录', icon: 'addressBook', roles: ['admin'] }, + children: [ + { + path: 'index', + name: 'Form', + component: () => import('@/views/addressBook/index'), + meta: { title: '通讯录', icon: 'addressBook' } + } + ] +},{ + path: '/notice', + component: Layout, + meta: { title: '通知', icon: 'notice', roles: ['admin'] }, + children: [ + { + path: 'index', + name: 'Form', + component: () => import('@/views/notice/index'), + meta: { title: '通知', icon: 'notice' } + } + ] }, { path: '/login', component: () => import('@/views/login'), diff --git a/src/renderer/store/user.js b/src/renderer/store/user.js index 1aac1a2..6356cbf 100644 --- a/src/renderer/store/user.js +++ b/src/renderer/store/user.js @@ -5,7 +5,7 @@ import { login, getInfo, logout } from "@/api/login" const store = () => ({ token: JSON.parse(localStorage.getItem('token')), name: JSON.parse(localStorage.getItem('name')), - roles: JSON.parse(localStorage.getItem('roles')), + roles: [], info: {}, }) diff --git a/src/renderer/views/addressBook/index.vue b/src/renderer/views/addressBook/index.vue new file mode 100644 index 0000000..303d393 --- /dev/null +++ b/src/renderer/views/addressBook/index.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/renderer/views/login/index.vue b/src/renderer/views/login/index.vue index 574e454..5740aa4 100644 --- a/src/renderer/views/login/index.vue +++ b/src/renderer/views/login/index.vue @@ -45,18 +45,18 @@ - 记住密码 + 记住密码 { $bg: #283443; $light_gray: #fff; -$cursor: #fff; +$cursor: #4c79ee; @supports (-webkit-mask: none) and (not (cater-color: $cursor)) { .login-container .el-input input { @@ -186,9 +185,6 @@ $cursor: #fff; width: 100vw; height: 100vh; .el-input { - display: inline-block; - height: 47px; - width: 70%; input { background: transparent; @@ -197,7 +193,7 @@ $cursor: #fff; border-radius: 0px; padding: 12px 5px 12px 15px; color: #666; - height: 47px; + height: 100%; caret-color: $cursor; &:-webkit-autofill { @@ -207,14 +203,6 @@ $cursor: #fff; } } - .el-form-item { - color: #0003; - font-size: 16px; - line-height: 24px; - border-radius: 6px; - background-color: #ffffff; - border: 1px solid #d9d9d9; - } } @@ -224,17 +212,10 @@ $bg: #2d3a4b; $dark_gray: #889aa4; $light_gray: #eee; -.login-container-w { - min-height: 100%; - width: 100%; - background-color: #ffffff; - overflow: hidden; -} - .login-container { min-height: 100%; width: 100%; - background: url("../../assets/imgs/login-bkg.png") no-repeat; + background: url("~@/assets/imgs/login-bkg.png") no-repeat; background-size: cover; overflow: hidden; display: flex; @@ -243,8 +224,10 @@ $light_gray: #eee; .form-container { - padding: 20px; - + padding: 20px 20px 24px 20px; + background: #fff; + border-radius: 10px; + box-shadow: 0 2px 16px 0 rgba(0,0,0,.2); } .tips { @@ -279,7 +262,15 @@ $light_gray: #eee; user-select: none; } } -.form-item + .form-item { - margin-top: 22px; + +::v-deep .el-form-item__content { + display: flex; + line-height: 34px; + align-items: center; + position: relative; + border-bottom: 1px #aaa6 solid; +} +.form-item { + margin-bottom: 10px; } diff --git a/src/renderer/views/notice/index.vue b/src/renderer/views/notice/index.vue new file mode 100644 index 0000000..303d393 --- /dev/null +++ b/src/renderer/views/notice/index.vue @@ -0,0 +1,11 @@ + + + + +