diff --git a/src/assets/img/search-white.png b/src/assets/img/search-white.png deleted file mode 100644 index 7d6f254..0000000 Binary files a/src/assets/img/search-white.png and /dev/null differ diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index c8c5112..9ecb8c9 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -115,8 +115,12 @@ export default { let mg = this.$route.query.mg if (mg && atob(decodeURI(mg)) === 'true') { this.showSetting = false + const userName = this.$route.query.userName + userName && this.setInfo({ + userName + }) } - // 如果登录了,并且非客户，才调用用户信息的接口（客户是没有用户信息的，也不能进入后台） + // 如果登录了,并且非客户，才调用用户信息的接口（客户是没有用户信息的，但是能进入后台） setTimeout(() => { this.token && !this.isCustomer && this.getUserInfo() }, 1000) @@ -125,6 +129,7 @@ export default { ...mapActions('user', [ 'setInfo', 'logout', 'setManager', 'setCustomer' ]), + // 获取个人信息 getUserInfo() { this.$get(this.api.userInfo).then(res => { let userInfo = res.userInfo ? res.userInfo : {} @@ -166,7 +171,8 @@ export default { query: { mg: btoa(true), schoolId: btoa(this.schoolId), - customer: btoa(this.isCustomer) + customer: btoa(this.isCustomer), + userName: this.userName } }) window.open(route.href) diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index 0113333..2713740 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -14,7 +14,7 @@ import util from '@/libs/util' export default { data() { return { - managerStr: this.$route.query.mg, + managerStr: this.$route.query.mg, // 判断是否在后台的标识，只有url上带了mg，并且mg的值为编码后的true，才算进入了后台 isManager: false, active: this.$route.path, defaultMenus: [], @@ -62,9 +62,8 @@ export default { }, mounted() { if (util.local.get(Setting.tokenKey)) {// 如果是登录状态 - setTimeout(() => { - this.isCustomer ? this.getPer() : this.initMenu() - }, 100) + this.getPer() + // 判断是否在后台，并且存到store里 if (this.managerStr && atob(decodeURI(this.managerStr)) === 'true') { this.isManager = true this.setManager(false) @@ -78,7 +77,7 @@ export default { 'setManager' ]), initMenu() { - if (this.isManager) {// 该值为true，则表示当前是在后台（是否是后台是通过url上面的managerStr来判断的） + if (this.isManager) {// 该值为true，则表示当前是在后台（是否是后台是通过url上面的mg来判断的） this.defaultMenus = this.managerMenus if (Setting.dynamicRoute) { let routes = this.routes @@ -106,6 +105,7 @@ export default { Setting.dynamicRoute && addRoutes(routes) this.initMenu() }).catch(err => { + // 被捕获了则显示默认菜单 this.menus = this.defaultMenus }) }, diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue index b4fb0a6..aaaa22e 100644 --- a/src/pages/data/list/index.vue +++ b/src/pages/data/list/index.vue @@ -113,8 +113,8 @@ @@ -549,6 +549,9 @@ export default { color: #3381d2; } } + &>.el-submenu>.el-menu{ + background-color: #FAFAFA !important; + } .el-submenu__title i{ font-size: 14px; } @@ -571,7 +574,7 @@ export default { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - .is-active{ + &.is-active{ color: #fff; background-color: #0070FF; } @@ -596,6 +599,9 @@ export default { } } } + /deep/.el-table__body tr.current-row > td{ + background-color: #daeaff; + } .desc{ padding: 9px 12px; margin: 20px 0 10px; diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 7070b0e..eddb39a 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -6,6 +6,7 @@
+
热门下载： @@ -296,6 +297,10 @@ export default { background-color: #fff; border-radius: 4px; overflow: hidden; + .icon-wrap{ + width: 20px; + margin: 0 20px; + } input{ flex: 1; padding-left: 15px; @@ -312,7 +317,7 @@ export default { } } .remove{ - margin: 0 20px; + margin-left: 20px; cursor: pointer; } } diff --git a/src/pages/setting/person/info.vue b/src/pages/setting/person/info.vue index 6885946..7d723e4 100644 --- a/src/pages/setting/person/info.vue +++ b/src/pages/setting/person/info.vue @@ -5,70 +5,54 @@
用户信息
@@ -135,36 +119,29 @@
账号信息
    -
    -
  • +
    +
  • -
    - -
    + + 更换
  • -
    - - 更换 -
    + + 更换
    • -
    +
  • -
    - - 更换 - 添加 -
    + + 更换 + 添加
  • -
    - - 更换 -
    + + 更换
@@ -229,6 +206,18 @@ 确 定 + + + + + + + + + 取 消 + 确 定 + +
@@ -337,7 +326,9 @@ export default { phoneCode: '', phoneDisabled: false, phoneTimer: null, - updateTime: 0 + updateTime: 0, + account: '', + accountVisible: false }; }, watch: { @@ -526,10 +517,13 @@ export default { this.concatArch() }, delArchive(i) { - const id = this.archivesList[i].personalFileId - id && this.$post(`${this.api.deleteProfile}?personalFileIds=${id}`).then(res => { + this.$confirm(`此操作不可逆，是否确认删除？`, '提示', { + type: 'warning' + }).then(() => { + const id = this.archivesList[i].personalFileId this.archivesList.splice(i, 1) - }).catch(err => {}) + id && this.$post(`${this.api.deleteProfile}?personalFileIds=${id}`).then(res => {}).catch(err => {}) + }).catch(() => {}) }, bindEmail() { this.email = this.form.email @@ -598,14 +592,6 @@ export default { this.archivesList[index].professionalClassName = '' this.archivesList[index].professionalId = '' this.archivesList[index].professionalName = '' - // this.archivesList.map(e =>{ - // if(e.disciplineId == item){ - // e.professionalClassId = '', - // e.professionalClassName = '', - // e.professionalId = '', - // e.professionalName = '' - // } - // }) }, getItemProfessionalClass(item,index){ this.clearItemClass(index) @@ -811,6 +797,18 @@ export default { this.phoneVisible = false }).catch(res => {}) }, + openAccount() { + this.account = this.form.account + this.accountVisible = true + }, + confirmAccount() { + if (this.account) { + this.form.account = this.account + this.accountVisible = false + } else { + util.errorMsg('请输入账号') + } + } } }; @@ -829,8 +827,17 @@ export default { .line{ display: flex; margin-bottom: 24px; - li{ - margin-right: 100px; + &.info li:not(.selects){ + width: 30%; + .el-input{ + flex: 1; + } + &:first-child{ + margin-right: 16%; + } + } + &.imp li{ + width: calc(30% + 36px) !important; } } li{ @@ -874,14 +881,14 @@ export default { } .archives{ position: relative; - padding: 16px 30px; + padding: 16px 0; margin-bottom: 6px; border-radius: 4px; background-color: #FAFAFA; .del{ position: absolute; top: 48px; - right: 55px; + right: 16px; cursor: pointer; } li{ diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue index e4ac98f..d5f133a 100644 --- a/src/pages/user/list/index.vue +++ b/src/pages/user/list/index.vue @@ -92,7 +92,7 @@