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
f18b9d30
Commit
f18b9d30
authored
Nov 08, 2019
by
wangshuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
显示抽奖次数以及模块位置变化
parent
cfb784da
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
21 deletions
+20
-21
src/components/blessingPreheat/banner/index.scss
+1
-0
src/components/blessingPreheat/formal-draw/index.js
+1
-1
src/components/blessingPreheat/index.js
+18
-20
No files found.
src/components/blessingPreheat/banner/index.scss
View file @
f18b9d30
#main-banner
{
#main-banner
{
overflow
:
auto
;
overflow
:
auto
;
margin-bottom
:
70px
;
.banner
{
.banner
{
width
:
375px
;
width
:
375px
;
height
:
183px
;
height
:
183px
;
...
...
src/components/blessingPreheat/formal-draw/index.js
View file @
f18b9d30
...
@@ -241,7 +241,7 @@ class FormalDraw extends Component {
...
@@ -241,7 +241,7 @@ class FormalDraw extends Component {
statusContent
=
(
statusContent
=
(
<>
<>
<
span
>
已结束
<
/span
>
<
span
>
已结束
<
/span
>
<
Link
to
=
{
`/prize-winner-list?tid=
${
item
.
id
}
`
}
>
查看中奖
记录
<
/Link
>
<
Link
to
=
{
`/prize-winner-list?tid=
${
item
.
id
}
`
}
>
查看中奖
名单
<
/Link
>
<
/
>
<
/
>
)
)
break
break
...
...
src/components/blessingPreheat/index.js
View file @
f18b9d30
...
@@ -245,9 +245,7 @@ class BlessingPreheat extends Component {
...
@@ -245,9 +245,7 @@ class BlessingPreheat extends Component {
if
(
code
===
200
)
{
if
(
code
===
200
)
{
this
.
setState
({
this
.
setState
({
isSign
:
!!
data
.
today_signed
,
isSign
:
!!
data
.
today_signed
,
// isFormal: data.is_activity,
isFormal
:
data
.
is_activity
,
//todo 去掉假数据
isFormal
:
1
,
testSum
:
parseInt
(
data
.
user_test_total
,
10
)
||
0
,
testSum
:
parseInt
(
data
.
user_test_total
,
10
)
||
0
,
userInfo
:
Object
.
assign
({},
userInfo
,
{
userInfo
:
Object
.
assign
({},
userInfo
,
{
isFollow
:
data
.
subscribed
,
isFollow
:
data
.
subscribed
,
...
@@ -540,8 +538,23 @@ class BlessingPreheat extends Component {
...
@@ -540,8 +538,23 @@ class BlessingPreheat extends Component {
toSection
=
{
this
.
toSection
}
toSection
=
{
this
.
toSection
}
index
=
{
index
}
index
=
{
index
}
/
>
/
>
{
/* 抽奖--正式 */
}
{
isFormal
===
1
&&
<>
<
ListHeader
id
=
{
'lucky-draw'
}
text
=
"幸运大抽奖"
styles
=
{{
margin
:
'30px 0 10px'
}}
/
>
<
div
className
=
"formal-draw-btns"
>
<
button
className
=
"luck-draw__button"
onClick
=
{()
=>
this
.
handleToShow
(
'isRule'
)}
>
活动规则
><
/button
>
<
button
className
=
'prize-record'
onClick
=
{
this
.
getMyPrizeRecord
}
>
中奖记录
><
/button
>
<
/div
>
<
FormalDraw
toLogin
=
{
this
.
toLogin
}
/
>
<
/
>
}
{
/* 积福气 */
}
{
/* 积福气 */
}
<
ListHeader
id
=
{
'lucky-value'
}
text
=
"积福气,享受更多福利"
styles
=
{{
margin
:
'
6
0px 0 15px'
}}
/
>
<
ListHeader
id
=
{
'lucky-value'
}
text
=
"积福气,享受更多福利"
styles
=
{{
margin
:
'
3
0px 0 15px'
}}
/
>
<
Link
className
=
"luck-draw__button"
to
=
"/blessingRank"
>
福气排行榜
><
/Link
>
<
Link
className
=
"luck-draw__button"
to
=
"/blessingRank"
>
福气排行榜
><
/Link
>
...
@@ -558,11 +571,10 @@ class BlessingPreheat extends Component {
...
@@ -558,11 +571,10 @@ class BlessingPreheat extends Component {
/
>
/
>
{
/* 幸运大抽奖--预热 */
}
{
/* 幸运大抽奖--预热 */
}
<
ListHeader
id
=
{
'lucky-draw'
}
text
=
"幸运大抽奖"
styles
=
{{
margin
:
'30px 0 10px'
}}
/
>
{
{
isFormal
===
0
&&
isFormal
===
0
&&
<>
<>
<
ListHeader
id
=
{
'lucky-draw'
}
text
=
"幸运大抽奖"
styles
=
{{
margin
:
'30px 0 10px'
}}
/
>
<
p
className
=
"luck-draw__tip"
>-
将于
11
月
11
日
10
点开启
-<
/p
>
<
p
className
=
"luck-draw__tip"
>-
将于
11
月
11
日
10
点开启
-<
/p
>
<
button
className
=
"luck-draw__button"
onClick
=
{()
=>
this
.
handleToShow
(
'isRule'
)}
>
活动规则
><
/button
>
<
button
className
=
"luck-draw__button"
onClick
=
{()
=>
this
.
handleToShow
(
'isRule'
)}
>
活动规则
><
/button
>
<
LuckDraw
/>
<
LuckDraw
/>
...
@@ -570,20 +582,6 @@ class BlessingPreheat extends Component {
...
@@ -570,20 +582,6 @@ class BlessingPreheat extends Component {
}
}
{
/* 抽奖--正式 */
}
{
isFormal
===
1
&&
<>
<
div
className
=
"formal-draw-btns"
>
<
button
className
=
"luck-draw__button"
onClick
=
{()
=>
this
.
handleToShow
(
'isRule'
)}
>
活动规则
><
/button
>
<
button
className
=
'prize-record'
onClick
=
{
this
.
getMyPrizeRecord
}
>
中奖记录
><
/button
>
<
/div
>
<
FormalDraw
toLogin
=
{
this
.
toLogin
}
/
>
<
/
>
}
{
/*定金--只在预热期间显示*/
}
{
/*定金--只在预热期间显示*/
}
{
{
isFormal
===
0
&&
isFormal
===
0
&&
...
...
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