From 202b31e6fa8da0d609d2e02ffa0e6a73f55f9a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Sat, 23 Nov 2024 20:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=B8=B2=E6=9F=93=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/userRecord/tur-home-sub.vue  | 17 ++-------
 src/components/userRecord/tur-world-sub.vue | 40 +++++----------------
 2 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/src/components/userRecord/tur-home-sub.vue b/src/components/userRecord/tur-home-sub.vue
index 3e13dc32..2ff07261 100644
--- a/src/components/userRecord/tur-home-sub.vue
+++ b/src/components/userRecord/tur-home-sub.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     :style="{
-      backgroundImage: 'url(' + getUrl.bg + ')',
+      backgroundImage: 'url(' + props.data.bg + ')',
       backgroundSize: 'cover',
     }"
     class="tur-hs-box"
@@ -10,7 +10,7 @@
       {{ data.name }}
     </div>
     <div class="tur-hs-title">
-      <img :src="getUrl.icon" alt="comfort" />
+      <img :src="props.data.comfortIcon" alt="comfort" />
       {{ data.comfortName }}
     </div>
     <div class="tur-hs-text-grid">
@@ -34,24 +34,11 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { onMounted, ref } from "vue";
-
-import { saveImgLocal } from "../../utils/TGShare.js";
-
 interface TurHomeSubProps {
   data: TGApp.Sqlite.Record.Home;
 }
 
 const props = defineProps<TurHomeSubProps>();
-const getUrl = ref({
-  icon: "",
-  bg: "",
-});
-
-onMounted(async () => {
-  getUrl.value.icon = await saveImgLocal(props.data.comfortIcon);
-  getUrl.value.bg = await saveImgLocal(props.data.bg);
-});
 </script>
 <style lang="css" scoped>
 .tur-hs-box {
diff --git a/src/components/userRecord/tur-world-sub.vue b/src/components/userRecord/tur-world-sub.vue
index de169f19..2cfb67a3 100644
--- a/src/components/userRecord/tur-world-sub.vue
+++ b/src/components/userRecord/tur-world-sub.vue
@@ -44,7 +44,6 @@ import { Event, UnlistenFn } from "@tauri-apps/api/event";
 import { computed, onMounted, onUnmounted, ref } from "vue";
 
 import { useAppStore } from "../../store/modules/app.js";
-import { saveImgLocal } from "../../utils/TGShare.js";
 
 interface TurWorldSubProps {
   data: TGApp.Sqlite.Record.WorldExplore;
@@ -52,13 +51,13 @@ interface TurWorldSubProps {
 
 const props = defineProps<TurWorldSubProps>();
 let themeListener: UnlistenFn | null = null;
-const bg = ref<string>();
 const icon = ref<string>();
-const iconLight = ref<string>();
-const iconDark = ref<string>();
 const offer = ref<string>();
 const appStore = useAppStore();
 
+const bg = computed<string>(() => {
+  return `url('${props.data.bg}')`;
+});
 const imgFilter = computed<string>(() => {
   if (props.data.name !== "纳塔") return "none";
   if (appStore.theme === "dark") return "none";
@@ -68,23 +67,12 @@ const imgFilter = computed<string>(() => {
 onMounted(async () => {
   themeListener = await event.listen("readTheme", (e: Event<string>) => {
     const theme = e.payload;
-    if (theme === "dark") {
-      icon.value = iconLight.value;
-    } else {
-      icon.value = iconDark.value;
-    }
+    if (theme === "dark") icon.value = props.data.iconLight;
+    else icon.value = props.data.iconDark;
   });
-  bg.value = `url('${await saveImgLocal(props.data.bg)}')`;
-  iconLight.value = await saveImgLocal(props.data.iconLight);
-  iconDark.value = await saveImgLocal(props.data.iconDark);
-  if (props.data.offering) {
-    offer.value = await saveImgLocal(props.data.offering.icon);
-  }
-  if (appStore.theme === "dark") {
-    icon.value = iconLight.value;
-  } else {
-    icon.value = iconDark.value;
-  }
+  if (props.data.offering) offer.value = props.data.offering.icon;
+  if (appStore.theme === "dark") icon.value = props.data.iconLight;
+  else icon.value = props.data.iconDark;
 });
 
 onUnmounted(() => {
@@ -92,18 +80,6 @@ onUnmounted(() => {
     themeListener();
     themeListener = null;
   }
-  const urlList = [iconLight.value, iconDark.value, offer.value];
-  urlList.forEach((url) => {
-    URL.revokeObjectURL(typeof url === "string" ? url : "");
-  });
-  const reg = /url\(['"]?([^'"]*)['"]?\)/;
-  if (bg.value) {
-    const bgOri = bg.value?.replace("url('", "").replace("')", "");
-    const bgUrl = bgOri.match(reg);
-    if (bgUrl) {
-      URL.revokeObjectURL(bgUrl[1]);
-    }
-  }
 });
 </script>
 <style lang="css" scoped>