Authored by 郝肖肖

Merge branch 'feature/plustar' into release/4.9.1.0

... ... @@ -37,6 +37,7 @@ exports.index = (req, res, next) => {
res.render('plusstar/index', Object.assign({
page: 'plusstar-index',
result: result,
isApp: isApp,
title: title
}, parameter));
}).catch(next);
... ...
... ... @@ -12,6 +12,10 @@
{{/if}}
<!--/tab-nav-->
{{#if isApp}}
<div class='empty-height'></div>
{{/if}}
<div class="plusstar-resources">
<!--资源位数据模板-->
</div><!--/plusstar-resources-->
... ...
... ... @@ -111,6 +111,13 @@ plusstar = {
};
$(function() {
if (!(window.queryString.app_version || window.queryString.appVersion)) {
$('.tab-nav').css({
position: 'absolute'
});
}
if ($footer.length > 0) {
$footer.before(
'<div style="height: ' + parseInt($footer.css('height'), 0) + 'px"></div>'
... ...
... ... @@ -53,10 +53,8 @@
}
}
.plusstar-resources:before {
.empty-height {
height: 72px;
content: "";
display: inline-block;
}
.resources {
... ... @@ -115,7 +113,6 @@
.swipe-indicators {
display: none;
}
}
.swipe-item {
... ...