diff --git a/admin/src/components/UploadImg/index.vue b/admin/src/components/UploadImg/index.vue index 62bd53d..a7d5c95 100644 --- a/admin/src/components/UploadImg/index.vue +++ b/admin/src/components/UploadImg/index.vue @@ -58,8 +58,8 @@ this.$message.error('只能选择图片'); return; } - if (file.size / 1024 / 1024 > 2) { - this.$message.error('大小不能超过 2MB'); + if (file.size / 1024 / 1024 > 10) { + this.$message.error('大小不能超过 10MB'); return; } item.url = window.URL.createObjectURL(file); diff --git a/pingan/src/components/UploadImg/index.vue b/pingan/src/components/UploadImg/index.vue index 62bd53d..a7d5c95 100644 --- a/pingan/src/components/UploadImg/index.vue +++ b/pingan/src/components/UploadImg/index.vue @@ -58,8 +58,8 @@ this.$message.error('只能选择图片'); return; } - if (file.size / 1024 / 1024 > 2) { - this.$message.error('大小不能超过 2MB'); + if (file.size / 1024 / 1024 > 10) { + this.$message.error('大小不能超过 10MB'); return; } item.url = window.URL.createObjectURL(file); diff --git a/pingan/src/views/user/cmmssn/components/user-search.vue b/pingan/src/views/user/cmmssn/components/user-search.vue index 6ff12c3..027cf65 100644 --- a/pingan/src/views/user/cmmssn/components/user-search.vue +++ b/pingan/src/views/user/cmmssn/components/user-search.vue @@ -11,13 +11,13 @@ @@ -44,9 +44,7 @@ data() { // 默认表单数据 const defaultWhere = { - username: '', - nickname: '', - sex: undefined + dateRange: '' }; return { // 表单数据 @@ -118,8 +116,7 @@ }, /* 重置 */ reset() { - this.where = { ...this.defaultWhere }; - this.search(); + this.where = {}; } } }; diff --git a/pingan/src/views/user/cmmssn/index.vue b/pingan/src/views/user/cmmssn/index.vue index 6d5b16b..2a69505 100644 --- a/pingan/src/views/user/cmmssn/index.vue +++ b/pingan/src/views/user/cmmssn/index.vue @@ -3,13 +3,13 @@ - 我的收入 - 团队收入 + 我的收入 + 团队收入
- ¥10000 + ¥{{ money }}
我的收入（元） @@ -22,7 +22,7 @@ ref="table" :columns="columns" :datasource="datasource" - cache-key="systemUserTable" + cache-key="userCmmssn" > @@ -73,13 +73,17 @@ showOverflowTooltip: true } ], - tabPosition: 'my' + tabPosition: '1', + money: 0 }; }, methods: { /* 表格数据源 */ - datasource({ page, limit, where, order }) { - return pageCmmssn({ ...where, ...order, page, limit }); + async datasource({ page, limit, where, order }) { + where.type = this.tabPosition; + const result = await pageCmmssn({ ...where, ...order, page, limit }); + this.money = result.money; + return result; }, /* 刷新表格 */ reload(where) { @@ -87,6 +91,7 @@ }, handleOptionChange() { console.log(this.tabPosition); + this.reload(); } } };