From 9fa1a81b8afd92566815026d833bfe00f0b6f905 Mon Sep 17 00:00:00 2001 From: Huakk <1751826683@qq.com> Date: Thu, 5 Sep 2024 16:38:10 +0800 Subject: [PATCH 1/5] feat(custom): \! --- .idea/codeStyles/Project.xml | 62 ------------ .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/git_toolbox_blame.xml | 6 -- .idea/modules.xml | 8 -- .idea/vcs.xml | 6 -- .idea/workspace.xml | 127 ------------------------- src/views/commodity/hot_list/index.vue | 37 +++---- src/views/finance/index.vue | 10 +- 8 files changed, 15 insertions(+), 246 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/git_toolbox_blame.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index f021dc9..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml deleted file mode 100644 index 7dc1249..0000000 --- a/.idea/git_toolbox_blame.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 737be84..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 08d9f9f..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "associatedIndex": 2 -} - - - - - - - - - - diff --git a/src/views/system/msgMag/index.vue b/src/views/system/msgMag/index.vue new file mode 100644 index 0000000..35a41e0 --- /dev/null +++ b/src/views/system/msgMag/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/views/user/index/index.vue b/src/views/user/index/index.vue index d9d21eb..5216a7a 100644 --- a/src/views/user/index/index.vue +++ b/src/views/user/index/index.vue @@ -3,21 +3,21 @@
- + + - + - + +
- + 筛选条件: - + +
时间筛选： Date: Mon, 9 Sep 2024 16:03:59 +0800 Subject: [PATCH 4/5] 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 5/5] 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 || '', })