Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-annual-summary
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.education.frontend
pica-annual-summary
提交
f9911493
提交
f9911493
编写于
7月 28, 2020
作者:
guofeng.chen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加埋点
上级
d240074b
变更
5
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
63 行增加
和
33 行删除
+63
-33
cell-list-detail.vue
src/components/business/cell-list-detail.vue
+25
-17
card-banner.vue
src/components/cme/card-banner.vue
+4
-4
change-card.vue
src/components/cme/change-card.vue
+13
-4
index.vue
src/views/index.vue
+6
-3
merge-detail.vue
src/views/merge-detail.vue
+15
-5
未找到文件。
src/components/business/cell-list-detail.vue
浏览文件 @
f9911493
<
template
>
<
template
>
<!-- 项目组件列表项 -->
<!-- 项目组件列表项 -->
<section>
<section>
<div
<div
class=
"cell-detail"
class=
"cell-detail"
v-for=
"(component , index) in projectComponent"
v-for=
"(component , index) in projectComponent"
:key=
"index"
>
:key=
"index"
>
<van-collapse
v-model=
"activeNames"
@
change=
"changeCollapse"
>
<van-collapse
v-model=
"activeNames"
@
change=
"changeCollapse"
>
<van-collapse-item
<van-collapse-item
v-for=
"(portalModule, index) in component.portalModuleDTOS"
v-for=
"(portalModule, index) in component.portalModuleDTOS"
:key=
"index"
:key=
"index"
:title=
"(parseInt(index) + 1) + '.' + portalModule.moduleName | shortName(19)"
:title=
"(parseInt(index) + 1) + '.' + portalModule.moduleName | shortName(19)"
:name=
"portalModule.expandKey"
:name=
"portalModule.expandKey"
:value=
"portalModule.value"
:value=
"portalModule.value"
@
click
.
native=
"chooseItem(portalModule)"
@
click
.
native=
"chooseItem(portalModule)"
...
@@ -27,12 +27,12 @@
...
@@ -27,12 +27,12 @@
<img
v-if=
"item.type == 2 && item.useFlag == 2"
class=
"img-icon"
src=
"../../images/learn-dark.png"
>
<img
v-if=
"item.type == 2 && item.useFlag == 2"
class=
"img-icon"
src=
"../../images/learn-dark.png"
>
</div>
</div>
<p
class=
"name-title"
:class=
"
{'name-title-no': item.useFlag == 2}">
{{
item
.
name
|
shortName
(
30
)
}}
</p>
<p
class=
"name-title"
:class=
"
{'name-title-no': item.useFlag == 2}">
{{
item
.
name
|
shortName
(
30
)
}}
</p>
</div>
</div>
<span
<span
v-if=
"!item.id"
v-if=
"!item.id"
class=
"text-action text-action-no"
class=
"text-action text-action-no"
@
click=
"toastToBuy(item.type == 1 ? '每周更新考试' : '每周更新课程')"
@
click=
"toastToBuy(item.type == 1 ? '每周更新考试' : '每周更新课程')"
>
>
更新中
更新中
</span>
</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('激活/购买后可学习课程')"
src=
"../../images/cme/phrase2/key.png"
alt=
""
>
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
>
>
{{
getActionText
(
item
.
status
,
item
.
type
)
}}
{{
getActionText
(
item
.
status
,
item
.
type
)
}}
</span>
</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
"
>
v-if=
"index+1
<
portalModule
.
contentList
.
length
&&
portalModule
.
contentList
[
index
].
templetId =
=
portalModule
.
contentList
[
index
+
1
].
templetId
"
>
</div>
</div>
</div>
</div>
...
@@ -157,7 +157,7 @@ export default {
...
@@ -157,7 +157,7 @@ export default {
// });
// });
// }
// }
// this.gotoCourse(item, contentList, index, trySee);
// this.gotoCourse(item, contentList, index, trySee);
let
logId
=
null
;
let
appVersion
=
getAppVersion
(
this
.
userInfo
.
appVersion
);
let
appVersion
=
getAppVersion
(
this
.
userInfo
.
appVersion
);
if
(
item
.
useFlag
==
2
)
{
if
(
item
.
useFlag
==
2
)
{
if
(
item
.
type
==
1
)
{
if
(
item
.
type
==
1
)
{
...
@@ -174,9 +174,17 @@ export default {
...
@@ -174,9 +174,17 @@ export default {
}
else
{
}
else
{
this
.
gotoExam
(
item
.
id
);
this
.
gotoExam
(
item
.
id
);
}
}
logId
=
'882#88206'
;
}
else
if
(
item
.
type
==
2
)
{
}
else
if
(
item
.
type
==
2
)
{
this
.
gotoCourse
(
item
,
contentList
,
index
,
trySee
);
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 {
...
@@ -201,13 +209,13 @@ export default {
let
hasNoLearningCourse
=
false
;
let
hasNoLearningCourse
=
false
;
// 查找本模块中是否还有没有学习完的课程,排除当前这个
// 查找本模块中是否还有没有学习完的课程,排除当前这个
for
(
let
j
=
0
;
j
<
contentList
.
length
;
j
++
)
{
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
))
{
if
(
contentList
[
j
].
type
==
2
&&
(
contentList
[
j
].
status
==
21
||
contentList
[
j
].
status
==
22
))
{
hasNoLearningCourse
=
true
;
hasNoLearningCourse
=
true
;
break
;
break
;
}
}
}
}
// 如果还有课程没有学完,则直接退出
// 如果还有课程没有学完,则直接退出
if
(
hasNoLearningCourse
)
return
extendsParam
;
if
(
hasNoLearningCourse
)
return
extendsParam
;
...
@@ -229,7 +237,7 @@ export default {
...
@@ -229,7 +237,7 @@ export default {
return
extendsParam
;
return
extendsParam
;
},
},
// 跳转到课程
// 跳转到课程
gotoCourse
:
function
(
item
,
contentList
,
index
,
trySee
)
{
gotoCourse
:
function
(
item
,
contentList
,
index
,
trySee
)
{
let
extendsParam
=
this
.
beforeGotoCourse
(
item
,
contentList
,
index
);
let
extendsParam
=
this
.
beforeGotoCourse
(
item
,
contentList
,
index
);
let
appVersion
=
getAppVersion
(
this
.
userInfo
.
appVersion
);
let
appVersion
=
getAppVersion
(
this
.
userInfo
.
appVersion
);
...
@@ -241,9 +249,9 @@ export default {
...
@@ -241,9 +249,9 @@ export default {
// message: '激活/购买后可学习完整课程',
// message: '激活/购买后可学习完整课程',
message
:
'升级最新版本可试看课程'
,
message
:
'升级最新版本可试看课程'
,
confirmButtonText
:
'我知道了'
,
confirmButtonText
:
'我知道了'
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
})
})
return
;
return
;
}
}
let
paramList
=
[]
let
paramList
=
[]
...
@@ -406,7 +414,7 @@ export default {
...
@@ -406,7 +414,7 @@ export default {
}
}
.van-collapse-item
{
.van-collapse-item
{
.van-cell
{
.van-cell
{
margin
:
px2rem
(
9px
)
auto
0
auto
;
margin
:
px2rem
(
9px
)
auto
0
auto
;
width
:
px2rem
(
345px
);
width
:
px2rem
(
345px
);
min-height
:
px2rem
(
48px
);
min-height
:
px2rem
(
48px
);
border-radius
:
px2rem
(
6px
);
border-radius
:
px2rem
(
6px
);
...
@@ -694,4 +702,4 @@ export default {
...
@@ -694,4 +702,4 @@ export default {
.bg-13
{
.bg-13
{
background
:
#abcec7
;
background
:
#abcec7
;
}
}
</
style
>
</
style
>
\ No newline at end of file
src/components/cme/card-banner.vue
浏览文件 @
f9911493
...
@@ -31,9 +31,9 @@ export default {
...
@@ -31,9 +31,9 @@ export default {
jumpToCardList
()
{
jumpToCardList
()
{
// 如果没有登录,则要去登录页面
// 如果没有登录,则要去登录页面
// 打开页面埋点
// 打开页面埋点
//
this.$sendBuriedData({
this
.
$sendBuriedData
({
// component_tag: "880#8801
"
component_tag
:
"886#8865
"
//
});
});
let
appVersion
=
this
.
userInfo
.
appVersion
;
let
appVersion
=
this
.
userInfo
.
appVersion
;
let
appVersionNum
=
appVersion
.
split
(
'.'
).
join
(
''
);
let
appVersionNum
=
appVersion
.
split
(
'.'
).
join
(
''
);
console
.
log
(
'appVersionNum'
,
appVersionNum
);
console
.
log
(
'appVersionNum'
,
appVersionNum
);
...
@@ -109,4 +109,4 @@ export default {
...
@@ -109,4 +109,4 @@ export default {
color
:
#ffffff
;
color
:
#ffffff
;
}
}
}
}
</
style
>
</
style
>
\ No newline at end of file
src/components/cme/change-card.vue
浏览文件 @
f9911493
<
template
>
<
template
>
<van-popup
<van-popup
v-model=
"isShow"
v-model=
"isShow"
@
click-overlay=
"cancle"
@
click-overlay=
"cancle"
position=
"bottom"
position=
"bottom"
>
>
<section
class=
"bind-cart-wrapper"
>
<section
class=
"bind-cart-wrapper"
>
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
v-model=
"activationCode"
v-model=
"activationCode"
label=
"激活码"
label=
"激活码"
placeholder=
"请输入激活码"
placeholder=
"请输入激活码"
@
click
.
native=
"onInputClick"
/>
/>
<!--
<span>
激活码
</span>
<!--
<span>
激活码
</span>
<input
type=
"text"
maxlength=
"26"
v-model=
"activationCode"
placeholder=
"请输入激活码"
>
-->
<input
type=
"text"
maxlength=
"26"
v-model=
"activationCode"
placeholder=
"请输入激活码"
>
-->
...
@@ -49,7 +50,7 @@ export default {
...
@@ -49,7 +50,7 @@ export default {
default
:
''
default
:
''
}
}
},
},
data
()
{
data
()
{
return
{
return
{
isAndroid
:
__isAndroid
,
isAndroid
:
__isAndroid
,
...
@@ -58,7 +59,7 @@ export default {
...
@@ -58,7 +59,7 @@ export default {
};
};
},
},
//
//
watch
:
{
watch
:
{
activationCode
(
val
)
{
activationCode
(
val
)
{
if
(
!
val
)
{
if
(
!
val
)
{
...
@@ -97,9 +98,17 @@ export default {
...
@@ -97,9 +98,17 @@ export default {
let
aCode
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
activationCode
));
let
aCode
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
activationCode
));
aCode
=
aCode
.
replace
(
/
\s
/g
,
''
);
aCode
=
aCode
.
replace
(
/
\s
/g
,
''
);
this
.
$emit
(
"confirm"
,
aCode
);
this
.
$emit
(
"confirm"
,
aCode
);
this
.
$sendBuriedData
({
component_tag
:
`882#88207`
});
},
},
clear
()
{
clear
()
{
this
.
activationCode
=
''
this
.
activationCode
=
''
},
onInputClick
()
{
this
.
$sendBuriedData
({
component_tag
:
`882#88208`
});
}
}
}
}
};
};
...
@@ -203,4 +212,4 @@ export default {
...
@@ -203,4 +212,4 @@ export default {
margin-bottom
:
px2rem
(
40px
);
margin-bottom
:
px2rem
(
40px
);
}
}
}
}
</
style
>
</
style
>
\ No newline at end of file
src/views/index.vue
浏览文件 @
f9911493
...
@@ -182,14 +182,17 @@ export default {
...
@@ -182,14 +182,17 @@ export default {
this
.
currentModelIndex
=
index
;
this
.
currentModelIndex
=
index
;
this
.
listData
=
this
.
listData
=
this
.
titleTestModelList
[
index
].
firstSubjectModelList
||
[];
this
.
titleTestModelList
[
index
].
firstSubjectModelList
||
[];
this
.
$sendBuriedData
({
component_tag
:
model
.
titleCode
===
'1001'
?
'886#8861'
:
(
model
.
titleCode
===
'1002'
?
'886#8862'
:
'886#8863'
)
}
);
}
,
}
,
// 跳转到项目页面
// 跳转到项目页面
coopDetails
(
item
)
{
coopDetails
(
item
)
{
if
(
item
.
openFlag
==
0
)
return
;
if
(
item
.
openFlag
==
0
)
return
;
//
this.$sendBuriedData(
{
this
.
$sendBuriedData
({
// component_tag: `880#8803
#$
{
item
.
id
}#
$
{
item
.
name
}
` //'210#210002#0#'+item.projectName
component_tag
:
`886#8864
#${item.id
}
#${item.name
}
`
//'210#210002#0#'+item.projectName
//
}
);
}
);
// 临时添加
// 临时添加
if
(
window
.
__isWeb
)
{
if
(
window
.
__isWeb
)
{
...
...
src/views/merge-detail.vue
浏览文件 @
f9911493
...
@@ -264,7 +264,7 @@ export default {
...
@@ -264,7 +264,7 @@ export default {
let
_this
=
this
;
let
_this
=
this
;
this
.
from
=
this
.
$route
.
query
.
from
||
this
.
from
||
"native"
;
this
.
from
=
this
.
$route
.
query
.
from
||
this
.
from
||
"native"
;
this
.
projectId
=
this
.
$route
.
query
.
id
||
1
;
this
.
projectId
=
this
.
$route
.
query
.
id
||
1
;
window
.
__getUserInfo64Comp
=
function
(
param
)
{
window
.
__getUserInfo64Comp
=
function
(
param
)
{
// appVersion 安卓 3.2.2 iOS
// appVersion 安卓 3.2.2 iOS
console
.
log
(
"__getUserInfo64Comp"
,
param
);
console
.
log
(
"__getUserInfo64Comp"
,
param
);
...
@@ -414,7 +414,7 @@ export default {
...
@@ -414,7 +414,7 @@ export default {
modeCode
:
"M300"
,
modeCode
:
"M300"
,
jsonString
:
paramList
jsonString
:
paramList
});
});
}
}
},
1000
);
},
1000
);
},
},
...
@@ -478,9 +478,10 @@ export default {
...
@@ -478,9 +478,10 @@ export default {
Toast
(
"请您下载新版本App"
);
Toast
(
"请您下载新版本App"
);
return
;
return
;
}
}
// this.$sendBuriedData({
// component_tag: `885#8852`
this
.
$sendBuriedData
({
// });
component_tag
:
`882#88203`
});
// let pageUrl = this.project.examBtnUrl;
// let pageUrl = this.project.examBtnUrl;
// 直接传入项目ID(projectId)
// 直接传入项目ID(projectId)
...
@@ -598,6 +599,10 @@ export default {
...
@@ -598,6 +599,10 @@ export default {
changeClick
(
msg
)
{
changeClick
(
msg
)
{
console
.
log
(
"in changeClick"
);
console
.
log
(
"in changeClick"
);
this
.
showChangeCard
=
true
;
this
.
showChangeCard
=
true
;
this
.
$sendBuriedData
({
component_tag
:
`882#88202`
});
},
},
scrollFun
()
{
scrollFun
()
{
...
@@ -766,6 +771,11 @@ export default {
...
@@ -766,6 +771,11 @@ export default {
if
(
!
_this
.
hasBindCard
)
{
if
(
!
_this
.
hasBindCard
)
{
_this
.
preJumper
();
_this
.
preJumper
();
}
}
// 请求成功后统计,获取项目名
this
.
$sendBuriedData
({
component_tag
:
`882#88201#
${
_this
.
projectId
}
#
${
_this
.
project
.
projectName
}
`
});
}
}
});
});
},
},
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录