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:
  添加视频

# Conflicts:
#	src/views/share-merge-detail.vue

src/views/share-merge-detail.vue

@@ -30,31 +30,22 @@
         :options="videoOptions"
         @sk-tip="isShowSkDialog=true"
       ></CommonTcPlayer> -->
-
-      <pica-video v-if="bannerType == 2" ref="picaVideo" @onVideoEnd="onVideoEnd" @onReplay="onReplay">
-        <!-- 试看结束 -->
-        <div class="cover" v-if="logged && coverType === 1">
-          <course-covers coverTips="试看结束<br />请来云鹊医App学习完整课程" :isSingle="true" rightBtnText="学习完整课程" @btnClick="btnClick" />
-        </div>
-        <!-- 付费课程，下载App -->
-        <div class="cover" v-if="logged && coverType === 2">
-          <course-covers coverTips="本课程为付费课程，请来云鹊医App学习" :isSingle="true" rightBtnText="去云鹊医App" @btnClick="btnClick" />
-        </div>
-        <!-- 下一个提示 -->
-        <div class="next-countdown" v-if="coverType === 3">3秒后播放下一节</div>
-        <!-- 未学完提示 -->
-        <div class="cover" v-if="logged && coverType === 4">
-          <course-covers coverTips="您已学习至最后一节<br />但本课程中仍有未学完的内容" :isSingle="true" rightBtnText="继续学完本课程" @btnClick="btnClick" />
-        </div>
-        <!-- 已学完，无考试 -->
-        <div class="cover" v-if="logged && coverType === 5">
-          <course-covers coverTips="您已完成全部学习<br />来云鹊医App参加考试巩固学习成果" leftBtnText="返回项目" @btnClick="btnClick" />
-        </div>
-        <!-- 未登录 -->
-        <div class="cover" v-if="!logged">
-          <course-covers coverTips="登录后马上学习课程" :isSingle="true" rightBtnText="去登录" @btnClick="goLogin" />
-        </div>
-      </pica-video>
+      <div class="video-box" v-if="bannerType == 2">
+        <pica-video ref="picaVideo" @onVideoEnd="onVideoEnd" @onReplay="onReplay">
+          <!-- 试看结束 -->
+          <div class="cover" v-if="logged && coverType === 1">
+            <course-covers coverTips="试看结束<br />请来云鹊医App学习完整课程" :isSingle="true" rightBtnText="学习完整课程" @btnClick="btnClick" />
+          </div>
+          <!-- 播放结束，下载App -->
+          <div class="cover" v-if="logged && coverType === 2">
+            <course-covers coverTips="播放结束<br />更多其他课程，请前往鹊医App学习" :isSingle="true" rightBtnText="去云鹊医App" @btnClick="btnClick" />
+          </div>
+          <!-- 未登录 -->
+          <div class="cover" v-if="!logged">
+            <course-covers coverTips="登录后马上学习课程" :isSingle="true" rightBtnText="去登录" @btnClick="goLogin" />
+          </div>
+        </pica-video>
+      </div>
 
       <!-- <div class="sk-btn-cover-new" @click="continueStudy()" v-if="bannerType == 2 && hasBindCard">
         <span :class="{'android': isAndroid}">继续学习</span>
@@ -284,7 +275,7 @@ export default {
       projectId: "1",
       contentList: [],
       //moduleName: "",
-      bannerType: 1, // 1 图片 2视频
+      bannerType: 2, // 1 图片 2视频
       videoOptions: {
         mp4: "",
         autoplay: false, //iOS下safari浏览器，以及大部分移动端浏览器是不开放视频自动播放这个能力的
@@ -397,50 +388,10 @@ export default {
         }
       });
     },
-
     // 视频播放结束
     onVideoEnd(opt) {
       if (opt.type === 1) {
-        let chapters = deepCopy(this.chapters);
-        let curtI = 0;
-        let curtJ = 0;
-        let curtIndex = 0;
-        let count = 0;
-        let prev; // 第一个未完成的
-        for (let i = 0; i < chapters.length; i++) {
-          let lectures = chapters[i]['lectures'];
-          for (let j = 0; j < lectures.length; j++) {
-            count += 1;
-            let lecture = lectures[j];
-            if (this.curtLectureId === lecture.lectureId) {
-              curtIndex = count;
-              curtI = i;
-              curtJ = j;
-              lecture.progress = 1;
-              lecture.statusText = '已学习';
-              lecture.btnText = '复习课程';
-            }
-            if (!prev && lecture.progress < 1) {
-              prev = { ...lecture }
-            }
-          }
-        }
-        if (curtIndex === count) { // 最后一个
-          if (prev) {
-            this.coverType = 4;
-            this.prev = prev;
-          } else {
-            this.coverType = 5;
-            this.course.status = 3;
-          }
-        } else { // 3秒后播放下一个
-          let next = chapters[curtI]['lectures'][curtJ + 1] || chapters[curtI + 1]['lectures'][0];
-          this.coverType = 3;
-          setTimeout(() => {
-            this.selectLecture(next);
-          }, 3000)
-        }
-        this.chapters = chapters;
+        this.coverType = 2;
       } else if (opt.type === 2) { // 试看结束
         this.coverType = 1;
       }
@@ -448,11 +399,6 @@ export default {
     onReplay() {
       this.coverType = 0;
     },
-    goLogin() {
-      this.$store.dispatch('goLogin');
-    },
-
-
     btnClick() {
       this.goLogin();
     },
@@ -724,7 +670,11 @@ export default {
           // 判断是否是mp4
           if (mp4Url.lastIndexOf(".mp4") > 0) {
             _this.bannerType = 2;
-
+            _this.$refs.picaVideo.switchUrl({
+              url: mp4Url,
+              proved: _this.videoOptions.trySeeTime,
+              enable: true,
+            });
             // // TODO test
             // _this.videoOptions.mp4 += 2;
           } else {
@@ -1009,6 +959,10 @@ export default {
       height: 30px;
     }
   }
+  .video-box{
+    position: relative;
+    height: 210px;
+  }
   .list-container {
     // margin-bottom: 40px;
     .sk-btn-cover-new {
@@ -1115,7 +1069,7 @@ export default {
     position: absolute;
     z-index: 100;
     top: 0;
-    left: 0; 
+    left: 0;
   }
 }
 .no-more-bottom {