Merge branch 'test'

src/views/business/mer_list/index.vue

@@ -290,7 +290,7 @@ const columns = ref([
     },
   },
   {
-    title: '积分',
+    title: '余额',
     align: 'center',
     key: 'integral',
   },

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 = {
@@ -663,7 +664,7 @@ const veeify = async () => {
       }
       await api.getHotStatus(data)
       await getList()
-    clear()
+      // clear()
     } else {
       formRef.value?.validate(async (errors) => {
         if (!errors) {
@@ -673,10 +674,14 @@ const veeify = async () => {
           }
           await api.getHotStatus(data)
           await getList()
-        clear()
+          // clear()
         }
       })
     }
+  } 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 || '',
       })