Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cooperation-cme
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.education.frontend
pica-cooperation-cme
提交
c98e959c
提交
c98e959c
编写于
9月 02, 2020
作者:
guangjun.yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
直接传projectId给原生
上级
e9e4d1fe
变更
5
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
68 行增加
和
57 行删除
+68
-57
cell-list-detail-share.vue
src/components/business/cell-list-detail-share.vue
+1
-1
cell-list-detail.vue
src/components/business/cell-list-detail.vue
+7
-1
cell-list-item.vue
src/components/business/cell-list-item.vue
+10
-0
component-details.vue
src/views/component-details.vue
+50
-45
merge-detail.vue
src/views/merge-detail.vue
+0
-10
未找到文件。
src/components/business/cell-list-detail-share.vue
浏览文件 @
c98e959c
...
@@ -97,7 +97,7 @@ const sendBuriedDataMap = {
...
@@ -97,7 +97,7 @@ const sendBuriedDataMap = {
23
:
"8823"
23
:
"8823"
}
}
export
default
{
export
default
{
name
:
"cell-list-
item
"
,
name
:
"cell-list-
detail-share
"
,
data
()
{
data
()
{
return
{
return
{
appVersion
:
"200"
,
appVersion
:
"200"
,
...
...
src/components/business/cell-list-detail.vue
浏览文件 @
c98e959c
...
@@ -96,7 +96,7 @@ const sendBuriedDataMap = {
...
@@ -96,7 +96,7 @@ const sendBuriedDataMap = {
23
:
"8823"
23
:
"8823"
}
}
export
default
{
export
default
{
name
:
"cell-list-
item
"
,
name
:
"cell-list-
detail
"
,
data
()
{
data
()
{
return
{
return
{
appVersion
:
"200"
,
appVersion
:
"200"
,
...
@@ -242,6 +242,12 @@ export default {
...
@@ -242,6 +242,12 @@ export default {
type
:
4
,
type
:
4
,
seqNo
:
1
seqNo
:
1
},
},
{
key
:
"projectId"
,
value
:
this
.
projectId
,
type
:
4
,
seqNo
:
1
},
];
];
console
.
log
(
paramList
);
console
.
log
(
paramList
);
rocNative
.
dispatchEventByModuleCode
({
rocNative
.
dispatchEventByModuleCode
({
...
...
src/components/business/cell-list-item.vue
浏览文件 @
c98e959c
...
@@ -77,6 +77,10 @@ export default {
...
@@ -77,6 +77,10 @@ export default {
courseRequire
:
{
courseRequire
:
{
type
:
Number
,
type
:
Number
,
default
:
0
,
default
:
0
,
},
projectId
:
{
type
:
Number
|
String
,
default
:
0
,
}
}
},
},
computed
:
{
computed
:
{
...
@@ -143,6 +147,12 @@ export default {
...
@@ -143,6 +147,12 @@ export default {
type
:
4
,
type
:
4
,
seqNo
:
1
seqNo
:
1
},
},
{
key
:
"projectId"
,
value
:
this
.
projectId
,
type
:
4
,
seqNo
:
1
},
];
];
rocNative
.
dispatchEventByModuleCode
({
rocNative
.
dispatchEventByModuleCode
({
modeCode
:
"M200"
,
modeCode
:
"M200"
,
...
...
src/views/component-details.vue
浏览文件 @
c98e959c
...
@@ -19,20 +19,25 @@
...
@@ -19,20 +19,25 @@
>
-->
>
-->
<!--
<div
v-if=
"bannerType == 1"
class=
"page-content-img-container"
>
-->
<!--
<div
v-if=
"bannerType == 1"
class=
"page-content-img-container"
>
-->
<div
v-if=
"bannerType == 1"
class=
"page-content-img-container"
>
<div
v-if=
"bannerType == 1"
class=
"page-content-img-container"
>
<img
class=
"banner-img"
:src=
"attachmentUrl"
>
<img
class=
"banner-img"
:src=
"attachmentUrl"
/
>
<img
v-show=
"pStatus == 1"
class=
"banner-img-1"
src=
"../images/status-join.png"
>
<img
v-show=
"pStatus == 1"
class=
"banner-img-1"
src=
"../images/status-join.png"
/
>
<img
v-show=
"pStatus == 5"
class=
"banner-img-5"
src=
"../images/status-keep-on.png"
>
<img
v-show=
"pStatus == 5"
class=
"banner-img-5"
src=
"../images/status-keep-on.png"
/
>
<img
v-show=
"pStatus == 10"
class=
"banner-img-10"
src=
"../images/status-end.png"
>
<img
v-show=
"pStatus == 10"
class=
"banner-img-10"
src=
"../images/status-end.png"
/
>
</div>
</div>
<!--
<CommonBannerVideo
v-if=
"bannerType == 1"
:videoOptions=
"videoOptions"
></CommonBannerVideo>
-->
<!--
<CommonBannerVideo
v-if=
"bannerType == 1"
:videoOptions=
"videoOptions"
></CommonBannerVideo>
-->
<CommonTcPlayer
v-if=
"bannerType == 2"
style=
"flex"
:options=
"videoOptions"
></CommonTcPlayer>
<CommonTcPlayer
v-if=
"bannerType == 2"
style=
"flex"
:options=
"videoOptions"
></CommonTcPlayer>
<CommonDescription
:descTitle=
"projectName"
:value=
"projectIntro"
></CommonDescription>
<CommonDescription
:descTitle=
"projectName"
:value=
"projectIntro"
></CommonDescription>
<CommonSpliteLine></CommonSpliteLine>
<CommonSpliteLine></CommonSpliteLine>
<CellListItem
:paramData=
"contentList"
:moduleName=
"moduleName"
:courseRequire=
"courseRequire"
></CellListItem>
<CellListItem
:paramData=
"contentList"
:moduleName=
"moduleName"
:courseRequire=
"courseRequire"
:projectId=
"projectId"
></CellListItem>
<!--
<CellListDetail
:paramData=
"contentList"
:moduleName=
"moduleName"
></CellListDetail>
-->
<!--
<CellListDetail
:paramData=
"contentList"
:moduleName=
"moduleName"
></CellListDetail>
-->
</div>
</div>
<Loading
v-show=
"showLoading"
/>
<Loading
v-show=
"showLoading"
/>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
...
@@ -46,7 +51,7 @@ import CommonBannerVideo from "@/components/common/common-banner-video";
...
@@ -46,7 +51,7 @@ import CommonBannerVideo from "@/components/common/common-banner-video";
import
CommonTcPlayer
from
"@/components/common/common-tcplayer"
;
import
CommonTcPlayer
from
"@/components/common/common-tcplayer"
;
import
Loading
from
"@/components/common/common-loading"
;
import
Loading
from
"@/components/common/common-loading"
;
import
{
mapGetters
,
mapActions
}
from
"vuex"
;
import
{
mapGetters
,
mapActions
}
from
"vuex"
;
import
vueFilters
from
'@/utils/filter'
import
vueFilters
from
"@/utils/filter"
;
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
...
@@ -139,9 +144,9 @@ export default {
...
@@ -139,9 +144,9 @@ export default {
__funcName
:
"__getUserInfo4Comp"
__funcName
:
"__getUserInfo4Comp"
});
});
if
(
window
.
__isWeb
&&
process
.
env
.
BUILD_ENV
==
"development"
)
{
if
(
window
.
__isWeb
&&
process
.
env
.
BUILD_ENV
==
"development"
)
{
console
.
log
(
'projectId'
,
this
.
projectId
);
console
.
log
(
"projectId"
,
this
.
projectId
);
let
param
=
{
let
param
=
{
userToken
:
'ED9F3381362641858B2B1F90C92A8050'
,
userToken
:
"ED9F3381362641858B2B1F90C92A8050"
};
};
__getUserInfo4Comp
(
param
);
__getUserInfo4Comp
(
param
);
}
}
...
@@ -190,20 +195,20 @@ export default {
...
@@ -190,20 +195,20 @@ export default {
},
},
setContent
(
data
)
{
setContent
(
data
)
{
let
list
=
data
;
let
list
=
data
;
for
(
let
i
=
0
;
i
<
list
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
list
.
length
;
i
++
)
{
let
len
=
vueFilters
.
strLength
(
list
[
i
].
name
);
let
len
=
vueFilters
.
strLength
(
list
[
i
].
name
);
let
certificate
=
list
[
i
].
certificateFlag
;
let
certificate
=
list
[
i
].
certificateFlag
;
if
(
len
>
30
&&
certificate
==
2
)
{
if
(
len
>
30
&&
certificate
==
2
)
{
list
[
i
].
height
=
"2"
;
list
[
i
].
height
=
"2"
;
}
else
if
(
len
>
30
&&
certificate
!=
2
)
{
}
else
if
(
len
>
30
&&
certificate
!=
2
)
{
list
[
i
].
height
=
2
;
list
[
i
].
height
=
2
;
}
else
if
(
len
<=
30
&&
certificate
==
2
)
{
}
else
if
(
len
<=
30
&&
certificate
==
2
)
{
list
[
i
].
height
=
"1"
;
list
[
i
].
height
=
"1"
;
}
else
if
(
len
<=
30
&&
certificate
!=
2
)
{
}
else
if
(
len
<=
30
&&
certificate
!=
2
)
{
list
[
i
].
height
=
1
;
list
[
i
].
height
=
1
;
}
}
}
}
console
.
log
(
'contentList!'
,
list
);
console
.
log
(
"contentList!"
,
list
);
return
list
;
return
list
;
},
},
// 获取内容列表
// 获取内容列表
...
@@ -213,7 +218,7 @@ export default {
...
@@ -213,7 +218,7 @@ export default {
moduleId
:
_this
.
moduleId
,
moduleId
:
_this
.
moduleId
,
token
:
_this
.
userInfo
.
userToken
,
token
:
_this
.
userInfo
.
userToken
,
setEntry
:
true
,
setEntry
:
true
,
projectId
:
_this
.
projectId
,
projectId
:
_this
.
projectId
};
};
_this
.
showLoading
=
true
;
_this
.
showLoading
=
true
;
this
.
GET
(
"portal/portalApp/contentList"
,
param
).
then
(
res
=>
{
this
.
GET
(
"portal/portalApp/contentList"
,
param
).
then
(
res
=>
{
...
@@ -239,39 +244,39 @@ export default {
...
@@ -239,39 +244,39 @@ export default {
</
script
>
</
script
>
<
style
lang=
"less"
>
<
style
lang=
"less"
>
.page-container-comp {
.page-container-comp {
.nav-top .nav-title {
.nav-top .nav-title {
height: 0px;
height: 0px;
padding: 18px;
padding: 18px;
}
.banner-img {
display: inherit;
width: 375px;
height: 210px;
&-1 {
position: absolute;
left: 0;
top: 180px;
width: 76px;
height: 30px;
}
}
&-5 {
.banner-img {
position: absolute;
display: inherit;
left: 0;
width: 375px;
top: 180px;
height: 210px;
width: 76px;
&-1 {
height: 30px;
position: absolute;
left: 0;
top: 180px;
width: 76px;
height: 30px;
}
&-5 {
position: absolute;
left: 0;
top: 180px;
width: 76px;
height: 30px;
}
&-10 {
position: absolute;
left: 0;
top: 180px;
width: 148px;
height: 30px;
}
}
}
&-10 {
.list-container {
position: absolute;
margin-bottom: 40px;
left: 0;
top: 180px;
width: 148px;
height: 30px;
}
}
}
}
.list-container {
margin-bottom: 40px;
}
}
</
style
>
</
style
>
src/views/merge-detail.vue
浏览文件 @
c98e959c
...
@@ -1198,10 +1198,6 @@ export default {
...
@@ -1198,10 +1198,6 @@ export default {
return
;
return
;
}
}
let
paramList
=
[]
let
paramList
=
[]
// let limitTimes = this.limitTimes - 0;
// if(this.hasBindCard) {
// limitTimes = -1;
// }
paramList
=
[
paramList
=
[
{
{
key
:
"className"
,
key
:
"className"
,
...
@@ -1227,12 +1223,6 @@ export default {
...
@@ -1227,12 +1223,6 @@ export default {
type
:
4
,
type
:
4
,
seqNo
:
1
seqNo
:
1
},
},
// {
// key: "limitTimes",
// value: limitTimes,
// type: 4,
// seqNo: 1
// },
];
];
console
.
log
(
'gotoCourse'
,
paramList
);
console
.
log
(
'gotoCourse'
,
paramList
);
rocNative
.
dispatchEventByModuleCode
({
rocNative
.
dispatchEventByModuleCode
({
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录