Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
Overview
Overview
Details
Activity
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
baiguangyao
mr-julyedu
Commits
a3aa6c9c
Commit
a3aa6c9c
authored
Nov 05, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app旧版本提示
parent
578094ad
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
76 additions
and
24 deletions
+76
-24
src/components/activity/invite.js
+26
-1
src/components/blessingPreheat/ReserveCourse/index.js
+1
-5
src/components/blessingPreheat/collectBlessing/index.js
+1
-1
src/components/blessingPreheat/courseList/index.js
+1
-5
src/components/blessingPreheat/coursePopup/index.js
+36
-8
src/components/blessingPreheat/coursePopup/index.scss
+9
-2
src/components/blessingPreheat/live/index.js
+2
-2
No files found.
src/components/activity/invite.js
View file @
a3aa6c9c
...
...
@@ -16,6 +16,7 @@ class Invite extends Component {
hot_schedule
:
''
,
userList
:
[],
inviteCode
:
''
,
isshowAppTip
:
false
}
}
...
...
@@ -28,8 +29,28 @@ class Invite extends Component {
this
.
props
.
history
.
push
(
`/activity?shareuid=
${
shareuid
}
&inviteCode=
${
getParam
(
'inviteCode'
)}
`
);
}
}
this
.
distinguishVersion
()
}
distinguishVersion
=
()
=>
{
// plat_form 1ios 2android
// version 1->3.704 2->4.5.1.20191105
if
(
getParam
(
'plat_form'
)
==
1
){
let
version
=
Number
(
getParam
(
'version'
))
this
.
setState
({
isshowAppTip
:
version
<
3.704
?
true
:
false
});
}
if
(
getParam
(
'plat_form'
)
==
2
){
let
version
=
getParam
(
'version'
).
replace
(
/
\.
/g
,
''
).
slice
(
0
,
3
)
this
.
setState
({
isshowAppTip
:
Number
(
version
)
<
451
?
true
:
false
});
}
}
componentDidMount
()
{
if
(
!
this
.
props
.
user
.
hasError
)
{
this
.
getUserList
();
...
...
@@ -100,12 +121,15 @@ class Invite extends Component {
inviteFriends
=
()
=>
{
const
{
user
,
history
}
=
this
.
props
;
const
{
inviteCode
}
=
this
.
state
;
const
{
inviteCode
,
isshowAppTip
}
=
this
.
state
;
// 未登录先去登录
if
(
getParam
(
'version'
))
{
if
(
user
.
hasError
)
{
SendMessageToApp
(
"toLogin"
);
}
else
{
if
(
isshowAppTip
){
Toast
.
info
(
'请前往h5/pc端使用该功能'
,
2
);
}
else
{
let
data
=
{
title
:
'AI充电节,积福气享1折秒课,超10万元奖品来就送!!'
,
desc
:
'把这门超5万人报名的【Python基础入门 升级版】课程送给你,附200元红包,请笑纳!--七月在线'
,
...
...
@@ -114,6 +138,7 @@ class Invite extends Component {
}
SendMessageToApp
(
"toShare"
,
data
)
}
}
}
else
{
if
(
user
.
hasError
)
{
history
.
push
(
'/passport'
);
...
...
src/components/blessingPreheat/ReserveCourse/index.js
View file @
a3aa6c9c
...
...
@@ -105,11 +105,7 @@ class ReserveCourse extends Component {
if
(
!
getParam
(
'version'
))
{
this
.
props
.
history
.
push
(
`/getDetail?id=
${
courseId
}
`
)
}
else
{
let
data
=
{
courseId
:
courseId
,
type
:
0
// 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
}
SendMessageToApp
(
"toCourse"
,
data
);
SendMessageToApp
(
"toCourse"
,
courseId
);
}
}
// 查看更多
...
...
src/components/blessingPreheat/collectBlessing/index.js
View file @
a3aa6c9c
...
...
@@ -181,7 +181,7 @@ class CollectBlessing extends Component {
}
}
else
{
if
(
getParam
(
'version'
))
{
history
.
push
(
'/invite?version='
+
getParam
(
'version'
))
history
.
push
(
'/invite?version='
+
getParam
(
'version'
)
+
'&plat_form='
+
getParam
(
'plat_form'
)
)
}
else
{
history
.
push
(
'/invite'
)
}
...
...
src/components/blessingPreheat/courseList/index.js
View file @
a3aa6c9c
...
...
@@ -301,11 +301,7 @@ class CourseList extends Component {
if
(
!
getParam
(
'version'
))
{
history
.
push
(
`/detail?id=
${
courseId
}
`
);
}
else
{
let
data
=
{
courseId
:
courseId
,
type
:
0
// 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
};
SendMessageToApp
(
"toCourse"
,
data
);
SendMessageToApp
(
"toCourse"
,
courseId
);
}
}
...
...
src/components/blessingPreheat/coursePopup/index.js
View file @
a3aa6c9c
...
...
@@ -8,12 +8,31 @@ class CoursePopup extends Component {
constructor
(
props
)
{
super
(
props
);
this
.
state
=
{
courseList
:
[]
courseList
:
[],
isshowAppTip
:
false
};
}
componentDidMount
()
{
this
.
fetchCourseData
();
this
.
distinguishVersion
();
}
distinguishVersion
=
()
=>
{
// plat_form 1ios 2android
// version 1->3.704 2->4.5.1.20191105
if
(
getParam
(
'plat_form'
)
==
1
){
let
version
=
Number
(
getParam
(
'version'
))
this
.
setState
({
isshowAppTip
:
version
<
3.704
?
true
:
false
});
}
if
(
getParam
(
'plat_form'
)
==
2
){
let
version
=
getParam
(
'version'
).
replace
(
/
\.
/g
,
''
).
slice
(
0
,
3
)
this
.
setState
({
isshowAppTip
:
Number
(
version
)
<
451
?
true
:
false
});
}
}
fetchCourseData
=
()
=>
{
...
...
@@ -46,17 +65,19 @@ class CoursePopup extends Component {
if
(
!
getParam
(
'version'
))
{
history
.
push
(
`/detail?id=
${
item
.
course_id
}
&ac=11`
);
}
else
{
let
type
=
0
;
if
(
item
.
blessing
)
{
type
=
2
;
}
else
{
type
=
1
;
let
data
=
{
courseId
:
item
.
course_id
,
type
:
2
}
SendMessageToApp
(
"toBlessingCourse"
,
data
);
}
else
{
let
data
=
{
courseId
:
item
.
course_id
,
type
:
type
// 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
type
:
1
// 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
}
SendMessageToApp
(
"toBlessingCourse"
,
data
);
}
SendMessageToApp
(
"toCourse"
,
data
);
}
}
else
{
toLogin
();
...
...
@@ -64,7 +85,7 @@ class CoursePopup extends Component {
}
render
()
{
const
{
courseList
}
=
this
.
state
;
const
{
courseList
,
isshowAppTip
}
=
this
.
state
;
const
{
handleToHide
}
=
this
.
props
;
return
(
<
div
className
=
"course-popup__container"
>
...
...
@@ -89,6 +110,13 @@ class CoursePopup extends Component {
))
}
<
/div
>
{
isshowAppTip
&&
<
div
className
=
"course-popup-apptip"
>
当前版本浏览课程暂不能增加福气值,可以前往
h5
/
pc
端浏览课程增加福气值
<
/div
>
}
<
/div
>
<
i
className
=
"iconfont iconiconfront-2"
onClick
=
{
handleToHide
}
><
/i
>
<
/div
>
...
...
src/components/blessingPreheat/coursePopup/index.scss
View file @
a3aa6c9c
...
...
@@ -9,6 +9,7 @@
width
:
100%
;
height
:
100%
;
background-color
:
rgba
(
0
,
0
,
0
,
.5
);
z-index
:
2
;
.iconfont
{
margin
:
16px
0
0
;
...
...
@@ -20,8 +21,7 @@
.course-popup
{
width
:
300px
;
height
:
275px
;
padding
:
20px
0
0
;
padding
:
20px
0
;
border-radius
:
10px
;
box-sizing
:
border-box
;
background-color
:
#fff
;
...
...
@@ -79,3 +79,9 @@
text-overflow
:
ellipsis
;
overflow
:
hidden
;
}
.course-popup-apptip
{
padding
:
10px
15px
0
15px
;
color
:
#FF0000
;
text-align
:
center
;
}
\ No newline at end of file
src/components/blessingPreheat/live/index.js
View file @
a3aa6c9c
...
...
@@ -166,7 +166,7 @@ class Live extends Component {
return
(
<
div
key
=
{
index
}
>
{
todayLives
.
map
((
item
,
index
)
=>
{
todayLives
&&
todayLives
.
map
((
item
,
index
)
=>
{
return
(
<
LiveContent
item
=
{
item
}
key
=
{
index
}
makeSubscribe
=
{
this
.
makeSubscribe
}
toLiveRoom
=
{
this
.
toLiveRoom
}
/
>
...
...
@@ -181,7 +181,7 @@ class Live extends Component {
return
(
<
div
key
=
{
index
}
>
{
todayLives
.
map
((
item
,
index
)
=>
{
todayLives
&&
todayLives
.
map
((
item
,
index
)
=>
{
return
(
<
LiveContent
item
=
{
item
}
key
=
{
index
}
makeSubscribe
=
{
this
.
makeSubscribe
}
toLiveRoom
=
{
this
.
toLiveRoom
}
/
>
...
...
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