Merge branch 'dev-coursedetail-0817' of...

Merge branch 'dev-coursedetail-0817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam into dev-coursedetail-0817

* 'dev-coursedetail-0817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam:
  修改头像加载错误
  修改课件样式
  修改文件路径
  测试pdf

# Conflicts:
#	src/utils/env-config.js

src/components/course/course-comment.vue

 <template>
   <div class="course-comment">
     <div class="item" v-for="(item, index) in comments" :key="index">
-      <img class="img" :src="item.imageUrl || 'https://file.yunqueyi.com/File/doctor_default.png'" alt="头像" />
+      <img class="img" :src="item.imageUrl || 'https://file.yunqueyi.com/File/doctor_default.png'" alt="头像" @error="onAvatarError" />
       <div class="info-box">
         <div class="info-user">
           <div class="name">{{ item.doctorName }}</div>
@@ -78,7 +78,7 @@ export default {
         item.cList = item.aList;
       }
       this.comments.splice(index, 1, item);
-    }
+    },
   }
 };
 </script>

src/components/course/course-teacher.vue

@@ -2,7 +2,7 @@
   <div class="course-teacher-wrapper">
     <div class="basic-title">讲师介绍</div>
     <div class="leader-info" v-for="(item,index) in doctorList" :key="index">
-      <img :src="item.app_image_url" alt="头像" />
+      <img :src="item.app_image_url" alt="头像" @error="onAvatarError" />
       <div class="leader-text">
         <div class="leader-con">
           <span>{{item.name}}</span>

src/components/course/course-ware.vue

@@ -10,6 +10,7 @@
 */
 import pdfJS from 'pdfjs-dist/es5/build/pdf';
 pdfJS.GlobalWorkerOptions.workerSrc = 'https://cdn.bootcdn.net/ajax/libs/pdf.js/2.4.456/pdf.worker.min.js';
+import coverImg from '@/images/course/lock-big.png';
 
 export default {
   props: {
@@ -58,10 +59,13 @@ export default {
     createCanvas(pdfPage) {
       let viewport = pdfPage.getViewport({ scale: 1.0 });
       let box = document.createElement("div");
-      box.className = 'canvas-box';
+      box.style.position = 'relative';
+      box.style.marginBottom = '30px';
       let canvas = document.createElement("canvas");
       canvas.width = viewport.width;
       canvas.height = viewport.height;
+      canvas.style.display = 'block';
+      canvas.style.width = '100%';
       let ctx = canvas.getContext("2d");
       let renderTask = pdfPage.render({
         canvasContext: ctx,
@@ -70,9 +74,16 @@ export default {
       box.appendChild(canvas);
       if (!this.visible) {
         let cover = document.createElement("div");
-        cover.className = 'canvas-cover';
+        cover.style.position = 'absolute';
+        cover.style.left = '0';
+        cover.style.top = '0';
+        cover.style.width = '100%';
+        cover.style.height = '100%';
+        cover.style.background = `url(${coverImg}) no-repeat center center`;
+        cover.style.backgroundSize = '50px auto';
+        cover.style.backgroundColor = 'rgba(255, 255, 255, .8)';
         cover.onclick = () => {
-          if (!this.$store.getter.logged) {
+          if (!this.$store.getters.logged) {
             this.$store.dispatch('goLogin');
             return;
           }
@@ -90,23 +101,5 @@ export default {
 .course-ware{
   padding-top: 20px;
   overflow: hidden;
-  /deep/ .canvas-box{
-    position: relative;
-    margin-bottom: 30px;
-  }
-  /deep/ .canvas-cover{
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background: url('~@/images/course/lock-big.png') no-repeat center center;
-    background-size: 50px auto;
-    background-color: rgba(255, 255, 255, .2);
-  }
-  /deep/ canvas{
-    display: block;
-    width: 100%;
-  }
 }
 </style>

src/utils/env-config.js

@@ -27,6 +27,12 @@ export const envConfig = {
     // fileUrl: 'https://dev-www.yunqueyi.com',
     // appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
 
+    // apiUrl: 'https://uat-api.yunqueyi.com/',
+    // webPageUrl: 'https://uat-phome.yunqueyi.com/',
+    // hactiveUrl: 'https://uat-hactive.yunqueyi.com',
+    // phomeDemain: 'https://dev-phome.yunqueyi.com',
+    // appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
+
     // baseUrl: 'https://sc.yunqueyi.com/',
     // apiUrl: 'https://api.yunqueyi.com/',
     // webPageUrl: 'https://phome.yunqueyi.com/'

src/utils/index.js

@@ -25,8 +25,8 @@ export function getHactiveUrl(url) {
 
 // 获取pdf文件地址
 export function getPdfFileUrl(path) {
-  let base = getConfigByEnvType('fileUrl');
-  return `${base}/proxyPdf${path}`;
+  let base = getConfigByEnvType('webPageUrl');
+  return `${base}proxyPdf${path}`;
 }
 
 // 获取微信APPID

src/utils/mixins.js

@@ -211,6 +211,8 @@ module.exports = {
             }
             return null
         },
-
+        onAvatarError(e) {
+          e.target.src = 'https://file.yunqueyi.com/File/doctor_default.png';
+        },
     }
 }