Authored by xuqi

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

framework @ 119c247f
Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
... ...
... ... @@ -2,7 +2,7 @@
float: left;
width: 276rem / $pxConvertRem;
height: 486rem / $pxConvertRem;
margin: 0 (15rem / $pxConvertRem) (28rem / $pxConvertRem);
margin: 0 (15rem / $pxConvertRem) (15rem / $pxConvertRem);
.tag-container {
height: 28rem / $pxConvertRem;
... ...
... ... @@ -112,6 +112,8 @@
.goods-container {
position: relative;
min-height: 440px;
padding-left: 0.375rem;
padding-top: 0.2rem;
}
}
... ...
... ... @@ -241,5 +241,7 @@
.goods-container {
position: relative;
min-height: 440px;
padding-left: 0.375rem;
padding-top: 0.2rem;
}
}
\ No newline at end of file
... ...
... ... @@ -84,6 +84,8 @@
.goods-container {
position: relative;
min-height: 440px;
padding-left: 0.375rem;
padding-top: 0.2rem;
}
}
... ...
... ... @@ -83,4 +83,3 @@
</div>
</div>
{{> layout/footer}}
{{> layout/download_app}}
... ...
... ... @@ -19,4 +19,3 @@
{{{brandList}}}
</script>
{{> layout/footer}}
{{> layout/download_app}}
... ...
... ... @@ -40,5 +40,4 @@
</div>
{{/ category}}
</div>
{{> layout/footer}}
{{> layout/download_app}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -24,5 +24,4 @@
</div>
</div>
</div>
{{> layout/footer}}
{{> layout/download_app}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -2,5 +2,4 @@
<div class="good-list-page yoho-page">
{{> product/list}}
</div>
{{> layout/footer}}
{{> layout/download_app}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -84,5 +84,4 @@
{{> product/suspend-cart}}
</div>
{{> layout/footer}}
{{> layout/download_app}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -95,5 +95,4 @@
{{> product/suspend-cart}}
</div>
{{> layout/footer}}
{{> layout/download_app}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...