Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/pile/merchant/components/revenue.vue

@@ -97,7 +97,11 @@
       <el-table-column label="交易金额" align="center" prop="tradeAmount" />
       <el-table-column label="交易手续费" align="center" prop="tradeFee" />
     </el-table>
-    <el-dialog title="订单流水" :visible.sync="dialogTableVisible">
+    <el-dialog
+      title="订单流水"
+      :visible.sync="dialogTableVisible"
+      :before-close="orderClose"
+    >
       <el-table :data="orderList">
         <el-table-column property="orderCode" label="订单编号" />
         <el-table-column property="settleAmount" label="结算金额" />
@@ -161,6 +165,17 @@ export default {
     };
   },
   methods: {
+    orderClose(done) {
+      this.$confirm("确认关闭？")
+        .then((res) => {
+          done();
+          this.getOrderParams.pageNum = 1;
+          this.orderList = [];
+        })
+        .catch((err) => {
+          console.log("取消 err", err);
+        });
+    },
     getOrderList() {
       console.log("this.getOrderParams", this.getOrderParams);
       getOrderReportDetail(this.getOrderParams).then((res) => {