From cbc0c07421dea612d811825c8d6c61f75667b2f0 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Tue, 16 Jul 2024 10:20:25 +0800
Subject: [PATCH] 123
---
src/page/list/tradingList/data.list.vue | 124 ++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 33 deletions(-)
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 7bb82fe..e64b4f8 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -12,71 +12,108 @@
{{ $t("市场") }}
</div>
</van-col>
- <van-col span="7">
+ <van-col :span="active == 'DZ' ? '12' : '7'">
<div style="text-align: right">
{{ $t("hj314") }}
</div>
</van-col>
- <van-col span="6">
+ <van-col span="6" v-if="active == 3">
<div style="text-align: right">
{{ $t("hj315") }}
</div>
</van-col>
</van-row>
</div>
- <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-pull-refresh
+ v-model="refreshing"
+ @refresh="onRefresh"
+ :loosing-text="$t('hj430')"
+ :pulling-text="$t('hj430')"
+ >
+ <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
+ class="shu"
+ :class="item.isOption == '1' ? 'shublue' : ''"
+ ></div>
</div>
- <div class="title_color" style="
- width: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- ">
- {{ item.name }}
+ <div
+ class="title_color"
+ style="
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ "
+ >
+ {{ item.name || item.stockName }}
</div>
</div>
<div class="bt">
- <span>{{ item.spell }}</span>
+ <span>{{ item.spell || item.stockSpell }}</span>
</div>
</div>
</van-col>
<van-col span="3">
<div style="text-align: right">
- {{ item.gid }}
+ {{ (item.gid || item.stockGid) == "nse" ? "NSE" : "BSE" }}
</div>
</van-col>
- <van-col span="7">
+ <van-col :span="active == 'DZ' ? '12' : '7'">
<div style="text-align: right">
<div class="tp">
<span class="price_color">
{{ item.nowPrice | _toLocaleString(false) }}
</span>
</div>
- <div class="bt">
+ <div class="bt" v-if="active != 'DZ'">
<span>{{ item.addTime }}</span>
</div>
</div>
</van-col>
- <van-col span="6">
+ <van-col span="6" v-if="active != 'DZ'">
<div style="text-align: right">
- <div class="tp right_bs" :class="`${item.color > 0 ? 'green' : 'red'}`">
+ <div
+ class="tp right_bs"
+ :class="`${item.color > 0 ? 'green' : 'red'}`"
+ >
<span class="price_color">{{ item.hcrateP }}</span>
</div>
</div>
</van-col>
</van-row>
+ <div class="box-a" v-if="active == 'DZ'">
+ <div class="box_a_left">
+ {{ $t("kpsj") }}:{{
+ $moment(item.startTime).format("DD-MM-YYYY hh:mm:ss A")
+ }}
+ </div>
+ <div class="box_a_right">
+ {{ $t("gbsj") }}:{{
+ $moment(item.endTime).format("DD-MM-YYYY hh:mm:ss A")
+ }}
+ </div>
+ </div>
</div>
</van-list>
</van-pull-refresh>
@@ -146,7 +183,7 @@
pageNumVal: 1,
getInterval: null,
num: 1,
- refreshing: false
+ refreshing: false,
};
},
@@ -154,7 +191,7 @@
this.listArr = [];
this.pageNumVal = 1;
this.getStock(this.active, this.zxactive, 1);
- this.initWebSocket()
+ this.initWebSocket();
// this.getInterval = setInterval(() => {
// this.getStock(this.active, this.zxactive, 1);
// }, 5000);
@@ -227,7 +264,14 @@
// api.positionzx;
let data;
if (a !== "") {
- data = await api.getStockByType(opt);
+ if (a == "IN") {
+ //印股
+ data = await api.getStockByType(opt);
+ } else {
+ //大宗
+ opt.stockType = "";
+ data = await api.stockgetDzList(opt);
+ }
} else {
// 自选
data = await api.positionzx(opt);
@@ -245,12 +289,19 @@
if (this.listArr.length % 20) {
this.finished = true;
}
+ } else {
+ this.listArr = data.data.list;
+ this.loadings = false;
+ // 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;
}
@@ -277,7 +328,7 @@
},
initWebSocket() {
- console.log('initWebSocket');
+ console.log("initWebSocket");
this.Trade = new WhrWebSocket({
path: `wss://ws.is4vc.com/websocket-server`,
onmessage: this.getTradeMessage,
@@ -286,9 +337,9 @@
this.Trade.init();
},
getTradeMessage({ data }) {
- let result = JSON.parse(data)
- let pid = result.pid
- let userToUpdate = this.listArr.find(item => item.code == pid)
+ let result = JSON.parse(data);
+ let pid = result.pid;
+ let userToUpdate = this.listArr.find((item) => item.code == pid);
if (userToUpdate) {
// 更新对象数据
userToUpdate.nowPrice = result.last;
@@ -297,13 +348,13 @@
},
onLoads() {
- console.log('onLoads');
+ console.log("onLoads");
// this.pageNumVal++;
this.loadings = true;
- this.num += 1
+ this.num += 1;
this.getStock();
},
- optionszx() { },
+ optionszx() {},
},
destroyed() {
clearInterval(this.getInterval);
@@ -313,8 +364,15 @@
</script>
<style lang="less" scoped>
+.box-a {
+ display: flex;
+ justify-content: space-between;
+ font-size: 14px;
+ margin-top: 10px;
+}
.list-data {
width: 100%;
+ height: 85vh;
background-color: #fff;
.header-box {
@@ -378,4 +436,4 @@
text-align: left;
color: #14181f;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3