diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index c4cde2e..0465445 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -220,7 +220,6 @@ export default { height: 100%; background-image: url(../../../assets/img/login-bg.png); background-size: 100%; - .header { width: 100%; height: 60px; @@ -242,7 +241,6 @@ export default { } } } - /deep/ .main { position: absolute; left: 50%; diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue index a6c9192..faf2cc7 100644 --- a/src/pages/achievement/list/index.vue +++ b/src/pages/achievement/list/index.vue @@ -224,7 +224,7 @@ export default { this.getData(); }, disabledSelection(row, index) { // 禁用勾选 - if (row.isDel === 1) return false; + if (row.isDel == 0) return false; return true; }, entry(row) { // 成绩管理 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cb9fe06..a8811e4 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -66,7 +66,9 @@ export default { commit("SET_INFO", data); resolve(); } else { + console.log(res.message) util.errorMsg(res.message); + reject(res); } }).catch(error => { diff --git a/src/styles/common.scss b/src/styles/common.scss index 9330025..5dab496 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -189,6 +189,7 @@ .el-message { padding: 11px 20px; + top:1.2rem!important; .el-message__icon { font-size: 16px;