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

src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue

@@ -24,6 +24,7 @@
       </div>
     </div>
     <AiEmpty description="暂无数据" v-if="!list.length"/>
+
     <u-popup v-model="filterShow" mode="bottom" border-radius="14">
       <div class="popup">
         <div class="tips"></div>
@@ -74,6 +75,7 @@
         </div>
       </div>
     </u-popup>
+
   </div>
 </template>
 
@@ -160,7 +162,7 @@ export default {
     },
     confirmEnd(val) {
       this.endTime = val.year + '-' + val.month + '-' + val.day
-    },
+    }
   },
   onShow() {
     document.title = '协同宣发'
@@ -252,6 +254,7 @@ export default {
       }
     }
   }
+
   .popup {
     box-sizing: border-box;
     // height: 800px;