邮件提示

src/common/dateUtils.ts

@@ -9,6 +9,6 @@ export default {
             y = now.getFullYear(),
             m = now.getMonth() + 1,
             d = now.getDate()
-        return y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d) + " " + now.toTimeString().substr(0, 8);
+        return y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d) + " " + now.toTimeString().substring(0, 8);
     }
 }

src/views/operation/announcement/index.vue

@@ -45,7 +45,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="公告生效时间" required>
-          <el-col :span="11">
+          <el-col :span="7">
             <el-form-item prop="validTime">
               <el-date-picker
                   v-model="ruleForm.validTime"
@@ -59,11 +59,16 @@
           <el-col class="text-center" :span="2" style="text-align: center">
             <span class="text-gray-500">-</span>
           </el-col>
-          <el-col :span="11">
+          <el-col :span="7">
             <el-form-item prop="invalidTime">
               <el-date-picker v-model="ruleForm.invalidTime"  type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" style="width: 100%" />
             </el-form-item>
           </el-col>
+          <el-col class="text-enpty" :span="1">
+          </el-col>
+          <el-button type="primary" @click="valid7Day">7天</el-button>
+          <el-button type="primary" @click="valid15Day">15天</el-button>
+          <el-button type="primary" @click="valid30Day">30天</el-button>
         </el-form-item>
         <el-form-item label="公告内容" prop="content">
           <el-input v-model="ruleForm.content" :rows="10" type="textarea" />
@@ -322,6 +327,30 @@ const add = () => {
   ruleForm.content = null
 }
 
+const valid7Day = () => {
+  let now = new Date();
+  ruleForm.validTime = dateUtils.getDate(now);
+  let invalidDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7, 
+    now.getHours(), now.getMinutes(), now.getSeconds())
+  ruleForm.invalidTime = dateUtils.getDate(invalidDate)
+}
+
+const valid15Day = () => {
+  let now = new Date();
+  ruleForm.validTime = dateUtils.getDate(now);
+  let invalidDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 15, 
+    now.getHours(), now.getMinutes(), now.getSeconds())
+  ruleForm.invalidTime = dateUtils.getDate(invalidDate)
+}
+
+const valid30Day = () => {
+  let now = new Date();
+  ruleForm.validTime = dateUtils.getDate(now);
+  let invalidDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 30, 
+    now.getHours(), now.getMinutes(), now.getSeconds())
+  ruleForm.invalidTime = dateUtils.getDate(invalidDate)
+}
+
 const handleConfirm = () => {
   // 验证table数据
   // ...

src/views/operation/gmmail/index.vue

@@ -37,19 +37,19 @@
           <el-input readonly v-model="ruleForm.id" />
         </el-form-item>
         <el-form-item label="收件人服务器ID" prop="toServerIds">
-          <el-input v-model="ruleForm.toServerIds" />
+          <el-input v-model="ruleForm.toServerIds" placeholder="默认不填为全服，支持数组，格式：1,2,3..."/>
         </el-form-item>
         <el-form-item label="收件人角色ID" prop="toPlayerIds">
-          <el-input v-model="ruleForm.toPlayerIds" />
+          <el-input v-model="ruleForm.toPlayerIds" placeholder="指定具体角色发送，支持数组，格式：10000001,10000002..." />
         </el-form-item>
         <el-form-item label="收件人等级条件" prop="levelCondition">
-          <el-input v-model="ruleForm.levelCondition" />
+          <el-input v-model="ruleForm.levelCondition" placeholder="指定角色等级区间[min,max]，格式：1,100" />
         </el-form-item>
         <el-form-item label="收件人道具条件" prop="itemCondition">
-          <el-input v-model="ruleForm.itemCondition" />
+          <el-input v-model="ruleForm.itemCondition" placeholder="指定角色拥有道具，支持数组，格式：1001,1002..." />
         </el-form-item>
         <el-form-item label="收件人英雄条件" prop="heroCondition">
-          <el-input v-model="ruleForm.heroCondition" />
+          <el-input v-model="ruleForm.heroCondition" placeholder="指定角色拥有英雄，支持数组，格式：101,102..."/>
         </el-form-item>
 
         <el-form-item label="收件人角色创建">
@@ -70,16 +70,16 @@
           </el-col>
         </el-form-item>
         <el-form-item label="邮件标题" prop="title">
-          <el-input v-model="ruleForm.title" />
+          <el-input v-model="ruleForm.title" placeholder="限制7字"/>
         </el-form-item>
         <el-form-item label="发送者名称" prop="sendName">
-          <el-input v-model="ruleForm.sendName" />
+          <el-input v-model="ruleForm.sendName" placeholder="限制10字"/>
         </el-form-item>
         <el-form-item label="邮件道具" prop="items">
-          <el-input v-model="ruleForm.items" />
+          <el-input v-model="ruleForm.items" placeholder="支持数组，格式：1001-100,1002-200..."/>
         </el-form-item>
         <el-form-item label="邮件生效时间" required>
-          <el-col :span="11">
+          <el-col :span="7">
             <el-form-item prop="validTime">
               <el-date-picker v-model="ruleForm.validTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="选择起始时间" style="width: 100%" />
@@ -88,15 +88,20 @@
           <el-col class="text-center" :span="2" style="text-align: center">
             <span class="text-gray-500">-</span>
           </el-col>
-          <el-col :span="11">
+          <el-col :span="7">
             <el-form-item prop="invalidTime">
               <el-date-picker v-model="ruleForm.invalidTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="选择截止时间" style="width: 100%" />
             </el-form-item>
           </el-col>
+          <el-col class="text-enpty" :span="1">
+          </el-col>
+          <el-button type="primary" @click="valid7Day">7天</el-button>
+          <el-button type="primary" @click="valid15Day">15天</el-button>
+          <el-button type="primary" @click="valid30Day">30天</el-button>
         </el-form-item>
         <el-form-item label="邮件内容" prop="content">
-          <el-input v-model="ruleForm.content" :rows="8" type="textarea" />
+          <el-input v-model="ruleForm.content" :rows="8" type="textarea" placeholder="限制3000字" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -385,6 +390,30 @@ const add = () => {
   ruleForm.content = null
 }
 
+const valid7Day = () => {
+  let now = new Date();
+  ruleForm.validTime = dateUtils.getDate(now);
+  let invalidDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7, 
+    now.getHours(), now.getMinutes(), now.getSeconds())
+  ruleForm.invalidTime = dateUtils.getDate(invalidDate)
+}
+
+const valid15Day = () => {
+  let now = new Date();
+  ruleForm.validTime = dateUtils.getDate(now);
+  let invalidDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 15, 
+    now.getHours(), now.getMinutes(), now.getSeconds())
+  ruleForm.invalidTime = dateUtils.getDate(invalidDate)
+}
+
+const valid30Day = () => {
+  let now = new Date();
+  ruleForm.validTime = dateUtils.getDate(now);
+  let invalidDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 30, 
+    now.getHours(), now.getMinutes(), now.getSeconds())
+  ruleForm.invalidTime = dateUtils.getDate(invalidDate)
+}
+
 const handleConfirm = () => {
   // 验证table数据
   let isValid = true