协同宣发

project/sass/apps/Announce/AppAnnounce/components/Add.vue

@@ -55,7 +55,7 @@
                       <div class="add-item" v-for="(item, index) in fileList" :key="index">
                         <div class="left">
                           <img :src="mapIcon(item.msgType)" />
-                          <span>{{ item.name || item.linkTitle || item.mpTitle }}</span>
+                          <span>{{ item.mpTitle || item.name || item.linkTitle }}</span>
                         </div>
                         <i @click="removeFile(index)">删除</i>
                       </div>
@@ -198,6 +198,7 @@
                   </div>
                   <div class="msg-wrapper msg-miniapp" v-if="item.msgType === '5'">
                     <h2>{{ item.mpTitle }}</h2>
+                    <img :src="item.url" />
                     <div class="msg-bottom">
                       <i>小程序</i>
                       <img src="https://cdn.cunwuyun.cn/dvcp/announce/miniapp.png">
@@ -292,6 +293,7 @@
                   v-model="dateForm.choiceTime"
                   type="datetime"
                   size="small"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="请选择定时发送时间">
                 </el-date-picker>
               </el-form-item>
@@ -490,7 +492,8 @@
               ...this.miniAppForm,
               msgType: '5',
               ...this.miniAppForm.media[0],
-              mediaId: this.miniAppForm.media[0].media.mediaId
+              mediaId: this.miniAppForm.media[0].media.mediaId,
+              sysFileId: this.miniAppForm.media[0].id
             })
 
             this.isShowAddMiniapp = false
@@ -600,12 +603,15 @@
               ...this.fileList
             ]
 
-            this.isLoading = true
+            if (sendType === 0) {
+              this.isLoading = true
+            }
             this.instance.post(`/app/appmasssendingtask/addOrUpdate`, {
               ...this.form,
               id: this.params.id,
               wxGroups: this.form.wxGroups,
               contents,
+              sendType,
               choiceTime: this.dateForm.choiceTime,
               filterCriteria: this.form.filterCriteria.join(','),
               examines: this.form.examines.length ? this.form.examines.map(v => {
@@ -865,7 +871,9 @@
 
               .msg-miniapp {
                 width: 206px;
+                padding: 0 12px;
                 text-align: justify;
+                font-size: 0;
                 background: #FFFFFF;
                 border-radius: 5px;
                 font-size: 14px;
@@ -873,17 +881,24 @@
 
                 h2 {
                   line-height: 1.2;
-                  padding: 8px 10px 8px;
+                  padding: 8px 0;
                   border-bottom: 1px solid #eee;
                   color: #222222;
                   font-size: 14px;
                 }
 
+                img {
+                  width: 100%;
+                  height: 120px;
+                  margin-bottom: 8px;
+                }
+
                 .msg-bottom {
                   display: flex;
                   align-items: center;
                   line-height: 1;
-                  padding: 8px 12px;
+                  padding: 4px 0;
+                  border-top: 1px solid #eee;
 
                   i {
                     margin-right: 4px;
@@ -893,8 +908,8 @@
                   }
 
                   img {
-                    width: 20px;
-                    height: 20px;
+                    width: 16px;
+                    height: 16px;
                     border-radius: 50%;
                   }
                 }