From 1bf85462c60611d75c93721157735bf834f018b8 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Sat, 29 Jun 2024 13:53:13 +0800
Subject: [PATCH] 123

---
 src/page/list/tradingList/data.list.vue |  218 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 139 insertions(+), 79 deletions(-)

diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 5fd2a73..7bb82fe 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -5,93 +5,94 @@
         <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>
-
-    <van-list
-      style="margin-bottom: 50px"
-      v-model="loadings"
-      :finished="finished"
-      :finished-text="$t('hj43')"
-      @load="onLoads"
-      :immediate-check="false"
-    >
-      <div
-        class="item"
-        @click="handleGoToKlineDetail1(item, index)"
-        v-for="(item, index) in listArr"
-        :key="item.indexCode"
-      >
-        <van-row type="flex" align="center" gutter="20">
-          <van-col span="8">
-            <div>
-              <div class="tp">
-                <span class="collection" @click="optionszx(item)">
-                  <span
-                    class="shu"
-                    :class="item.isOption == '1' ? 'shublue' : ''"
-                  ></span>
-                </span>
-                <span
-                  class="title_color"
-                  style="
+    <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
+      <van-list style="margin-bottom: 50px" v-model="loadings" :finished="finished" :finished-text="$t('hj43')"
+        :loading-text="$t('hj430')" @load="onLoads" :immediate-check="false">
+        <div class="item" @click="handleGoToKlineDetail1(item, index)" v-for="(item, index) in listArr"
+          :key="item.indexCode">
+          <van-row type="flex" align="center" gutter="20">
+            <van-col span="8">
+              <div>
+                <div class="tp">
+                  <div class="collection" @click="optionszx(item)">
+                    <div class="shu" :class="item.isOption == '1' ? 'shublue' : ''"></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;
-                  "
-                  >{{ item.name }}</span
-                >
+                    white-space: nowrap;
+                  ">
+                    {{ item.name }}
+                  </div>
+                </div>
+                <div class="bt">
+                  <span>{{ item.spell }}</span>
+                </div>
               </div>
-              <div class="bt">
-                <span>{{ item.spell }}</span>
-              </div>
-            </div></van-col
-          >
+            </van-col>
 
-          <van-col span="10">
-            <div style="text-align: right">
-              <div class="tp">
-                <span class="price_color">{{ item.nowPrice }}</span>
+            <van-col span="3">
+              <div style="text-align: right">
+                {{ item.gid }}
               </div>
-              <div class="bt">
-                <span>{{ item.addTime }}</span>
+            </van-col>
+
+            <van-col span="7">
+              <div style="text-align: right">
+                <div class="tp">
+                  <span class="price_color">
+                    {{ item.nowPrice | _toLocaleString(false) }}
+                  </span>
+                </div>
+                <div class="bt">
+                  <span>{{ item.addTime }}</span>
+                </div>
               </div>
-            </div>
-          </van-col>
-          <van-col span="6">
-            <div style="text-align: right">
-              <div
-                class="tp right_bs"
-                :class="`${item.color > 0 ? 'green' : 'red'}`"
-              >
-                <span class="price_color">{{ item.hcrateP }}</span>
+            </van-col>
+            <van-col span="6">
+              <div style="text-align: right">
+                <div class="tp right_bs" :class="`${item.color > 0 ? 'green' : 'red'}`">
+                  <span class="price_color">{{ item.hcrateP }}</span>
+                </div>
               </div>
-            </div>
-          </van-col>
-        </van-row>
-      </div>
-    </van-list>
+            </van-col>
+          </van-row>
+        </div>
+      </van-list>
+    </van-pull-refresh>
+
+    <dazy ref="dazy" />
   </div>
 </template>
 
 <script>
 import * as api from "@/axios/api";
 import handleDt from "@/utils/deTh";
+import dazy from "./dazy.vue";
+import { WhrWebSocket } from "@/utils/WhrWebSocket";
+
 export default {
+  components: { dazy },
   props: {
     active: {
       type: String,
@@ -144,6 +145,8 @@
       listArr: [],
       pageNumVal: 1,
       getInterval: null,
+      num: 1,
+      refreshing: false
     };
   },
 
@@ -151,9 +154,10 @@
     this.listArr = [];
     this.pageNumVal = 1;
     this.getStock(this.active, this.zxactive, 1);
-    this.getInterval = setInterval(() => {
-      this.getStock(this.active, this.zxactive, 1);
-    }, 5000);
+    this.initWebSocket()
+    // this.getInterval = setInterval(() => {
+    //   this.getStock(this.active, this.zxactive, 1);
+    // }, 5000);
   },
   methods: {
     filterSH(val) {
@@ -163,8 +167,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 || "",
@@ -198,12 +210,13 @@
         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;
       let opt = {
         pageNum: pageNumVal,
-        pageSize: 100,
+        pageSize: 20 * this.num,
         stockPlate: "",
         keyWords: this.sousuo,
         stockType: stockType,
@@ -228,13 +241,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;
+              }
             }
           }
         }
@@ -242,12 +261,49 @@
         this.finished = true;
       }
     }, 500),
-    onLoads() {
-      // this.pageNumVal++;
-      // this.loadings = true;
-      // this.getStock();
+
+    onRefresh() {
+      // 清空列表数据
+      this.finished = false;
+
+      // 重新加载数据
+      // 将 loading 设置为 true,表示处于加载状态
+      this.loading = true;
+      if (this.refreshing) {
+        // this.listArr = [];
+        this.refreshing = false;
+      }
+      this.getStock();
     },
-    optionszx() {},
+
+    initWebSocket() {
+      console.log('initWebSocket');
+      this.Trade = new WhrWebSocket({
+        path: `wss://ws.is4vc.com/websocket-server`,
+        onmessage: this.getTradeMessage,
+      });
+
+      this.Trade.init();
+    },
+    getTradeMessage({ data }) {
+      let result = JSON.parse(data)
+      let pid = result.pid
+      let userToUpdate = this.listArr.find(item => item.code == pid)
+      if (userToUpdate) {
+        // 更新对象数据
+        userToUpdate.nowPrice = result.last;
+        userToUpdate.hcrateP = result.pcp;
+      }
+    },
+
+    onLoads() {
+      console.log('onLoads');
+      // this.pageNumVal++;
+      this.loadings = true;
+      this.num += 1
+      this.getStock();
+    },
+    optionszx() { },
   },
   destroyed() {
     clearInterval(this.getInterval);
@@ -275,6 +331,7 @@
   // display: flex;
   // justify-content: space-between;
   border-bottom: 1px solid #f0f2f3;
+
   .right_bs {
     text-align: center;
     border-radius: 0.05333rem;
@@ -294,10 +351,12 @@
   .green {
     background-color: rgb(3, 173, 143);
   }
+
   .red {
     background-color: rgb(208, 75, 100);
   }
 }
+
 .center_price {
   font-style: normal;
   font-weight: 500;
@@ -309,6 +368,7 @@
   flex: 1;
   margin-right: 20px;
 }
+
 .title_color {
   font-style: normal;
   font-weight: 500;

--
Gitblit v1.9.3