Merge remote-tracking branch 'origin/feature/live' into feature/live
Showing
1 changed file
with
4 additions
and
3 deletions
@@ -30,7 +30,8 @@ const _formatTime = (timestamp, b) => { | @@ -30,7 +30,8 @@ const _formatTime = (timestamp, b) => { | ||
30 | // 获取顶部bannel | 30 | // 获取顶部bannel |
31 | let _getBannerData = () => { | 31 | let _getBannerData = () => { |
32 | return service.get('operations/api/v5/resource/get', { | 32 | return service.get('operations/api/v5/resource/get', { |
33 | - content_code: contentCodeConfig.live.index | 33 | + content_code: contentCodeConfig.live.index, |
34 | + platform: 'iphone' | ||
34 | }, { | 35 | }, { |
35 | code: 200, | 36 | code: 200, |
36 | cache: true | 37 | cache: true |
@@ -46,7 +47,7 @@ const _getBestList = () => { | @@ -46,7 +47,7 @@ const _getBestList = () => { | ||
46 | cache: false | 47 | cache: false |
47 | }).then(result => { | 48 | }).then(result => { |
48 | let list = result && result.data || []; | 49 | let list = result && result.data || []; |
49 | - | 50 | + |
50 | if (result && result.data && result.data.length !== 2) { | 51 | if (result && result.data && result.data.length !== 2) { |
51 | result.data = []; | 52 | result.data = []; |
52 | } | 53 | } |
@@ -61,7 +62,7 @@ const _getBestList = () => { | @@ -61,7 +62,7 @@ const _getBestList = () => { | ||
61 | item.now_living = true; | 62 | item.now_living = true; |
62 | break; | 63 | break; |
63 | case 2: | 64 | case 2: |
64 | - //直播结束不显示 | 65 | + // 直播结束不显示 |
65 | result.data = []; | 66 | result.data = []; |
66 | break; | 67 | break; |
67 | } | 68 | } |
-
Please register or login to post a comment