From 80a67f92faa04ac248d825f26895e2d37ef8e36f Mon Sep 17 00:00:00 2001
From: admin-lmm <2497833386@QQ.com>
Date: Wed, 30 Aug 2023 11:55:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E8=BD=BD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/financial/financeDetail.vue | 11 ++++++++---
 jsowell-ui/src/views/pile/merchant/index.vue     |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue
index df794979b..2a79b46aa 100644
--- a/jsowell-ui/src/views/financial/financeDetail.vue
+++ b/jsowell-ui/src/views/financial/financeDetail.vue
@@ -4,7 +4,7 @@
       <div class="header-txt">运营汇总</div>
       <el-button type="primary" @click="goAccount">开户信息</el-button>
     </div>
-    <div class="header">
+    <div class="header" v-loading="loading">
       <template v-if="operationStatus == null">
         <div class="foot1">
           <div style="margin: 12px 0">没有查询到结算账户</div>
@@ -317,7 +317,7 @@
       :visible.sync="dialogTableVisible"
       :before-close="orderClose"
     >
-      <el-table :data="orderList">
+      <el-table :data="orderList" v-loading="loading">
         <el-table-column property="orderCode" label="订单编号" />
         <el-table-column property="settleAmount" label="结算金额(元)" />
         <el-table-column property="clearingStatus" label="清分状态">
@@ -356,6 +356,7 @@ export default {
   dicts: ["bill_status"],
   data() {
     return {
+      loading: true,
       operationStatus: null,
       adapayMember: {},
       // 开启
@@ -407,12 +408,14 @@ export default {
     },
     selectAdapayMember() {
       console.log("this.merchantId", this.merchantId);
+      // this.loading = true;
       let param = {
         merchantId: this.merchantId,
       };
       selectAdapayMember(param).then((response) => {
         console.log("查询结算账户", response);
         this.operationStatus = response.data;
+        this.loading = false;
         // console.log("this.operationStatus", this.operationStatus.bankAcctType);
         // 商家性质：
         if (response.data != null) {
@@ -440,12 +443,15 @@ export default {
         this.adapayMember = response.data;
       });
     },
+    // 订单流水请求
     getOrderList() {
+      this.loading = true;
       console.log("this.getOrderParams", this.getOrderParams);
       getOrderReportDetail(this.getOrderParams).then((res) => {
         console.log("获取订单列表res", res);
         this.orderList = res.rows;
         this.orderTotal = res.total;
+        this.loading = false;
         // console.log("this.orderTotal", this.orderTotal);
       });
     },
@@ -531,7 +537,6 @@ export default {
       this.reportQueryParams.pageNum = 1;
       this.reportTotal = 0;
       this.getList();
-      // this.getOrderList();
     },
     defaultDate() {
       //字符串拼接，开始时间，结束时间
diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue
index 64be0dad2..fdaa79c2d 100644
--- a/jsowell-ui/src/views/pile/merchant/index.vue
+++ b/jsowell-ui/src/views/pile/merchant/index.vue
@@ -329,8 +329,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
   </div>