diff --git a/src/assets/icons/AccountNumber.vue b/src/assets/icons/AccountNumber.vue new file mode 100644 index 0000000..23e1ebf --- /dev/null +++ b/src/assets/icons/AccountNumber.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/ClearCache.vue b/src/assets/icons/ClearCache.vue new file mode 100644 index 0000000..0fbb20d --- /dev/null +++ b/src/assets/icons/ClearCache.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/Right.vue b/src/assets/icons/Right.vue new file mode 100644 index 0000000..800d650 --- /dev/null +++ b/src/assets/icons/Right.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/User.vue b/src/assets/icons/User.vue new file mode 100644 index 0000000..ea9b51b --- /dev/null +++ b/src/assets/icons/User.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index b262b39..c5b3577 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -38,6 +38,11 @@ export { default as CreateFolder } from './CreateFolder.vue' export { default as CreateShare } from './CreateShare.vue' export { default as Fingerprint } from './Fingerprint.vue' export { default as Folder } from './Folder.vue' +export { default as User } from './User.vue' +export { default as AccountNumber } from './AccountNumber.vue' +export { default as ClearCache } from './ClearCache.vue' +export { default as Right } from './Right.vue' + export { default as File7z } from './file/7z.vue' export { default as FileBmp } from './file/Bmp.vue' export { default as FileBz2 } from './file/Bz2.vue' @@ -78,7 +83,6 @@ export { default as OrderMaintenance } from './OrderMaintenance.vue' export { default as OrderReview } from './OrderReview.vue' export { default as SaveMaintenance } from './SaveMaintenance.vue' - export { default as Home } from './menu/Home.vue' export { default as Setup } from './menu/Setup.vue' export { default as Other } from './menu/Other.vue' diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index dd5595f..5384a30 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -58,11 +58,33 @@ @@ -90,6 +112,7 @@ return { userName: "", userNameF: "", + userInfo:{}, searchVisible: false, tasksVisible: false, msg: false, @@ -130,6 +153,7 @@ this.$store.commit("SET_LOGIN_AVATAR", userInfo.avatar); this.$store.commit("SET_LOGIN_NAME", userInfo.name); + this.userInfo = userInfo; this.userName = this.$store.state.global.login_name; if(userInfo.company_info){ this.companyName = userInfo.company_info.name; @@ -164,21 +188,21 @@ //取消 }) } - if (command == "outLogin") { - this.$confirm('确认是否退出当前用户？', '警告', { - type: 'warning', - confirmButtonText: '退出', - confirmButtonClass: 'el-button--danger' - }).then(() => { - this.$router.replace({ path: '/login' }); - }).catch(() => { - //取消退出 - }) - } + }, + loginOut(){ + this.$confirm('确认是否退出当前用户？', '警告', { + type: 'warning', + confirmButtonText: '退出', + confirmButtonClass: 'el-button--danger' + }).then(() => { + this.$router.replace({ path: '/login' }); + }).catch(() => { + //取消退出 + }) }, //全屏 screen() { - var element = document.documentElement; + const element = document.documentElement; this.$TOOL.screen(element) }, //显示短消息 @@ -281,6 +305,55 @@ text-align: right; color: #999; } + .userView{ + background: #F5F7FA; + padding:10px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: 1px solid #EBEEF5; + .headerView{ + padding: 0 6px; + display: flex;align-items: center; + margin-bottom: 10px; + .icon{ + color: var(--el-color-primary); + display: flex; + align-items: center; + } + .name{ + font-size: 16px;font-weight: 500; + margin-left: 8px; + } + .solid{ + width: 2px; + height: 18px; + background: var(--el-color-danger); + margin: 0 12px; + } + .account{ + font-size: 14px; + } + } + .itemBox{ + display: flex;align-items: center; + padding: 6px 6px; + font-size: 13px; + .name{ + width: 65px; + color: #888; + } + .text{ + flex: 1;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; + } + } + } + .loginOut{ + border-top: 1px solid #EBEEF5; + padding: 16px; + .btn{ + font-weight: inherit; + } + } .dark .msg-list__main h2 { color: #d0d0d0; diff --git a/src/views/login/activate.vue b/src/views/login/activate.vue index 350af6c..15c2388 100644 --- a/src/views/login/activate.vue +++ b/src/views/login/activate.vue @@ -5,7 +5,7 @@
电子邮件确认链接
电子邮件确认链接
- 请求向您发送新的电子邮件 + 点此激活账号并登录
您最近是否申请过帐户，但未确认您的电子邮件地址?如果您尚未确认您的电子邮件地址，您可能需要创建一个新帐户。如果您有问题，请参阅帐户帮助。
@@ -36,20 +36,25 @@ export default { async getActivation() { const user = await this.$API.user.active.post(); if(user.code == 200){ - this.$TOOL.cookie.set("TOKEN", user.data.token) - this.$TOOL.data.set("USER_INFO", user.data.user) - if(user.data.user.avatar!=''){ - this.$store.commit("SET_LOGIN_AVATAR", user.data.user.avatar); - } - this.$store.commit("SET_LOGIN_NAME", user.data.user.name); - }else{ - return false + await this.setLoginData(user); } + }, + + async setLoginData(user) { + this.$TOOL.cookie.set("TOKEN", user.data.token, { + expires: 0 + }) + this.$TOOL.data.set("USER_INFO", user.data.user) + if(user.data.user.avatar!=''){ + this.$store.commit("SET_LOGIN_AVATAR", user.data.user.avatar); + } + this.$store.commit("SET_LOGIN_NAME", user.data.user.name); //获取菜单 - const menu = await this.$API.system.menu.myMenus.get(); - if (menu.code == 200) { - if (menu.data.menu.length == 0) { + let menu = null; + menu = await this.$API.system.menu.myMenus.get() + if (menu.code === 200) { + if (menu.data.menu.length === 0) { this.islogin = false await this.$alert("当前用户无任何菜单权限，请联系系统管理员", "无权限访问", { type: 'error', @@ -63,15 +68,13 @@ export default { this.$TOOL.data.set("PERMISSIONS", data_auth) this.$TOOL.data.set("DASHBOARDGRID", menu.data.dashboardGrid) } else { - this.islogin = false - this.$message.warning(menu.message) + this.$message.warning(menu.msg) return false } - this.$router.replace({ path: '/' }) - } + }, } } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index bd1fb2c..e3c83c3 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -37,10 +37,10 @@ -
passKey登录
+
使用passKey登录
- xwcloud.com 版权所有 © 2023 + linkwing.com·麟云 版权所有 @ 2023-{{new Date().getFullYear()}}
@@ -286,7 +286,7 @@ font-size: 22px; position: relative; padding-left: 18px; - color: #3F4244; + color: #595E5C; font-weight: 500; .origin{ position: absolute; @@ -296,7 +296,7 @@ width: 8px; height: 8px; border-radius: 50%; - background: #333; + background: #595E5C; margin: 0 8px 0 0; } } diff --git a/src/views/setting/company/save.vue b/src/views/setting/company/save.vue index 3f41be2..3f4a4cd 100644 --- a/src/views/setting/company/save.vue +++ b/src/views/setting/company/save.vue @@ -1,9 +1,17 @@