Merge branch 'develop' into test

src/views/message-manage/main/add-mass/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-08 10:09:47
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-09-19 16:59:03
+ * @LastEditTime: 2022-09-19 17:25:05
  * @FilePath: \TelpoUserManageAdmin\src\views\message-manage\main\add-mass\index.vue
  * @description: 添加群发
 -->
@@ -23,13 +23,18 @@
             </el-form-item>
 
             <el-form-item prop="keyword1">
-              <p>学习账号{{keyword1Data}}</p>
+              <p>消息类别{{keyword1Data}}</p>
               <el-input v-model="form.keyword1" class="input-width-400" clearable prop="keyword1"></el-input>
             </el-form-item>
 
             <el-form-item prop="keyword2">
-              <p>更新内容{{keyword2Data}}</p>
-              <el-input v-model="form.keyword2" class="input-width-600" clearable prop="keyword1"></el-input>
+              <p>通知用户{{keyword2Data}}</p>
+              <el-input v-model="form.keyword2" class="input-width-400" clearable prop="keyword1"></el-input>
+            </el-form-item>
+
+            <el-form-item prop="keyword3">
+              <p>通知内容{{keyword3Data}}</p>
+              <el-input v-model="form.keyword3" class="input-width-600" clearable prop="keyword1"></el-input>
             </el-form-item>
 
             <el-form-item prop="remark">
@@ -53,12 +58,12 @@
             </el-select>
             <el-button type="primary" @click="onCheckList" disabled>查看名单</el-button>
           </el-form-item>
+          <div class="footer-container">
+        <el-button type="primary" v-for="(item, index) in footBtnList" :key="index" @click="item.click">{{item.name}}</el-button>
+      </div>
         </el-form>
       </div>
       <!-- 底部操作按钮 -->
-      <div class="footer-container">
-        <el-button type="primary" v-for="(item, index) in footBtnList" :key="index" @click="item.click">{{item.name}}</el-button>
-      </div>
       <!-- 预览dialog -->
       <el-dialog title="预览信息" :visible.sync="previewShow">
         <div class="preview-container">
@@ -95,6 +100,7 @@ export default {
      firstData: '{{first.DATA}}:',
      keyword1Data: '{{keyword1DATA}}:',
      keyword2Data: '{{keyword2DATA}}:',
+     keyword3Data: '{{keyword3DATA}}:',
      remarkData: '{{remarkDATA}}:',
      form: {
        subject: '' /* || '财商学习通知' */, //发送主题
@@ -105,6 +111,7 @@ export default {
        first: '' /* || '家长您好，您孩子所需的财商学习内容有更新' */, //内容模板标题
        keyword1: '' /* || 'csds' */, //学习账号
        keyword2: '' /* || '财商36问' */, //更新内容
+       keyword3: '',
        remark: '' /* || '请点击内容查看详情' */, //内容详情
      },
      article: '', //选择文章
@@ -135,6 +142,9 @@ export default {
       keyword2: [
         { required: true, message: '请填写消息模板内容', trigger: 'blur' },
       ],
+      keyword3: [
+        { required: true, message: '请填写消息模板内容', trigger: 'blur' },
+      ],
       remark: [
         { required: true, message: '请填写消息模板内容', trigger: 'blur' },
       ],
@@ -208,7 +218,7 @@ export default {
     // 立即发送
     onSend() {
       // 拼接所需字段
-      let keywordStr = this.form.keyword1 + ',' + this.form.keyword2;
+      let keywordStr = this.form.keyword1 + ',' + this.form.keyword2 + ',' + this.form.keyword3;
       let reqBody = {
         send_now: true, //true 是立即发送， false是保存
         subject: this.form.subject,
@@ -235,7 +245,7 @@ export default {
     // 保存
     onSave() {
       // 拼接所需字段
-      let keywordStr = this.form.keyword1 + ',' + this.form.keyword2;
+      let keywordStr = this.form.keyword1 + ',' + this.form.keyword2 + ',' + this.form.keyword3;
       let reqBody = {
         send_now: false, //true 是立即发送， false是保存
         subject: this.form.subject,
@@ -318,18 +328,21 @@ export default {
 
 <style scoped lang="scss">
     .home-container {
+      height: 600px;
       padding: 0 20px;
       //overflow-y: scroll;
       overflow-x: hidden;
       border: none;
       box-shadow: none;
+      overflow-y: scroll;
       .form-container {
-        height: 520px;
+        height: 600px;
         padding: 5px 0;
         border: 1px solid #d8dce5;
         display: flex;
         justify-content: center;
-        align-items: center;
+        //align-items: center;
+        overflow: scroll;
         p {
           margin: 5px 0;
         }