From 7d379fa03cd4d2b83b91e3dd9727025ed383e99c Mon Sep 17 00:00:00 2001
From: Huakk <1751826683@qq.com>
Date: Mon, 9 Sep 2024 16:03:59 +0800
Subject: [PATCH 1/2] fix(custom): \!

---
 src/views/business/mer_list/index.vue  | 2 +-
 src/views/commodity/hot_list/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/business/mer_list/index.vue b/src/views/business/mer_list/index.vue
index 339a9ac..41ebbf6 100644
--- a/src/views/business/mer_list/index.vue
+++ b/src/views/business/mer_list/index.vue
@@ -290,7 +290,7 @@ const columns = ref([
     },
   },
   {
-    title: '积分',
+    title: '余额',
     align: 'center',
     key: 'integral',
   },
diff --git a/src/views/commodity/hot_list/index.vue b/src/views/commodity/hot_list/index.vue
index 9cf9f7b..8c267b7 100644
--- a/src/views/commodity/hot_list/index.vue
+++ b/src/views/commodity/hot_list/index.vue
@@ -663,7 +663,7 @@ const veeify = async () => {
     }
     await api.getHotStatus(data)
     await getList()
-    clear()
+    // clear()
   } else {
     formRef.value?.validate(async (errors) => {
       if (!errors) {
@@ -673,7 +673,7 @@ const veeify = async () => {
         }
         await api.getHotStatus(data)
         await getList()
-        clear()
+        // clear()
       }
     })
   }

From 82211679f950ba46b4817968e440f0d1e09ff98d Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Thu, 12 Sep 2024 01:40:25 +0800
Subject: [PATCH 2/2] fix(custom): \!

---
 src/views/commodity/hot_list/index.vue | 47 ++++++++++++++------------
 src/views/finance/suyuan.vue           |  2 +-
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/views/commodity/hot_list/index.vue b/src/views/commodity/hot_list/index.vue
index 8c267b7..6468a5e 100644
--- a/src/views/commodity/hot_list/index.vue
+++ b/src/views/commodity/hot_list/index.vue
@@ -654,28 +654,33 @@ const clear = () => {
 }
 
 const veeify = async () => {
-  let data = {}
-  if (nowKey.value === 1 || nowKey.value === 2) {
-    data = {
-      gid: [nowRow.value.gid],
-      status: nowKey.value,
-      notes: notesVal.value,
-    }
-    await api.getHotStatus(data)
-    await getList()
-    // clear()
-  } else {
-    formRef.value?.validate(async (errors) => {
-      if (!errors) {
-        data = {
-          ...nowRow.value,
-          gid: [nowRow.value.gid],
-        }
-        await api.getHotStatus(data)
-        await getList()
-        // clear()
+  try {
+    let data = {}
+    if (nowKey.value === 1 || nowKey.value === 2) {
+      data = {
+        gid: [nowRow.value.gid],
+        status: nowKey.value,
+        notes: notesVal.value,
       }
-    })
+      await api.getHotStatus(data)
+      await getList()
+      // clear()
+    } else {
+      formRef.value?.validate(async (errors) => {
+        if (!errors) {
+          data = {
+            ...nowRow.value,
+            gid: [nowRow.value.gid],
+          }
+          await api.getHotStatus(data)
+          await getList()
+          // clear()
+        }
+      })
+    }
+  } finally {
+    isNoteModel.value = false
+    isDzModel.value = false
   }
 }
 
diff --git a/src/views/finance/suyuan.vue b/src/views/finance/suyuan.vue
index 80ef984..bbb339f 100644
--- a/src/views/finance/suyuan.vue
+++ b/src/views/finance/suyuan.vue
@@ -157,7 +157,7 @@ const columns = ref([
     align: 'center',
     slot: 'game_name',
     render: (row) => {
-      const res = gamelist.value.find((item) => item.value === row.hall_id)
+      const res = gamelist.value.find((item) => item.value === Number(row.hall_id))
       return h('span', null, {
         default: () => res?.label || '',
       })