From 040f49a33e94ea770749a15f7b69728ed1813933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Thu, 9 May 2024 16:17:43 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/gachaRecord/gro-dataview.vue | 8 +++++---
 src/plugins/Sqlite/modules/userGacha.ts     | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/gachaRecord/gro-dataview.vue b/src/components/gachaRecord/gro-dataview.vue
index 9688a877..31e96ca4 100644
--- a/src/components/gachaRecord/gro-dataview.vue
+++ b/src/components/gachaRecord/gro-dataview.vue
@@ -66,9 +66,10 @@
   </div>
 </template>
 <script lang="ts" setup>
-// vue
 import { onMounted, ref, watch } from "vue";
 
+import TSUserGacha from "../../plugins/Sqlite/modules/userGacha.js";
+
 interface GachaDataViewProps {
   dataType: "new" | "avatar" | "weapon" | "normal" | "mix";
   dataVal: TGApp.Sqlite.GachaRecords.SingleTable[];
@@ -179,8 +180,9 @@ function getStar5Avg(): string {
 }
 
 // 获取物品图标
-function getIcon(itemId: string, type: string): string {
-  if (type === "角色") {
+function getIcon(itemId: string): string {
+  const type = TSUserGacha.getGachaItemType(itemId);
+  if (type[0] === "角色") {
     return "/WIKI/character/" + itemId + ".webp";
   } else {
     return "/WIKI/weapon/" + itemId + ".webp";
diff --git a/src/plugins/Sqlite/modules/userGacha.ts b/src/plugins/Sqlite/modules/userGacha.ts
index 506fde0e..3cc7fcb3 100644
--- a/src/plugins/Sqlite/modules/userGacha.ts
+++ b/src/plugins/Sqlite/modules/userGacha.ts
@@ -20,9 +20,9 @@ type gachaItemTypeRes =
  * @return {gachaItemTypeRes}
  */
 function getGachaItemType(item_id: string): gachaItemTypeRes {
-  const findAvatar = AppCharacterData.find((i) => i.id === item_id);
+  const findAvatar = AppCharacterData.find((i) => i.id.toString() === item_id);
   if (findAvatar !== undefined) return ["角色", findAvatar];
-  const findWeapon = AppWeaponData.find((i) => i.id === item_id);
+  const findWeapon = AppWeaponData.find((i) => i.id.toString() === item_id);
   if (findWeapon !== undefined) return ["武器", findWeapon];
   return ["未知", "未知"];
 }
@@ -139,6 +139,7 @@ const TSUserGacha = {
   getUidList,
   getGachaCheck,
   getGachaRecords,
+  getGachaItemType,
   deleteGachaRecords,
   mergeUIGF,
 };