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
e5ea31b2
Commit
e5ea31b2
authored
Dec 17, 2019
by
FE
Browse files
Options
Browse Files
Download
Plain Diff
pull
parents
7a6d4187
87e0d8cc
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
36 deletions
+31
-36
src/components/activity/newyear-2019/common/prizes/index.js
+6
-5
src/components/activity/newyear-2019/common/system-bullet-screen/index.js
+11
-10
src/components/activity/newyear-2019/landing/index.js
+4
-8
src/components/activity/newyear-2019/preheat/YearCourse/index.js
+9
-12
src/components/activity/newyear-2019/year-wish/index.js
+1
-1
No files found.
src/components/activity/newyear-2019/common/prizes/index.js
View file @
e5ea31b2
...
...
@@ -83,9 +83,10 @@ class Prizes extends Component {
const
{
showSystemNotices
}
=
this
.
props
const
{
notices
}
=
this
.
state
return
(
<>
{
showSystemNotices
&&
<
SystemBulletScreen
bullets
=
{
this
.
state
.
notices
}
/>
}
{
(
showSystemNotices
&&
notices
&&
notices
.
length
)
?
<
SystemBulletScreen
bullets
=
{
notices
}
/> : null
}
<
div
className
=
{
'prizes-box'
}
ref
=
{
el
=>
this
.
prizeBox
=
el
}
>
<
a
href
=
"javascript:;"
className
=
'rule-btn'
onClick
=
{
this
.
showRules
}
>
活动规则
>
<
/a
>
<
div
className
=
{
`bg`
}
ref
=
{
el
=>
this
.
bg
=
el
}
/
>
...
...
@@ -97,10 +98,10 @@ class Prizes extends Component {
<
li
key
=
{
index
}
>
{
item
.
img_name
?
<
i
className
=
"prize-list__image"
style
=
{{
backgroundImage
:
`url(
${
item
.
img_name
}
)`
}}
><
/i
>
:
<
i
className
=
"prize-list__image"
><
/i
>
?
<
i
className
=
"prize-list__image"
style
=
{{
backgroundImage
:
`url(
${
item
.
img_name
}
)`
}}
/
>
:
<
i
className
=
"prize-list__image"
/
>
}
{
/* <img src={item.img_name} alt=""/> */
}
{
...
...
src/components/activity/newyear-2019/common/system-bullet-screen/index.js
View file @
e5ea31b2
...
...
@@ -61,8 +61,8 @@ class SystemBulletScreen extends Component {
},
1000
)
}
else
{
setTimeout
(()
=>
{
++
this
.
count
swiper
.
slideNext
()
++
this
.
count
;
(
swiper
&&
!
swiper
.
destroyed
)
&&
swiper
.
slideNext
()
},
3000
)
}
}
...
...
@@ -99,17 +99,18 @@ class SystemBulletScreen extends Component {
this
.
state
.
showNotices
&&
<
div
id
=
"system-bullet-screen"
onTransitionEnd
=
{
this
.
removeSystemNotices
}
ref
=
{
el
=>
this
.
sysNotice
=
el
}
>
<
img
className
=
'avatar'
src
=
'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/system-
avatar
.png'
alt
=
""
/>
src
=
'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/system-
notice-icon
.png'
alt
=
""
/>
<
div
className
=
'sys-bullet-screen-swiper-container'
>
<
ul
className
=
"swiper-wrapper"
>
{
bullets
&&
bullets
.
length
&&
bullets
.
map
((
item
,
index
)
=>
{
return
(
<
li
className
=
"swiper-slide"
key
=
{
index
}
>
<
span
>
{
item
}
<
/span
>
<
/li
>
)
})
(
bullets
&&
bullets
.
length
)
?
bullets
.
map
((
item
,
index
)
=>
{
return
(
<
li
className
=
"swiper-slide"
key
=
{
index
}
>
<
span
>
{
item
}
<
/span
>
<
/li
>
)
})
:
null
}
<
/ul
>
<
/div
>
...
...
src/components/activity/newyear-2019/landing/index.js
View file @
e5ea31b2
...
...
@@ -119,9 +119,9 @@ class Landing extends Component {
handleToMyTreasure
=
()
=>
{
this
.
joinSuccessPopup
&&
this
.
joinSuccessPopup
.
remove
()
if
(
getParam
(
'version'
))
{
if
(
getParam
(
'version'
))
{
history
.
push
(
`/year/yearTreasure?id=
${
id
}
&version=
${
getParam
(
'version'
)}
`
)
}
else
{
}
else
{
history
.
push
(
`/year/yearTreasure?id=
${
id
}
`
)
}
}
...
...
@@ -276,17 +276,13 @@ class Landing extends Component {
showShareTip
=
()
=>
{
const
{
user
}
=
this
.
props
if
(
browser
.
isAndroidApp
)
{
}
else
if
(
browser
.
isIOSApp
)
{
if
(
browser
.
isAndroidApp
||
browser
.
isIOSApp
)
{
SendMessageToApp
(
'toShare'
,
{
title
:
`@
${
user
.
data
.
username
}
邀您一起组队拿豪礼!`
,
desc
:
`加入我的队伍,机械键盘,纸质书籍等超多奖品等你拿!`
,
link
:
`
${
window
.
location
.
origin
}
/
${
location
.
pathname
}
?treasure_code=
${
getParam
(
'treasure_code'
)}
&origin=2`
,
//todo 分享图片更换
imgUrl
:
'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newIndex/community/tou5_bj.png'
imgUrl
:
'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
})
}
else
{
...
...
src/components/activity/newyear-2019/preheat/YearCourse/index.js
View file @
e5ea31b2
...
...
@@ -297,18 +297,15 @@ class YearCourse extends Component {
http
.
get
(
`
${
API
[
'base-api'
]}
/wx/user_temporary_qrcode/
${
_this
.
props
.
user
.
data
.
uid
}
`
)
.
then
(
res
=>
{
const
{
errno
,
data
,
msg
}
=
res
.
data
QRCode
.
toDataURL
(
'http://weixin.qq.com/q/02mntn9j4xcw01_VSN1tc2'
,
(
err
,
url
)
=>
{
this
.
setState
({
followBarcode
:
url
,
if
(
errno
==
0
)
{
QRCode
.
toDataURL
(
data
.
url
,
(
err
,
url
)
=>
{
this
.
setState
({
followBarcode
:
url
,
})
})
})
// _this.followBarcode = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=gQEV8DwAAAAAAAAAAS5odHRwOi8vd2VpeGluLnFxLmNvbS9xLzAybW50bjlqNHhjdzAxX1ZTTjF0YzIAAgR5pfBdAwSAUQEA"
// if (errno == 0) {
// _this.followBarcode = data.url
// } else {
// Message.warning(msg)
// }
}
else
{
Toast
.
info
(
msg
,
2
)
}
})
}
...
...
@@ -434,7 +431,7 @@ class YearCourse extends Component {
}
else
{
this
.
props
.
history
.
push
(
`/year/yearWish?version=
${
getParam
(
'version'
)}
`
)
}
}
else
{
this
.
toLogin
()
}
...
...
src/components/activity/newyear-2019/year-wish/index.js
View file @
e5ea31b2
...
...
@@ -120,7 +120,7 @@ class YarnWish extends Component {
{
item
.
type
==
2
?
'到手最低:¥'
:
'¥'
}
<
span
className
=
"new-price"
>
{
item
.
type
==
4
?
'0.01'
:
item
.
price2
}
<
/span
>
<
span
className
=
"old-price"
>
现价:
<
s
>
¥
{
item
.
price1
}
<
/s></
span
>
<
span
className
=
"old-price"
>
{
item
.
type
==
2
?
''
:
'现价:'
}
<
s
>
¥
{
item
.
price1
}
<
/s></
span
>
<
/div
>
<
div
className
=
"status"
>
...
...
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