From f15ad3456b47e43646234b9c91c3ddd77ab2cd02 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Wed, 05 Jun 2024 10:05:13 +0800
Subject: [PATCH] 123

---
 src/page/list/tradingList/data.list.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 8bce7d2..331917a 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -5,18 +5,18 @@
         <van-col span="8">
           <div>
             {{ $t("hj313") }}
-          </div></van-col
-        >
-        <van-col span="10"
-          ><div style="text-align: right">
+          </div>
+        </van-col>
+        <van-col span="10">
+          <div style="text-align: right">
             {{ $t("hj314") }}
-          </div></van-col
-        >
+          </div>
+        </van-col>
         <van-col span="6">
           <div style="text-align: right">
             {{ $t("hj315") }}
-          </div></van-col
-        >
+          </div>
+        </van-col>
       </van-row>
     </div>
 
@@ -24,6 +24,7 @@
       style="margin-bottom: 50px"
       v-model="loadings"
       :finished="finished"
+      :loading-text="$t('hj430')"
       :finished-text="$t('hj43')"
       @load="onLoads"
       :immediate-check="false"
@@ -120,6 +121,7 @@
       this.listArr = [];
       this.pageNumVal = 1;
       this.loadings = true;
+      this.getStock(e, this.zxactive, 1);
     },
     zxactive(e) {
       this.finished = false;
@@ -219,15 +221,23 @@
         data = await api.positionzx(opt);
       }
 
-      this.loadings = false;
       if (data.status === 0) {
-        // if (data.data.list.length < 15) {
-        this.finished = true;
-        // }
         if (pageNumVal !== 1) {
           this.listArr = [...this.listArr, ...data.data.list];
         } else {
-          this.listArr = data.data.list;
+          if (this.active) {
+            if (this.active === data.data.stockType) {
+              this.listArr = data.data.list;
+              this.loadings = false;
+              this.finished = true;
+            }
+          } else {
+            if (this.zxactive === data.data.stockType) {
+              this.listArr = data.data.list;
+              this.loadings = false;
+              this.finished = true;
+            }
+          }
         }
       } else {
         this.finished = true;

--
Gitblit v1.9.3