Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/project/saas/AppCooperationPropaganda/addPropaganda.vue

@@ -48,13 +48,28 @@
     <div class="mask" v-show="showPopup" @tap="showPopup = false">
       <div class="noticeModal" @tap.stop>
         <div class="body">
+
           <div class="text_content">
             <img class="text_left" src="https://cdn.cunwuyun.cn/dvcp/announce/avatar.png" />
             <div class="text_right">
               居民每个月最多接收来自同一企业管理员的4条群发消息，咨询电话：
             </div>
           </div>
-          <div class="file_content"></div>
+        
+          <div class="file_content">
+            <img class="text_left" src="https://cdn.cunwuyun.cn/dvcp/announce/avatar.png" />
+            <div class="text_right file_right">
+              <!-- 居民每个月最多接收来自同一企业管理员的4条群发消息，咨询电话： -->
+              <div class="cont_left">
+                <h4>企微协同宣发测cs试测试pptx</h4>
+                <p>847k</p>
+              </div>
+              <div class="cont_right">
+                <img src="https://cdn.cunwuyun.cn/dvcp/announce/ppt.png" alt="">
+              </div>
+            </div>
+          </div>
+
         </div>
         <div class="footer">
           <div class="exit" @click="showPopup = false">退出预览</div>
@@ -172,7 +187,7 @@ export default {
 
   .isExamine {
     background: #FFF;
-    padding: 0 32px;
+    padding: 0px 32px;
     box-sizing: border-box;
     box-shadow: inset 0px -1px 0px 0px #DDDDDD;
     
@@ -180,12 +195,13 @@ export default {
     .examine_person {
       display: flex;
       justify-content: space-between;
-      padding: 26px 0;
+      padding: 26px 0px;
       box-sizing: border-box;
     }
 
     .examine_person {
       border-top: 2px solid #DDD;
+      padding: 26px 0 0 0;
     }
   }
   .color_red {
@@ -228,14 +244,17 @@ export default {
       color: #333;
       line-height: 48px;
 
-      .text_content {
+      .text_content,
+      .file_content {
         display: flex;
+        margin-bottom: 32px;
         .text_left { 
           margin-right: 32px;
           width: 84px;
           height: 84px;
         }
         .text_right {
+          width: calc(100% - 116px);
           background: #FFF;
           border-radius: 10px;
           padding: 24px;
@@ -256,6 +275,25 @@ export default {
             transform: translate(-100%, 0%);
           }
         }
+        .file_right {
+          display: flex;
+          .cont_left {
+            width: calc(100% - 90px);
+            h4 { 
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+          }
+          .cont_right {
+            width: 84px;
+            height: 84px;
+            img {
+              width: 100%;
+              height: 100%;
+            }
+          }
+        }
       }
     }