|
@@ -15,6 +15,7 @@
|
|
|
</el-icon>删除</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
+ <template v-slot:type="scope">{{ getTypeLabel(scope.row.type) }}</template>
|
|
|
<template v-slot:validTime="scope">{{ dateUtils.getDate(scope.row.validTime) }}</template>
|
|
|
<template v-slot:invalidTime="scope">{{ dateUtils.getDate(scope.row.invalidTime) }}</template>
|
|
|
<template v-slot:state="scope">{{ getStateLabel(scope.row) }}</template>
|
|
@@ -72,6 +73,12 @@
|
|
|
<el-form-item label="邮件标题" prop="title">
|
|
|
<el-input v-model="ruleForm.title" placeholder="限制7字"/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="邮件类型" prop="type">
|
|
|
+ <el-radio-group v-model="ruleForm.type">
|
|
|
+ <el-radio :label="0">一次性(进入游戏或打开邮箱判断一次条件,满足则收到邮件)</el-radio>
|
|
|
+ <el-radio :label="1">常驻(邮件生效期间满足条件,都可以收到邮件)</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="发送者名称" prop="sendName">
|
|
|
<el-input v-model="ruleForm.sendName" placeholder="限制10字"/>
|
|
|
</el-form-item>
|
|
@@ -242,6 +249,23 @@ const column = [
|
|
|
{ type: 'selection', width: 60, fixed: 'left' },
|
|
|
{ name: 'id', label: 'ID', width: 80 },
|
|
|
{ name: 'title', label: '邮件标题', inSearch: true, valueType: 'input' },
|
|
|
+ {
|
|
|
+ name: 'type',
|
|
|
+ label: '邮件类型',
|
|
|
+ slot: true,
|
|
|
+ inSearch: true,
|
|
|
+ options: [
|
|
|
+ {
|
|
|
+ value: 0,
|
|
|
+ label: '一次性',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: 1,
|
|
|
+ label: '常驻',
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ valueType: 'select',
|
|
|
+ },
|
|
|
{ name: 'validTime', label: '邮件生效时间', slot: true, valueType: 'datetime' },
|
|
|
{ name: 'invalidTime', label: '邮件失效时间', slot: true, valueType: 'datetime' },
|
|
|
{ name: 'state', label: '邮件状态', slot: true },
|
|
@@ -250,6 +274,14 @@ const column = [
|
|
|
{ name: 'operation', slot: true, fixed: 'right', width: 200, label: '操作' },
|
|
|
]
|
|
|
|
|
|
+const getTypeLabel = (val) => {
|
|
|
+ if (val == 0) {
|
|
|
+ return '一次性'
|
|
|
+ } else if (val == 1) {
|
|
|
+ return '常驻'
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
const getStateLabel = (val) => {
|
|
|
// 取得当前时间,单位:秒
|
|
|
const timestamp: number = Date.parse(new Date().toString());
|
|
@@ -284,6 +316,7 @@ const ruleFormRef = ref<FormInstance>()
|
|
|
const ruleForm = reactive({
|
|
|
id: null,
|
|
|
title: null,
|
|
|
+ type: 0,
|
|
|
validTime: null,
|
|
|
invalidTime: null,
|
|
|
items: null,
|
|
@@ -300,6 +333,11 @@ const ruleForm = reactive({
|
|
|
})
|
|
|
|
|
|
const rules = reactive({
|
|
|
+ type: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ }
|
|
|
+ ],
|
|
|
title: [
|
|
|
{
|
|
|
required: true,
|
|
@@ -375,6 +413,7 @@ const add = () => {
|
|
|
isIdShow.value = false
|
|
|
dialogVisible.value = true
|
|
|
ruleForm.id = null
|
|
|
+ ruleForm.type = 0
|
|
|
ruleForm.toServerIds = null
|
|
|
ruleForm.toPlayerIds = null
|
|
|
ruleForm.levelCondition = null
|
|
@@ -528,6 +567,7 @@ const more = (row) => {
|
|
|
console.log(row)
|
|
|
dialogVisible.value = true
|
|
|
ruleForm.id = row.id
|
|
|
+ ruleForm.type = row.type
|
|
|
ruleForm.toServerIds = row.toServerIds
|
|
|
ruleForm.toPlayerIds = row.toPlayerIds
|
|
|
ruleForm.levelCondition = row.levelCondition
|