Browse Source

Merge remote-tracking branch 'origin/dev-bq'

白白 2 years ago
parent
commit
d477134979

+ 1 - 0
src/components/WordEditor/WordEditor.vue

@@ -115,6 +115,7 @@
   // 监听 OnlyOffice组件中的文档准备事件
   const onDocumentReady = (event: any) => {
     console.log('Document is loaded');
+    console.log(props.documentUrl);
   };
 
   // 监听 OnlyOffice组件中的加载组件错误事件

+ 7 - 4
src/views/CourseSquare/component/AllCourse/MoreCourse.vue

@@ -171,7 +171,7 @@ const fetchData = () => {
   }
 }
 
-const processTeacherName = () => {
+const processData = () => {
   for(let i:number = 0; i < pageInfo.courseData.length; i++){
     for(let j = 0; j < pageInfo.courseData[i].teacherIds.length; j++){
       apis.findUserById(pageInfo.courseData[i].teacherIds[j])
@@ -183,6 +183,9 @@ const processTeacherName = () => {
           })
     }
   }
+  for(let i:number = 0; i < pageInfo.courseData.length; i++){
+    pageInfo.courseData[i].courseImages[0] = pageInfo.courseData[i].courseImages[0].split("?")[0]
+  }
 }
 
 const fetchAllCourse = () => {
@@ -190,7 +193,7 @@ const fetchAllCourse = () => {
       .then((res: any) => {
         console.log(res)
         pageInfo.courseData = res.data.data.records
-        processTeacherName()
+        processData()
         pageInfo.total = res.data.data.total
         Object.assign(pageInfo2Show, pageInfo)
       })
@@ -206,7 +209,7 @@ const fetchCourseByUserId = () => {
         .then((res: any) => {
           console.log(res)
           pageInfo.courseData = res.data.data.records
-          processTeacherName()
+          processData()
           pageInfo.total = res.data.data.total
           Object.assign(pageInfo2Show, pageInfo)
         })
@@ -219,7 +222,7 @@ const fetchCourseByUserId = () => {
         .then((res: any) => {
           console.log(res.data.data)
           pageInfo.courseData = res.data.data.records
-          processTeacherName()
+          processData()
           pageInfo.total = res.data.data.total
           Object.assign(pageInfo2Show, pageInfo)
         })

+ 9 - 9
src/views/CourseSquare/component/Banner/Banner.vue

@@ -20,29 +20,29 @@
   const pictureItems = reactive([
     {
       id: 1,
-      src:"http://eai-files.oss-cn-shanghai.aliyuncs.com/uploads/%E5%90%AC%E5%8A%9B.png?Expires=1723824152&OSSAccessKeyId=LTAI5tAbkw8rkreiJbfcY1jZ&Signature=%2BHeaAgMm9Qo8%2Fyi8y0n85HPB3Xo%3D",
+      src:"https://ts1.cn.mm.bing.net/th/id/R-C.0aa9ed99186139c4e63a27925fb1c8c3?rik=6s%2bivLti461gug&riu=http%3a%2f%2fwww.quazero.com%2fuploads%2fallimg%2f140607%2f1-14060G63057.jpg&ehk=UC319wlPmShs08sfR11%2bnuGdT25fCAyOaLgasO9TEWE%3d&risl=&pid=ImgRaw&r=0",
       alt:""
     },
     {
       id: 2,
-      src:"http://eai-files.oss-cn-shanghai.aliyuncs.com/uploads/%E4%BA%92%E8%AF%91.png?Expires=1723824596&OSSAccessKeyId=LTAI5tAbkw8rkreiJbfcY1jZ&Signature=f%2FX0RyaFuRc9lRnOnkfMnAJP0DA%3D",
+      src:"https://ts1.cn.mm.bing.net/th/id/R-C.ba878cda40c552712ff91b7441c15c6f?rik=KjUig1Gbxp%2f04w&riu=http%3a%2f%2fwww.quazero.com%2fuploads%2fallimg%2f140607%2f1-14060G63046.jpg&ehk=%2fJ7uX4m3ffl26ltsA%2b7n%2bAcZKlyPBI9s%2bKQNa%2bgp1p8%3d&risl=&pid=ImgRaw&r=0",
       alt:""
     },
     {
       id: 3,
-      src:"http://eai-files.oss-cn-shanghai.aliyuncs.com/uploads/%E5%B0%8F%E8%AF%B4.png?Expires=1723824605&OSSAccessKeyId=LTAI5tAbkw8rkreiJbfcY1jZ&Signature=x7V%2BrN2jTdHowB5ymzbPAFrPTtk%3D",
+      src:"https://ts1.cn.mm.bing.net/th/id/R-C.15e5174fc0f174df652977a29cb8c971?rik=LW%2b0WEV0Nn9fig&riu=http%3a%2f%2fwww.quazero.com%2fuploads%2fallimg%2f140607%2f1-14060G63059.jpg&ehk=5d9bDO4Y6a9g36PQ6usFLLr7IGtBlRJIWnmAXSJ0FLo%3d&risl=&pid=ImgRaw&r=0",
       alt:""
     },
     {
       id: 4,
-      src:"https://nos.netease.com/edu-image/6206b18f29804aeb87d83f360552b8ce.jpg",
-      alt:""
-    },
-    {
-      id: 7,
-      src:"https://nos.netease.com/edu-image/c76ad7fd5c3644899844c1edc0c11193.jpg",
+      src: "https://ts1.cn.mm.bing.net/th/id/R-C.344979857cde4bb5240a133c4c19cf64?rik=vwb78fOeQFChYg&riu=http%3a%2f%2fwww.quazero.com%2fuploads%2fallimg%2f140607%2f1-14060G63050.jpg&ehk=LdMiMyS4pebCqp%2b547SJxao%2byoVw%2fdZoIooa3kYGWgE%3d&risl=&pid=ImgRaw&r=0",
       alt:""
     },
+    // {
+    //   id: 7,
+    //   src:"https://nos.netease.com/edu-image/c76ad7fd5c3644899844c1edc0c11193.jpg",
+    //   alt:""
+    // },
   ])
 </script>
 

+ 3 - 0
src/views/CourseSquare/component/Course/index.vue

@@ -214,6 +214,9 @@
             })
       }
     }
+    for(let i:number = 0; i < courses.course.length; i++){
+      courses.course[i].courseImages[0] = courses.course[i].courseImages[0].split("?")[0]
+    }
   }
 
   onMounted(()=>{

+ 1 - 0
src/views/CourseSquare/component/CourseDetails/index.vue

@@ -320,6 +320,7 @@ const processCourses = () => {
           console.log("错误信息",err)
         })
   }
+  dataForm.courseImages[0] = dataForm.courseImages[0].split("?")[0]
 }
 
 const getCourse = () => {