最新

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);

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);

pingan/src/views/user/cmmssn/components/user-search.vue

@@ -11,13 +11,13 @@
         <el-form-item label="筛选日期:">
           <el-date-picker
             unlink-panels
-            v-model="dateRange"
+            v-model="where.dateRange"
             range-separator="-"
-            type="datetimerange"
+            type="daterange"
             end-placeholder="结束日期"
             start-placeholder="开始日期"
             :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd"
             class="ele-fluid"
           />
         </el-form-item>
@@ -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 = {};
       }
     }
   };

pingan/src/views/user/cmmssn/index.vue

@@ -3,13 +3,13 @@
     <el-card shadow="never">
       <el-row class="ele-text-center">
         <el-radio-group v-model="tabPosition" @change="handleOptionChange">
-          <el-radio-button label="my">我的收入</el-radio-button>
-          <el-radio-button label="team">团队收入</el-radio-button>
+          <el-radio-button label="1">我的收入</el-radio-button>
+          <el-radio-button label="2">团队收入</el-radio-button>
         </el-radio-group>
       </el-row>
       <el-row class="ele-text-center" style="font-size: 30px; padding: 20px">
         <div class="ele-text-danger">
-          <span>¥10000</span>
+          <span>¥{{ money }}</span>
         </div>
         <div>
           <span>我的收入（元）</span>
@@ -22,7 +22,7 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        cache-key="systemUserTable"
+        cache-key="userCmmssn"
       >
       </ele-pro-table>
     </el-card>
@@ -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();
       }
     }
   };