diff --git a/src/api/cai/user.js b/src/api/cai/user.js index 1423993..2b3c214 100644 --- a/src/api/cai/user.js +++ b/src/api/cai/user.js @@ -17,6 +17,14 @@ export function resetUserPassword(data) { }) } +export function userForbid(data) { + return request({ + url: '/cai/user/userForbid', + method: 'post', + data: data + }) +} + export function resetUserMobile(data) { return request({ url: '/cai/user/updateMobile', diff --git a/src/api/cai/userForbid.js b/src/api/cai/userForbid.js index b38b269..0b17283 100644 --- a/src/api/cai/userForbid.js +++ b/src/api/cai/userForbid.js @@ -9,6 +9,14 @@ export function listUserForbid(query) { }) } +export function unForbid(id) { + return request({ + url: '/cai/userForbid/un/forbid', + method: 'get', + params:{id} + }) +} + // 查询封号列表详细 export function getUserForbid(id) { return request({ diff --git a/src/components/ImageAvatar/index.vue b/src/components/ImageAvatar/index.vue index c9d98d8..c6c88ea 100644 --- a/src/components/ImageAvatar/index.vue +++ b/src/components/ImageAvatar/index.vue @@ -24,11 +24,11 @@ export default { }, width: { type: [Number, String], - default: "41px" + default: "30px" }, height: { type: [Number, String], - default: "41px" + default: "30px" }, }, computed: { diff --git a/src/constant/statusMap.js b/src/constant/statusMap.js index 2ec4df5..39504cb 100644 --- a/src/constant/statusMap.js +++ b/src/constant/statusMap.js @@ -46,18 +46,14 @@ export const cashStatusList = [ { value: 3, label: '审核不通过',listClass: listClass.danger }, { value: 4, label: '提现取消',listClass: listClass.info } ] -// 1.封6小时 2.封1天 3.封3天 4.封5天 5.封7天 6.封一个月 7.封10年 8 一小时 9 三小时 10 十二小时 + export const forbidTimeList = [ { value: 1, label: '封6小时' }, { value: 2, label: '封1天'}, { value: 3, label: '封3天' }, - { value: 4, label: '封5天' }, - { value: 5, label: '封7天' }, - { value: 6, label: '封一个月' }, - { value: 7, label: '封10年' }, - { value: 8, label: '一小时' }, - { value: 9, label: '三小时' }, - { value: 10, label: '十二小时' }, + { value: 4, label: '封7天' }, + { value: 5, label: '封一个月' }, + { value: 6, label: '封10年' }, ] // 1 封用户uid 2.封设备uuid 3.imei 4.mac @@ -66,6 +62,7 @@ export const forbidTypeList = [ { value: 2, label: '设备'}, { value: 3, label: 'imei' }, { value: 4, label: 'mac' }, + { value: 5, label: 'ip' }, ] export const memberTypeList = [ diff --git a/src/main.js b/src/main.js index 1aafcaf..8710080 100644 --- a/src/main.js +++ b/src/main.js @@ -83,7 +83,7 @@ DictData.install() Element.Dialog.props.closeOnClickModal.default = false Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size + size: Cookies.get('size') || 'mini' // set element-ui default size }) Vue.config.productionTip = false diff --git a/src/views/cai/forbidFilter/index.vue b/src/views/cai/forbidFilter/index.vue index 3efffd2..0346824 100644 --- a/src/views/cai/forbidFilter/index.vue +++ b/src/views/cai/forbidFilter/index.vue @@ -1,45 +1,46 @@ @@ -152,15 +154,17 @@ import {delUser, getFullUser, listUser, resetUserMobile, resetUserPassword} from import {authList, genderList, userStatusList, isAnchorList, videoStatusList} from '@/constant/statusMap' import UserAddUpdateDialog from '@/views/cai/user/user-add-update-dialog.vue' import UserInfoDialog from "@/views/cai/user/user-info-dialog"; - +import UserForbidDialog from "@/views/cai/user/user-forbid-dialog"; export default { name: "User", components:{ + UserForbidDialog, UserAddUpdateDialog,UserInfoDialog }, data() { return { genderList,authList,userStatusList,isAnchorList,videoStatusList, + userForbidVisible: false, // 遮罩层 loading: true, // 选中数组 @@ -300,6 +304,12 @@ export default { }); }).catch(() => {}); }, + handleUserForbid(row){ + this.userForbidVisible = true + this.$nextTick(() => { + this.$refs.userForbid.init(row) + }) + }, handleCommand(command, row) { switch (command) { case "handleDelete": @@ -311,6 +321,9 @@ export default { case "handleResetMobile": this.handleResetMobile(row); break; + case "handleUserForbid": + this.handleUserForbid(row); + break; default: break; } diff --git a/src/views/cai/user/user-forbid-dialog.vue b/src/views/cai/user/user-forbid-dialog.vue new file mode 100644 index 0000000..6d2dfa2 --- /dev/null +++ b/src/views/cai/user/user-forbid-dialog.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/views/cai/userForbid/index.vue b/src/views/cai/userForbid/index.vue index 4dd417c..fe96ca6 100644 --- a/src/views/cai/userForbid/index.vue +++ b/src/views/cai/userForbid/index.vue @@ -1,6 +1,24 @@ - + + + @@ -23,7 +50,7 @@ - + diff --git a/src/views/cai/userForbidLog/index.vue b/src/views/cai/userForbidLog/index.vue index ad6984a..7b31f8c 100644 --- a/src/views/cai/userForbidLog/index.vue +++ b/src/views/cai/userForbidLog/index.vue @@ -1,159 +1,86 @@