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

project/oms/apps/develop/AppDeployCustom/add.vue

@@ -57,12 +57,18 @@
                     </ai-table>
                   </template>
                   <template v-else-if="form.type=='wxwork'">
-                    <el-form-item label="接口是否单服务">
-                      <el-checkbox v-model="form.isSingleService"/>
-                    </el-form-item>
-                    <el-form-item label="默认首页">
-                      <el-input v-model="form.homePage" clearable placeholder="默认首页"/>
-                    </el-form-item>
+                    <el-row type="flex">
+                      <div class="fill">
+                        <el-form-item label="接口是否单服务">
+                          <el-checkbox v-model="form.isSingleService"/>
+                        </el-form-item>
+                      </div>
+                      <div class="fill">
+                        <el-form-item label="默认首页">
+                          <el-input v-model="form.homePage" clearable placeholder="填写应用的文件名"/>
+                        </el-form-item>
+                      </div>
+                    </el-row>
                   </template>
                 </template>
               </ai-card>
@@ -164,7 +170,7 @@ export default {
           const {tabBar, form: {type, appId, isSingleService, homePage}} = this
           if (type == 'mp') {
             this.form.extra = {tabBar, appId}
-          } else if (v == 'wxwork') {
+          } else if (type == 'wxwork') {
             this.form.extra = {isSingleService, homePage}
           }
           this.instance.post("/node/custom/addOrUpdate", this.form).then(res => {

project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue

@@ -28,8 +28,8 @@
           </div>
           <div class="flex-right">
             <div class="title">{{chooseMonth}}月{{chooseDay}}日宣发内容</div>
-            <div class="list-content">
-              <el-timeline>
+            <div class="list-content" v-if="taskList.length">
+              <el-timeline >
                 <el-timeline-item v-for="(item, index) in taskList" :key="index">
                   <el-card>
                     <div class="flex-between">
@@ -52,8 +52,9 @@
                   </el-card>
                 </el-timeline-item>
               </el-timeline>
-              <ai-empty v-if="!taskList.length" />
+              
             </div>
+            <ai-empty v-if="!taskList.length" />
           </div>
         </div>
       </div>
@@ -530,6 +531,7 @@
             box-sizing: border-box;
             overflow-y: scroll;
             background-color: #F9F9F9;
+            box-sizing: border-box;
             .item-title{
               width: calc(100% - 100px);
               word-break: break-all;