From bbaa7aed6790a03517a1bed831b0b63f9a683764 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 7 Jul 2023 09:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B4=A2=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/financial/components/cleanFinancial.vue       | 1 +
 jsowell-ui/src/views/financial/merchant.vue                 | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jsowell-ui/src/views/financial/components/cleanFinancial.vue b/jsowell-ui/src/views/financial/components/cleanFinancial.vue
index 2d322ed5b..ba698956c 100644
--- a/jsowell-ui/src/views/financial/components/cleanFinancial.vue
+++ b/jsowell-ui/src/views/financial/components/cleanFinancial.vue
@@ -171,6 +171,7 @@ export default {
             getMerchantOrderList(param).then((response) => {
                 console.log("getMerchantOrderList", response)
                 this.merchantOrderList = response.rows;
+                this.total = response.total;
             })
         }
     }
diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue
index 9bca450e7..3ef64aa81 100644
--- a/jsowell-ui/src/views/financial/merchant.vue
+++ b/jsowell-ui/src/views/financial/merchant.vue
@@ -167,7 +167,6 @@
                 </template>
             </el-table-column>
         </el-table>
-
         <pagination
             v-show="total > 0"
             :total="total"
@@ -176,6 +175,7 @@
             @pagination="getFinancialMerchantList"
         />
     </div>
+
 </template>
 
 <script>
@@ -244,8 +244,10 @@ export default {
         // 获取运营商列表
         getFinancialMerchantList() {
             getFinancialMerchantList().then((response) => {
-                console.log("merchantList", response)
+                console.log("response", response)
                 this.merchantList = response.rows;
+                console.log("response.total", response.total)
+                this.total = response.total;
             })
         },
         // 取消按钮