From 74bcf0374dad94d352b68f10e2e3d6e0ebc2c9dc Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Sun, 07 Apr 2024 12:32:13 +0800
Subject: [PATCH] 1
---
src/page/user/Warehouse/data.list.vue | 9 +++++----
src/eastmoney/HQData.js | 24 +++++++++---------------
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/eastmoney/HQData.js b/src/eastmoney/HQData.js
index 4dfc7da..5ab9adc 100644
--- a/src/eastmoney/HQData.js
+++ b/src/eastmoney/HQData.js
@@ -1650,14 +1650,11 @@
// hqChartData.name = data.name
const kLines = JSON.parse(window.localStorage.getItem("kLine"));
hqChartData.name = "123";
- // console.log('data.name', data.name)
- //
- // var yClose = data.preKPrice
+
var yClose = "";
console.log("recvData===data.name22", recvData, kLines);
recvData = JSON.parse(recvData);
-
if (kLines.type === "SZHB") {
recvData = recvData.data;
recvData.reverse();
@@ -1667,7 +1664,7 @@
// var today = new Date(strItem.t)
// var date = today.getFullYear() * 10000 + (today.getMonth() + 1) * 100 + today.getDate()
var date = moment.unix(strItem.id).format("YYYYMMDD");
- //
+ var time = moment.unix(strItem.id).format("HHmm");
var open = parseFloat(strItem.open);
var close = parseFloat(strItem.close);
var high = parseFloat(strItem.high);
@@ -1675,19 +1672,21 @@
var vol = parseFloat(strItem.vol) * 100;
var amount = parseFloat(Math.random() * 100 + "");
//
- var newItem = [date, yClose, open, high, low, close, vol, amount];
+ var newItem = [date, yClose, open, high, low, close, vol, amount, time];
hqChartData.data.push(newItem);
//
yClose = close;
}
- }else{
+ } else {
for (var i = 0; i < recvData.length; ++i) {
var strItem = recvData[i];
// var item = strItem.split(',')
// var today = new Date(strItem.t)
// var date = today.getFullYear() * 10000 + (today.getMonth() + 1) * 100 + today.getDate()
var date = moment.unix(strItem.t).format("YYYYMMDD");
+ var time = moment.unix(strItem.t).format("HHmm");
+
var open = parseFloat(strItem.o);
var close = parseFloat(strItem.c);
var high = parseFloat(strItem.h);
@@ -1695,14 +1694,14 @@
var vol = parseFloat(strItem.v) * 100;
var amount = parseFloat(Math.random() * 100 + "");
//
- var newItem = [date, yClose, open, high, low, close, vol, amount];
+ var newItem = [date, yClose, open, high, low, close, vol, amount, time];
hqChartData.data.push(newItem);
//
yClose = close;
}
}
-
+
if (option.Data.Self.IsDestroy === false) {
HQData.Log("[HQData.RecvHistoryData] hqchartData ", hqChartData);
callback(hqChartData);
@@ -1750,13 +1749,8 @@
for (var i = 0; i < data.klines.length; ++i) {
var strItem = data.klines[i];
var item = strItem.split(",");
- var today = new Date(Date.parse(item[0]));
- var date =
- today.getFullYear() * 10000 +
- (today.getMonth() + 1) * 100 +
- today.getDate();
- var time = today.getHours() * 100 + today.getMinutes();
+ var time = moment.unix(item[0]).format("HHmm");
var open = parseFloat(item[1]);
var close = parseFloat(item[2]);
var high = parseFloat(item[3]);
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 83176cb..ccab3fc 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -39,12 +39,13 @@
{{ item.profitAndLose }}
</div>
</div>
- </van-col
- >
+ </van-col>
<van-col span="8">
<div style="text-align: center">
<div class="sport-content-title2">{{ $t("hj141") }} (USD)</div>
- <div class="sport-content-text2">{{ item.profitAndLoseParent }}</div>
+ <div class="sport-content-text2">
+ {{ item.profitAndLoseParent }}
+ </div>
</div>
</van-col>
<van-col span="8">
@@ -112,7 +113,7 @@
<van-col span="12">
<div style="text-align: right">
<div class="sport-content-title2">{{ $t("訂單編號") }}</div>
- <div class="sport-content-text2">-{{ item.buyOrderId }}</div>
+ <div class="sport-content-text2">{{ item.buyOrderId }}</div>
</div>
</van-col>
</van-row>
--
Gitblit v1.9.3