第一次正式提测版本，数据问题修复 -zzx

build/utils.js

@@ -47,7 +47,8 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
         use: loaders,
-        fallback: 'vue-style-loader'
+        fallback: 'vue-style-loader',
+        publicPath: '../../'            //解决ele小图标出不来问题
       })
     } else {
       return ['vue-style-loader'].concat(loaders)

config/dev.env.js

@@ -6,5 +6,5 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://192.168.110.241:9120/zs/channel/admin"'
   BASE_API: '"http://192.168.2.21:9120/zs/channel/admin"'
-  // BASE_API: '"https://channel.admin.dev.zonelife.cn"'
+  // BASE_API: '"http://channel.admin.dev.zonelife.cn/zs/channel/admin"'
 })

config/prod.env.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"https://admin-api.macrozheng.com"'
+  BASE_API: '"http://channel.admin.dev.zonelife.cn/zs/channel/admin"'
 }

src/api/distribution.js

@@ -117,3 +117,12 @@ export function updatePassword(data) {
     data:data
   })
 }
+
+// 结算记录列表
+export function financeList(params) {
+  return request({
+    url: "/ums/umsAdminUser/getSettleRecordList",
+    method: "get",
+    params: params,
+  });
+}

src/api/oss.js

@@ -3,9 +3,6 @@ export function policy(data) {
   return request({
     url:'/ums/fileCtl/upload',
     method:'post',
-    headers:{
-      "Content-Type":"multipart/form-data",
-    },
     data:data
   })
 }

src/components/Upload/uploadImg.vue

@@ -1,22 +1,22 @@
 <template>
     <div>
-            <!-- :on-change="uploadFile" -->
-            <el-upload :limit="limit" action accept="image/*" :on-change="uploadFile" list-type="picture-card"
-                :auto-upload="false" :file-list="fileList" :on-exceed="handleExceed"
-                :on-preview="handlePictureCardPreview" :on-remove="handleRemove" ref="upload" class="avatar-uploader"
-                :class="{ hide: showUpload }" :disabled="disabled">
-                <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog width="30%" :visible.sync="dialogVisible">
-                <img width="100%" :src="imgUrl.url" alt />
-            </el-dialog>
-            <!-- <Button text="上 传" type="add_u" style="margin-top: 10px;" @click.native="submitUpload"></Button> -->
+        <!-- :on-change="uploadFile" -->
+        <el-upload :limit="limit" action accept="image/*" :on-change="uploadFile" list-type="picture-card"
+            :auto-upload="false" :file-list="fileList" :on-exceed="handleExceed" :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove" ref="upload" class="avatar-uploader" :class="{ hide: showUpload }"
+            :disabled="disabled">
+            <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog width="30%" :visible.sync="dialogVisible" :modal="false">
+            <img width="100%" :src="imgUrl.url" alt />
+        </el-dialog>
+        <!-- <Button text="上 传" type="add_u" style="margin-top: 10px;" @click.native="submitUpload"></Button> -->
     </div>
 </template>
 
 <script>
 //引入上传图片接口
-  import {policy} from '@/api/oss'
+import { policy } from '@/api/oss'
 // import { uploadImg } from "@/api/public/api";
 export default {
     props: {
@@ -28,13 +28,13 @@ export default {
         return {
             showUpload: false, //控制limit最大值之后 关闭上传按钮
             dialogVisible: false, //查看图片弹出框
-            imgUrl: [], //上传图片后地址合集
+            imgUrl: {}, //上传图片后地址合集
         };
     },
     //监听上传图片的数组(为了处理修改时,自动渲染问题,和上传按钮消失问题);
     watch: {
         fileList(newName, oldName) {
-            if (newName.length == this.limit) this.showUpload = true;
+            if (newName.length == this.limit) this.showUpload = false;
             else this.showUpload = false;
         },
     },
@@ -42,13 +42,13 @@ export default {
         //文件列表移除文件时的函数
         handleRemove(file, fileList) {
             const index = this.fileList.findIndex((item) => item === file.uid);
-            this.imgUrl.splice(index, 1);
+            // this.imgUrl.splice();
             this.$emit("delUrl", this.imgUrl);
             if (fileList.length < this.limit) this.showUpload = false;
         },
         //点击文件列表中已上传的文件时的函数
         handlePictureCardPreview(file) {
-            this.imgUrl.url = file.url;
+            this.imgUrl = file;
             this.dialogVisible = true;
         },
         //这里是不需要直接上传而是通过按钮上传的方法
@@ -87,7 +87,7 @@ export default {
                 params.append("fileMut", file);
                 policy(params).then((res) => {
                     //这里返回的数据结构(根据自己返回结构进行修改)
-                    if (res.code ===200 ) {
+                    if (res.code === 200) {
                         this.$message.success("上传成功");
                         this.imgUrl = res.data;
                         //调用父组件的方法来传递图片参数

src/router/index.js

@@ -21,6 +21,18 @@ import Layout from '../views/layout/Layout'
 export const constantRouterMap = [
   {path: '/login', component: () => import('@/views/login/index'), hidden: true},
   {path: '/404', component: () => import('@/views/404'), hidden: true},
+  {
+    path: '',
+    component: Layout,
+    redirect: '/home',
+    meta: {title: '首页', icon: 'home'},
+    children: [{
+      path: 'home',
+      name: 'home',
+      component: () => import('@/views/home/index'),
+      meta: {title: '首页', icon: 'home'}
+    },] 
+  }
 
 ]
 
@@ -94,6 +106,12 @@ export const asyncRouterMap = [
       component: () => import('@/views/distribution/records/index'),
       meta: {title: '分销记录', icon: 'example'}
     },
+    {
+      path: 'finance',
+      name: 'finance',
+      component: () => import('@/views/distribution/finance/index'),
+      meta: {title: '结算记录', icon: 'marker'}
+    },
     {
       path: 'changePwd',
       name: 'changePwd',

src/styles/index.scss

@@ -1,8 +1,8 @@
-@import './variables.scss';
-@import './mixin.scss';
-@import './transition.scss';
-@import './element-ui.scss';
-@import './sidebar.scss';
+@use './variables.scss' as *;
+@use './mixin.scss' as *;
+@use './transition.scss' as *;
+@use './element-ui.scss' as *;
+@use './sidebar.scss' as *;
 
 body {
   -moz-osx-font-smoothing: grayscale;

src/styles/sidebar.scss

@@ -69,9 +69,9 @@
   .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
   .sidebar-container .el-submenu .el-menu-item {
     min-width: 180px !important;
-    background-color: $subMenuBg !important;
+    background-color:#1f2d3d !important;
     &:hover {
-      background-color: $menuHover !important;
+      background-color:#001528 !important;
     }
   }
   .el-menu--collapse .el-menu .el-submenu {

src/views/channel/info/index.vue

@@ -35,14 +35,22 @@
     <el-card class="operate-container" shadow="hover">
       <i class="el-icon-tickets"></i>
       <span>数据列表</span>
-      <el-button size="mini" class="btn-add" @click="handleAdd()" style="margin-left: 20px">添加</el-button>
+      <!-- <el-button size="mini" class="btn-add" @click="handleAdd()" style="margin-left: 20px">添加</el-button> -->
     </el-card>
     <div class="table-container">
       <el-table ref="adminTable" :data="list" style="width: 100%" v-loading="listLoading" border>
         <el-table-column label="渠道编号" width="100" align="center" prop="appId"></el-table-column>
         <el-table-column label="渠道名称" align="center" prop="ecName"></el-table-column>
-        <el-table-column label="联系人" align="center" prop="contactName"></el-table-column>
-        <el-table-column label="手机号" align="center" prop="contactPhone"></el-table-column>
+        <el-table-column label="联系人" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.contactName||'--' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="手机号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.contactPhone||'--' }}
+          </template>
+        </el-table-column>
         <el-table-column label="渠道服务费/元" width="160" align="center" prop="serviceMoney"></el-table-column>
         <el-table-column label="使用状态" width="160" align="center">
           <template slot-scope="scope">
@@ -50,10 +58,26 @@
             <el-tag type="danger" v-else>禁用</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="创建人" width="140" align="center" prop="createBy"></el-table-column>
-        <el-table-column label="创建时间" width="140" align="center" prop="createTime"></el-table-column>
-        <el-table-column label="更新人" width="140" align="center" prop="updateBy"></el-table-column>
-        <el-table-column label="更新时间" width="140" align="center" prop="updateTime"></el-table-column>
+        <el-table-column label="创建人" width="140" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.createBy||'--' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="140" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.createTime||'--' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" width="140" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.updateBy||'--' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="更新时间" width="140" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.updateTime||'--' }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="180" align="center">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" plain @click="handleUpdate(scope.$index, scope.row)">
@@ -110,13 +134,11 @@ const defaultListQuery = {
   endTime: ''
 };
 const defaultAdmin = {
-  id: null,
-  username: null,
-  password: null,
-  nickName: null,
-  email: null,
-  note: null,
-  status: 1,
+  appId: null,
+  ecName: null,
+  contactName: null,
+  contactPhone: null,
+  serviceMoney: null,
 };
 export default {
   name: "info",

src/views/channel/useCondition/index.vue

@@ -4,7 +4,7 @@
  * @Author: zzx
  * @Date: 2024-11-09 16:08:16
  * @LastEditors: zzx
- * @LastEditTime: 2024-11-19 16:08:16
+ * @LastEditTime: 2024-11-21 18:00:00   
 -->
 <template>
     <div class="app-container">
@@ -120,14 +120,14 @@
                         admin.totalPayable || "0"
                             }}</span></template>
                 </el-form-item>
-                <el-form-item label="本次上账金额/元：" prop="upAccount">
-                    <el-input v-model="admin.money" placeholder="请输入上账金额" type="text" :rows="5"
+                <el-form-item label="本次上账金额/元：" prop="money">
+                    <el-input v-model="admin.money" placeholder="请输入上账金额" type="number" :rows="5"
                         style="width: 250px"></el-input>
                     <el-checkbox v-if="!isEdit" v-model="admin.checked">负数</el-checkbox>
                 </el-form-item>
                 <el-form-item label="上传凭证：">
-                    <uploadImg :limit="2" :file-list="fileList" @getUrl="getUrl($event)" @delUrl="delUrl($event)"
-                        :disabled="false"></uploadImg>
+                    <uploadImg :limit="1" :file-list="fileList" @getUrl="getUrl($event)" @delUrl="delUrl($event)"
+                        :disabled="true"></uploadImg>
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
@@ -163,7 +163,7 @@ export default {
     data() {
         return {
             fileList: [],
-            upImg:'',
+            upImg: '',
             setQuery: {},
             date: "",
             isforbidden: false,
@@ -179,7 +179,7 @@ export default {
             allRoleList: [],
             allocAdminId: null,
             rules: {
-                upAccount: [{ required: true, message: "请输入金额", trigger: "blur" }],
+                money: [{ required: true, message: "请输入金额", trigger: "blur" }],
             },
         };
     },
@@ -209,10 +209,9 @@ export default {
     methods: {
         //函数
         getUrl(getUrl) {
-            this.upImgUrl = getUrl;
+            this.upImg = getUrl;
         },
         delUrl(getUrl) {
-            console.log(getUrl,'----删除')
         },
 
         // 启用
@@ -297,6 +296,8 @@ export default {
                             message: this.isEdit == true ? "上账成功！" : "结算成功！",
                             type: "success",
                         });
+                        this.fileList = [];
+                        this.$refs["adminForm"].resetFields();
                         this.dialogVisible = false;
                         this.getList();
                     } else {

src/views/distribution/finance/index.vue

@@ -0,0 +1,241 @@
+<!--
+ * @Descripttion: 分销记录
+ * @version: 1.0
+ * @Author: zzx
+ * @Date: 2024-11-09 16:08:16
+ * @LastEditors: zzx
+ * @LastEditTime: 2024-11-21 18:00:00
+-->
+<template>
+    <div class="app-container">
+        <el-card class="filter-container" shadow="hover">
+            <div>
+                <i class="el-icon-search"></i>
+                <span>筛选搜索</span>
+                <el-button style="float: right" type="primary" @click="handleSearchList()" size="small">
+                    查询搜索
+                </el-button>
+                <el-button style="float: right; margin-right: 15px" @click="handleResetSearch()" size="small">
+                    重置
+                </el-button>
+            </div>
+            <div style="margin-top: 15px">
+                <el-form :inline="true" :model="listQuery" size="mini" label-width="140px">
+                    <el-form-item label="结算状态：">
+                        <el-select v-model="listQuery.status" clearable placeholder="请选择">
+                            <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="结算时间：">
+                        <el-date-picker v-model="colseDate" size="mini" value-format="yyyy-MM-dd"
+                            class="item-width-350 ml10" type="datetimerange" range-separator="至"
+                            start-placeholder="开始日期" end-placeholder="结束日期">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="提现时间：">
+                        <el-date-picker v-model="txDate" size="mini" value-format="yyyy-MM-dd"
+                            class="item-width-350 ml10" type="datetimerange" range-separator="至"
+                            start-placeholder="开始日期" end-placeholder="结束日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </el-card>
+        <el-card class="operate-container" shadow="hover">
+            <div class="title">
+                <div class="titleContent">
+                    <i class="el-icon-tickets"></i>
+                    <span>数据列表</span>
+                </div>
+                <div>
+                    <el-button class="ml10" type="info" size="small" :loading="downloadLoading" icon="el-icon-printer"
+                        @click="exportAllExcel">导出</el-button>
+                </div>
+            </div>
+        </el-card>
+        <div class="table-container">
+            <el-table ref="adminTable" :data="list" style="width: 100%" v-loading="listLoading" border>
+                <el-table-column label="结算金额/元" align="center">
+                    <template slot-scope="scope">
+                    <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.money || '--' }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="结算状态" align="center">
+                    <template slot-scope="scope">
+                        <el-tag type="success" v-if="scope.row.status === 2">已结算</el-tag>
+                        <el-tag type="danger" v-else>待结算</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="提现时间" align="center" prop="withdrawTime"></el-table-column>
+                <el-table-column label="结算时间" align="center" prop="settleTime"></el-table-column>
+            </el-table>
+        </div>
+        <div class="pagination-container">
+            <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                layout="total, sizes,prev, pager, next,jumper" :current-page.sync="listQuery.pageNum"
+                :page-size="listQuery.pageSize" :page-sizes="[10, 15, 20]" :total="total">
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { financeList } from "@/api/distribution";
+import { formatDate } from "@/utils/date";
+import FileSaver from 'file-saver';
+import XLSX from 'xlsx';
+const defaultListQuery = {
+    pageNum: 1,
+    pageSize: 10,
+    status: null,
+    // startSettleTime: "",
+    // endSettleTime: "",
+    settleStartTime: "",
+    settleEndTime: "",
+    startWithdrawTime: "",
+    endWithdrawTime: "",
+};
+export default {
+    name: "finance",
+    data() {
+        return {
+            colseDate: '',
+            txDate: '',
+            downloadLoading: false,
+            listQuery: Object.assign({}, defaultListQuery),
+            list: null,
+            total: null,
+            listLoading: false,
+            options: [{
+                value: 1,
+                label: "待结算",
+            },
+            {
+                value: 2,
+                label: "已结算",
+            },
+            ],
+        };
+    },
+    watch: {
+        txDate(val) {
+            if (val) {
+                this.listQuery.startWithdrawTime = Date.parse(val[0]);
+                this.listQuery.endWithdrawTime = Date.parse(val[1]);
+            } else {
+                this.listQuery.startWithdrawTime = "";
+                this.listQuery.endWithdrawTime = "";
+            }
+        },
+        colseDate(val) {
+            if (val) {
+                // this.listQuery.startSettleTime = Date.parse(val[0]);
+                // this.listQuery.endSettleTime = Date.parse(val[1]);
+                this.listQuery.settleStartTime = Date.parse(val[0]);
+                this.listQuery.settleEndTime = Date.parse(val[1]);
+            } else {
+                // this.listQuery.startSettleTime = "";
+                // this.listQuery.endSettleTime = "";
+                this.listQuery.settleStartTime = "";
+                this.listQuery.settleEndTime = "";
+            }
+        },
+    },
+    created() {
+        this.getList();
+        if (this.$route) {
+            this.listQuery.adminUserId = this.$route.query.adminUserId
+        }
+    },
+    filters: {
+        formatDateTime(time) {
+            if (time == null || time === "") {
+                return "N/A";
+            }
+            let date = new Date(time);
+            return formatDate(date, "yyyy-MM-dd hh:mm:ss");
+        },
+    },
+    methods: {
+        // 跳转至记录列表
+        pushRecords(row) {
+            this.$router.push({
+                path: "/distribution/records",
+                query: {
+                    adminUserId: row.adminUserId,
+                },
+            });
+        },
+        // 导出
+        exportAllExcel() {
+            this.downloadLoading = true
+            const allData = [];
+            let query = JSON.parse(JSON.stringify(this.listQuery))
+            query.pageSize = this.total
+            query.page = 0
+            financeList(query).then(res => {
+                this.downloadLoading = false
+                if (res.code == 200) {
+                    allData.push(...res.data.list);
+                    this.exportExcel(allData);
+                }
+            });
+        },
+
+        // 导出数据处理
+        exportExcel(r) {
+            const data = r.map((item) => {
+                return {
+                    "结算金额/元": item.money,
+                    "结算状态": item.status == 2 ? "已结算" : "待结算",
+                    "提现时间": item.withdrawTime,
+                    "结算时间": item.settleTime,
+                }
+            })
+            const worksheet = XLSX.utils.json_to_sheet(data);
+            const workbook = { Sheets: { data: worksheet }, SheetNames: ['data'] };
+            const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+            const blob = new Blob([excelBuffer], { type: 'application/octet-stream' });
+            FileSaver.saveAs(blob, '结算记录表.xlsx');
+        },
+
+        handleResetSearch() {
+            this.listQuery = Object.assign({}, defaultListQuery);
+        },
+        handleSearchList() {
+            this.listQuery.pageNum = 1;
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.listQuery.pageNum = 1;
+            this.listQuery.pageSize = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.listQuery.pageNum = val;
+            this.getList();
+        },
+        getList() {
+            this.listLoading = true;
+            financeList(this.listQuery).then((response) => {
+                this.listLoading = false;
+                this.list = response.data.list;
+                this.total = response.data.total;
+            });
+        },
+    },
+};
+</script>
+<style scoped lang="scss">
+.title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.pushRecords {
+    color: #409EFF;
+    cursor: pointer;
+}
+</style>

src/views/distribution/statistics/index.vue

@@ -52,14 +52,16 @@
                 <el-table-column label="用户退款金额/元" align="center" prop="userRefundAllMoney"></el-table-column>
                 <el-table-column label="待结算佣金/元" align="center">
                     <template slot-scope="scope">
-                        <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.unSettleAccountMoney ||
-                            '0' }}</span>
+                        <!-- <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.unSettleAccountMoney ||
+                            '0' }}</span> -->
+                            {{scope.row.unSettleAccountMoney ||'0' }}
                     </template>
                 </el-table-column>
                 <el-table-column label="已结算佣金/元" align="center">
                     <template slot-scope="scope">
-                        <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.settleAccountMoney ||
-                            '0' }}</span>
+                        <!-- <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.settleAccountMoney ||
+                            '0' }}</span> -->
+                            {{scope.row.settleAccountMoney ||'0' }}
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" width="180" align="center">
@@ -147,14 +149,14 @@ export default {
     },
     methods: {
         // 跳转至记录列表
-        pushRecords(row) {
-            this.$router.push({
-                path: "/distribution/records",
-                query: {
-                    adminUserId: row.adminUserId,
-                },
-            });
-        },
+        // pushRecords(row) {
+        //     this.$router.push({
+        //         path: "/distribution/records",
+        //         query: {
+        //             adminUserId: row.adminUserId,
+        //         },
+        //     });
+        // },
         // 导出
         exportAllExcel() {
             this.downloadLoading = true

src/views/home/index.vue

@@ -1,309 +1,23 @@
 <template>
   <div class="app-container">
-    <div class="total-layout">
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <div class="total-frame">
-            <img :src="img_home_order" class="total-icon">
-            <div class="total-title">今日订单总数</div>
-            <div class="total-value">200</div>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="total-frame">
-            <img :src="img_home_today_amount" class="total-icon">
-            <div class="total-title">今日销售总额</div>
-            <div class="total-value">￥5000.00</div>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="total-frame">
-            <img :src="img_home_yesterday_amount" class="total-icon">
-            <div class="total-title">昨日销售总额</div>
-            <div class="total-value">￥5000.00</div>
-          </div>
-        </el-col>
-        <!--<el-col :span="6">-->
-          <!--<div class="total-frame">-->
-            <!--<svg-icon icon-class="total-week" class="total-icon">-->
-            <!--</svg-icon>-->
-            <!--<div class="total-title">近7天销售总额</div>-->
-            <!--<div class="total-value">￥50000.00</div>-->
-          <!--</div>-->
-        <!--</el-col>-->
-      </el-row>
-    </div>
-    <div class="un-handle-layout">
-      <div class="layout-title">待处理事务</div>
-      <div class="un-handle-content">
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">待付款订单</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">已完成订单</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">待确认收货订单</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">待发货订单</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">新缺货登记</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">待处理退款申请</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">已发货订单</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">待处理退货订单</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="un-handle-item">
-              <span class="font-medium">广告位即将到期</span>
-              <span style="float: right" class="color-danger">(10)</span>
-            </div>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <div class="overview-layout">
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <div class="out-border">
-            <div class="layout-title">商品总览</div>
-            <div style="padding: 40px">
-              <el-row>
-                <el-col :span="6" class="color-danger overview-item-value">100</el-col>
-                <el-col :span="6" class="color-danger overview-item-value">400</el-col>
-                <el-col :span="6" class="color-danger overview-item-value">50</el-col>
-                <el-col :span="6" class="color-danger overview-item-value">500</el-col>
-              </el-row>
-              <el-row class="font-medium">
-                <el-col :span="6" class="overview-item-title">已下架</el-col>
-                <el-col :span="6" class="overview-item-title">已上架</el-col>
-                <el-col :span="6" class="overview-item-title">库存紧张</el-col>
-                <el-col :span="6" class="overview-item-title">全部商品</el-col>
-              </el-row>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="out-border">
-            <div class="layout-title">用户总览</div>
-            <div style="padding: 40px">
-              <el-row>
-                <el-col :span="6" class="color-danger overview-item-value">100</el-col>
-                <el-col :span="6" class="color-danger overview-item-value">200</el-col>
-                <el-col :span="6" class="color-danger overview-item-value">1000</el-col>
-                <el-col :span="6" class="color-danger overview-item-value">5000</el-col>
-              </el-row>
-              <el-row class="font-medium">
-                <el-col :span="6" class="overview-item-title">今日新增</el-col>
-                <el-col :span="6" class="overview-item-title">昨日新增</el-col>
-                <el-col :span="6" class="overview-item-title">本月新增</el-col>
-                <el-col :span="6" class="overview-item-title">会员总数</el-col>
-              </el-row>
-            </div>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="statistics-layout">
-      <div class="layout-title">订单统计</div>
-      <el-row>
-        <el-col :span="4">
-          <div style="padding: 20px">
-            <div>
-              <div style="color: #909399;font-size: 14px">本月订单总数</div>
-              <div style="color: #606266;font-size: 24px;padding: 10px 0">10000</div>
-              <div>
-                <span class="color-success" style="font-size: 14px">+10%</span>
-                <span style="color: #C0C4CC;font-size: 14px">同比上月</span>
-              </div>
-            </div>
-            <div style="margin-top: 20px;">
-              <div style="color: #909399;font-size: 14px">本周订单总数</div>
-              <div style="color: #606266;font-size: 24px;padding: 10px 0">1000</div>
-              <div>
-                <span class="color-danger" style="font-size: 14px">-10%</span>
-                <span style="color: #C0C4CC;font-size: 14px">同比上周</span>
-              </div>
-            </div>
-            <div style="margin-top: 20px;">
-              <div style="color: #909399;font-size: 14px">本月销售总额</div>
-              <div style="color: #606266;font-size: 24px;padding: 10px 0">100000</div>
-              <div>
-                <span class="color-success" style="font-size: 14px">+10%</span>
-                <span style="color: #C0C4CC;font-size: 14px">同比上月</span>
-              </div>
-            </div>
-            <div style="margin-top: 20px;">
-              <div style="color: #909399;font-size: 14px">本周销售总额</div>
-              <div style="color: #606266;font-size: 24px;padding: 10px 0">50000</div>
-              <div>
-                <span class="color-danger" style="font-size: 14px">-10%</span>
-                <span style="color: #C0C4CC;font-size: 14px">同比上周</span>
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="20">
-          <div style="padding: 10px;border-left:1px solid #DCDFE6">
-            <el-date-picker
-              style="float: right;z-index: 1"
-              size="small"
-              v-model="orderCountDate"
-              type="daterange"
-              align="right"
-              unlink-panels
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="handleDateChange"
-              :picker-options="pickerOptions">
-            </el-date-picker>
-            <div>
-              <ve-line
-                :data="chartData"
-                :legend-visible="false"
-                :loading="loading"
-                :data-empty="dataEmpty"
-                :settings="chartSettings"></ve-line>
-            </div>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
+    <el-card class="filter-container" shadow="hover">
+      <span>欢迎使用中数电动，后续将在首页逐步添加入口、数据看板等功能</span>
+    </el-card>
   </div>
 </template>
 
 <script>
-  import {str2Date} from '@/utils/date';
-  import img_home_order from '@/assets/images/home_order.png';
-  import img_home_today_amount from '@/assets/images/home_today_amount.png';
-  import img_home_yesterday_amount from '@/assets/images/home_yesterday_amount.png';
-  const DATA_FROM_BACKEND = {
-    columns: ['date', 'orderCount','orderAmount'],
-    rows: [
-      {date: '2018-11-01', orderCount: 10, orderAmount: 1093},
-      {date: '2018-11-02', orderCount: 20, orderAmount: 2230},
-      {date: '2018-11-03', orderCount: 33, orderAmount: 3623},
-      {date: '2018-11-04', orderCount: 50, orderAmount: 6423},
-      {date: '2018-11-05', orderCount: 80, orderAmount: 8492},
-      {date: '2018-11-06', orderCount: 60, orderAmount: 6293},
-      {date: '2018-11-07', orderCount: 20, orderAmount: 2293},
-      {date: '2018-11-08', orderCount: 60, orderAmount: 6293},
-      {date: '2018-11-09', orderCount: 50, orderAmount: 5293},
-      {date: '2018-11-10', orderCount: 30, orderAmount: 3293},
-      {date: '2018-11-11', orderCount: 20, orderAmount: 2293},
-      {date: '2018-11-12', orderCount: 80, orderAmount: 8293},
-      {date: '2018-11-13', orderCount: 100, orderAmount: 10293},
-      {date: '2018-11-14', orderCount: 10, orderAmount: 1293},
-      {date: '2018-11-15', orderCount: 40, orderAmount: 4293}
-    ]
-  };
   export default {
     name: 'home',
     data() {
       return {
-        pickerOptions: {
-          shortcuts: [{
-            text: '最近一周',
-            onClick(picker) {
-              let start = new Date(2018,10,1);
-              const end = new Date(start.getTime() + 1000 * 60 * 60 * 24 * 7);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: '最近一月',
-            onClick(picker) {
-              let start = new Date(2018,10,1);
-              const end = new Date(start.getTime() + 1000 * 60 * 60 * 24 * 30);
-              picker.$emit('pick', [start, end]);
-            }
-          }]
-        },
-        orderCountDate: '',
-        chartSettings: {
-          xAxisType: 'time',
-          area:true,
-          axisSite: { right: ['orderAmount']},
-        labelMap: {'orderCount': '订单数量', 'orderAmount': '订单金额'}},
-        chartData: {
-          columns: [],
-          rows: []
-        },
-        loading: false,
-        dataEmpty: false,
-        img_home_order,
-        img_home_today_amount,
-        img_home_yesterday_amount
+
       }
     },
     created(){
-      this.initOrderCountDate();
-      this.getData();
     },
     methods:{
-      handleDateChange(){
-        this.getData();
-      },
-      initOrderCountDate(){
-        let start = new Date(2018,10,1);
-        const end = new Date(start.getTime() + 1000 * 60 * 60 * 24 * 7);
-        this.orderCountDate=[start,end];
-      },
-      getData(){
-        setTimeout(() => {
-          this.chartData = {
-            columns: ['date', 'orderCount','orderAmount'],
-            rows: []
-          };
-          for(let i=0;i<DATA_FROM_BACKEND.rows.length;i++){
-            let item=DATA_FROM_BACKEND.rows[i];
-            let currDate=str2Date(item.date);
-            let start=this.orderCountDate[0];
-            let end=this.orderCountDate[1];
-            if(currDate.getTime()>=start.getTime()&&currDate.getTime()<=end.getTime()){
-              this.chartData.rows.push(item);
-            }
-          }
-          this.dataEmpty = false;
-          this.loading = false
-        }, 1000)
-      }
+
     }
   }
 </script>

src/views/login/index.vue

@@ -110,7 +110,7 @@
               this.loading = false;
               setCookie("username",this.loginForm.username,15);
               setCookie("password",this.loginForm.password,15);
-              this.$router.push({path: '/distribution/userList'})
+              this.$router.push({path: '/'})
             }).catch(() => {
               this.loading = false
             })

src/views/ums/role/index.vue

@@ -96,7 +96,7 @@
         layout="total, sizes,prev, pager, next,jumper"
         :current-page.sync="listQuery.pageNum"
         :page-size="listQuery.pageSize"
-        :page-sizes="[5,10,15]"
+        :page-sizes="[10,15,20]"
         :total="total">
       </el-pagination>
     </div>
@@ -136,7 +136,7 @@
 
   const defaultListQuery = {
     pageNum: 1,
-    pageSize: 5,
+    pageSize: 10,
     keyword: null
   };
   const defaultRole = {