157578146@qq.com 2 years ago
parent
commit
e755d2d414
  1. 6
      src/pages/article/article_category.vue
  2. 6
      src/pages/collection/merge.vue
  3. 24
      src/pages/index/index.vue
  4. 2
      src/router/modules/capital.js
  5. 2
      src/router/modules/collection.js
  6. 2
      src/router/modules/digital.js
  7. 1
      src/utils/modalForm.js

6
src/pages/article/article_category.vue

@ -125,7 +125,7 @@
} }
}, },
computed: { computed: {
...mapState('admin/layout', [ ...mapState('store/layout', [
'isMobile' 'isMobile'
]), ]),
labelWidth () { labelWidth () {
@ -136,10 +136,10 @@
} }
}, },
mounted () { mounted () {
this.getList(); // this.getList();
}, },
methods: { methods: {
...mapMutations('admin/userLevel', [ ...mapMutations('store/userLevel', [
'getCategoryId' 'getCategoryId'
]), ]),
// //

6
src/pages/collection/merge.vue

@ -603,9 +603,9 @@
export default { export default {
name: "merge", name: "merge",
computed: { computed: {
...mapState('admin/layout', [ // ...mapState('admin/layout', [
'isMobile' // 'isMobile'
]), // ]),
labelWidth () { labelWidth () {
return this.isMobile ? undefined : 80; return this.isMobile ? undefined : 80;
}, },

24
src/pages/index/index.vue

@ -19,8 +19,7 @@
:label="item.val" :label="item.val"
v-for="(item, i) in fromList.fromTxt" v-for="(item, i) in fromList.fromTxt"
:key="i" :key="i"
>{{ item.text }}</Radio >{{ item.text }}</Radio>
>
</RadioGroup> </RadioGroup>
<DatePicker <DatePicker
:editable="false" :editable="false"
@ -192,19 +191,16 @@
return this.isMobile ? "top" : "left"; return this.isMobile ? "top" : "left";
}, },
}, },
created(){ // created(){
this.cardList() // this.cardList()
this.orderchart() // this.orderchart()
this.staff() // this.staff()
// },
// mounted() {
// this.$nextTick(function(){
// this.trends() // this.trends()
}, // })
mounted() { // },
this.$nextTick(function(){
// setTimeout(()=>{
this.trends()
// },2000)
})
},
methods:{ methods:{
int(){ int(){
this.cardList() this.cardList()

2
src/router/modules/capital.js

@ -13,7 +13,7 @@ const pre = 'capital_';
export default { export default {
path: '/store/finance/', path: '/store/finance/',
name: 'capital', name: pre,
header: 'capital', header: 'capital',
meta: { meta: {
// 授权标识 // 授权标识

2
src/router/modules/collection.js

@ -24,7 +24,7 @@ export default {
}, },
{ {
path: '/store/collection/list', path: '/store/collection/list',
name: `${pre}list`, name: `${pre}`,
meta: { meta: {
title: '合成管理', title: '合成管理',
auth: ['store-collection-list'] auth: ['store-collection-list']

2
src/router/modules/digital.js

@ -26,7 +26,7 @@ export default {
children: [ children: [
{ {
path: '/store/digital/index', path: '/store/digital/index',
name: `${pre}digital`, name: `${pre}`,
meta: { meta: {
title: '管理藏品', title: '管理藏品',
auth: ['store-digital-index'] auth: ['store-digital-index']

1
src/utils/modalForm.js

@ -42,6 +42,7 @@ export default function (formRequestPromise, { width = '700' } = { width: '700'
duration: 0 duration: 0
}); });
formRequestPromise.then(({ data }) => { formRequestPromise.then(({ data }) => {
if (data.status === false) { if (data.status === false) {
msg(); msg();
return Notice.warning({ return Notice.warning({

Loading…
Cancel
Save