Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
郝肖肖
2016-08-29 20:03:36 +0800
Commit
c54030772a9a9a168c3da446074373c94ba245c5
2 parents
7cc929aa
fe9569e3
Merge branch 'feature/plustar' into release/4.9.1.0
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
4 deletions
apps/guang/controllers/plusstar.js
apps/guang/views/action/plusstar/index.hbs
public/js/guang/plusstar-index.page.js
public/scss/guang/plusstar/_index.css
apps/guang/controllers/plusstar.js
View file @
c540307
...
...
@@ -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
);
...
...
apps/guang/views/action/plusstar/index.hbs
View file @
c540307
...
...
@@ -12,6 +12,10 @@
{{/if}}
<!--/tab-nav-->
{{#if
isApp
}}
<div
class=
'empty-height'
></div>
{{/if}}
<div
class=
"plusstar-resources"
>
<!--资源位数据模板-->
</div>
<!--/plusstar-resources-->
...
...
public/js/guang/plusstar-index.page.js
View file @
c540307
...
...
@@ -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>'
...
...
public/scss/guang/plusstar/_index.css
View file @
c540307
...
...
@@ -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
{
...
...
Please
register
or
login
to post a comment