Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李俊赕
self-support
Commits
b2d898b7
Commit
b2d898b7
authored
Jun 07, 2021
by
zhengzy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息通知栏
parent
9d504117
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
172 additions
and
129 deletions
+172
-129
.env.js
.env.js
+6
-6
learn.vue
src/pages/index/learn.vue
+105
-73
news-details.vue
src/pages/learn/news-details.vue
+61
-50
No files found.
.env.js
View file @
b2d898b7
;
;
(
function
()
{
(
function
()
{
let
NODE_ENV
=
'
prod
'
;
// dev:开发环境 | test:测试环境 | prod:生产环境
let
NODE_ENV
=
'
test
'
;
// dev:开发环境 | test:测试环境 | prod:生产环境
let
ENV_VAR
=
null
;
let
ENV_VAR
=
null
;
let
VERSION_NUMBER
=
'1.3.1'
;
//版本号
let
VERSION_NUMBER
=
'1.3.1'
;
//版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
...
...
src/pages/index/learn.vue
View file @
b2d898b7
...
@@ -24,16 +24,13 @@
...
@@ -24,16 +24,13 @@
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
@
scrolltolower=
"onreachBottom"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
refresherpulling=
"onPulling"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
@
scrolltolower=
"onreachBottom"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
refresherpulling=
"onPulling"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"notice"
@
click=
"bbb(item)"
>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"notice"
@
click=
"bbb(item)"
>
<view
class=
"n-head"
>
<view
class=
"notice-bottom-left"
>
{{
item
.
create_at
}}
</view>
{{
item
.
title
}}
<view
class=
"notice-content"
>
<img
:src=
"item.img"
alt=
""
style=
"width:690rpx;height:260rpx;display:block"
>
<view
class=
"notice-content-bottom"
>
<view
class=
"n-head"
>
{{
item
.
title
}}
</view>
<view
class=
"news"
>
{{
item
.
text
}}
</view>
</view>
</view>
<view
class=
"news"
v-html=
"item.body"
>
<u-parse
:html=
"item.body"
></u-parse>
</view>
<u-line
color=
"#F4F5F7"
/>
<view
class=
"notice-bottom"
>
<view
class=
"notice-bottom-left"
>
{{
item
.
create_at
}}
</view>
<view
class=
"notice-bottom-right"
>
查看详情
</view>
</view>
</view>
</view>
</view>
<view
v-shou=
"isLoadMore"
class=
"load-more"
>
<view
v-shou=
"isLoadMore"
class=
"load-more"
>
...
@@ -429,8 +426,7 @@ export default {
...
@@ -429,8 +426,7 @@ export default {
pic
:
courseListJson
[
2
].
pic
,
pic
:
courseListJson
[
2
].
pic
,
id
:
courseListJson
[
2
].
id
,
id
:
courseListJson
[
2
].
id
,
sectionId
:
courseListJson
[
2
].
sectionId
,
sectionId
:
courseListJson
[
2
].
sectionId
,
}
},
,
{
{
title
:
courseListJson
[
3
].
title
,
title
:
courseListJson
[
3
].
title
,
desc
:
courseListJson
[
3
].
desc
,
desc
:
courseListJson
[
3
].
desc
,
...
@@ -478,7 +474,7 @@ export default {
...
@@ -478,7 +474,7 @@ export default {
};
};
},
},
onLoad
(
param
)
{
onLoad
(
param
)
{
getApp
().
trackPage
(
'学习首页'
)
getApp
().
trackPage
(
"学习首页"
);
var
that
=
this
;
var
that
=
this
;
try
{
try
{
if
(
param
.
tabs
)
{
if
(
param
.
tabs
)
{
...
@@ -490,7 +486,7 @@ export default {
...
@@ -490,7 +486,7 @@ export default {
},
},
computed
:
{
computed
:
{
bannerImage
()
{
bannerImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
"
banner-xx@3x
.png"
;
return
process
.
uniEnv
.
qn_base_url
+
"
xuexibanner
.png"
;
},
},
},
},
onShow
:
function
(
param
)
{
onShow
:
function
(
param
)
{
...
@@ -512,14 +508,12 @@ export default {
...
@@ -512,14 +508,12 @@ export default {
.
getVersionInfo
(
version
)
.
getVersionInfo
(
version
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
let
data
=
res
.
data
;
let
data
=
res
.
data
;
if
(
data
.
hasOwnProperty
(
'is_audit'
)
&&
data
.
is_audit
==
0
)
{
if
(
data
.
hasOwnProperty
(
"is_audit"
)
&&
data
.
is_audit
==
0
)
{
that
.
tabs
=
that
.
tabs2
;
that
.
tabs
=
that
.
tabs2
;
that
.
version
=
false
that
.
version
=
false
;
}
}
})
})
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{});
});
},
},
stopPull
()
{
stopPull
()
{
let
that
=
this
;
let
that
=
this
;
...
@@ -564,6 +558,24 @@ export default {
...
@@ -564,6 +558,24 @@ export default {
stopTouchMove
()
{
stopTouchMove
()
{
return
false
;
return
false
;
},
},
//取文本第一张图片
imgUrlFun
(
str
)
{
var
data
=
""
;
str
.
replace
(
/<img
[^
>
]
*src=
[
'"
]([^
'"
]
+
)[^
>
]
*>/
,
function
(
match
,
capture
)
{
data
=
capture
;
}
);
return
data
;
},
//取文本信息
getText
(
str
)
{
return
str
.
replace
(
/<
[^
<>
]
+>/g
,
""
)
.
replace
(
/ /gi
,
""
)
.
replace
(
/
(\n)
/g
,
""
);
},
getNoticeList
()
{
getNoticeList
()
{
let
that
=
this
;
let
that
=
this
;
this
.
$u
.
api
this
.
$u
.
api
...
@@ -587,8 +599,11 @@ export default {
...
@@ -587,8 +599,11 @@ export default {
res
.
data
[
i
].
create_at
,
res
.
data
[
i
].
create_at
,
"yyyy.MM.dd hh:mm"
"yyyy.MM.dd hh:mm"
);
);
res
.
data
[
i
].
img
=
this
.
imgUrlFun
(
res
.
data
[
i
].
body
);
res
.
data
[
i
].
text
=
this
.
getText
(
res
.
data
[
i
].
body
);
}
}
that
.
list
=
that
.
list
.
concat
(
res
.
data
);
that
.
list
=
that
.
list
.
concat
(
res
.
data
);
console
.
log
(
"消息列表"
,
that
.
list
);
}
}
if
(
res
.
data
.
length
>=
5
)
{
if
(
res
.
data
.
length
>=
5
)
{
that
.
isLoadMore
=
false
;
that
.
isLoadMore
=
false
;
...
@@ -724,7 +739,8 @@ export default {
...
@@ -724,7 +739,8 @@ export default {
let
length
=
this
.
examList
.
length
;
let
length
=
this
.
examList
.
length
;
for
(
let
i
=
0
;
i
<
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
length
;
i
++
)
{
let
examId
=
this
.
examList
[
i
].
id
;
let
examId
=
this
.
examList
[
i
].
id
;
this
.
$u
.
api
.
getExamResult
(
examId
)
this
.
$u
.
api
.
getExamResult
(
examId
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
!=
200
)
{
if
(
res
.
code
!=
200
)
{
console
.
log
(
"getUserExamInfo 200 err"
);
console
.
log
(
"getUserExamInfo 200 err"
);
...
@@ -778,9 +794,8 @@ export default {
...
@@ -778,9 +794,8 @@ export default {
aaa
(
index
)
{
aaa
(
index
)
{
//examStatus 用户考试状态 0考试中 1考试完成 2未参与
//examStatus 用户考试状态 0考试中 1考试完成 2未参与
//考试完成分成通过、未通过
//考试完成分成通过、未通过
getApp
().
globalData
.
questionTime
=
this
.
examList
[
getApp
().
globalData
.
questionTime
=
index
this
.
examList
[
index
].
questionTime
;
].
questionTime
;
var
examInfo
=
this
.
examList
[
index
];
var
examInfo
=
this
.
examList
[
index
];
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
"/pages/learn/assessment?examId="
+
examInfo
.
id
,
url
:
"/pages/learn/assessment?examId="
+
examInfo
.
id
,
...
@@ -801,6 +816,7 @@ export default {
...
@@ -801,6 +816,7 @@ export default {
var
news
=
{
var
news
=
{
body
:
e
.
body
,
body
:
e
.
body
,
title
:
e
.
title
,
title
:
e
.
title
,
create_at
:
e
.
create_at
,
};
};
let
that
=
this
;
let
that
=
this
;
wx
.
navigateTo
({
wx
.
navigateTo
({
...
@@ -828,7 +844,7 @@ export default {
...
@@ -828,7 +844,7 @@ export default {
.banner
{
.banner
{
width
:
690
rpx
;
width
:
690
rpx
;
height
:
2
4
0
rpx
;
height
:
2
2
0
rpx
;
margin-top
:
10
rpx
;
margin-top
:
10
rpx
;
}
}
...
@@ -854,26 +870,40 @@ export default {
...
@@ -854,26 +870,40 @@ export default {
min-height
:
370
rpx
;
min-height
:
370
rpx
;
margin-top
:
36
rpx
;
margin-top
:
36
rpx
;
overflow
:
hidden
;
overflow
:
hidden
;
background-color
:
#ffffff
;
border-radius
:
12
rpx
;
border-radius
:
12
rpx
;
padding
:
30
rpx
;
}
}
.notice-content
{
background
:
#ffffff
;
width
:
100%
;
border-radius
:
12
rpx
;
overflow
:
hidden
;
}
.notice-content-bottom
{
height
:
150
rpx
;
padding
:
0
30
rpx
;
overflow
:
hidden
;
}
.n-head
{
.n-head
{
text-align
:
left
;
text-align
:
left
;
font-size
:
32
rpx
;
font-size
:
32
rpx
;
font-weight
:
bold
;
font-weight
:
bold
;
color
:
#333333
;
color
:
#333333
;
margin-top
:
30
rpx
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
}
}
.news
{
.news
{
height
:
168
rpx
;
overflow
:
hidden
;
overflow
:
hidden
;
margin-top
:
30
rpx
;
/* margin-top: 30rpx; */
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
font-size
:
24
rpx
;
font-size
:
24
rpx
;
color
:
#666666
;
color
:
#666666
;
line-height
:
34
rpx
;
line-height
:
34
rpx
;
margin-bottom
:
20
rpx
;
margin-bottom
:
20
rpx
;
margin-top
:
16
rpx
;
}
}
/* 在线学习 */
/* 在线学习 */
...
@@ -1056,8 +1086,10 @@ swiper {
...
@@ -1056,8 +1086,10 @@ swiper {
.notice-bottom-left
{
.notice-bottom-left
{
font-size
:
24
rpx
;
font-size
:
24
rpx
;
font-weight
:
500
;
color
:
#999999
;
color
:
#999999
;
float
:
left
;
text-align
:
center
;
margin-bottom
:
20
rpx
;
}
}
.notice-bottom-right
{
.notice-bottom-right
{
...
...
src/pages/learn/news-details.vue
View file @
b2d898b7
<
template
>
<
template
>
<view>
<view>
<u-navbar
<u-navbar
back-icon-color=
"#000000"
:background=
"background"
title-color=
"#000000"
:border-bottom=
"false"
>
back-icon-color=
"#000000"
:background=
"background"
title-color=
"#000000"
:border-bottom=
"false"
>
</u-navbar>
</u-navbar>
<view
class=
"title"
>
<view
class=
"title"
>
{{
title
}}
{{
title
}}
</view>
</view>
<view
class=
"creat_at"
>
{{
create_at
}}
</view>
<view
class=
"u-content"
>
<view
class=
"u-content"
>
<u-parse
:html=
"body"
:tag-style=
"style"
></u-parse>
<u-parse
:html=
"body"
:tag-style=
"style"
></u-parse>
</view>
</view>
...
@@ -16,39 +15,51 @@
...
@@ -16,39 +15,51 @@
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
title
:
''
,
title
:
""
,
body
:
''
body
:
""
,
}
create_at
:
""
,
};
},
},
onLoad
()
{
onLoad
()
{
getApp
().
trackPage
(
'消息通知详情页'
)
getApp
().
trackPage
(
"消息通知详情页"
);
var
that
=
this
;
var
that
=
this
;
const
eventChannel
=
this
.
getOpenerEventChannel
()
const
eventChannel
=
this
.
getOpenerEventChannel
();
eventChannel
.
on
(
'acceptDataFromLearn'
,
function
(
data
)
{
eventChannel
.
on
(
"acceptDataFromLearn"
,
function
(
data
)
{
that
.
title
=
data
.
title
;
that
.
title
=
data
.
title
;
that
.
body
=
data
.
body
;
that
.
body
=
data
.
body
;
})
that
.
create_at
=
data
.
create_at
;
this
.
$u
.
mpShare
.
path
=
''
console
.
log
(
data
);
});
this
.
$u
.
mpShare
.
path
=
""
;
},
},
}
};
</
script
>
</
script
>
<
style
>
<
style
>
.title
{
.title
{
font-size
:
32
rpx
;
font-size
:
32
rpx
;
font-weight
:
bold
;
font-weight
:
bold
;
margin-left
:
30
rpx
;
margin-left
:
30
rpx
;
margin-top
:
30
rpx
;
margin-top
:
30
rpx
;
}
}
.u-content
{
.u-content
{
font-size
:
24
rpx
;
font-size
:
24
rpx
;
line-height
:
36
rpx
;
line-height
:
36
rpx
;
color
:
#666666
;
color
:
#666666
;
margin-left
:
30
rpx
;
margin-left
:
30
rpx
;
margin-top
:
30
rpx
;
margin-right
:
30
rpx
;
margin-right
:
30
rpx
;
}
}
.creat_at
{
font-size
:
24
rpx
;
color
:
#999999
;
margin-left
:
30
rpx
;
margin-top
:
20
rpx
;
}
rich-text
{
margin-top
:
40
rpx
;
display
:
block
;
}
</
style
>
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment