diff --git a/src/pages/article/add_article.vue b/src/pages/article/add_article.vue index f546446..beded26 100644 --- a/src/pages/article/add_article.vue +++ b/src/pages/article/add_article.vue @@ -140,7 +140,7 @@ - + diff --git a/src/pages/article/article_category.vue b/src/pages/article/article_category.vue index adb057b..60e0812 100644 --- a/src/pages/article/article_category.vue +++ b/src/pages/article/article_category.vue @@ -125,7 +125,7 @@ } }, computed: { - ...mapState('admin/layout', [ + ...mapState('store/layout', [ 'isMobile' ]), labelWidth () { @@ -136,10 +136,10 @@ } }, mounted () { - this.getList(); + // this.getList(); }, methods: { - ...mapMutations('admin/userLevel', [ + ...mapMutations('store/userLevel', [ 'getCategoryId' ]), // 添加 diff --git a/src/pages/collection/merge.vue b/src/pages/collection/merge.vue index 3607d94..f252673 100644 --- a/src/pages/collection/merge.vue +++ b/src/pages/collection/merge.vue @@ -603,9 +603,9 @@ export default { name: "merge", computed: { - ...mapState('admin/layout', [ - 'isMobile' - ]), + // ...mapState('admin/layout', [ + // 'isMobile' + // ]), labelWidth () { return this.isMobile ? undefined : 80; }, diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index de8eaa7..258ef00 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -19,8 +19,7 @@ :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i" - >{{ item.text }} + >{{ item.text }} { - this.trends() - // },2000) - }) - }, + // created(){ + // this.cardList() + // this.orderchart() + // this.staff() + // }, + // mounted() { + // this.$nextTick(function(){ + // this.trends() + // }) + // }, methods:{ int(){ this.cardList() diff --git a/src/router/modules/capital.js b/src/router/modules/capital.js index c4e49ea..70adea4 100644 --- a/src/router/modules/capital.js +++ b/src/router/modules/capital.js @@ -13,7 +13,7 @@ const pre = 'capital_'; export default { path: '/store/finance/', - name: 'capital', + name: pre, header: 'capital', meta: { // 授权标识 diff --git a/src/router/modules/collection.js b/src/router/modules/collection.js index f04e372..a76b3f7 100644 --- a/src/router/modules/collection.js +++ b/src/router/modules/collection.js @@ -24,7 +24,7 @@ export default { }, { path: '/store/collection/list', - name: `${pre}list`, + name: `${pre}`, meta: { title: '合成管理', auth: ['store-collection-list'] diff --git a/src/router/modules/digital.js b/src/router/modules/digital.js index c40e811..58a98fd 100644 --- a/src/router/modules/digital.js +++ b/src/router/modules/digital.js @@ -26,7 +26,7 @@ export default { children: [ { path: '/store/digital/index', - name: `${pre}digital`, + name: `${pre}`, meta: { title: '管理藏品', auth: ['store-digital-index'] diff --git a/src/utils/modalForm.js b/src/utils/modalForm.js index ee25969..5ea9b48 100644 --- a/src/utils/modalForm.js +++ b/src/utils/modalForm.js @@ -42,6 +42,7 @@ export default function (formRequestPromise, { width = '700' } = { width: '700' duration: 0 }); formRequestPromise.then(({ data }) => { + if (data.status === false) { msg(); return Notice.warning({ @@ -80,7 +81,7 @@ export default function (formRequestPromise, { width = '700' } = { width: '700' } } let flag = 0 - data.config.onSubmit = function (formData, $f) { + data.config.onSubmit = function (formData, $f) { $f.btn.loading(true); $f.btn.disabled(true); if(flag==0){