Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
		@@ -130,7 +130,12 @@ export default {
 | 
				
			|||||||
          this.articInfo.title = res.data.title;
 | 
					          this.articInfo.title = res.data.title;
 | 
				
			||||||
          this.articInfo.content = res.data.content;
 | 
					          this.articInfo.content = res.data.content;
 | 
				
			||||||
          this.articInfo.category = res.data.category
 | 
					          this.articInfo.category = res.data.category
 | 
				
			||||||
          this.articInfo.thumbUrl = [{url: res.data.thumbUrl}]
 | 
					          if (res.data.thumbUrl) {
 | 
				
			||||||
 | 
					            this.articInfo.thumbUrl = [{url: res.data.thumbUrl}]
 | 
				
			||||||
 | 
					          } else {
 | 
				
			||||||
 | 
					            this.articInfo.thumbUrl = []
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
 | 
					          
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      })
 | 
					      })
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -169,7 +169,11 @@ export default {
 | 
				
			|||||||
          this.newsInfo.description = res.data.description;
 | 
					          this.newsInfo.description = res.data.description;
 | 
				
			||||||
          this.newsInfo.category = res.data.category
 | 
					          this.newsInfo.category = res.data.category
 | 
				
			||||||
          this.newsInfo.videoUrl = res.data.videoUrl;
 | 
					          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 = []
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      })
 | 
					      })
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user