Merge branch 'feature/plustar' into release/4.9.1.0
Showing
4 changed files
with
13 additions
and
4 deletions
@@ -37,6 +37,7 @@ exports.index = (req, res, next) => { | @@ -37,6 +37,7 @@ exports.index = (req, res, next) => { | ||
37 | res.render('plusstar/index', Object.assign({ | 37 | res.render('plusstar/index', Object.assign({ |
38 | page: 'plusstar-index', | 38 | page: 'plusstar-index', |
39 | result: result, | 39 | result: result, |
40 | + isApp: isApp, | ||
40 | title: title | 41 | title: title |
41 | }, parameter)); | 42 | }, parameter)); |
42 | }).catch(next); | 43 | }).catch(next); |
@@ -12,6 +12,10 @@ | @@ -12,6 +12,10 @@ | ||
12 | {{/if}} | 12 | {{/if}} |
13 | <!--/tab-nav--> | 13 | <!--/tab-nav--> |
14 | 14 | ||
15 | + {{#if isApp}} | ||
16 | + <div class='empty-height'></div> | ||
17 | + {{/if}} | ||
18 | + | ||
15 | <div class="plusstar-resources"> | 19 | <div class="plusstar-resources"> |
16 | <!--资源位数据模板--> | 20 | <!--资源位数据模板--> |
17 | </div><!--/plusstar-resources--> | 21 | </div><!--/plusstar-resources--> |
@@ -111,6 +111,13 @@ plusstar = { | @@ -111,6 +111,13 @@ plusstar = { | ||
111 | }; | 111 | }; |
112 | 112 | ||
113 | $(function() { | 113 | $(function() { |
114 | + | ||
115 | + if (!(window.queryString.app_version || window.queryString.appVersion)) { | ||
116 | + $('.tab-nav').css({ | ||
117 | + position: 'absolute' | ||
118 | + }); | ||
119 | + } | ||
120 | + | ||
114 | if ($footer.length > 0) { | 121 | if ($footer.length > 0) { |
115 | $footer.before( | 122 | $footer.before( |
116 | '<div style="height: ' + parseInt($footer.css('height'), 0) + 'px"></div>' | 123 | '<div style="height: ' + parseInt($footer.css('height'), 0) + 'px"></div>' |
@@ -53,10 +53,8 @@ | @@ -53,10 +53,8 @@ | ||
53 | } | 53 | } |
54 | } | 54 | } |
55 | 55 | ||
56 | - .plusstar-resources:before { | 56 | + .empty-height { |
57 | height: 72px; | 57 | height: 72px; |
58 | - content: ""; | ||
59 | - display: inline-block; | ||
60 | } | 58 | } |
61 | 59 | ||
62 | .resources { | 60 | .resources { |
@@ -115,7 +113,6 @@ | @@ -115,7 +113,6 @@ | ||
115 | .swipe-indicators { | 113 | .swipe-indicators { |
116 | display: none; | 114 | display: none; |
117 | } | 115 | } |
118 | - | ||
119 | } | 116 | } |
120 | 117 | ||
121 | .swipe-item { | 118 | .swipe-item { |
-
Please register or login to post a comment