提交 97d48f90 编写于 作者: guangjun.yang's avatar guangjun.yang

Merge branch 'dev-coursedetail-0817' into release

* dev-coursedetail-0817:
  数据埋点等
  修改提示文字样式
  修改样式
  修改上报
......@@ -42,10 +42,10 @@
>
更新中
</span>
<img class="key" v-else-if="!hasBindCard && item.trySeeFlag == 1 && !item.trySeeTime" @click="toastToBuy('激活/购买后可学习课程')" src="../../images/cme/phrase2/key.png" alt="">
<img class="key" v-else-if="!hasBindCard && item.trySeeFlag == 1 && !item.trySeeTime" @click="toastToBuy('激活/购买后可学习课程', item)" src="../../images/cme/phrase2/key.png" alt="">
<span
v-else-if="!hasBindCard && item.trySeeFlag == 1"
@click="gotoExamOrCourse(item)"
@click="gotoExamOrCourse(item, 'sk')"
class="text-action"
>
去试看
......@@ -160,7 +160,12 @@ export default {
methods: {
// 跳转到考试或课程 type 1: 考试; 2: 课程
// 如果是考试,将根据appVersion判断是新考试还是老考试,如果是301或之前的,都是老考试
gotoExamOrCourse(item) {
gotoExamOrCourse(item, type) {
if(type == 'sk') {
this.$sendBuriedData({
component_tag: `882#88216#${item.id}#${item.name}`
});
}
if(!isWeiXin()) {
if(item.type == 1) {
Toast('请前往云鹊医APP参加考试');
......@@ -273,7 +278,12 @@ export default {
},
// 弹框提示
toastToBuy(toastMsg) {
toastToBuy(toastMsg, item) {
if(item) {
this.$sendBuriedData({
component_tag: `882#88215#${item.id}#${item.name}`
});
}
Toast(toastMsg);
}
}
......
......@@ -31,6 +31,9 @@ export default {
},
methods: {
download() {
this.$sendBuriedData({
component_tag: `882#88217`
});
window.location.href =
"https://a.app.qq.com/o/simple.jsp?pkgname=com.picahealth.yunque";
},
......
......@@ -116,6 +116,9 @@ export default {
// 生成分享的url
goShare() {
this.$sendBuriedData({
component_tag: `882#88209`
});
let _this = this;
let videoUrl = this.$route.query.videoUrl || '';
let info = "";
......
<template>
<div class="course-ware">
<div v-show="url && loadPdf" class="canvas-box"></div>
<p v-show="!url" class="tip">无相关课件</p>
<template v-show="!url">
<img class="img" src="~@/images/course/empty_ware.png" alt="" />
<p class="tip">暂无相关课件</p>
</template>
</div>
</template>
......@@ -58,9 +61,14 @@ export default {
}
const pages = await Promise.all(pageAll);
this.parentDom.innerHTML = '';
for (let item of pages) {
this.createCanvas(item)
if (!this.visible && pages[0]) {
this.createCanvas(pages[0])
} else {
for (let item of pages) {
this.createCanvas(item)
}
}
this.loadPdf = true;
} catch(err) {
console.log(err)
......@@ -111,10 +119,15 @@ export default {
.course-ware{
padding-top: 20px;
overflow: hidden;
.img{
display: block;
width: 100px;
margin: 40px auto 5px;
}
.tip{
font-size: 14px;
color: #999;
font-size: 12px;
text-align: center;
margin-top: 50px;
}
}
</style>
......@@ -14,6 +14,9 @@ export default {
},
methods: {
download() {
this.$sendBuriedData({
component_tag: `882#88210`
});
window.location.href =
"https://a.app.qq.com/o/simple.jsp?pkgname=com.picahealth.yunque";
},
......
......@@ -175,6 +175,7 @@ export default {
},
onPause() {
this.reportOnOff(2);
this.reportLeave();
this.isPaused = true;
},
togglePlay() {
......@@ -262,6 +263,9 @@ export default {
},
// 重播
onReplay() {
this.$sendBuriedData({
component_tag: `882#88213`
});
this.player.style.display = 'block';
this.player.currentTime = 0;
this.player.play();
......@@ -635,7 +639,7 @@ export default {
color: #fff;
font-size: 12px;
left: 10px;
bottom: 44px;
bottom: 12px;
height: 24px;
line-height: 24px;
padding: 0 12px;
......@@ -666,7 +670,7 @@ export default {
color: #fff;
font-size: 12px;
right: 10px;
bottom: 44px;
bottom: 12px;
height: 24px;
line-height: 24px;
padding: 0 12px 0 22px;
......
......@@ -5,11 +5,11 @@
<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" />
<course-covers coverTips="试看结束<br />请来云鹊医App学习完整课程" :isSingle="true" rightBtnText="学习完整课程" @btnClick="btnClick(1)" />
</div>
<!-- 付费课程,下载App -->
<div class="cover" v-if="logged && coverType === 2">
<course-covers coverTips="本课程为付费课程,请来云鹊医App学习" :isSingle="true" rightBtnText="去云鹊医App" @btnClick="btnClick" />
<course-covers coverTips="本课程为付费课程,请来云鹊医App学习" :isSingle="true" rightBtnText="去云鹊医App" @btnClick="btnClick(2)" />
</div>
<!-- 下一个提示 -->
<div class="next-countdown" v-if="coverType === 13">3秒后播放下一节</div>
......@@ -275,7 +275,13 @@ export default {
}
return [chapters, curtLecture];
},
btnClick(index) {
btnClick(index, type) {
// 学习完整课程
if(type == 1) {
this.$sendBuriedData({
component_tag: `884#88401`
});
}
const coverType = this.coverType;
switch(coverType) {
case 1:
......@@ -287,6 +293,9 @@ export default {
break;
case 5:
if (index === 1) {
this.$sendBuriedData({
component_tag: `884#88402`
});
window.history.back();
} else {
this.download();
......@@ -311,9 +320,15 @@ export default {
const { showFlag, trySeeFlag, trySeeTime, examType } = this.course;
// console.log(lecture);
if (examType === 2) { // 是考试,mustLearnIds必须完成的lectureId
this.$sendBuriedData({
component_tag: `884#88405`
});
this.$toast('请前往云鹊医APP进行考试');
return;
}
this.$sendBuriedData({
component_tag: `884#88404#${lecture.lectureId}#${lecture.lectureName}`
});
if (lecture.lectureId === this.curtLectureId) {
return;
}
......
......@@ -27,15 +27,15 @@
<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" />
<course-covers coverTips="试看结束<br />请来云鹊医App学习完整课程" :isSingle="true" rightBtnText="学习完整课程" @btnClick="btnClick(1)" />
</div>
<!-- 播放结束,下载App -->
<div class="cover" v-if="logged && coverType === 2">
<course-covers coverTips="播放结束<br />更多其他课程,请前往鹊医App学习" :isSingle="true" rightBtnText="去云鹊医App" @btnClick="btnClick" />
<course-covers coverTips="播放结束<br />更多其他课程,请前往鹊医App学习" :isSingle="true" rightBtnText="去云鹊医App" @btnClick="btnClick(2)" />
</div>
<!-- 未登录 -->
<div class="cover" v-if="!logged">
<course-covers coverTips="登录后马上学习课程" :isSingle="true" rightBtnText="去登录" @btnClick="goLogin" />
<course-covers coverTips="登录后马上学习课程" :isSingle="true" rightBtnText="去登录" @btnClick="beforeGoLogin" />
</div>
</pica-video>
</div>
......@@ -49,7 +49,7 @@
:studyNum="project.studyNum"
:subject="project.subject"
/>
<CommonAdertImg :advertInfoList="advertInfoList" position="0" />
<!-- <CommonAdertImg :advertInfoList="advertInfoList" position="0" /> -->
<!-- 简介和目录 -->
<div class="intro-catalogue-container">
<div
......@@ -105,7 +105,7 @@
</div>
</div>
<CommonAdertImg needPadTop :advertInfoList="advertInfoList" position="1" />
<!-- <CommonAdertImg needPadTop :advertInfoList="advertInfoList" position="1" /> -->
<NoMoreContent />
<div v-if="detailNum <= 9" class="no-more-bottom"></div>
</div>
......@@ -198,7 +198,7 @@ import TeacterIntro from "@/components/cme/teacter-intro";
import CommonDialog from "@/components/cme/common-dialog";
import ExjumperButton from "@/components/cme/exjumper-button";
import NoMoreContent from "@/components/business/no-more-content";
import CommonAdertImg from "@/components/common/common-advert-img";
// import CommonAdertImg from "@/components/common/common-advert-img";
import { getWebPageUrl, gotoPage, getAppVersion } from "@/utils/index";
import { mapGetters, mapActions } from "vuex";
......@@ -326,7 +326,7 @@ export default {
TeacterIntro,
CommonDialog,
ExjumperButton,
CommonAdertImg,
// CommonAdertImg,
NoMoreContent,
BindCardButtonShare,
ChangeCard,
......@@ -375,6 +375,13 @@ export default {
methods: {
...mapActions(["setUserInfo", "goLogin"]),
beforeGoLogin() {
this.$sendBuriedData({
component_tag: `882#88211`
});
this.goLogin();
},
// 解析uuid
queryByUuid(uuid) {
let param = {
......@@ -400,11 +407,27 @@ export default {
onReplay() {
this.coverType = 0;
},
btnClick() {
btnClick(index, type) {
// 学习完整课程
if(type == 1) {
this.$sendBuriedData({
component_tag: `882#88212`
});
// 播放结束
} else if(type == 2) {
this.$sendBuriedData({
component_tag: `882#88214`
});
}
this.download();
},
download() {
download(type) {
if(type == 1) {
this.$sendBuriedData({
component_tag: `882#88210`
});
}
window.location.href =
"https://a.app.qq.com/o/simple.jsp?pkgname=com.picahealth.yunque";
},
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册