fix

README.md

@@ -112,6 +112,7 @@ Copyright (c) 2017-present PanJiaChen
 -------- todo -----------
 
 - 后台前端富文本需要 px 转换 rem
+- 图片编辑增加字段
 - H5 补充幼儿园详情页、活动详情页。到时再看看怎么展示图片等图片吧。（H5 的详情页只是做基本信息展示 + 后面增加个导流下载 app 的（增加一个浮动弹框，打开腾讯应用宝的注册。上线后就有了））
 
 --- hold 暂时停滞 --------------

package.json

@@ -18,6 +18,7 @@
     "core-js": "3.6.5",
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
+    "moment": "^2.29.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",

src/api/cash/index.js

@@ -0,0 +1,4 @@
+import api from '@/utils/request';
+
+export const getPage = params =>
+	api.post(`/yxl-back-end/admin/cash/record/page`, params);

src/components/Upload.vue

@@ -119,6 +119,7 @@ export default {
         this.$emit('input', []);
         return false;
       }
+      console.log(file);
       const result =
         fileList.length > 0
           ? fileList.map(x => ({

src/main.js

@@ -28,6 +28,9 @@ import bus from './utils/bus';
 import DICT from '@/const/dictType';
 import TABLECOLSIZE from '@/const/tableColSize';
 
+// 时间
+import Moment from 'moment';
+
 Vue.prototype.$Bus = bus;
 Vue.prototype.$g_emit = (eventName, payload) => {
   bus.$emit(eventName, payload);
@@ -64,6 +67,8 @@ Vue.prototype.$success = message.success;
 Vue.prototype.$error = message.error;
 Vue.prototype.$warning = message.warning;
 
+Vue.prototype.$moment = Moment;
+
 // 数据字典搜索关键词
 Vue.prototype.$dict = DICT;
 

src/mixins/filterList.js

@@ -8,7 +8,7 @@ const filterList = (params = {}) => ({
       pagination: {
         page: 1,
         total: 0,
-        pageSize: 50
+        pageSize: 10
       },
       filter: {}, // 每次填写的过滤条件
       internalFilterObj: {}, // 必定的内置过滤条件

src/router/index.js

@@ -128,6 +128,15 @@ export const constantRoutes = [
           title: '资金明细'
           // icon: 'tree'
         }
+      },
+      {
+        path: 'CashDetail',
+        name: '用户资金明细',
+        component: () => import('@/views/financialManagement/cashDetail/index'),
+        meta: {
+          title: '用户资金明细'
+          // icon: 'tree'
+        }
       }
     ]
   },

src/views/financialManagement/cashDetail/index.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="">
+    <toolbar @on-filter="filterData" @on-reset="filterData" />
+
+    <base-table
+      class="m-10 bg-w p-20 br-10"
+      :columns="columns"
+      :items="items"
+      :pagination="pagination"
+      :page-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import toolbar from './toolbar';
+import mxFilterList from '@/mixins/filterList';
+import { getPage } from '@/api/cash';
+
+export default {
+  name: 'CashDetail',
+
+  components: { toolbar },
+
+  mixins: [
+    mxFilterList({
+      fetchList: getPage // 在下方data再声明一个 fetchList: iGetList 同等效果
+    })
+  ],
+
+  data() {
+    return {
+      columns: [
+        {
+          key: 'accountId',
+          name: '用户ID',
+          width: this.$col.m
+        },
+        {
+          key: 'scene',
+          name: '场景',
+          width: this.$col.b
+        },
+        {
+          key: 'displayText',
+          name: '用途',
+          minWidth: this.$col.b
+        },
+        {
+          key: 'createAt',
+          name: '时间',
+          width: this.$col.b
+        }
+      ]
+    };
+  }
+};
+</script>
+
+<style type="scss" scoped></style>

src/views/financialManagement/cashDetail/toolbar.vue

@@ -0,0 +1,23 @@
+<template>
+  <toolbar-container :fields="fields" v-on="$listeners" />
+</template>
+
+<script>
+export default {
+  name: 'CashDetailToolbar',
+
+  data() {
+    return {
+      fields: [
+        {
+          type: 'select',
+          name: 'displayText',
+          label: '用途'
+        }
+      ]
+    };
+  }
+};
+</script>
+
+<style type="scss" scoped></style>

src/views/photoManagement/eventsList/modal/ItemModal.vue

@@ -98,8 +98,8 @@ export default {
         brief: '',
         kindergartenId: '',
         eventTimeArr: [
-          new Date().format('yyyy-MM-dd hh:mm:ss'),
-          new Date().format('yyyy-MM-dd hh:mm:ss')
+          this.$moment(new Date()).format('yyyy-MM-dd HH:mm:ss'),
+          this.$moment(new Date()).format('yyyy-MM-dd HH:mm:ss')
         ],
         isShow: false,
         sort: 1

src/views/photoManagement/imageGoodsManagement/index.vue

@@ -24,7 +24,10 @@ export default {
 
   mixins: [
     mxFilterList({
-      fetchList: getPage // 在下方data再声明一个 fetchList: iGetList 同等效果
+      fetchList: getPage, // 在下方data再声明一个 fetchList: iGetList 同等效果
+      internalFilterObj: {
+        auditStatus: 1
+      }
     })
   ],