合并

pages/course/courseDetail.vue

@@ -906,7 +906,6 @@ export default {
       this.htmlContent = data.html;
       console.log(data, this.htmlContent, "this.htmlContent--++++");
 
-<<<<<<< HEAD
       if (
         (this.htmlContent == "" || this.htmlContent == "<p><br></p>") &&
         this.uploadPicLIst.length == 0
@@ -917,19 +916,6 @@ export default {
         });
         return;
       }
-=======
-				if ((this.htmlContent == '' || this.htmlContent == '<p><br></p>') && this.uploadPicLIst.length == 0) {
-					uni.showToast({
-						icon: 'none',
-						title: '您未输入内容哦'
-					})
-					return
-				}
-				
-				let images = ''
-				if (this.uploadPicLIst.length > 0) {
-					let list = this.uploadPicLIst.map(item => item.url)
->>>>>>> b988ec5ba4c35d1a3e1bed5bd9907a93aaeeb559
 
       let images = "";
       if (this.uploadPicLIst.length > 0) {