From 44a1fd74d29b5386b6f7b5bdb1c04fb4c9e25f9c Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Thu, 24 Apr 2025 17:44:38 +0800
Subject: [PATCH] Merge branch 'master' of http://124.156.157.155:8060/r/gp/cakuns_st_app
---
src/page/list/tradingList/data.list.vue | 52 ++++++++++++++++------------------------------------
1 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 8aadde9..e0e5f29 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -22,19 +22,6 @@
{{ $t("hj315") }}
</div>
</van-col>
- <van-col span="6" v-if="active == 'ST'">
- <van-popover
- theme="dark"
- v-model="showPopover"
- trigger="click"
- :actions="actions"
- @select="onSelect"
- >
- <template #reference>
- <van-button type="primary">الترتيب</van-button>
- </template>
- </van-popover>
- </van-col>
</van-row>
</div>
<van-pull-refresh
@@ -59,7 +46,7 @@
:key="item.indexCode"
>
<van-row type="flex" align="center" gutter="20">
- <van-col span="8" style="padding-right: 0 !important;">
+ <van-col span="8">
<div>
<div class="tp">
<div class="collection" @click="optionszx(item)">
@@ -71,14 +58,13 @@
<div
class="title_color"
style="
- font-size: 14px;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
"
>
- {{ item.name || item.stockName }}
+ {{ item.st_name || item.stockName }}
</div>
</div>
<div class="bt">
@@ -109,7 +95,7 @@
<div style="text-align: right">
<div
class="tp right_bs"
- :class="`${item.hcrate > 0 ? 'green' : 'red'}`"
+ :class="`${item.hcrateP.charAt(0) == '+' ? 'green' : 'red'}`"
>
<span class="price_color">{{ item.hcrateP }}</span>
</div>
@@ -191,20 +177,13 @@
},
data() {
return {
- showPopover: false,
loadings: false,
finished: false,
listArr: [],
pageNumVal: 1,
getInterval: null,
num: 1,
- orderBy: '',
- refreshing: false,
- actions:[
- { text: 'ترتيب', zh: '升序', val: 'asc' },
- { text: 'التخفيض',zh:'降序' , val: 'desc'},
- { text: 'طبيعي' ,zh: '正常', val: ''},
- ]
+ refreshing: false
};
},
beforeDestroy() {
@@ -223,10 +202,6 @@
// }, 5000);
},
methods: {
- onSelect(action) {
- this.orderBy = (action.val);
- this.getStock(this.active, this.zxactive, 1);
- },
filterSH(val) {
if (val === "sh") {
return 1;
@@ -246,7 +221,8 @@
// 点击进入详情
const obj = {
pid: item.code || "",
- type: item.stock_type || ""
+ type: item.stock_type || "",
+ name: item.name || ""
};
window.localStorage.setItem("kLine", JSON.stringify(obj));
// return;
@@ -255,6 +231,7 @@
var ifZhishu = "0";
var ifUs =
item.stock_type === "us" ? "1" : item.stock_type === "hk" ? "2" : "";
+ console.log("td_item:", item);
this.$router.push({
path: "/kline",
query: {
@@ -289,7 +266,7 @@
stockPlate: "",
keyWords: this.sousuo,
stockType: stockType,
- orderBy: this.orderBy
+ orderBy: ""
};
// console.log();
@@ -303,13 +280,15 @@
} else if (a == "HJ") {
data = await api.getGoldCrudeOil();
- data.data.list = Object.entries(data.data).map(
- ([name, nowPrice]) => ({
+ data.data.list = Object.entries(data.data).map(([name, nowPrice]) => {
+ let nowPriceArr = Object.entries(nowPrice);
+ return {
name,
- nowPrice,
+ st_name: nowPriceArr[0][0],
+ nowPrice: nowPriceArr[0][1],
stock_type: "HJ"
- })
- );
+ };
+ });
} else {
//大宗
opt.stockType = "";
@@ -336,6 +315,7 @@
this.listArr = data.data.list;
this.loadings = false;
// this.finished = true;
+ console.log("listArr", this.listArr);
if (this.listArr.length % 20) {
this.finished = true;
}
--
Gitblit v1.9.3