Merge branch 'master' of https://gitee.com/wjl2008_admin/medicine_app

pages/course/courseDetail.vue

@@ -906,6 +906,7 @@ 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
@@ -916,6 +917,19 @@ 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) {