Merge branch 'teacher' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into case

# Conflicts:
#	.gitignore

src/components/Course/collectItem.vue

@@ -134,7 +134,7 @@ export default {
 <style lang="scss" scoped>
 .one-line-ellipsis{
   display: -webkit-box;
-  // white-space:pre-wrap;
+  white-space:pre-wrap;
   word-wrap: break-word;
   word-break:break-all;
   overflow: hidden;

src/components/Course/weikeContent.vue

@@ -103,7 +103,7 @@
                             <el-image :src="fileBaseUrl+cware.content.content" fit="fill"></el-image>
                           </div>
                           <div v-if="cware.content.contentType==40">
-                            <div style="padding: 10px;color: #767676; ">如果pdf无法显示，请稍后再试，文档转化是异步处理，有可能是文档还未转化完成 </div>
+                            <div style="padding: 10px;color: #767676; ">如果pdf无法显示，请稍后再试，文档转化是异步处理，有可能是文档还未转化完成，您可以先提交课程内容 </div>
                             <pdfPreview v-if="cware.content.contentType == 40" :filePath="fileBaseUrl+cware.content.pdfPath"></pdfPreview>
                           </div>
                       </div>
@@ -580,6 +580,7 @@
             setupTage:0,
           },
         },
+        pdfTip:'',//pdf文件的提示
         hasCWare:{ keyword:'', count: 0, pageSize: 10, pageIndex: 1, list:[]},
         homework:{
           show:1,