From a5f4dd223bd0fc3ef727891d68b830ef825e23ba Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Mon, 22 Apr 2024 15:20:16 +0800
Subject: [PATCH] Merge branch 'ziyouqishi' into api.essencefunds.com
---
src/page/list/favorites/data.list.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/page/list/favorites/data.list.vue b/src/page/list/favorites/data.list.vue
index e4852cc..b65558d 100644
--- a/src/page/list/favorites/data.list.vue
+++ b/src/page/list/favorites/data.list.vue
@@ -71,7 +71,7 @@
</van-col>
<van-col span="6">
<div style="text-align: right">
- <div class="xgsgType">
+ <div :class="item.type === 1 ? 'xgsgType' : 'xgpsType'">
<span class="price_color">
{{ item.type === 1 ? $t("hj45") : $t("新股配售") }}
</span>
@@ -102,21 +102,28 @@
<div class="shijian">
<div class="xgsj">
<div class="sjtlt">
- {{ shengouObj.type === 1 ? $t("hj59") : $t("配售时间") }}:
+ {{
+ shengouObj.type === 1 ? $t("申购开启时间") : $t("配售开启时间")
+ }}:
</div>
<div class="xgTime">
{{
- $moment(shengouObj.subscribeTime).format(
+ $moment(shengouObj.subscriptionTime).format(
"DD-MM-YYYY hh:mm:ss A"
)
}}
</div>
</div>
<div class="xgsj">
- <div class="sjtlt">{{ $t("hj60") }}:</div>
+ <div class="sjtlt">
+ {{
+ shengouObj.type === 1 ? $t("申购结束时间") : $t("配售结束时间")
+ }}:
+ <!-- {{ $t("hj60") }}: -->
+ </div>
<div class="xgTime">
{{
- $moment(shengouObj.subscriptionTime).format(
+ $moment(shengouObj.subscribeTime).format(
"DD-MM-YYYY hh:mm:ss A"
)
}}
@@ -321,7 +328,7 @@
-ms-flex-align: center;
align-items: center;
.sjtlt {
- width: 25%;
+ width: 33%;
margin-left: 0.4rem;
}
}
@@ -390,10 +397,18 @@
}
.xgsgType {
border-radius: 0.1rem;
- background-color: rgba(102, 204, 153, 0.1);
+ // background-color: rgba(102, 204, 153, 0.1);
border: 0.04rem solid #5ce398;
color: #5ce398;
text-align: center;
line-height: 35px;
}
+.xgpsType {
+ border-radius: 0.1rem;
+ // background-color: rgba(102, 204, 153, 0.1);
+ border: 0.04rem solid #ba33a5;
+ color: #ba33a5;
+ text-align: center;
+ line-height: 35px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3