Merge branch 'dev' into test

fix(custom): \!
2024-09-09 16:04:14 +08:00 · 2024-09-09 16:03:59 +08:00
2 changed files with 3 additions and 3 deletions
--- 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',
  },
--- 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()
      }
    })
  }
Author	SHA1	Message	Date
Huakk	f031d84745	Merge branch 'dev' into test All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-09 16:04:14 +08:00
Huakk	7d379fa03c	fix(custom): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-09 16:03:59 +08:00