From 84695c3df3f62eca60063a7fe8ddaa7b4dc51293 Mon Sep 17 00:00:00 2001
From: mengyxu <kekeningxiaobai@sina.com>
Date: Mon, 28 Apr 2025 16:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B1=9E=E6=80=A7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tool/formatter.ts           |  3 +++
 src/views/backpack/player.vue   | 12 +++---------
 src/views/message/attribute.vue |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/tool/formatter.ts b/src/tool/formatter.ts
index 744ca02..0e31702 100644
--- a/src/tool/formatter.ts
+++ b/src/tool/formatter.ts
@@ -1,4 +1,7 @@
 export const formartNum = (num) => {
+  if (num > 100000000) {
+    return (num / 1000000).toFixed(1) + 'm';
+  }
   if (num > 100000) {
     return (num / 1000).toFixed(1) + 'k';
   }
diff --git a/src/views/backpack/player.vue b/src/views/backpack/player.vue
index 3b66480..e717fd8 100644
--- a/src/views/backpack/player.vue
+++ b/src/views/backpack/player.vue
@@ -12,7 +12,7 @@
             <div class="value">
                 <div>{{ state.rebornPoints.count }}</div>
                 <div> {{ state.playerAttribute.lv }} </div>
-                <div v-for="attr in attrs" :key="attr">{{ attribute[attr] }}{{ attr_unitys[attr] }} </div>
+                <div v-for="attr in attrs" :key="attr">{{ formartNum(attribute[attr]) }}{{ attr_unitys[attr] }} </div>
                 <div> {{ coins }} </div>
             </div>
         </div>
@@ -33,6 +33,7 @@ import { reactive, onMounted, ref, computed } from "vue";
 import { useI18n } from "vue3-i18n";
 import { EquipIcon } from "@/components"
 import { attr_unitys, playerImg2 } from "@/config";
+import { formartNum } from "@/tool";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
@@ -54,14 +55,7 @@ const attribute = computed(() => {
 
 const attrs = ['dps', 'atk', 'crit', 'critDmg', 'hp', 'def', 'bloc'];
 const coins = computed(() => {
-    const coins = state.playerAttribute.coins;
-    if (coins > 100000000) {
-        return (coins / 1000000).toFixed(1) + 'm';
-    }
-    if (coins > 100000) {
-        return (coins / 1000).toFixed(1) + 'k';
-    }
-    return coins;
+    return formartNum(state.playerAttribute.coins);
 })
 
 onMounted(() => { });
diff --git a/src/views/message/attribute.vue b/src/views/message/attribute.vue
index 40d737b..4190ff3 100644
--- a/src/views/message/attribute.vue
+++ b/src/views/message/attribute.vue
@@ -32,7 +32,7 @@
             <div class="item">
                 <img :src="attr_icon_urls.hp">
                 <span class="value">
-                    {{ formartNum(attribute.curHp) }}/{{ (attribute.hp) }}
+                    {{ formartNum(attribute.curHp) }}/{{ formartNum(attribute.hp) }}
                 </span>
             </div>
         </Tooltip>