diff --git a/src/apis/modules/userControl.js b/src/apis/modules/userControl.js
new file mode 100644
index 0000000..543276c
--- /dev/null
+++ b/src/apis/modules/userControl.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+//获取banner列表
+export const getCustomersList = (params) => request.basic.get('/api/v1/customers', params)
+
+// 黑名单列表
+export const getBlackCustomersList = (params) => request.basic.get('/api/v1/blackCustomers', params)
+
+
+//获取单个banner
+export const getBanner = (id) => request.basic.get(`/api/v1/banners/${id}`)
+//创建banner
+export const createBanner = (data) => request.basic.post('/api/v1/banners', data)
+//更新banner
+export const updateBanner = (id, data) => request.basic.put(`/api/v1/banners/${id}`, data)
+//删除banner
+export const deleteBanner = (id) => request.basic.delete(`/api/v1/banners/${id}`)
\ No newline at end of file
diff --git a/src/enums/dict.js b/src/enums/dict.js
index e4bac27..22d0e86 100644
--- a/src/enums/dict.js
+++ b/src/enums/dict.js
@@ -62,6 +62,15 @@ class AuthenticationTypeDict extends BaseDict {
}
}
+// 状态
+class DisabledDict extends BaseDict {
+ constructor() {
+ super([
+ ['ENABLED', '启用'],
+ ['DISABLED', '禁用']
+ ])
+ }
+}
//如何使用:import {payTypeDict} from '@/enums/dict
//获取下拉框列表:payTypeDict.options
//获取label:payTypeDict.getLabel(1)
@@ -69,3 +78,4 @@ export const payTypeDict = new PayTypeDict()
export const payStatusDict = new PayStatusDict()
export const authenticationDict = new AuthenticationDict()
export const authenticationTypeDict = new AuthenticationTypeDict()
+export const disabledDict = new DisabledDict()
diff --git a/src/views/userControl/ blackList/index.vue b/src/views/userControl/ blackList/index.vue
deleted file mode 100644
index f69cc79..0000000
--- a/src/views/userControl/ blackList/index.vue
+++ /dev/null
@@ -1,294 +0,0 @@
-
-
-
-
-
-
-
-
- 规则名称
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 重置
-
- 搜索
-
- (searchBarExpand = !searchBarExpand)">
- 展开
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新建
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 默认
- 中等
- 紧凑
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
- 菜单1
- 菜单2
- 菜单3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/userControl/ blackList/components/EditDialog.vue b/src/views/userControl/blackList/components/EditDialog.vue
similarity index 100%
rename from src/views/userControl/ blackList/components/EditDialog.vue
rename to src/views/userControl/blackList/components/EditDialog.vue
diff --git a/src/views/userControl/blackList/index.vue b/src/views/userControl/blackList/index.vue
new file mode 100644
index 0000000..fd4f41f
--- /dev/null
+++ b/src/views/userControl/blackList/index.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('button.reset') }}
+
+ {{ $t('button.search') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 首页轮播图
+
+
+
+ 营销活动图
+
+
+
+
+
+
+ 启用
+
+
+
+ 禁用
+
+
+
+
+
+ {{ formatUtcDateTime(record.created_at) }}
+
+
+
+
+
+ {{ $t('pages.system.role.edit') }}
+
+
+
+
+
+ {{ $t('pages.system.delete') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/userControl/userList/index.vue b/src/views/userControl/userList/index.vue
index ac36a1a..622cd3b 100644
--- a/src/views/userControl/userList/index.vue
+++ b/src/views/userControl/userList/index.vue
@@ -1,248 +1,181 @@
-
+
-
-
- 规则名称
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- 重置
-
- 搜索
+ {{ $t('button.reset') }}
+
+ {{ $t('button.search') }}
- (searchBarExpand = !searchBarExpand)">
- 展开
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新建
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 默认
- 中等
- 紧凑
-
+
+
+
+
+
+
+
+
+
+
+
+ 首页轮播图
+
+
+
+ 营销活动图
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
- 菜单1
- 菜单2
- 菜单3
-
-
-
-
-
-
-
-
-
+
+
+
+ 启用
+
+
+
+ 禁用
+
+
+
+
+
+ {{ formatUtcDateTime(record.created_at) }}
+
+
+
+
+
+ {{ $t('pages.system.role.edit') }}
+
+
+
+
+
+ {{ $t('pages.system.delete') }}
+
+
+
+
+
+
+
+
+
+
+