From dd577b486884b6044aa5a6f3a7257cd9cc8d341a Mon Sep 17 00:00:00 2001
From: qiuyuan <qiuyuan@yonyou.com>
Date: Wed, 28 Jan 2026 13:58:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=BB=91=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/modules/userControl.js               |   3 +
 .../blackList/components/EditDialog.vue       | 119 ------------------
 src/views/userControl/blackList/index.vue     |  46 +++----
 3 files changed, 18 insertions(+), 150 deletions(-)
 delete mode 100644 src/views/userControl/blackList/components/EditDialog.vue

diff --git a/src/apis/modules/userControl.js b/src/apis/modules/userControl.js
index 543276c..0eabbef 100644
--- a/src/apis/modules/userControl.js
+++ b/src/apis/modules/userControl.js
@@ -6,6 +6,9 @@ export const getCustomersList = (params) => request.basic.get('/api/v1/customers
 // 黑名单列表
 export const getBlackCustomersList = (params) => request.basic.get('/api/v1/blackCustomers', params)
 
+// 移除黑名单
+export const deleteBlackCustomers = (id) => request.basic.delete(`/api/v1/blackCustomers/${id}`)
+
 
 //获取单个banner
 export const getBanner = (id) => request.basic.get(`/api/v1/banners/${id}`)
diff --git a/src/views/userControl/blackList/components/EditDialog.vue b/src/views/userControl/blackList/components/EditDialog.vue
deleted file mode 100644
index 51f7a3a..0000000
--- a/src/views/userControl/blackList/components/EditDialog.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-    <a-modal
-        :open="modal.open"
-        :title="modal.title"
-        :confirm-loading="modal.confirmLoading"
-        :after-close="onAfterClose"
-        @ok="handleOk"
-        @cancel="handleCancel">
-        <a-form
-            ref="formRef"
-            scroll-to-first-error
-            :model="formData"
-            :rules="formRules"
-            :label-col="{ style: { width: '80px' } }">
-            <a-form-item
-                label="标题"
-                name="title">
-                <a-input v-model:value="formData.title"></a-input>
-            </a-form-item>
-        </a-form>
-    </a-modal>
-</template>
-
-<script setup>
-import { cloneDeep } from 'lodash-es'
-import apis from '@/apis'
-import { useForm, useModal } from '@/hooks'
-
-const emit = defineEmits(['ok'])
-
-const { modal, showModal, hideModal, showLoading, hideLoading } = useModal()
-const { formRef, formRules, formRecord, formData, resetForm } = useForm()
-
-formRules.value = {
-    title: { required: true, message: '请输入标题' },
-}
-
-/**
- * 新建
- */
-function handleCreate() {
-    showModal({
-        type: 'create',
-        title: '新建',
-    })
-}
-
-/**
- * 编辑
- */
-function handleEdit(record = {}) {
-    showModal({
-        type: 'edit',
-        title: '编辑',
-    })
-    formRecord.value = record
-    formData.value = cloneDeep(record)
-}
-
-/**
- * 确定
- */
-function handleOk() {
-    formRef.value
-        .validateFields()
-        .then(async (values) => {
-            try {
-                showLoading()
-                const params = {
-                    ...values,
-                }
-                let result = null
-                switch (modal.value.type) {
-                    case 'create':
-                        result = await apis.common.create(params).catch(() => {
-                            throw new Error()
-                        })
-                        break
-                    case 'edit':
-                        result = await apis.common.update(formRecord.value.id, params).catch(() => {
-                            throw new Error()
-                        })
-                        break
-                }
-                hideLoading()
-                if (200 === result?.code) {
-                    hideModal()
-                    emit('ok')
-                }
-            } catch (error) {
-                hideLoading()
-            }
-        })
-        .catch(() => {
-            hideLoading()
-        })
-}
-
-/**
- * 取消
- */
-function handleCancel() {
-    hideModal()
-}
-
-/**
- * 关闭后
- */
-function onAfterClose() {
-    resetForm()
-}
-
-defineExpose({
-    handleCreate,
-    handleEdit,
-})
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/userControl/blackList/index.vue b/src/views/userControl/blackList/index.vue
index 617b381..432c3d4 100644
--- a/src/views/userControl/blackList/index.vue
+++ b/src/views/userControl/blackList/index.vue
@@ -40,26 +40,15 @@
                 <a-table :columns="columns" :data-source="listData" :loading="loading" :pagination="paginationState"
                     :scroll="{ x: 1000 }" @change="onTableChange">
                     <template #bodyCell="{ column, record }">
-                        <template v-if="'banner_type' === column.key">
+                        <template v-if="'status' === column.key">
                             <!--状态-->
-                            <a-tag v-if="record.banner_type == 1" color="processing">
-                                首页轮播图
-                            </a-tag>
-                            <!--状态-->
-                            <a-tag v-else color="processing">
-                                营销活动图
-                            </a-tag>
-                        </template>
-
-                        <template v-if="'is_recommend' === column.key">
-                            <!--状态-->
-                            <a-tag v-if="record.banner_type == true" color="processing">
-                                启用
-                            </a-tag>
-                            <!--状态-->
-                            <a-tag v-else color="processing">
+                            <a-tag v-if="record.status == 'DISABLED'" color="red">
                                 禁用
                             </a-tag>
+                            <!--状态-->
+                            <a-tag v-else color="processing">
+                                启用
+                            </a-tag>
                         </template>
 
 
@@ -68,15 +57,9 @@
                         </template>
 
                         <template v-if="'action' === column.key">
-                            <x-action-button @click="$refs.editDialogRef.handleEdit(record)">
-                                <a-tooltip>
-                                    <template #title> {{ $t('pages.system.role.edit') }}</template>
-                                    <edit-outlined />
-                                </a-tooltip>
-                            </x-action-button>
                             <x-action-button @click="handleRemove(record)">
                                 <a-tooltip>
-                                    <template #title> {{ $t('pages.system.delete') }}</template>
+                                    <template #title> 移出黑名单</template>
                                     <delete-outlined style="color: #ff4d4f" />
                                 </a-tooltip>
                             </x-action-button>
@@ -86,8 +69,6 @@
             </a-card>
         </a-col>
     </a-row>
-
-    <edit-dialog ref="editDialogRef" @ok="onOk"></edit-dialog>
 </template>
 
 <script setup>
@@ -98,7 +79,7 @@ import { formatUtcDateTime } from '@/utils/util'
 import { config } from '@/config'
 import { statusTypeEnum } from '@/enums/system'
 import { usePagination, useForm } from '@/hooks'
-import EditDialog from './components/EditDialog.vue'
+
 import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
 import { useI18n } from 'vue-i18n'
 import { disabledDict, authenticationTypeDict } from '@/enums/dict'
@@ -133,7 +114,7 @@ const columns = [
 const { listData, loading, showLoading, hideLoading, paginationState, searchFormData, resetPagination } =
     usePagination()
 const { resetForm } = useForm()
-const editDialogRef = ref()
+
 
 getPageList()
 
@@ -158,6 +139,9 @@ async function getPageList() {
         if (data.length > 0) {
             listData.value = data
             paginationState.total = total
+        }else{
+            listData.value = []
+            paginationState.total = 0 
         }
     } catch (error) {
         hideLoading()
@@ -169,14 +153,14 @@ async function getPageList() {
  */
 function handleRemove({ id }) {
     Modal.confirm({
-        title: t('pages.system.role.delTip'),
-        content: t('button.confirm'),
+        title: '提示',
+        content: '确定移出黑名单吗？',
         okText: t('button.confirm'),
         onOk: () => {
             return new Promise((resolve, reject) => {
                 ; (async () => {
                     try {
-                        const { success } = await apis.role.delRole(id).catch(() => {
+                        const { success } = await apis.userControl.deleteBlackCustomers(id).catch(() => {
                             throw new Error()
                         })
                         if (config('http.code.success') === success) {