diff --git a/src/components/func/geetest.vue b/src/components/func/geetest.vue index 253d7744..4fbe9f66 100644 --- a/src/components/func/geetest.vue +++ b/src/components/func/geetest.vue @@ -107,7 +107,7 @@ defineExpose({ displayBox }); .geetest-overlay { position: fixed; - z-index: 999; + z-index: 100; top: 0; left: 0; display: flex; @@ -115,7 +115,7 @@ defineExpose({ displayBox }); height: 100%; align-items: center; justify-content: center; - backdrop-filter: blur(10px); + backdrop-filter: blur(20px); background: rgb(0 0 0 / 50%); } diff --git a/src/components/func/loading.ts b/src/components/func/loading.ts index 7fee7c17..03cb6a83 100644 --- a/src/components/func/loading.ts +++ b/src/components/func/loading.ts @@ -11,7 +11,7 @@ import loading from "./loading.vue"; const loadingId = "tg-func-loading"; -export type LoadingParams = { show: boolean; title: string; subtitle?: string; empty?: boolean }; +export type LoadingParams = { show: boolean; title: string; subtitle: string; empty?: boolean }; /** * @description 自定义 loading 组件 diff --git a/src/components/func/loading.vue b/src/components/func/loading.vue index e823d928..50a6b033 100644 --- a/src/components/func/loading.vue +++ b/src/components/func/loading.vue @@ -6,9 +6,12 @@
{{ data.title }} - +
+
+
+
-
{{ data.subtitle }}
+
{{ data.subtitle }}
loading empty @@ -111,7 +114,7 @@ defineExpose({ displayBox }); height: 100%; align-items: center; justify-content: center; - backdrop-filter: blur(20px); + backdrop-filter: blur(10px); background: rgb(0 0 0 / 50%); } @@ -150,25 +153,6 @@ defineExpose({ displayBox }); font-weight: 600; } -.loading-circle { - width: 40px; - height: 40px; - border: 5px solid #f4d8a8; - border-radius: 100%; - border-top-color: transparent; - animation: circle infinite 0.75s linear; -} - -@keyframes circle { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } -} - .loading-subtitle { width: 100%; height: 25px; @@ -190,3 +174,76 @@ defineExpose({ displayBox }); } } + + diff --git a/src/components/main/t-postcard.vue b/src/components/main/t-postcard.vue index 39e70a80..2959fc3d 100644 --- a/src/components/main/t-postcard.vue +++ b/src/components/main/t-postcard.vue @@ -5,7 +5,7 @@ cover
-
+
{{ card.status?.status }}
@@ -18,14 +18,14 @@
{{ card.title }}
-
+
mdi-tag {{ topic.name }}
-
+
mdi-eye {{ card.data.view }} @@ -98,6 +98,10 @@ const selectedList = computed({ emits("update:selected", v); }, }); +const cardBg = computed(() => { + if (card.value && card.value.status) return card.value.status.colorCss; + return "none"; +}); onMounted(async () => await reload(props.modelValue)); @@ -414,6 +418,7 @@ async function toTopic(topic: TGApp.Plugins.Mys.Topic.Info): Promise { align-items: center; justify-content: flex-start; padding: 5px 30px 5px 5px; + background-color: v-bind(cardBg); clip-path: polygon(0 0, calc(100% - 15px) 0, 100% 50%, calc(100% - 15px) 100%, 0 100%); color: var(--tgc-white-1); diff --git a/src/pages/common/Home.vue b/src/pages/common/Home.vue index 550385ad..f5803efc 100644 --- a/src/pages/common/Home.vue +++ b/src/pages/common/Home.vue @@ -32,7 +32,7 @@