Skip to content

P
pica-professional-exam
提交 9ed52432 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-buryingpoint-0728' into release 

* dev-buryingpoint-0728:
  关闭分享
  修改统计
  添加埋点

# Conflicts:
#	src/components/business/cell-list-detail.vue
上级 e56083a9 2c4b29b0
隐藏空白字符变更
内嵌 并排
正在显示 包含 63 行增加 和 33 行删除
src/components/business/cell-list-detail.vue
浏览文件 @ 9ed52432
<template>
<!-- 项目组件列表项 -->
<section>
<div
<div
class="cell-detail"
v-for="(component , index) in projectComponent"
v-for="(component , index) in projectComponent"
:key="index">
<van-collapse v-model="activeNames" @change="changeCollapse">
<van-collapse-item
v-for="(portalModule, index) in component.portalModuleDTOS"
<van-collapse-item
v-for="(portalModule, index) in component.portalModuleDTOS"
:key="index"
:title="(parseInt(index) + 1) + '.' + portalModule.moduleName | shortName(19)"
:title="(parseInt(index) + 1) + '.' + portalModule.moduleName | shortName(19)"
:name="portalModule.expandKey"
:value="portalModule.value"
@click.native="chooseItem(portalModule)"
......@@ -27,7 +27,7 @@
<img v-if="item.type == 2 && item.useFlag == 2" class="img-icon" src="../../images/learn-dark.png">
</div>
<p class="name-title" :class="{'name-title-no': item.useFlag == 2}">{{item.name | shortName(30)}}</p>
</div>
</div>
<span
v-if="!item.id"
class="text-action text-action-no"
......@@ -51,7 +51,7 @@
>
{{getActionText(item.status, item.type)}}
</span>
<div class="foot-line"
<div class="foot-line"
v-if="index+1 < portalModule.contentList.length && portalModule.contentList[index].templetId == portalModule.contentList[index+1].templetId">
</div>
</div>
......@@ -157,7 +157,7 @@ export default {
// });
// }
// this.gotoCourse(item, contentList, index, trySee);
let logId = null;
let appVersion = getAppVersion(this.userInfo.appVersion);
if (item.useFlag == 2) {
if(item.type == 1) {
......@@ -174,9 +174,17 @@ export default {
} else {
this.gotoExam(item.id);
}
logId = '882#88206';
} else if (item.type == 2) {
this.gotoCourse(item, contentList, index, trySee);
logId = '882#88205';
}
if (trySee) {
logId = '882#88204';
}
logId && this.$sendBuriedData({
component_tag: logId
});
},
// 如果此模块中没有考试，则直接退出；否则
......@@ -201,13 +209,13 @@ export default {
let hasNoLearningCourse = false;
// 查找本模块中是否还有没有学习完的课程，排除当前这个
for(let j = 0; j < contentList.length; j ++) {
if(j == index) continue;
if(j == index) continue;
if(contentList[j].type == 2 && (contentList[j].status == 21 || contentList[j].status == 22)) {
hasNoLearningCourse = true;
break;
}
}
// 如果还有课程没有学完，则直接退出
if(hasNoLearningCourse) return extendsParam;
......@@ -229,7 +237,7 @@ export default {
return extendsParam;
},
// 跳转到课程
// 跳转到课程
gotoCourse: function(item, contentList, index, trySee) {
let extendsParam = this.beforeGotoCourse(item, contentList, index);
let appVersion = getAppVersion(this.userInfo.appVersion);
......@@ -241,9 +249,9 @@ export default {
// message: '激活/购买后可学习完整课程',
message: '升级最新版本可试看课程',
confirmButtonText: '我知道了',
}).then(res => {
})
}).then(res => {
})
return;
}
let paramList = []
......@@ -406,7 +414,7 @@ export default {
}
.van-collapse-item {
.van-cell {
margin: px2rem(9px) auto 0 auto;
margin: px2rem(9px) auto 0 auto;
width: px2rem(345px);
min-height: px2rem(48px);
border-radius: px2rem(6px);
......@@ -694,4 +702,4 @@ export default {
.bg-13 {
background: #abcec7;
}
</style>
\ No newline at end of file
</style>
src/components/cme/card-banner.vue
浏览文件 @ 9ed52432
......@@ -31,9 +31,9 @@ export default {
jumpToCardList() {
// 如果没有登录，则要去登录页面
// 打开页面埋点
// this.$sendBuriedData({
// component_tag: "880#8801"
// });
this.$sendBuriedData({
component_tag: "886#8865"
});
let appVersion = this.userInfo.appVersion;
let appVersionNum = appVersion.split('.').join('');
console.log('appVersionNum', appVersionNum);
......@@ -109,4 +109,4 @@ export default {
color: #ffffff;
}
}
</style>
\ No newline at end of file
</style>
src/components/cme/change-card.vue
浏览文件 @ 9ed52432
<template>
<van-popup
v-model="isShow"
@click-overlay="cancle"
@click-overlay="cancle"
position="bottom"
>
<section class="bind-cart-wrapper">
......@@ -22,6 +22,7 @@
v-model="activationCode"
label="激活码"
placeholder="请输入激活码"
@click.native="onInputClick"
/>
<!-- <span>激活码</span>
<input type="text" maxlength="26" v-model="activationCode" placeholder="请输入激活码"> -->
......@@ -49,7 +50,7 @@ export default {
default: ''
}
},
data() {
return {
isAndroid: __isAndroid,
......@@ -58,7 +59,7 @@ export default {
};
},
//
//
watch: {
activationCode(val) {
if(!val) {
......@@ -86,6 +87,9 @@ export default {
this.$emit("cancle");
},
confirm() {
this.$sendBuriedData({
component_tag: `882#88207`
});
if(!this.activationCode) {
this.errorMsg = '请输入激活码';
return;
......@@ -100,6 +104,11 @@ export default {
},
clear() {
this.activationCode = ''
},
onInputClick() {
this.$sendBuriedData({
component_tag: `882#88208`
});
}
}
};
......@@ -203,4 +212,4 @@ export default {
margin-bottom: px2rem(40px);
}
}
</style>
\ No newline at end of file
</style>
src/views/index.vue
浏览文件 @ 9ed52432
......@@ -182,14 +182,17 @@ export default {
this.currentModelIndex = index;
this.listData =
this.titleTestModelList[index].firstSubjectModelList || [];
this.$sendBuriedData({
component_tag: model.titleCode === '1001' ? '886#8861' : (model.titleCode === '1002' ? '886#8862' : '886#8863')
});
},
// 跳转到项目页面
coopDetails(item) {
if (item.openFlag == 0) return;
// this.$sendBuriedData({
// component_tag: `880#8803#${item.id}#${item.name}` //'210#210002#0#'+item.projectName
// });
this.$sendBuriedData({
component_tag: `886#8864#${item.id}#${item.name}` //'210#210002#0#'+item.projectName
});
// 临时添加
if (window.__isWeb) {
......
src/views/merge-detail.vue
浏览文件 @ 9ed52432
......@@ -159,7 +159,7 @@ export default {
textContent: "",
leaderText: "",
pageTitle: "",
isShowShare: true,
isShowShare: false,
tabFlag: true, // 显示目录还是简介
fixedFlag: false, // 目录和简介是否固定
project: {
......@@ -264,7 +264,7 @@ export default {
let _this = this;
this.from = this.$route.query.from || this.from || "native";
this.projectId = this.$route.query.id || 1;
window.__getUserInfo64Comp = function(param) {
// appVersion 安卓 3.2.2 iOS
console.log("__getUserInfo64Comp", param);
......@@ -414,7 +414,7 @@ export default {
modeCode: "M300",
jsonString: paramList
});
}
}
}, 1000);
},
......@@ -472,15 +472,16 @@ export default {
// 跳转到原生的购买页面
confirm() {
this.$sendBuriedData({
component_tag: `882#88203`
});
let appVersion = this.userInfo.appVersion || "";
let appVersionNum = appVersion.split(".").join("");
if (appVersionNum < 344) {
Toast("请您下载新版本App");
return;
}
// this.$sendBuriedData({
// component_tag: `885#8852`
// });
// let pageUrl = this.project.examBtnUrl;
// 直接传入项目ID(projectId)
......@@ -598,6 +599,10 @@ export default {
changeClick(msg) {
console.log("in changeClick");
this.showChangeCard = true;
this.$sendBuriedData({
component_tag: `882#88202`
});
},
scrollFun() {
......@@ -766,6 +771,11 @@ export default {
if (!_this.hasBindCard) {
_this.preJumper();
}
// 请求成功后统计，获取项目名
this.$sendBuriedData({
component_tag: `882#88201#${_this.projectId}#${_this.project.projectName}`
});
}
});
},
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或