diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index ec9d13eb..11dcb12c 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -18,11 +18,13 @@ Vue.use(Language); import PageTitle from './components/PageTitle.vue' import Loading from './components/Loading.vue' import AutoTip from './components/AutoTip.vue' +import TagInput from './components/TagInput.vue' import TableAction from './components/TableAction.vue' Vue.component('PageTitle', PageTitle); Vue.component('Loading', Loading); Vue.component('AutoTip', AutoTip); +Vue.component('TagInput', TagInput) Vue.component('TableAction', TableAction); diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index 3697a111..501e80fb 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -146,9 +146,9 @@ export default { complete: () => { this.loadIng--; }, - success: (res) => { + success: ({ret}) => { this.reCode(); - this.codeNeed = res.ret === 1; + this.codeNeed = ret === 1; } }) }, @@ -171,14 +171,14 @@ export default { complete: () => { this.loadIng--; }, - success: (res) => { - if (res.ret === 1) { - this.$store.commit('setUserInfo', res.data); + success: ({ret, data, msg}) => { + if (ret === 1) { + this.$store.commit('setUserInfo', data); // this.goNext(); } else { - $A.noticeError(res.msg); - if (res.data.code === 'need') { + $A.noticeError(msg); + if (data.code === 'need') { this.reCode(); this.codeNeed = true; } diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index d12dd5e8..3b2ed90f 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -20,15 +20,17 @@ - +
@@ -39,6 +41,40 @@
+ + + +
+ + + + + + + +
+ + {{item}} + +
+
+
+ +
+
+
+
+ + +
+
@@ -112,6 +148,9 @@ text-overflow: ellipsis; } &.menu-project { + display: flex; + flex-direction: column; + align-items: center; height: auto; padding: 14px 0 0; > ul { @@ -144,6 +183,11 @@ } } } + .common-loading { + margin: 6px; + width: 22px; + height: 22px; + } } &.active { background-color: #ffffff; @@ -189,24 +233,69 @@