From 369d62f4e7f2ffc681a199d752cd072285dae747 Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Wed, 20 Dec 2023 00:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 部分武器描述存在 \n 导致的渲染错误
* 传入参数类型与定义类型不一致导致控制台 warn
---
 src/components/userCharacter/tuc-detail-desc-relic.vue  | 2 +-
 src/components/userCharacter/tuc-detail-desc-weapon.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/userCharacter/tuc-detail-desc-relic.vue b/src/components/userCharacter/tuc-detail-desc-relic.vue
index 25139348..21202f16 100644
--- a/src/components/userCharacter/tuc-detail-desc-relic.vue
+++ b/src/components/userCharacter/tuc-detail-desc-relic.vue
@@ -4,7 +4,7 @@
       <span>圣遗物</span>
     </template>
     <template #content>
-      <TucDetailRelic :model-value="props.modelValue" :pos="`${props.modelValue.pos}`" />
+      <TucDetailRelic :model-value="props.modelValue" :pos="props.modelValue.pos" />
       <div class="tuc-ddr-content">
         <div class="tuc-ddrc-top">
           <span>{{ props.modelValue.name }}</span>
diff --git a/src/components/userCharacter/tuc-detail-desc-weapon.vue b/src/components/userCharacter/tuc-detail-desc-weapon.vue
index 0677bfe7..9f3b1738 100644
--- a/src/components/userCharacter/tuc-detail-desc-weapon.vue
+++ b/src/components/userCharacter/tuc-detail-desc-weapon.vue
@@ -19,7 +19,10 @@
       </div>
     </template>
     <template #desc>
-      <span>{{ props.modelValue.description }}</span>
+      <span
+        v-if="props.modelValue.description"
+        v-html="parseHtmlText(props.modelValue.description)"
+      ></span>
     </template>
   </TucDetailDesc>
 </template>
@@ -28,6 +31,7 @@ import { computed } from "vue";
 
 import TucDetailDesc from "./tuc-detail-desc.vue";
 import TucDetailItemBox from "./tuc-detail-itembox.vue";
+import { parseHtmlText } from "../../utils/toolFunc";
 
 interface TucDetailDescWeaponProps {
   modelValue: TGApp.Sqlite.Character.RoleWeapon;