diff --git a/.gitignore b/.gitignore index 278a55b..6fd9635 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ test/ dist/ +backmanage/dist.zip +backmanage/stats.html diff --git a/backmanage/src/components/common/CustomEditor.vue b/backmanage/src/components/common/CustomEditor.vue index d938cf3..804fe79 100644 --- a/backmanage/src/components/common/CustomEditor.vue +++ b/backmanage/src/components/common/CustomEditor.vue @@ -1,10 +1,14 @@ diff --git a/backmanage/src/views/betRecord/index.vue b/backmanage/src/views/betRecord/index.vue index 9d6f122..c8c880c 100644 --- a/backmanage/src/views/betRecord/index.vue +++ b/backmanage/src/views/betRecord/index.vue @@ -70,7 +70,6 @@ const getBetReview = async () => { } } - data.reviewResult.at(-1).value = sum } //变动记录 @@ -118,7 +117,6 @@ onMounted(async () => { ;[data.options.games, data.options.rooms] = await GamesRoomsInfo() - console.log(data.options.games) //添加动态游戏类型 for (const game of data.options.games) { for (const room of game.rooms_info) { @@ -127,7 +125,7 @@ onMounted(async () => { data.reviewResult.push({ id: parseInt(label), title: game.game_name+ '-' + room.room_name, value: 0 }) } } - console.log(data.reviewResult) + getBetRecord() }) diff --git a/backmanage/src/views/person/records/Email.vue b/backmanage/src/views/person/records/Email.vue index 9b3de0a..13d93d0 100644 --- a/backmanage/src/views/person/records/Email.vue +++ b/backmanage/src/views/person/records/Email.vue @@ -1,133 +1,150 @@ - - diff --git a/backmanage/src/views/userSearch/changeEmail.vue b/backmanage/src/views/userSearch/changeEmail.vue index c734f39..a5dfd8f 100644 --- a/backmanage/src/views/userSearch/changeEmail.vue +++ b/backmanage/src/views/userSearch/changeEmail.vue @@ -6,20 +6,22 @@ import { Plus, Minus } from '@element-plus/icons-vue' import CustomEditor from '@/components/common/CustomEditor.vue' const emits = defineEmits(['closeBox']) -const props = defineProps(['uid', 'user_no', 'gold', 'diamonds', 'pid', 'channel_name']) +const props = defineProps(['user_no', 'gold', 'sendMode']) const data = reactive({ options: [ { label: '金币', value: 1 }, - { label: '钻石', value: 2 }, - { label: '点券', value: 3 }, - { label: '道具', value: 4 }, + // { label: '钻石', value: 2 }, + // { label: '点券', value: 3 }, + // { label: '道具', value: 4 }, ] as any[], form: { - recipient: [parseInt(props.user_no)], + user_no: props.user_no, + recipient: '[]', append: [] as any[], //[{num:2,type:1}] title: [''], content: [''], timing: '', + send_mode: props.sendMode, // 0: 群发,1:指定玩家 }, emailNum: 1, }) @@ -60,15 +62,20 @@ const onSubmit = async () => { data.form.append[index].num = parseInt(data.form.append[index].num) } - const params = { - user_id: props.uid, - recipient: JSON.stringify(data.form.recipient), + let params = { + type: data.form.send_mode, title: data.form.title, content: data.form.content, - timing: data.form.timing, - type: 2, + timing: '', append: JSON.stringify(data.form.append), + recipient: '[]', + } + + //单体 + if (data.form.send_mode == 2) { + params.recipient = JSON.stringify([parseInt(props.user_no)]) } + const respond = await request.post('/person/sendEmail', params) if (respond.code != 0) { ElMessage.error(respond.msg) @@ -82,20 +89,28 @@ const onSubmit = async () => {