Merge remote-tracking branch 'origin/dev' into dev

project/xiushan/apps/AppNewsCenter/components/addArticle.vue

@@ -130,7 +130,12 @@ export default {
           this.articInfo.title = res.data.title;
           this.articInfo.content = res.data.content;
           this.articInfo.category = res.data.category
+          if (res.data.thumbUrl) {
             this.articInfo.thumbUrl = [{url: res.data.thumbUrl}]
+          } else {
+            this.articInfo.thumbUrl = []
+          }
+          
         }
       })
     }

project/xiushan/apps/AppNewsCenter/components/addVideo.vue

@@ -169,7 +169,11 @@ export default {
           this.newsInfo.description = res.data.description;
           this.newsInfo.category = res.data.category
           this.newsInfo.videoUrl = res.data.videoUrl;
-          this.newsInfo.thumbUrl = [{url: res.data.thumbUrl}];
+          if (res.data.thumbUrl) {
+            this.newsInfo.thumbUrl = [{url: res.data.thumbUrl}]
+          } else {
+            this.newsInfo.thumbUrl = []
+          }
         }
       })
     }