From ee00a45f408636ca2507733cf26252fa5ee25d52 Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Thu, 25 Apr 2024 01:01:39 +0800
Subject: [PATCH] first

---
 src/page/list/tradingList/data.list.vue |   91 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 8bce7d2..7281e50 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -5,18 +5,23 @@
         <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="3">
+          <div style="text-align: right">
+            {{ $t("市场") }}
+          </div>
+        </van-col>
+        <van-col span="7">
+          <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>
 
@@ -25,6 +30,7 @@
       v-model="loadings"
       :finished="finished"
       :finished-text="$t('hj43')"
+      :loading-text="$t('hj430')"
       @load="onLoads"
       :immediate-check="false"
     >
@@ -38,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 }}</span>
+                <span class="price_color">
+                  {{ item.nowPrice | _toLocaleString(false) }}
+                </span>
               </div>
               <div class="bt">
                 <span>{{ item.addTime }}</span>
@@ -85,13 +99,18 @@
         </van-row>
       </div>
     </van-list>
+
+    <dazy ref="dazy" />
   </div>
 </template>
 
 <script>
 import * as api from "@/axios/api";
 import handleDt from "@/utils/deTh";
+import dazy from "./dazy.vue";
+
 export default {
+  components: { dazy },
   props: {
     active: {
       type: String,
@@ -120,6 +139,7 @@
       this.listArr = [];
       this.pageNumVal = 1;
       this.loadings = true;
+      this.getStock(e, this.zxactive, 1);
     },
     zxactive(e) {
       this.finished = false;
@@ -162,8 +182,16 @@
         return 0;
       }
     },
-    // 点击进入详情
+
     handleGoToKlineDetail1(item) {
+      // 如果是大宗交易。不需要进入详情
+      if (this.active === "DZ") {
+        this.$refs.dazy.currentItem = item;
+        this.$refs.dazy.show = true;
+        return;
+      }
+
+      // 点击进入详情
       const obj = {
         pid: item.code || "",
         type: item.stock_type || "",
@@ -197,6 +225,7 @@
         stockType = array[0].name;
       } else {
         let array = this.zxtabsList.filter((item) => item.key === b);
+        console.log(this.zxtabsList, b);
         stockType = array[0].name;
       }
       let pageNumVal = c || this.pageNumVal;
@@ -219,15 +248,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