Commit f18b9d30 by wangshuo

显示抽奖次数以及模块位置变化

parent cfb784da
#main-banner{ #main-banner{
overflow: auto; overflow: auto;
margin-bottom: 70px;
.banner{ .banner{
width: 375px; width: 375px;
height: 183px; height: 183px;
......
...@@ -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
......
...@@ -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: '60px 0 15px'}}/> <ListHeader id={'lucky-value'} text="积福气,享受更多福利" styles={{margin: '30px 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">- 将于111110点开启 -</p> <p className="luck-draw__tip">- 将于111110点开启 -</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 &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment