From e81116f4bd7b4bc1961b1b5f721e6b1c55cc5206 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 12 Jan 2021 16:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=A0=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/games/details/mail.vue | 72 +++++++++++++++++---------------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/views/games/details/mail.vue b/src/views/games/details/mail.vue
index 7610c70..6cb3ec9 100644
--- a/src/views/games/details/mail.vue
+++ b/src/views/games/details/mail.vue
@@ -3,24 +3,24 @@
     <!-- toolbar -->
     <div class="toolbar clearfix">
       <div
-        class="l fl"
         v-if="permEdit"
+        class="l fl"
       >
         <el-button
           type="primary"
-          @click="addMail"
           icon="el-icon-plus"
+          @click="addMail"
         >新增</el-button>
         <el-button
           type="warning"
-          @click="addFromDraft"
           icon="el-icon-document"
           plain
+          @click="addFromDraft"
         >从模板新增</el-button>
         <el-button
-          @click="switchData"
           type="success"
           icon="el-icon-d-caret"
+          @click="switchData"
         >{{ switchText }}</el-button>
         <el-button
           v-if="batch.show && ((isDev && permEdit) || (!isDev && permPublish))"
@@ -29,8 +29,8 @@
           @click="batchDel"
         >批量删除</el-button>
         <el-button
-          @click="batchOpt"
           icon="el-icon-setting"
+          @click="batchOpt"
         > {{ batch.txt }} </el-button>
       </div>
       <div class="r fr">
@@ -42,11 +42,11 @@
     </div>
     <!-- table -->
     <el-alert
+      v-if="!isDev"
       title="当前数据为【正式】数据！"
       type="warning"
       class="mgt-20 mgb-20"
       effect="dark"
-      v-if="!isDev"
     />
     <el-table
       v-loading="isLoaded"
@@ -64,8 +64,8 @@
       />
       <el-table-column
         type="index"
-        :index="indexMethod">
-      </el-table-column>
+        :index="indexMethod"
+      />
       <el-table-column
         prop="mailtype"
         label="类型"
@@ -79,6 +79,12 @@
         sortable
         show-overflow-tooltip
       />
+      <el-table-column
+        prop="channel"
+        label="渠道"
+        sortable
+        show-overflow-tooltip
+      />
       <el-table-column
         prop="attachments"
         label="物品"
@@ -154,6 +160,13 @@
           <el-input v-model="modalForm.from" :disabled="!isNew"/>
           <span class="ipt-tip">发件人</span>
         </el-form-item>
+        <el-form-item
+          label="渠道"
+          prop="mailFrom"
+        >
+          <el-input v-model="modalForm.channel"/>
+          <span class="ipt-tip">渠道</span>
+        </el-form-item>
         <el-form-item
           label="邮件类型"
           prop="mailtype"
@@ -164,7 +177,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
-          v-if="modalForm.mailtype == 2"
+          v-if="modalForm.mailtype === 2"
           label="用户类型"
           prop="usertype"
         >
@@ -175,7 +188,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
-          v-if="modalForm.mailtype == 1"
+          v-if="modalForm.mailtype === 1"
           label="收件人"
           prop="mailTo"
         >
@@ -200,8 +213,8 @@
           prop="content"
         >
           <el-input
-            type="textarea"
             v-model="modalForm.content"
+            type="textarea"
           />
         </el-form-item>
         <el-form-item
@@ -218,7 +231,8 @@
           <el-date-picker
             v-model="modalForm.sendtime"
             type="datetime"
-            placeholder="选择发送时间"/>
+            placeholder="选择发送时间"
+          />
         </el-form-item>
         <el-form-item
           class="ipt-tip"
@@ -228,7 +242,8 @@
           <el-date-picker
             v-model="modalForm.expiretime"
             type="datetime"
-            placeholder="选择过期时间"/>
+            placeholder="选择过期时间"
+          />
         </el-form-item>
         <el-form-item
           label="物品"
@@ -255,10 +270,10 @@
             >
               <template slot-scope="scope">
                 <el-button
+                  v-if="permEdit"
                   type="text"
                   size="small"
                   @click="editItem(scope.$index,scope.row)"
-                  v-if="permEdit"
                 >编辑</el-button>
                 <el-button
                   v-if="permEdit"
@@ -270,24 +285,24 @@
             </el-table-column>
           </el-table>
           <el-button
+            v-if="permEdit"
             type="primary"
             size="mini"
             @click="addItem"
-            v-if="permEdit"
           >添加</el-button>
         </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="closeModal">取 消</el-button>
         <el-button
-          @click="reset"
           type="warning"
           plain
+          @click="reset"
         >重置</el-button>
         <el-button
+          v-if="permEdit"
           type="primary"
           @click="save"
-          v-if="permEdit"
         >确 定</el-button>
       </div>
     </el-dialog>
@@ -321,9 +336,9 @@
       <div slot="footer">
         <el-button @click="closeInnerModal">取 消</el-button>
         <el-button
+          v-if="permEdit"
           type="primary"
           @click="saveItem"
-          v-if="permEdit"
         >确 定</el-button>
       </div>
     </el-dialog>
@@ -338,7 +353,6 @@ import {
   getMails,
   saveMail,
   delMails,
-  getOpsToken
 } from '@/api/mail'
 import moment from 'moment'
 
@@ -375,6 +389,7 @@ export default {
       modalForm: {
         subject: '',
         actived: true,
+        channel: '',
         attachments: [],
         content: '',
         to: '',
@@ -467,27 +482,15 @@ export default {
           const data = res.data
           if (data.errcode === 0) {
             this.tableData = data.maillist
-            this.total = data.maillist.length;
+            this.total = data.maillist.length
             this.isLoaded = false
           }
         })
         .catch(err => {
           console.log(err)
-          this.isLoaded = false;
+          this.isLoaded = false
         })
     },
-    getOpsToken() {
-      return new Promise((resolve, reject) => {
-        getOpsToken()
-          .then(res => {
-            const data = res.data
-            data.errcode === 0 ? resolve(data.result) : reject(data.errmsg)
-          })
-          .catch(err => {
-            reject(err)
-          })
-      })
-    },
     validateForm(formName) {
       return new Promise((resolve, reject) => {
         this.$refs[formName].validate(valid => {
@@ -526,6 +529,7 @@ export default {
       return {
         subject: '',
         actived: true,
+        channel: '0',
         attachments: [],
         content: '',
         to: '',
@@ -678,7 +682,7 @@ export default {
       return (this.currentPage - 1) * this.pageSize + index + 1
     },
     formType(row, column, cellValue, index) {
-      if (cellValue == 1) {
+      if (cellValue === 1) {
         return '个人邮件'
       } else {
         return '群发邮件'