更新对账系统静态页面

src/router/index.js

@@ -68,6 +68,24 @@ const mainRoutes = {
       meta: { title: "财务中心", isTab: true }
     },
     {
+      path: "/paltBill",
+      component: _import("financeBill/paltBill"),
+      name: "paltBill",
+      meta: { title: "平台资金账单", isTab: true }
+    },
+    {
+      path: "/shopBill",
+      component: _import("financeBill/shopBill"),
+      name: "shopBill",
+      meta: { title: "商家对账", isTab: true }
+    },
+    {
+      path: "/riderBill",
+      component: _import("financeBill/riderBill"),
+      name: "riderBill",
+      meta: { title: "骑手对账", isTab: true }
+    },
+    {
       path: "/message",
       component: _import("message/message"),
       name: "message",
@@ -92,6 +110,12 @@ const mainRoutes = {
       meta: { title: "导出记录", isTab: true }
     },
     {
+      path: "/warnList",
+      component: _import("warnList/warnList"),
+      name: "warnList",
+      meta: { title: "系统警告", isTab: true }
+    },
+    {
       path: "/entryManagement",
       component: _import("entryManagement/entryManagement"),
       name: "entryManagement",

src/views/common/home.vue

@@ -245,12 +245,34 @@
               <div class="box">
                 <div class="box_num">
                   <div class="box_color">
+                    今日微信商户号实时金额
+                    <el-tooltip
+                      class="item"
+                      effect="dark"
+                      placement="top"
+                      content="(今日微信商户号实时金额)(按支付时间)"
+                      :open-delay="500"
+                    >
+                      <img class="help" src="~@/assets/img/help.png" alt="" />
+                    </el-tooltip>
+                  </div>
+                  <div class="text_color">
+                    <span>{{ taskStat.sumMoney ? taskStat.sumMoney : 0 }}</span
+                    >元
+                  </div>
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="6" class="cards">
+              <div class="box">
+                <div class="box_num">
+                  <div class="box_color">
                     订单总金额
                     <el-tooltip
                       class="item"
                       effect="dark"
                       placement="top"
-                      content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的已支付订单)(按支付时间)"
+                      content="(待接单+待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的已支付订单)(按支付时间)"
                       :open-delay="500"
                     >
                       <img class="help" src="~@/assets/img/help.png" alt="" />
@@ -272,7 +294,7 @@
                       class="item"
                       effect="dark"
                       placement="top"
-                      content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的已支付订单)(按支付时间)"
+                      content="(待接单+待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的已支付订单)(按支付时间)"
                       :open-delay="500"
                     >
                       <img class="help" src="~@/assets/img/help.png" alt="" />
@@ -297,7 +319,7 @@
                       class="item"
                       effect="dark"
                       placement="top"
-                      content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的到店已支付订单)(按支付时间)"
+                      content="(待接单+待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的到店已支付订单)(按支付时间)"
                       :open-delay="500"
                     >
                       <img class="help" src="~@/assets/img/help.png" alt="" />
@@ -321,7 +343,7 @@
                       class="item"
                       effect="dark"
                       placement="top"
-                      content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的外卖已支付订单)(按支付时间)"
+                      content="(待接单+待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的外卖已支付订单)(按支付时间)"
                       :open-delay="500"
                     >
                       <img class="help" src="~@/assets/img/help.png" alt="" />
@@ -346,7 +368,7 @@
                       class="item"
                       effect="dark"
                       placement="top"
-                      content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的到店已支付订单)(按支付时间)"
+                      content="(待接单+待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的到店已支付订单)(按支付时间)"
                       :open-delay="500"
                     >
                       <img class="help" src="~@/assets/img/help.png" alt="" />
@@ -371,7 +393,7 @@
                       class="item"
                       effect="dark"
                       placement="top"
-                      content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的外卖已支付订单)(按支付时间)"
+                      content="(待接单+待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的外卖已支付订单)(按支付时间)"
                       :open-delay="500"
                     >
                       <img class="help" src="~@/assets/img/help.png" alt="" />
@@ -396,7 +418,7 @@
                       class="item"
                       effect="dark"
                       placement="top"
-                      content="(已取消 状态的订单)(按订单创建时间)"
+                      content="(商家拒单+已取消 状态的订单)(按订单创建时间)"
                       :open-delay="500"
                     >
                       <img class="help" src="~@/assets/img/help.png" alt="" />
@@ -421,7 +443,7 @@
                       class="item"
                       effect="dark"
                       placement="top"
-                      content="(已取消 状态的订单)(按订单创建时间)"
+                      content="(商家拒单+已取消 状态的订单)(按订单创建时间)"
                       :open-delay="500"
                     >
                       <img class="help" src="~@/assets/img/help.png" alt="" />

src/views/finance/financeList.vue

@@ -72,7 +72,7 @@
           >  
         </div>
         <div style="margin:5px;display: inline-block;">
-          <span>开始时间：</span>
+          <span>申请开始时间：</span>
           <el-date-picker
             style="width: 160px;margin-left: 10px;"
             v-model="startTime"
@@ -86,7 +86,7 @@
           >&nbsp;&nbsp;&nbsp;
         </div>
         <div style="margin:5px;display: inline-block;">
-          <span>截止时间：</span>
+          <span>申请截止时间：</span>
           <el-date-picker
             style="width: 160px;margin-left: 10px;"
             v-model="endTime"

src/views/financeBill/paltBill.vue

@@ -0,0 +1,311 @@
+<template>
+  <div>
+    <div style="display: inline-block;">
+      <div style="margin:5px;display: inline-block;">
+        <span>开始时间：</span>
+        <el-date-picker
+          style="width: 220px;margin-left: 10px;"
+          v-model="startTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择开始时间"
+        >
+        </el-date-picker
+        >&nbsp;&nbsp;&nbsp;
+      </div>
+      <div style="margin:5px;display: inline-block;">
+        <span>截止时间：</span>
+        <el-date-picker
+          style="width: 220px;margin-left: 10px;"
+          v-model="endTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择截止时间"
+        >
+        </el-date-picker>
+      </div>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="select"
+        >查询
+      </el-button>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="warning"
+        icon="document"
+        @click="exportBtn"
+        >导出Excel
+      </el-button>
+    </div>
+    <el-table v-loading="tableDataLoading" :data="duanxinData.list">
+      <el-table-column fixed prop="complaintId" label="编号" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="fileName" label="日期" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="期初金额（元）" align="center">
+      </el-table-column>
+      <el-table-column
+        prop="exportId"
+        label="收入（元）"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="conditionDetail"
+        label="收入笔数"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.conditionDetail }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="平台抽成手续费" align="center">
+      </el-table-column>
+      <el-table-column
+        prop="fileSize"
+        label="商家提现（元）"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="sendFromShopName"
+        label="商家提现手续费"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column prop="updateTime" label="商家提现笔数" align="center">
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.updateTime }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="骑手提现（元）" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="骑手提现手续费" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="骑手提现笔数" align="center">
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.updateTime }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="退款金额" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="退款笔数" align="center">
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.updateTime }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="期末金额（元）" align="center">
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center;margin-top: 10px;">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="limit"
+        :current-page="page"
+        layout="total,sizes, prev, pager, next,jumper"
+        :total="duanxinData.totalCount"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      limit: 10,
+      page: 1,
+      activeName: "first",
+      tableDataLoading: false,
+      dialogFormVisible: false,
+      checkBoxData: [], //多选框选择的值
+
+      startTime: "",
+      endTime: "",
+      filename: "",
+      state: "",
+
+      statesnum2:[
+        {label:"待导出",value:0},
+        {label:"导出完成",value:1},
+        {label:"导出失败",value:2},
+      ],
+      duanxinData: []
+    };
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.limit = val;
+      this.dataSelect();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.dataSelect();
+    },
+    //处理默认选中当前日期
+    getNowTime1() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
+      var mm =
+        now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
+      var ss =
+        now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    getNowTime2() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    //处理默认选中当前日期
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth() - now.getMonth(); //得到月份
+      var date = now.getDate() - now.getDate() + 1; //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    // 查询
+    select() {
+      if(this.state==null){
+        this.state=''
+      }
+      this.page = 1;
+      this.limit = 10;
+      this.dataSelect();
+    },
+    // 重置
+    cleans() {
+      // this.filename = "";
+      this.state = "";
+      this.startTime = "";
+      this.endTime = "";
+      this.page = 1;
+      this.dataSelect();
+    },
+    refresh() {
+      this.dataSelect();
+    },
+    // 获取派单数据列表
+    dataSelect() {
+      console.log(this.state);
+      // if (this.endTime == '') {
+      // 	  this.endTime = this.info2.stockDate2
+      //   }
+      //   if (this.startTime == '') {
+      // 	  this.startTime = this.info.stockDate
+      //   }
+      this.tableDataLoading = true;
+      var userId = this.$cookie.get('userId')
+      this.$http({
+        url: this.$http.adornUrl("admin/export/listByUser"),
+        method: "get",
+        params: this.$http.adornParams({
+          curretPage: this.page,
+          pageSize: this.limit,
+          filename:'',// 文件名称
+          userId:userId,
+          state: this.state, //订单id
+          startTime: this.startTime, //开始时间
+          endTime: this.endTime, //结束时间
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.tableDataLoading = false;
+          let returnData = data.data;
+          this.duanxinData = returnData;
+          console.log(data.data,'导出文件列表');
+        }
+      });
+    },
+    // 下载文件
+    downFile(row){
+      var userId = this.$cookie.get('userId')
+      this.$http({
+        url: this.$http.adornUrl("admin/export/readBuffer"),
+        method: "get",
+        responseType: "blob",
+        params: this.$http.adornParams({
+          filename:row.fileName,// 文件名称
+          userId:userId,
+        })
+      }).then(({ data }) => {
+        console.log(data, "导出");
+        let blob = new Blob([data], {
+          type:
+            "application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        });
+        if (window.navigator.msSaveOrOpenBlob) {
+          navigator.msSaveBlob(blob);
+        } else {
+          let url = window.URL.createObjectURL(blob);
+          let elink = document.createElement("a");
+          elink.download = row.fileName;
+          elink.style.display = "none";
+          elink.href = url;
+          document.body.appendChild(elink);
+          elink.click();
+          document.body.removeChild(elink);
+        }
+      });
+    }
+  },
+  mounted() {
+    this.dataSelect();
+  },
+};
+</script>
+
+<style></style>

src/views/financeBill/riderBill.vue

@@ -0,0 +1,331 @@
+<template>
+  <div>
+    <div style="display: inline-block;">
+      <div style="margin:5px;display: inline-block;">
+        <span>开始时间：</span>
+        <el-date-picker
+          style="width: 220px;margin-left: 10px;"
+          v-model="startTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择开始时间"
+        >
+        </el-date-picker
+        >&nbsp;&nbsp;&nbsp;
+      </div>
+      <div style="margin:5px;display: inline-block;">
+        <span>截止时间：</span>
+        <el-date-picker
+          style="width: 220px;margin-left: 10px;"
+          v-model="endTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择截止时间"
+        >
+        </el-date-picker>
+      </div>
+      <div style="position: relative;display: inline-block;margin: 3px;">
+          <span>骑手所在站点:</span>
+          <el-select
+            @change="phoneSelect"
+            :clearable="true"
+            v-model="stationName"
+            placeholder="请选择骑手所在站点"
+          >
+            <el-option
+              :label="i.stationName"
+              :value="i.id"
+              :key="i.id"
+              v-for="i in stationData"
+            ></el-option> </el-select
+          >&nbsp;&nbsp;
+        </div>
+      <div style="position: relative;display: inline-block;margin: 3px;">
+        <span>骑手姓名:</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="phoneSelect"
+          placeholder="请输入骑手姓名"
+          v-model="phone"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <div style="position: relative;display: inline-block;margin: 3px;">
+        <span>骑手手机号:</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="phoneSelect"
+          placeholder="请输入骑手姓名"
+          v-model="phone"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="select"
+        >查询
+      </el-button>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="warning"
+        icon="document"
+        @click="exportBtn"
+        >导出Excel
+      </el-button>
+    </div>
+    <el-table v-loading="tableDataLoading" :data="duanxinData.list">
+      <el-table-column fixed prop="complaintId" label="编号" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="骑手姓名" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="骑手手机号" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="骑手所在站点" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="日期" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="期初金额（元）" align="center">
+      </el-table-column>
+      <el-table-column
+        prop="exportId"
+        label="收入（元）"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="conditionDetail"
+        label="收入笔数"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.conditionDetail }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="fileSize"
+        label="提现金额（元）"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="sendFromShopName"
+        label="提现手续费"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column prop="updateTime" label="提现笔数" align="center">
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.updateTime }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="期末金额（元）" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="赠送骑手余额（元）" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="总收益（元）" align="center">
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center;margin-top: 10px;">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="limit"
+        :current-page="page"
+        layout="total,sizes, prev, pager, next,jumper"
+        :total="duanxinData.totalCount"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      limit: 10,
+      page: 1,
+      activeName: "first",
+      tableDataLoading: false,
+      dialogFormVisible: false,
+      checkBoxData: [], //多选框选择的值
+
+      startTime: "",
+      endTime: "",
+      filename: "",
+      state: "",
+
+      statesnum2:[
+        {label:"待导出",value:0},
+        {label:"导出完成",value:1},
+        {label:"导出失败",value:2},
+      ],
+      duanxinData: []
+    };
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.limit = val;
+      this.dataSelect();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.dataSelect();
+    },
+    //处理默认选中当前日期
+    getNowTime1() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
+      var mm =
+        now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
+      var ss =
+        now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    getNowTime2() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    //处理默认选中当前日期
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth() - now.getMonth(); //得到月份
+      var date = now.getDate() - now.getDate() + 1; //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    // 查询
+    select() {
+      if(this.state==null){
+        this.state=''
+      }
+      this.page = 1;
+      this.limit = 10;
+      this.dataSelect();
+    },
+    // 重置
+    cleans() {
+      // this.filename = "";
+      this.state = "";
+      this.startTime = "";
+      this.endTime = "";
+      this.page = 1;
+      this.dataSelect();
+    },
+    refresh() {
+      this.dataSelect();
+    },
+    // 获取派单数据列表
+    dataSelect() {
+      console.log(this.state);
+      // if (this.endTime == '') {
+      // 	  this.endTime = this.info2.stockDate2
+      //   }
+      //   if (this.startTime == '') {
+      // 	  this.startTime = this.info.stockDate
+      //   }
+      this.tableDataLoading = true;
+      var userId = this.$cookie.get('userId')
+      this.$http({
+        url: this.$http.adornUrl("admin/export/listByUser"),
+        method: "get",
+        params: this.$http.adornParams({
+          curretPage: this.page,
+          pageSize: this.limit,
+          filename:'',// 文件名称
+          userId:userId,
+          state: this.state, //订单id
+          startTime: this.startTime, //开始时间
+          endTime: this.endTime, //结束时间
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.tableDataLoading = false;
+          let returnData = data.data;
+          this.duanxinData = returnData;
+          console.log(data.data,'导出文件列表');
+        }
+      });
+    },
+    // 下载文件
+    downFile(row){
+      var userId = this.$cookie.get('userId')
+      this.$http({
+        url: this.$http.adornUrl("admin/export/readBuffer"),
+        method: "get",
+        responseType: "blob",
+        params: this.$http.adornParams({
+          filename:row.fileName,// 文件名称
+          userId:userId,
+        })
+      }).then(({ data }) => {
+        console.log(data, "导出");
+        let blob = new Blob([data], {
+          type:
+            "application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        });
+        if (window.navigator.msSaveOrOpenBlob) {
+          navigator.msSaveBlob(blob);
+        } else {
+          let url = window.URL.createObjectURL(blob);
+          let elink = document.createElement("a");
+          elink.download = row.fileName;
+          elink.style.display = "none";
+          elink.href = url;
+          document.body.appendChild(elink);
+          elink.click();
+          document.body.removeChild(elink);
+        }
+      });
+    }
+  },
+  mounted() {
+    this.dataSelect();
+  },
+};
+</script>
+
+<style></style>

src/views/financeBill/shopBill.vue

@@ -0,0 +1,329 @@
+<template>
+  <div>
+    <div style="display: inline-block;">
+      <div style="margin:5px;display: inline-block;">
+        <span>开始时间：</span>
+        <el-date-picker
+          style="width: 220px;margin-left: 10px;"
+          v-model="startTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择开始时间"
+        >
+        </el-date-picker
+        >&nbsp;&nbsp;&nbsp;
+      </div>
+      <div style="margin:5px;display: inline-block;">
+        <span>截止时间：</span>
+        <el-date-picker
+          style="width: 220px;margin-left: 10px;"
+          v-model="endTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择截止时间"
+        >
+        </el-date-picker>
+      </div>
+      <div style="position: relative;display: inline-block;margin: 3px;">
+        <span>店铺名:</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="phoneSelect"
+          placeholder="请输入店铺名"
+          v-model="phone"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <div style="position: relative;display: inline-block;margin: 3px;">
+        <span>店铺手机号:</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="phoneSelect"
+          placeholder="请输入店铺手机号"
+          v-model="phone"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="select"
+        >查询
+      </el-button>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="warning"
+        icon="document"
+        @click="exportBtn"
+        >导出Excel
+      </el-button>
+    </div>
+    <el-table v-loading="tableDataLoading" :data="duanxinData.list">
+      <el-table-column fixed prop="complaintId" label="编号" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="店铺名" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="店铺手机号" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="日期" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="期初金额（元）" align="center">
+      </el-table-column>
+      <el-table-column
+        prop="exportId"
+        label="收入（元）"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="conditionDetail"
+        label="收入笔数"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.conditionDetail }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="平台抽成手续费" align="center">
+      </el-table-column>
+      <el-table-column
+        prop="fileSize"
+        label="提现金额（元）"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="sendFromShopName"
+        label="提现手续费"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column prop="updateTime" label="提现笔数" align="center">
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.updateTime }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" label="期末金额（元）" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="账户余额（元）" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="总收益（元）" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="用户实际付款（元）" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="退款金额（元）" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="退款笔数" align="center">
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click=""
+          >
+            {{ scope.row.updateTime }}
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center;margin-top: 10px;">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="limit"
+        :current-page="page"
+        layout="total,sizes, prev, pager, next,jumper"
+        :total="duanxinData.totalCount"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      limit: 10,
+      page: 1,
+      activeName: "first",
+      tableDataLoading: false,
+      dialogFormVisible: false,
+      checkBoxData: [], //多选框选择的值
+
+      startTime: "",
+      endTime: "",
+      filename: "",
+      state: "",
+
+      statesnum2:[
+        {label:"待导出",value:0},
+        {label:"导出完成",value:1},
+        {label:"导出失败",value:2},
+      ],
+      duanxinData: []
+    };
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.limit = val;
+      this.dataSelect();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.dataSelect();
+    },
+    //处理默认选中当前日期
+    getNowTime1() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
+      var mm =
+        now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
+      var ss =
+        now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    getNowTime2() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    //处理默认选中当前日期
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth() - now.getMonth(); //得到月份
+      var date = now.getDate() - now.getDate() + 1; //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    // 查询
+    select() {
+      if(this.state==null){
+        this.state=''
+      }
+      this.page = 1;
+      this.limit = 10;
+      this.dataSelect();
+    },
+    // 重置
+    cleans() {
+      // this.filename = "";
+      this.state = "";
+      this.startTime = "";
+      this.endTime = "";
+      this.page = 1;
+      this.dataSelect();
+    },
+    refresh() {
+      this.dataSelect();
+    },
+    // 获取派单数据列表
+    dataSelect() {
+      console.log(this.state);
+      // if (this.endTime == '') {
+      // 	  this.endTime = this.info2.stockDate2
+      //   }
+      //   if (this.startTime == '') {
+      // 	  this.startTime = this.info.stockDate
+      //   }
+      this.tableDataLoading = true;
+      var userId = this.$cookie.get('userId')
+      this.$http({
+        url: this.$http.adornUrl("admin/export/listByUser"),
+        method: "get",
+        params: this.$http.adornParams({
+          curretPage: this.page,
+          pageSize: this.limit,
+          filename:'',// 文件名称
+          userId:userId,
+          state: this.state, //订单id
+          startTime: this.startTime, //开始时间
+          endTime: this.endTime, //结束时间
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.tableDataLoading = false;
+          let returnData = data.data;
+          this.duanxinData = returnData;
+          console.log(data.data,'导出文件列表');
+        }
+      });
+    },
+    // 下载文件
+    downFile(row){
+      var userId = this.$cookie.get('userId')
+      this.$http({
+        url: this.$http.adornUrl("admin/export/readBuffer"),
+        method: "get",
+        responseType: "blob",
+        params: this.$http.adornParams({
+          filename:row.fileName,// 文件名称
+          userId:userId,
+        })
+      }).then(({ data }) => {
+        console.log(data, "导出");
+        let blob = new Blob([data], {
+          type:
+            "application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        });
+        if (window.navigator.msSaveOrOpenBlob) {
+          navigator.msSaveBlob(blob);
+        } else {
+          let url = window.URL.createObjectURL(blob);
+          let elink = document.createElement("a");
+          elink.download = row.fileName;
+          elink.style.display = "none";
+          elink.href = url;
+          document.body.appendChild(elink);
+          elink.click();
+          document.body.removeChild(elink);
+        }
+      });
+    }
+  },
+  mounted() {
+    this.dataSelect();
+  },
+};
+</script>
+
+<style></style>

src/views/main-navbar.vue

@@ -24,6 +24,11 @@
               controls hidden></audio>
           </template>
         </el-menu-item> -->
+        <el-menu-item index="9" style="position: relative;" @click="$router.push({ name: 'warnList' })">
+          <template slot="title">
+            <icon-svg name="yujin" class="el-icon-setting" style="font-size: 22px;"></icon-svg>
+          </template>
+        </el-menu-item>
         <el-menu-item index="10" style="position: relative;" @click="$router.push({ name: 'downList' })">
           <template slot="title">
             <icon-svg name="xiazai" class="el-icon-setting" style="font-size: 22px;"></icon-svg>

src/views/riderTop/riderTop.vue

@@ -91,6 +91,16 @@
 					<div>{{scope.$index+1}}</div>
 				</template> -->
       </el-table-column>
+      <el-table-column prop="nickName" label="骑手姓名" width="120">
+        <template slot-scope="scope">
+          <div
+            style="color: #4f9dec;cursor: pointer;"
+            @click="updatesvideo(scope.row)"
+          >
+            {{ scope.row.nickName ? scope.row.nickName : "未绑定" }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="nickName" label="骑手昵称" width="120">
         <template slot-scope="scope">
           <div
@@ -112,8 +122,22 @@
       <el-table-column prop="stationName" label="骑手所在地区">
       </el-table-column>
       <el-table-column prop="moneyOrder" label="总收益"> </el-table-column>
+      <el-table-column prop="moneyOrder" label="骑手余额"> </el-table-column>
       <!-- <el-table-column prop="createTime" label="创建时间" width="160">
 			</el-table-column> -->
+      <el-table-column label="操作" width="150" align="center">
+        <template slot-scope="scope" v-if="scope.row.flag==1">
+          <el-button
+            size="mini"
+            type="warn"
+            :disabled="!isAuth('riderTop:delete')"
+            @click="downFile(scope.row)"
+            style="margin: 5px;"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <div style="text-align: center;margin-top: 10px;">
       <el-pagination

src/views/runErrands/financeList.vue

@@ -34,6 +34,38 @@
             <icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
           </span>
         </div>
+        <div style="position: relative;display: inline-block;">
+          <span>骑手手机号：</span>
+          <el-input
+            style="width: 200px;"
+            @keydown.enter.native="phoneSelect"
+            placeholder="请输入骑手手机号"
+            v-model="zhifubaoName"
+          ></el-input
+          >&nbsp;&nbsp;&nbsp;
+          <span
+            @click="phoneSelect"
+            style="position: absolute;right: 18px;top:8px;"
+          >
+            <icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
+          </span>
+        </div>
+        <div style="position: relative;display: inline-block;">
+          <span>骑手名称：</span>
+          <el-input
+            style="width: 200px;"
+            @keydown.enter.native="phoneSelect"
+            placeholder="请输入骑手名称"
+            v-model="zhifubaoName"
+          ></el-input
+          >&nbsp;&nbsp;&nbsp;
+          <span
+            @click="phoneSelect"
+            style="position: absolute;right: 18px;top:8px;"
+          >
+            <icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
+          </span>
+        </div>
         <!-- <div style="margin:2% 0;display: inline-block;">
 					<span>手机号:</span>
 					<el-input style="width: 150px;" @keydown.enter.native="phoneSelect" clearable placeholder="请输入手机号"
@@ -56,7 +88,7 @@
           >&nbsp;&nbsp;&nbsp;
         </div>
         <div style="margin:5px;display: inline-block;">
-          <span>开始时间：</span>
+          <span>申请开始时间：</span>
           <el-date-picker
             style="width: 160px;margin-left: 10px;"
             v-model="startTime"
@@ -70,7 +102,7 @@
           >&nbsp;&nbsp;&nbsp;
         </div>
         <div style="margin:5px;display: inline-block;">
-          <span>截止时间：</span>
+          <span>申请截止时间：</span>
           <el-date-picker
             style="width: 160px;margin-left: 10px;"
             v-model="endTime"

src/views/warnList/warnList.vue

@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <el-table v-loading="tableDataLoading" :data="duanxinData.list">
+      <el-table-column fixed prop="complaintId" label="编号" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="fileName" label="消息标题" align="center">
+      </el-table-column>
+      <el-table-column prop="fileName" label="消息内容" align="center">
+      </el-table-column>
+      <el-table-column prop="updateTime" label="创建时间" align="center">
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center;margin-top: 10px;">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="limit"
+        :current-page="page"
+        layout="total,sizes, prev, pager, next,jumper"
+        :total="duanxinData.totalCount"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      limit: 10,
+      page: 1,
+      tableDataLoading: false,
+
+      startTime: "",
+      endTime: "",
+      filename: "",
+
+      duanxinData: []
+    };
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.limit = val;
+      this.dataSelect();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.dataSelect();
+    },
+    refresh() {
+      this.dataSelect();
+    },
+    // 获取派单数据列表
+    dataSelect() {
+      // if (this.endTime == '') {
+      // 	  this.endTime = this.info2.stockDate2
+      //   }
+      //   if (this.startTime == '') {
+      // 	  this.startTime = this.info.stockDate
+      //   }
+      this.tableDataLoading = true;
+      var userId = this.$cookie.get('userId')
+      this.$http({
+        url: this.$http.adornUrl("admin/export/listByUser"),
+        method: "get",
+        params: this.$http.adornParams({
+          curretPage: this.page,
+          pageSize: this.limit,
+          filename:'',// 文件名称
+          userId:userId,
+          state: this.state, //订单id
+          startTime: this.startTime, //开始时间
+          endTime: this.endTime, //结束时间
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.tableDataLoading = false;
+          let returnData = data.data;
+          this.duanxinData = returnData;
+          console.log(data.data,'导出文件列表');
+        }
+      });
+    },
+  },
+  mounted() {
+    // this.dataSelect();
+  },
+};
+</script>
+
+<style></style>