Merge branch 'main' of https://gitea-inner.fontree.cn/scout666/fiee-official-website
This commit is contained in:
齐斌
commit
de8617321d
@ -99,7 +99,7 @@
|
||||
<div class="data-row">
|
||||
<span style="font-size: 18px" class="data-label"> Time </span>
|
||||
<span style="font-size: 18px" class="data-value">{{
|
||||
formattedDate
|
||||
formatted
|
||||
}}</span>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
@ -114,8 +114,9 @@
|
||||
<span style="font-size: 18px" class="data-label">{{
|
||||
$t("HOME.CONTAINY.STOCK_INFO.CHANGE")
|
||||
}}</span>
|
||||
<span style="font-size: 18px" class="data-value positive"
|
||||
>{{ stockQuote.change[0] }}{{ stockQuote.change[1] }}</span
|
||||
<span class="data-value positive"
|
||||
>{{ stockQuote.change?.[0] || "--" }}
|
||||
{{ stockQuote.change?.[1] || "--" }}</span
|
||||
>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
@ -199,45 +200,6 @@ const { getStockQuate, stockQuote, formatted } = useStockQuote();
|
||||
|
||||
getStockQuate();
|
||||
|
||||
const formatCustomDate = (dateString, timeZone = "EDT") => {
|
||||
// 尝试解析日期
|
||||
const date = new Date(dateString);
|
||||
|
||||
// 验证日期有效性
|
||||
if (isNaN(date.getTime())) {
|
||||
return "Invalid Date";
|
||||
}
|
||||
|
||||
// 从原始字符串提取 AM/PM
|
||||
const periodMatch = dateString.match(/(AM|PM)/i);
|
||||
const period = periodMatch ? periodMatch[0] : "AM"; // 默认 AM（如果没有匹配到）
|
||||
|
||||
// 提取小时和分钟（基于 Date 对象，避免时区影响）
|
||||
let hours = date.getHours();
|
||||
const minutes = date.getMinutes().toString().padStart(2, "0");
|
||||
|
||||
// 转换为 12 小时制
|
||||
let displayHours = hours % 12;
|
||||
displayHours = displayHours || 12; // 0 显示为 12
|
||||
|
||||
// 时间部分（如 2:44AM）
|
||||
const timePart = `${displayHours}:${minutes}${period}`;
|
||||
|
||||
// 日期部分（如 EDT 26/05/25）
|
||||
const day = date.getDate().toString().padStart(2, "0");
|
||||
const month = (date.getMonth() + 1).toString().padStart(2, "0");
|
||||
const year = date.getFullYear().toString(); // 取后两位
|
||||
|
||||
const datePart = `${timeZone} ${day}/${month}/${year}`;
|
||||
|
||||
// 组合最终结果
|
||||
return `As of ${timePart} ${datePart}`;
|
||||
};
|
||||
|
||||
// 示例数据
|
||||
const sampleDate = ref(formatted);
|
||||
const formattedDate = computed(() => formatCustomDate(sampleDate.value));
|
||||
|
||||
const { t: $t } = useI18n();
|
||||
const contentRef = ref(null);
|
||||
const isInView = ref(false);
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
<div class="stock-data">
|
||||
<div class="data-row">
|
||||
<span class="data-label"> Time </span>
|
||||
<span class="data-value">{{ formattedDate }}</span>
|
||||
<span class="data-value">{{ sampleDate }}</span>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
<span class="data-label">{{
|
||||
@ -110,7 +110,8 @@
|
||||
$t("HOME.CONTAINY.STOCK_INFO.CHANGE")
|
||||
}}</span>
|
||||
<span class="data-value positive"
|
||||
>{{ stockQuote.change[0] }}{{ stockQuote.change[1] }}</span
|
||||
>{{ stockQuote.change?.[0] || "--" }}
|
||||
{{ stockQuote.change?.[1] || "--" }}</span
|
||||
>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
@ -185,47 +186,9 @@ import { onMounted, ref, onUnmounted, computed } from "vue";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import { useStockQuote } from "@/store/stock-quote/index.js";
|
||||
const { getStockQuate, stockQuote, formatted } = useStockQuote();
|
||||
|
||||
getStockQuate();
|
||||
|
||||
const formatCustomDate = (dateString, timeZone = "EDT") => {
|
||||
// 尝试解析日期
|
||||
const date = new Date(dateString);
|
||||
|
||||
// 验证日期有效性
|
||||
if (isNaN(date.getTime())) {
|
||||
return "Invalid Date";
|
||||
}
|
||||
|
||||
// 从原始字符串提取 AM/PM
|
||||
const periodMatch = dateString.match(/(AM|PM)/i);
|
||||
const period = periodMatch ? periodMatch[0] : "AM"; // 默认 AM（如果没有匹配到）
|
||||
|
||||
// 提取小时和分钟（基于 Date 对象，避免时区影响）
|
||||
let hours = date.getHours();
|
||||
const minutes = date.getMinutes().toString().padStart(2, "0");
|
||||
|
||||
// 转换为 12 小时制
|
||||
let displayHours = hours % 12;
|
||||
displayHours = displayHours || 12; // 0 显示为 12
|
||||
|
||||
// 时间部分（如 2:44AM）
|
||||
const timePart = `${displayHours}:${minutes}${period}`;
|
||||
|
||||
// 日期部分（如 EDT 26/05/25）
|
||||
const day = date.getDate().toString().padStart(2, "0");
|
||||
const month = (date.getMonth() + 1).toString().padStart(2, "0");
|
||||
const year = date.getFullYear().toString(); // 取后两位
|
||||
|
||||
const datePart = `${timeZone} ${day}/${month}/${year}`;
|
||||
|
||||
// 组合最终结果
|
||||
return `As of ${timePart} ${datePart}`;
|
||||
};
|
||||
|
||||
// 示例数据
|
||||
const sampleDate = ref(formatted);
|
||||
const formattedDate = computed(() => formatCustomDate(sampleDate.value));
|
||||
|
||||
const { t: $t } = useI18n();
|
||||
const contentRef = ref(null);
|
||||
|
||||
@ -99,7 +99,7 @@
|
||||
<div class="data-row">
|
||||
<span style="font-size: 18px" class="data-label"> Time </span>
|
||||
<span style="font-size: 18px" class="data-value">{{
|
||||
formattedDate
|
||||
formatted
|
||||
}}</span>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
@ -114,8 +114,9 @@
|
||||
<span style="font-size: 18px" class="data-label">{{
|
||||
$t("HOME.CONTAINY.STOCK_INFO.CHANGE")
|
||||
}}</span>
|
||||
<span style="font-size: 18px" class="data-value positive"
|
||||
>{{ stockQuote.change[0] }}{{ stockQuote.change[1] }}</span
|
||||
<span class="data-value positive"
|
||||
>{{ stockQuote.change?.[0] || "--" }}
|
||||
{{ stockQuote.change?.[1] || "--" }}</span
|
||||
>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
@ -196,48 +197,7 @@ import { onMounted, ref, onUnmounted, computed } from "vue";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import { useStockQuote } from "@/store/stock-quote/index.js";
|
||||
const { getStockQuate, stockQuote, formatted } = useStockQuote();
|
||||
|
||||
getStockQuate();
|
||||
|
||||
const formatCustomDate = (dateString, timeZone = "EDT") => {
|
||||
// 尝试解析日期
|
||||
const date = new Date(dateString);
|
||||
|
||||
// 验证日期有效性
|
||||
if (isNaN(date.getTime())) {
|
||||
return "Invalid Date";
|
||||
}
|
||||
|
||||
// 从原始字符串提取 AM/PM
|
||||
const periodMatch = dateString.match(/(AM|PM)/i);
|
||||
const period = periodMatch ? periodMatch[0] : "AM"; // 默认 AM（如果没有匹配到）
|
||||
|
||||
// 提取小时和分钟（基于 Date 对象，避免时区影响）
|
||||
let hours = date.getHours();
|
||||
const minutes = date.getMinutes().toString().padStart(2, "0");
|
||||
|
||||
// 转换为 12 小时制
|
||||
let displayHours = hours % 12;
|
||||
displayHours = displayHours || 12; // 0 显示为 12
|
||||
|
||||
// 时间部分（如 2:44AM）
|
||||
const timePart = `${displayHours}:${minutes}${period}`;
|
||||
|
||||
// 日期部分（如 EDT 26/05/25）
|
||||
const day = date.getDate().toString().padStart(2, "0");
|
||||
const month = (date.getMonth() + 1).toString().padStart(2, "0");
|
||||
const year = date.getFullYear().toString(); // 取后两位
|
||||
|
||||
const datePart = `${timeZone} ${day}/${month}/${year}`;
|
||||
|
||||
// 组合最终结果
|
||||
return `As of ${timePart} ${datePart}`;
|
||||
};
|
||||
|
||||
// 示例数据
|
||||
const sampleDate = ref(formatted);
|
||||
const formattedDate = computed(() => formatCustomDate(sampleDate.value));
|
||||
|
||||
const { t: $t } = useI18n();
|
||||
const contentRef = ref(null);
|
||||
const isInView = ref(false);
|
||||
|
||||
@ -99,7 +99,7 @@
|
||||
<div class="data-row">
|
||||
<span style="font-size: 18px" class="data-label"> Time </span>
|
||||
<span style="font-size: 18px" class="data-value">{{
|
||||
formattedDate
|
||||
formatted
|
||||
}}</span>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
@ -114,8 +114,9 @@
|
||||
<span style="font-size: 18px" class="data-label">{{
|
||||
$t("HOME.CONTAINY.STOCK_INFO.CHANGE")
|
||||
}}</span>
|
||||
<span style="font-size: 18px" class="data-value positive"
|
||||
>{{ stockQuote.change[0] }}{{ stockQuote.change[1] }}</span
|
||||
<span class="data-value positive"
|
||||
>{{ stockQuote.change?.[0] || "--" }}
|
||||
{{ stockQuote.change?.[1] || "--" }}</span
|
||||
>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
@ -199,45 +200,6 @@ const { getStockQuate, stockQuote, formatted } = useStockQuote();
|
||||
|
||||
getStockQuate();
|
||||
|
||||
const formatCustomDate = (dateString, timeZone = "EDT") => {
|
||||
// 尝试解析日期
|
||||
const date = new Date(dateString);
|
||||
|
||||
// 验证日期有效性
|
||||
if (isNaN(date.getTime())) {
|
||||
return "Invalid Date";
|
||||
}
|
||||
|
||||
// 从原始字符串提取 AM/PM
|
||||
const periodMatch = dateString.match(/(AM|PM)/i);
|
||||
const period = periodMatch ? periodMatch[0] : "AM"; // 默认 AM（如果没有匹配到）
|
||||
|
||||
// 提取小时和分钟（基于 Date 对象，避免时区影响）
|
||||
let hours = date.getHours();
|
||||
const minutes = date.getMinutes().toString().padStart(2, "0");
|
||||
|
||||
// 转换为 12 小时制
|
||||
let displayHours = hours % 12;
|
||||
displayHours = displayHours || 12; // 0 显示为 12
|
||||
|
||||
// 时间部分（如 2:44AM）
|
||||
const timePart = `${displayHours}:${minutes}${period}`;
|
||||
|
||||
// 日期部分（如 EDT 26/05/25）
|
||||
const day = date.getDate().toString().padStart(2, "0");
|
||||
const month = (date.getMonth() + 1).toString().padStart(2, "0");
|
||||
const year = date.getFullYear().toString(); // 取后两位
|
||||
|
||||
const datePart = `${timeZone} ${day}/${month}/${year}`;
|
||||
|
||||
// 组合最终结果
|
||||
return `As of ${timePart} ${datePart}`;
|
||||
};
|
||||
|
||||
// 示例数据
|
||||
const sampleDate = ref(formatted);
|
||||
const formattedDate = computed(() => formatCustomDate(sampleDate.value));
|
||||
|
||||
const { t: $t } = useI18n();
|
||||
const contentRef = ref(null);
|
||||
const isInView = ref(false);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user