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:
  修复两层遮罩
  修改下载

src/components/course/pica-video.vue

@@ -56,11 +56,11 @@
       </div>
       <!-- 播放遮罩 -->
       <transition name="fade">
-        <div v-show="isPaused" class="cover cover-play" @click="togglePlay"></div>
+        <div v-show="logged && isPaused" class="cover cover-play" @click="togglePlay"></div>
       </transition>
       <!-- 播放错误 -->
       <transition name="fade">
-        <div v-show="showError" class="cover cover-error">
+        <div v-show="logged && showError" class="cover cover-error">
           <p>播放失败，请确认网络正常或重新进入页面</p>
         </div>
       </transition>
@@ -144,7 +144,7 @@ export default {
   created() {
     this.vid = `video_${this._uid}`;
     const ua = navigator.userAgent;
-    this.isWechat = ua.match(/(MicroMessenger)\/([\d.]+)/);
+    // this.isWechat = ua.match(/(MicroMessenger)\/([\d.]+)/);
     this.isAndroid = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
   },
   mounted() {

src/views/course-detail.vue

@@ -2,7 +2,7 @@
   <div class="course-detail">
     <!-- 视频 -->
     <div class="video-box">
-      <pica-video ref="picaVideo" :coverType="coverType" @onVideoEnd="onVideoEnd" @onReplay="onReplay">
+      <pica-video ref="picaVideo" :coverType="coverType" :download="download" @onVideoEnd="onVideoEnd" @onReplay="onReplay">
         <!-- 试看结束 -->
         <div class="cover" v-if="logged && coverType === 1">
           <course-covers coverTips="试看结束<br />请来云鹊医App学习完整课程" :isSingle="true" rightBtnText="学习完整课程" @btnClick="btnClick" />