Commit cb060aff by wangshuo

双11线上对应

parent 28153c2f
...@@ -593,7 +593,7 @@ class BlessingPreheat extends Component { ...@@ -593,7 +593,7 @@ class BlessingPreheat extends Component {
{/* 积福气 */} {/* 积福气 */}
<ListHeader id={'lucky-value'} text="积福气,享受更多福利" styles={{margin: '30px 0 15px'}}/> <ListHeader id={'lucky-value'} text="积福气,享受更多福利" styles={{margin: '30px 0 15px'}}/>
<Link className="luck-draw__button" to="/blessingRank">福气排行榜></Link> <Link className="blessing__sort" to="/blessingRank"></Link>
<CollectBlessing <CollectBlessing
......
...@@ -76,6 +76,14 @@ ...@@ -76,6 +76,14 @@
cursor: pointer; cursor: pointer;
outline: none; outline: none;
} }
.blessing__sort {
display: block;
margin: 0 auto 15px;
width: 120px;
height: 28px;
background: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/m11_enter_icon.png') center center no-repeat;
background-size: 100% 100%;
}
.formal-draw-btns { .formal-draw-btns {
display: flex; display: flex;
......
...@@ -29,6 +29,10 @@ class LevelTest extends Component { ...@@ -29,6 +29,10 @@ class LevelTest extends Component {
{ {
url: url:
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/AIExam/top8-10.png" "https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/AIExam/top8-10.png"
},
{
url:
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/AIExam/top11-20.png"
} }
], ],
} }
......
...@@ -87,6 +87,21 @@ class Live extends Component { ...@@ -87,6 +87,21 @@ class Live extends Component {
} }
} }
checkVideo = (url) => {
let version = getParam('version');
const {history, user} = this.props;
if(!version) {
if (user.hasError) {
this.toLogin()
}else{
const vCourseId = url.split('/')[0];
history.push(`/play/video?id=${vCourseId}`)
}
}else{
Toast.info('当前版本不支持此功能,请前往h5/pc查看回放该直播', 2, null, false);
}
}
makeSubscribe = id => { makeSubscribe = id => {
const {user} = this.props const {user} = this.props
if (user.hasError) { if (user.hasError) {
...@@ -161,7 +176,7 @@ class Live extends Component { ...@@ -161,7 +176,7 @@ class Live extends Component {
todayLives && todayLives.map((item, index) => { todayLives && todayLives.map((item, index) => {
return ( return (
<LiveContent item={item} key={index} makeSubscribe={this.makeSubscribe} <LiveContent item={item} key={index} makeSubscribe={this.makeSubscribe}
toLiveRoom={this.toLiveRoom}/> toLiveRoom={this.toLiveRoom} checkVideo={this.checkVideo}/>
) )
}) })
} }
...@@ -178,7 +193,7 @@ class Live extends Component { ...@@ -178,7 +193,7 @@ class Live extends Component {
} }
} }
function LiveContent({item, makeSubscribe, toLiveRoom}) { function LiveContent({item, makeSubscribe, toLiveRoom, checkVideo}) {
return ( return (
<div className="content"> <div className="content">
{ {
...@@ -217,7 +232,7 @@ function LiveContent({item, makeSubscribe, toLiveRoom}) { ...@@ -217,7 +232,7 @@ function LiveContent({item, makeSubscribe, toLiveRoom}) {
}}>正在直播</button> }}>正在直播</button>
: :
item['is_end'] item['is_end']
? <button className={'subscribed'}>已结束</button> ? item.transcribe_url === '' ? <button className={'subscribed'}>已结束</button> : <button className={'on-living'} onClick={() => checkVideo(item.transcribe_url)}>查看回放</button>
: item['is_subscribe'] : item['is_subscribe']
? <button className={'subscribed'}>已预约</button> ? <button className={'subscribed'}>已预约</button>
: <button className={'subscribe'} : <button className={'subscribe'}
......
...@@ -12,7 +12,7 @@ export default class RankList extends Component { ...@@ -12,7 +12,7 @@ export default class RankList extends Component {
} }
componentDidMount() { componentDidMount() {
http.get(`${API.home}/sys/ai_test/ranking/10`).then(res => { http.get(`${API.home}/sys/ai_test/ranking/50`).then(res => {
let data = res.data.data; let data = res.data.data;
let code = res.data.code; let code = res.data.code;
if(code === 200) { if(code === 200) {
...@@ -42,7 +42,7 @@ export default class RankList extends Component { ...@@ -42,7 +42,7 @@ export default class RankList extends Component {
<> <>
<ListHeader text="测试排行榜" styles={{margin: '20px 0 10px'}} size='middle' /> <ListHeader text="测试排行榜" styles={{margin: '20px 0 10px'}} size='middle' />
<div className="sort__rules"> <div className="sort__rules">
仅显示前10 仅显示前50
</div> </div>
<div className="rank__list_module"> <div className="rank__list_module">
<div className="rank__table_head"> <div className="rank__table_head">
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
} }
.rank__table_body { .rank__table_body {
height: 504px;
overflow: auto;
.table__tr { .table__tr {
height: 48px; height: 48px;
display: flex; display: flex;
......
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