Merge branch 'feature/#base_management' into 'dev'

Feature/#base management

See merge request motive-power/yxl/yxl-web-admin-frontend!27

src/mixins/filterList.js

@@ -36,14 +36,11 @@ const filterList = (params = {}) => ({
       const inParams = {
         ...this.filter,
         ...this.internalFilterObj,
-        page: this.pagination.page,
-        size: this.pagination.pageSize
+        start: this.pagination.page,
+        limit: this.pagination.pageSize
       };
 
-      const { data, msg } = await this.apiList(inParams, {
-        limit: this.pagination.pageSize,
-        start: this.pagination.page
-      });
+      const { data, msg } = await this.apiList(inParams);
       if ('data' in data) {
         const items = data.data;
         if (items.length === 0 && this.pagination.page > 1) {

src/utils/request.js

@@ -315,8 +315,8 @@ const post = (url, data = {}, config) => {
         data,
         seq: config.seq,
         token: config.token,
-        limit: data.size,
-        start: data.page
+        limit: data.limit,
+        start: data.start
       },
       config
     )

src/views/photographerManagement/photoVerify/index.vue

@@ -26,10 +26,7 @@
     <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <div class="m-10 bg-w p-20 br-10">
-      <el-button
-        type="primary"
-        icon="el-icon-plus"
-        @click="$AliOssMultiModal()"
+      <el-button type="primary" icon="el-icon-plus" @click="$AliOssMultiModal()"
         >批量上传照片</el-button
       >
 
@@ -207,17 +204,14 @@ export default {
       const inParams = {
         ...this.filter,
         ...this.internalFilterObj,
-        page: this.pagination.page,
-        size: this.pagination.pageSize
+        start: this.pagination.page,
+        limit: this.pagination.pageSize
       };
 
-      const { data, msg } = await this.apiList(inParams, {
-        limit: this.pagination.pageSize,
-        start: this.pagination.page
-      });
+      const { data, msg } = await this.apiList(inParams);
 
-      const res2 = await getCount(inParams)
-      this.statistics = res2.data
+      const res2 = await getCount(inParams);
+      this.statistics = res2.data;
       if ('data' in data) {
         const items = data.data;
         if (items.length === 0 && this.pagination.page > 1) {

src/views/photographerManagement/photographerVerify/index.vue

@@ -187,17 +187,14 @@ export default {
       const inParams = {
         ...this.filter,
         ...this.internalFilterObj,
-        page: this.pagination.page,
-        size: this.pagination.pageSize
+        start: this.pagination.page,
+        limit: this.pagination.pageSize
       };
 
-      const { data, msg } = await this.apiList(inParams, {
-        limit: this.pagination.pageSize,
-        start: this.pagination.page
-      });
+      const { data, msg } = await this.apiList(inParams);
 
-      const res2 = await getCount(inParams)
-      this.statistics = res2.data
+      const res2 = await getCount(inParams);
+      this.statistics = res2.data;
       if ('data' in data) {
         const items = data.data;
         if (items.length === 0 && this.pagination.page > 1) {

src/views/sceneManagement/sceneList/index.vue

@@ -26,7 +26,9 @@
     <toolbar @on-filter="filterData" @on-reset="filterData" />
 
     <div class="m-10 bg-w p-20 br-10">
-      <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
+        >新增</el-button
+      >
       <base-table
         :columns="columns"
         :items="items"
@@ -222,17 +224,14 @@ export default {
       const inParams = {
         ...this.filter,
         ...this.internalFilterObj,
-        page: this.pagination.page,
-        size: this.pagination.pageSize
-      };
-
-      const { data, msg } = await this.apiList(inParams, {
         limit: this.pagination.pageSize,
         start: this.pagination.page
-      });
+      };
+
+      const { data, msg } = await this.apiList(inParams);
 
-      const res2 = await getCount(inParams)
-      this.statistics = res2.data
+      const res2 = await getCount(inParams);
+      this.statistics = res2.data;
       if ('data' in data) {
         const items = data.data;
         if (items.length === 0 && this.pagination.page > 1) {

src/views/statistics/downloadImage/index.vue

@@ -134,7 +134,7 @@ export default {
           key: 'payablePrice',
           name: '花费金额/积分(还没折算)',
           width: this.$col.b,
-          render: (h,{row}) => h('span',`￥${row.payablePrice}`)
+          render: (h, { row }) => h('span', `￥${row.payablePrice}`)
         },
         {
           key: 'photoTime',
@@ -151,23 +151,20 @@ export default {
     };
   },
 
-  methods:{
+  methods: {
     async pageChange(page) {
       this.pagination.page = page;
       const inParams = {
         ...this.filter,
         ...this.internalFilterObj,
-        page: this.pagination.page,
-        size: this.pagination.pageSize
-      };
-
-      const { data, msg } = await this.apiList(inParams, {
         limit: this.pagination.pageSize,
         start: this.pagination.page
-      });
+      };
+
+      const { data, msg } = await this.apiList(inParams);
 
-      const res2 = await getDownloadCount(inParams)
-      this.statistics = res2.data
+      const res2 = await getDownloadCount(inParams);
+      this.statistics = res2.data;
       if ('data' in data) {
         const items = data.data;
         if (items.length === 0 && this.pagination.page > 1) {

src/views/statistics/uploadImage/index.vue

@@ -1,18 +1,23 @@
 <template>
   <div class="">
-    <div
-      class="m-10 bg-w p-20 br-10 f-sa-s">
+    <div class="m-10 bg-w p-20 br-10 f-sa-s">
       <div class="f-fs-c f-col">
         <div style="font-size: 16px;">总量</div>
-        <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.all}}</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.all }}
+        </div>
       </div>
       <div class="f-fs-c f-col">
         <div style="font-size: 16px;">月新增</div>
-        <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.month}}</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.month }}
+        </div>
       </div>
       <div class="f-fs-c f-col">
         <div style="font-size: 16px;">周新增</div>
-        <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.week}}</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.week }}
+        </div>
       </div>
     </div>
 
@@ -33,7 +38,6 @@ import toolbar from './toolbar';
 import mxFilterList from '@/mixins/filterList';
 import { getUploadPage, getUploadCount } from '@/api/statistics';
 
-
 export default {
   name: 'UploadImage',
 
@@ -83,33 +87,31 @@ export default {
           key: 'isTake',
           name: '总上传数',
           width: '140',
-          render:(h, {row}) => h('span', `${row.isTakeTrue+row.isTakeFalse}`)
+          render: (h, { row }) =>
+            h('span', `${row.isTakeTrue + row.isTakeFalse}`)
         },
         {
           key: 'createAt',
           name: '上传时间',
           minWidth: this.$col.b
-        },
+        }
       ]
     };
   },
-  methods:{
+  methods: {
     async pageChange(page) {
       this.pagination.page = page;
       const inParams = {
         ...this.filter,
         ...this.internalFilterObj,
-        page: this.pagination.page,
-        size: this.pagination.pageSize
+        start: this.pagination.page,
+        limit: this.pagination.pageSize
       };
 
-      const { data, msg } = await this.apiList(inParams, {
-        limit: this.pagination.pageSize,
-        start: this.pagination.page
-      });
+      const { data, msg } = await this.apiList(inParams);
 
-      const res2 = await getUploadCount(inParams)
-      this.statistics = res2.data
+      const res2 = await getUploadCount(inParams);
+      this.statistics = res2.data;
       if ('data' in data) {
         const items = data.data;
         if (items.length === 0 && this.pagination.page > 1) {

src/views/statistics/withdrawalRecord/index.vue

@@ -1,20 +1,25 @@
 <template>
   <div class="">
-    <div
-      class="m-10 bg-w p-20 br-10 f-sa-s">
-        <div class="f-fs-c f-col">
-          <div style="font-size: 16px;">总收入金额</div>
-          <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.sumPaidPrice}}</div>
+    <div class="m-10 bg-w p-20 br-10 f-sa-s">
+      <div class="f-fs-c f-col">
+        <div style="font-size: 16px;">总收入金额</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.sumPaidPrice }}
         </div>
-        <div class="f-fs-c f-col">
-          <div style="font-size: 16px;">成功提现金额</div>
-          <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.undrawnAmount}}</div>
+      </div>
+      <div class="f-fs-c f-col">
+        <div style="font-size: 16px;">成功提现金额</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.undrawnAmount }}
         </div>
-        <div class="f-fs-c f-col">
-          <div style="font-size: 16px;">未提现金额</div>
-          <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.withdrawalAmount}}</div>
+      </div>
+      <div class="f-fs-c f-col">
+        <div style="font-size: 16px;">未提现金额</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.withdrawalAmount }}
         </div>
       </div>
+    </div>
 
     <toolbar @on-filter="filterData" @on-reset="filterData" />
 
@@ -31,7 +36,7 @@
 <script>
 import toolbar from './toolbar';
 import mxFilterList from '@/mixins/filterList';
-import { getPage,getCount } from '@/api/statistics/withdrawalRecord';
+import { getPage, getCount } from '@/api/statistics/withdrawalRecord';
 
 export default {
   name: 'WithdrawalRecord',
@@ -159,22 +164,19 @@ export default {
     this.$g_off('withdrawal_record_reload', this.reload);
   },
 
-  methods:{
+  methods: {
     async pageChange(page) {
       this.pagination.page = page;
       const inParams = {
         ...this.filter,
         ...this.internalFilterObj,
-        page: this.pagination.page,
-        size: this.pagination.pageSize
+        start: this.pagination.page,
+        limit: this.pagination.pageSize
       };
 
-      const { data, msg } = await this.apiList(inParams, {
-        limit: this.pagination.pageSize,
-        start: this.pagination.page
-      });
-      const res2 = await getCount(inParams)
-      this.statistics = res2.data
+      const { data, msg } = await this.apiList(inParams);
+      const res2 = await getCount(inParams);
+      this.statistics = res2.data;
       if ('data' in data) {
         const items = data.data;
         if (items.length === 0 && this.pagination.page > 1) {
@@ -185,7 +187,7 @@ export default {
         }
         this.loadCallBack(data);
       }
-    },
+    }
   }
 };
 </script>

src/views/systemManagement/accountManagement/index.vue

@@ -1,18 +1,23 @@
 <template>
   <div class="">
-    <div
-      class="m-10 bg-w p-20 br-10 f-sa-s">
+    <div class="m-10 bg-w p-20 br-10 f-sa-s">
       <div class="f-fs-c f-col">
         <div style="font-size: 16px;">总量</div>
-        <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.all}}</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.all }}
+        </div>
       </div>
       <div class="f-fs-c f-col">
         <div style="font-size: 16px;">月新增</div>
-        <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.month}}</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.month }}
+        </div>
       </div>
       <div class="f-fs-c f-col">
         <div style="font-size: 16px;">周新增</div>
-        <div class="mt-4" style="font-weight: bold; font-size: 18px;">{{statistics.week}}</div>
+        <div class="mt-4" style="font-weight: bold; font-size: 18px;">
+          {{ statistics.week }}
+        </div>
       </div>
     </div>
 
@@ -125,23 +130,20 @@ export default {
       ]
     };
   },
-  methods:{
+  methods: {
     async pageChange(page) {
       this.pagination.page = page;
       const inParams = {
         ...this.filter,
         ...this.internalFilterObj,
-        page: this.pagination.page,
-        size: this.pagination.pageSize
+        start: this.pagination.page,
+        limit: this.pagination.pageSize
       };
 
-      const { data, msg } = await this.apiList(inParams, {
-        limit: this.pagination.pageSize,
-        start: this.pagination.page
-      });
+      const { data, msg } = await this.apiList(inParams);
 
-      const res2 = await getCount(inParams)
-      this.statistics = res2.data
+      const res2 = await getCount(inParams);
+      this.statistics = res2.data;
       if ('data' in data) {
         const items = data.data;
         if (items.length === 0 && this.pagination.page > 1) {