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,28 +654,33 @@ const clear = () => {
 }
 
 const veeify = async () => {
-  let data = {}
+  try {
-  if (nowKey.value === 1 || nowKey.value === 2) {
+    let data = {}
-    data = {
+    if (nowKey.value === 1 || nowKey.value === 2) {
-      gid: [nowRow.value.gid],
+      data = {
-      status: nowKey.value,
+        gid: [nowRow.value.gid],
-      notes: notesVal.value,
+        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()
       }
-    })
+      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
   }
 }
 

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