Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohoblk-wap
·
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-09 11:42:59 +0800
Commit
844ca8497f51746251c92176081028a496be6842
2 parents
f9fde65a
e3284cb7
Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
apps/product/models/search.js
public/vue/component/header.vue
public/vue/component/product/filter/filter-sub.vue
public/vue/product/detail/top-nav.vue
public/vue/product/shop/top-bar.vue
apps/product/models/search.js
View file @
844ca84
...
...
@@ -27,8 +27,8 @@ const search = {
}
if
(
result
.
code
===
200
)
{
prettyFilter
(
result
.
data
.
filter
);
result
.
data
.
productList
=
processProductList
(
result
.
data
.
productList
);
result
=
camelCase
(
result
);
result
.
data
.
productList
=
processProductList
(
result
.
data
.
productList
);
}
return
result
;
});
...
...
public/vue/component/header.vue
View file @
844ca84
...
...
@@ -29,7 +29,7 @@
};
</script>
<style>
.header
-wrap
{
.header {
box-sizing: content-box;
position: fixed;
top: 0;
...
...
@@ -44,6 +44,7 @@
line-height: 70px;
font-size: 48px;
background-color: #fff;
color: #000;
.icon,
.header-title {
...
...
public/vue/component/product/filter/filter-sub.vue
View file @
844ca84
...
...
@@ -98,6 +98,10 @@
left: 0;
right: 0;
bottom: 0;
.app.ios & {
top: 140px;
}
}
.filter-detail {
...
...
public/vue/product/detail/top-nav.vue
View file @
844ca84
...
...
@@ -5,7 +5,9 @@
</template>
<style>
.top-nav {
background-color: transparent;
.header {
background-color: transparent;
}
.header-gap {
display: none;
...
...
public/vue/product/shop/top-bar.vue
View file @
844ca84
...
...
@@ -11,7 +11,7 @@
<style>
.top-box {
&.header-wrap
{
.header
{
background-color: transparent;
color: #fff;
}
...
...
@@ -22,7 +22,7 @@
}
.top-change {
&.header-wrap
{
.header
{
background-color: #fff;
color: #000;
}
...
...
Please
register
or
login
to post a comment