Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
5 changed files
with
20 additions
and
10 deletions
@@ -119,7 +119,7 @@ function rePosFooter() { | @@ -119,7 +119,7 @@ function rePosFooter() { | ||
119 | 119 | ||
120 | //未登录 | 120 | //未登录 |
121 | $op.prepend( | 121 | $op.prepend( |
122 | - '<a href="/signin.html">登录</a>' + | 122 | + '<a href="/signin.html?refer=' + location.href + '">登录</a>' + |
123 | '<span class="sep-line">|</span>' + | 123 | '<span class="sep-line">|</span>' + |
124 | '<a href="/reg.html">注册</a>' | 124 | '<a href="/reg.html">注册</a>' |
125 | ); | 125 | ); |
@@ -215,6 +215,7 @@ $('#yoho-footer').css({ | @@ -215,6 +215,7 @@ $('#yoho-footer').css({ | ||
215 | //set cookie | 215 | //set cookie |
216 | exports.set = function(c) { | 216 | exports.set = function(c) { |
217 | window.setCookie('_Channel', c, { | 217 | window.setCookie('_Channel', c, { |
218 | - expires: 365 | 218 | + expires: 365, |
219 | + domain: '.m.yohobuy.com' | ||
219 | }); | 220 | }); |
220 | }; | 221 | }; |
1 | .hot-brands { | 1 | .hot-brands { |
2 | - background: #f0f0f0; | ||
3 | border-bottom: 1px solid #e0e0e0; | 2 | border-bottom: 1px solid #e0e0e0; |
3 | + background: #fff; | ||
4 | + | ||
5 | + .floor-header { | ||
6 | + background: #f0f0f0; | ||
7 | + margin: 0; | ||
8 | + padding: 29rem / $pxConvertRem 30rem / $pxConvertRem 0; | ||
9 | + border: 0; | ||
10 | + | ||
11 | + h2 { | ||
12 | + border: 1px solid #e0e0e0; | ||
13 | + background: #fff; | ||
14 | + border-bottom: 0; | ||
15 | + } | ||
16 | + } | ||
4 | 17 | ||
5 | a { | 18 | a { |
6 | display: block; | 19 | display: block; |
@@ -8,10 +21,6 @@ | @@ -8,10 +21,6 @@ | ||
8 | height: 100%; | 21 | height: 100%; |
9 | } | 22 | } |
10 | 23 | ||
11 | - > * { | ||
12 | - background: #fff; | ||
13 | - } | ||
14 | - | ||
15 | .brand { | 24 | .brand { |
16 | float: left; | 25 | float: left; |
17 | width: 158rem / $pxConvertRem; | 26 | width: 158rem / $pxConvertRem; |
@@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
50 | top: 20rem / $pxConvertRem; | 50 | top: 20rem / $pxConvertRem; |
51 | width: 352rem / $pxConvertRem; | 51 | width: 352rem / $pxConvertRem; |
52 | height: 56rem / $pxConvertRem; | 52 | height: 56rem / $pxConvertRem; |
53 | - padding-right: 40rem / $pxConvertRem; | 53 | + padding-right: 80rem / $pxConvertRem; |
54 | z-index: 1; | 54 | z-index: 1; |
55 | transition: width 400ms; | 55 | transition: width 400ms; |
56 | box-sizing: border-box; | 56 | box-sizing: border-box; |
@@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
59 | } | 59 | } |
60 | input { | 60 | input { |
61 | float: left; | 61 | float: left; |
62 | - width: 100%; | 62 | + width: 96%; |
63 | font-size: 28rem / $pxConvertRem; | 63 | font-size: 28rem / $pxConvertRem; |
64 | padding: 10rem / $pxConvertRem; | 64 | padding: 10rem / $pxConvertRem; |
65 | color: #999; | 65 | color: #999; |
@@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
13 | {{/if}} | 13 | {{/if}} |
14 | {{#if testEnv}} | 14 | {{#if testEnv}} |
15 | <script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/lib.js"></script> | 15 | <script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/lib.js"></script> |
16 | -<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index.js"></script> | 16 | +<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script> |
17 | {{/if}} | 17 | {{/if}} |
18 | {{#if devEnv}} | 18 | {{#if devEnv}} |
19 | <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> | 19 | <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> |
-
Please register or login to post a comment