From 9b7caf3240f9c9a10477e62f23b1f477916c8e92 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Wed, 26 Jun 2024 19:20:22 +0800
Subject: [PATCH] 123

---
 src/page/list/tradingList/data.list.vue |   60 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index e3e45d2..da4ef60 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -7,7 +7,12 @@
             {{ $t("hj313") }}
           </div>
         </van-col>
-        <van-col span="10">
+        <van-col span="3">
+          <div style="text-align: right">
+            {{ $t("市场") }}
+          </div>
+        </van-col>
+        <van-col span="7">
           <div style="text-align: right">
             {{ $t("hj314") }}
           </div>
@@ -39,34 +44,42 @@
           <van-col span="8">
             <div>
               <div class="tp">
-                <span class="collection" @click="optionszx(item)">
-                  <span
+                <div class="collection" @click="optionszx(item)">
+                  <div
                     class="shu"
                     :class="item.isOption == '1' ? 'shublue' : ''"
-                  ></span>
-                </span>
-                <span
+                  ></div>
+                </div>
+                <div
                   class="title_color"
                   style="
+                    width: 100%;
                     overflow: hidden;
-                    -webkit-line-clamp: 1;
                     text-overflow: ellipsis;
-                    display: -webkit-box;
-                    -webkit-box-orient: vertical;
+                    white-space: nowrap;
                   "
-                  >{{ item.name }}</span
                 >
+                  {{ item.name }}
+                </div>
               </div>
               <div class="bt">
                 <span>{{ item.spell }}</span>
               </div>
-            </div></van-col
-          >
+            </div>
+          </van-col>
 
-          <van-col span="10">
+          <van-col span="3">
+            <div style="text-align: right">
+              {{ item.gid }}
+            </div>
+          </van-col>
+
+          <van-col span="7">
             <div style="text-align: right">
               <div class="tp">
-                <span class="price_color">{{ item.nowPrice | _toString }}</span>
+                <span class="price_color">
+                  {{ item.nowPrice | _toLocaleString(false) }}
+                </span>
               </div>
               <div class="bt">
                 <span>{{ item.addTime }}</span>
@@ -150,6 +163,7 @@
       listArr: [],
       pageNumVal: 1,
       getInterval: null,
+      num: 1
     };
   },
 
@@ -218,7 +232,7 @@
       let pageNumVal = c || this.pageNumVal;
       let opt = {
         pageNum: pageNumVal,
-        pageSize: 100,
+        pageSize: 20*this.num,
         stockPlate: "",
         keyWords: this.sousuo,
         stockType: stockType,
@@ -243,13 +257,19 @@
             if (this.active === data.data.stockType) {
               this.listArr = data.data.list;
               this.loadings = false;
-              this.finished = true;
+              // this.finished = true;
+              if(this.listArr.length % 20 ){
+                this.finished = true;
+              }
             }
           } else {
             if (this.zxactive === data.data.stockType) {
               this.listArr = data.data.list;
               this.loadings = false;
-              this.finished = true;
+              // this.finished = true;
+              if(this.listArr.length % 20 ){
+                this.finished = true;
+              }
             }
           }
         }
@@ -258,9 +278,11 @@
       }
     }, 500),
     onLoads() {
+      console.log('onLoads');
       // this.pageNumVal++;
-      // this.loadings = true;
-      // this.getStock();
+      this.loadings = true;
+      this.num+=1
+      this.getStock();
     },
     optionszx() {},
   },

--
Gitblit v1.9.3