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

# Conflicts: # .gitignore # src/components/Course/weikeContent.vue
2025-12-17 06:46:43 +08:00 · 2022-06-02 11:47:59 +08:00
parent 9ab5d6c21e 33563eef10
commit 3b60dea485
10 changed files with 442 additions and 132 deletions
--- a/src/components/Course/collectItem.vue
+++ b/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;
--- a/src/components/Course/weikeContent.vue
+++ b/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,