Merge branch 'test' of https://gitea.jdt168.com/XinLingKeJi/jdt-admin into test

src/views/commodity/hot_list/index.vue

@@ -654,6 +654,7 @@ const clear = () => {
 }
 
 const veeify = async () => {
+  try {
     let data = {}
     if (nowKey.value === 1 || nowKey.value === 2) {
       data = {
@@ -677,6 +678,10 @@ const veeify = async () => {
         }
       })
     }
+  } finally {
+    isNoteModel.value = false
+    isDzModel.value = false
+  }
 }
 
 const veeifys = async () => {

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 || '',
       })