调整

src/views/email/create.vue

@@ -49,7 +49,7 @@
               <el-input v-model="postForm.content" type="textarea" :maxlength="1024" placeholder="max 1024 chars" :rows="6" />
             </el-form-item>
             <el-form-item style="margin-bottom: 30px;" label="附件:">
-              <el-input v-model="postForm.attachments" type="textarea" :maxlength="256" placeholder="max 256 chars" :rows="6" />
+              <el-input v-model="postForm.attachments" type="textarea" :maxlength="128" placeholder="max 128 chars" :rows="6" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/email/list.vue

@@ -9,8 +9,35 @@
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label-width="120px" label="邮件内容" class="postInfo-container-item" prop="content">
+            <el-form-item label-width="120px" label="创建钱包地址" class="postInfo-container-item" prop="content">
-              <el-input v-model="postForm.content" />
+              <el-input v-model="postForm.create_address" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label-width="120px" label="更新钱包地址" class="postInfo-container-item" prop="content">
+              <el-input v-model="postForm.update_address" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label-width="120px" label="创建时间>=" class="postInfo-container-item" prop="createtime.start">
+              <el-date-picker v-model.number="postForm.createtime.start" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label-width="120px" label="创建时间<=" class="postInfo-container-item" prop="createtime.end">
+              <el-date-picker v-model.number="postForm.createtime.end" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label-width="120px" label="发送时间>=" class="postInfo-container-item" prop="sendtime.start">
+              <el-date-picker v-model.number="postForm.sendtime.start" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label-width="120px" label="发送时间<=" class="postInfo-container-item" prop="sendtime.end">
+              <el-date-picker v-model.number="postForm.sendtime.end" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" />
             </el-form-item>
           </el-col>
           <el-button style="margin-left: 10px;" type="success" @click="submitForm()">
@@ -26,6 +53,11 @@
           highlight-current-row
           style="width: 100%;"
         >
+          <el-table-column
+            prop="unikey"
+            label="unikey"
+            width="180"
+          />
           <el-table-column
             prop="mail_id"
             label="邮件id"
@@ -34,8 +66,13 @@
           <el-table-column
             prop="mail_type"
             label="类型"
-            width="50"
+            width="70"
-          />
+          >
+            <template slot-scope="{row}">
+              <el-tag v-if="row.mail_type === 1">群发</el-tag>
+              <el-tag v-if="row.mail_type === 2">全体</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="subject"
             label="邮件标题"
@@ -117,11 +154,53 @@ export default {
     return {
       postForm: {
         subject: '',
-        content: ''
+        content: '',
+        createtime: {
+          start: '',
+          end: ''
+        },
+        sendtime: {
+          start: '',
+          end: ''
+        },
+        create_address: '',
+        update_address: ''
       },
       rules: {
         subject: [{ required: false, message: '', trigger: 'blur' }],
-        content: [{ required: false, message: '', trigger: 'blur' }]
+        content: [{ required: false, message: '', trigger: 'blur' }],
+        createtime: {
+          start: [{ required: false, validator: (rule, value, callback) => {
+            if (this.postForm.createtime.end && !this.postForm.createtime.start) {
+              callback(new Error('请同时选择'))
+            } else {
+              callback()
+            }
+          }, trigger: 'blur' }],
+          end: [{ required: false, validator: (rule, value, callback) => {
+            if (this.postForm.createtime.start && !this.postForm.createtime.end) {
+              callback(new Error('请同时选择'))
+            } else {
+              callback()
+            }
+          }, trigger: 'blur' }]
+        },
+        sendtime: {
+          start: [{ required: false, validator: (rule, value, callback) => {
+            if (this.postForm.sendtime.end && !this.postForm.sendtime.start) {
+              callback(new Error('请同时选择'))
+            } else {
+              callback()
+            }
+          }, trigger: 'blur' }],
+          end: [{ required: false, validator: (rule, value, callback) => {
+            if (this.postForm.sendtime.start && !this.postForm.sendtime.end) {
+              callback(new Error('请同时选择'))
+            } else {
+              callback()
+            }
+          }, trigger: 'blur' }]
+        }
       },
       dialogAttaVisible: false,
       mailList: [],
@@ -140,6 +219,22 @@ export default {
   methods: {
     parseTime,
     getList(data) {
+      if (data.createtime.start === '' || data.createtime.end === '') {
+        data.createtime.start = 0
+        data.createtime.end = 0
+      }
+      if (data.createtime.start && data.createtime.end) {
+        data.createtime.start = data.createtime.start / 1000
+        data.createtime.end = data.createtime.end / 1000
+      }
+      if (data.sendtime.start === '' || data.sendtime.end === '') {
+        data.sendtime.start = 0
+        data.sendtime.end = 0
+      }
+      if (data.sendtime.start && data.sendtime.end) {
+        data.sendtime.start = data.sendtime.start / 1000
+        data.sendtime.end = data.sendtime.end / 1000
+      }
       getMailList(this.curpage, this.pagesize, data).then(response => {
         if (response.code === 0) {
           this.mailList = response.data