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

# Conflicts:
#	.gitignore
#	src/components/Course/weikeContent.vue

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

@@ -593,6 +593,7 @@
             setupTage:0,
           },
         },
+        pdfTip:'',//pdf文件的提示
         hasCWare:{ keyword:'', count: 0, pageSize: 10, pageIndex: 1, list:[]},
         homework:{
           show:1,

src/components/UserCenter/menu.vue

@@ -73,10 +73,11 @@
             <span slot="title" class="textl">考试管理</span>
           </el-menu-item>
         </el-submenu>
-       <!-- <el-menu-item index="/manage/teachers" v-show="curIdentity == 3">
+		<!--增加一个说明-->
+        <el-menu-item index="/manage/teachers" v-show="curIdentity == 3">
           <svg-icon icon-class="teather"></svg-icon>
           <span slot="title">教师管理</span>
-        </el-menu-item> -->
+        </el-menu-item>
         <!-- <el-menu-item index="/case/manage" v-show="curIdentity == 3">
           <svg-icon icon-class="case"></svg-icon>
           <span slot="title">案例管理</span>
@@ -426,7 +427,7 @@ export default {
    height: 36px;
 }
 .oneheight{
- 
+
   height: 36px;
   line-height: 36px;
 }