fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit c41ec492ef5972b304c72e56ac67c1c13bfe0446 2 parents 22478609 cc82f12f

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

Inline Side-by-side
Showing 7 changed files with 42 additions and 30 deletions
framework @ 119c247f
1 -Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 1 +Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
@@ -145,6 +145,8 @@ function rePosFooter() { @@ -145,6 +145,8 @@ function rePosFooter() {
145 145
146 uid = uid === 0 ? '' : uid; 146 uid = uid === 0 ? '' : uid;
147 147
  148 + window._ozuid = uid;//暴露ozuid
  149 +
148 if (window._yas) { 150 if (window._yas) {
149 window._yas(1 * new Date(), '1.0.8', 'yohobuy_m', uid, ''); 151 window._yas(1 * new Date(), '1.0.8', 'yohobuy_m', uid, '');
150 } 152 }
@@ -263,6 +263,7 @@ navHammer.on('tap', function(e) { @@ -263,6 +263,7 @@ navHammer.on('tap', function(e) {
263 navType, 263 navType,
264 $active; 264 $active;
265 265
  266 + e.preventDefault();
266 if ($this.hasClass('filter')) { 267 if ($this.hasClass('filter')) {
267 268
268 //筛选面板切换状态 269 //筛选面板切换状态
@@ -290,6 +290,7 @@ navHammer.on('tap', function(e) { @@ -290,6 +290,7 @@ navHammer.on('tap', function(e) {
290 navType, 290 navType,
291 $active; 291 $active;
292 292
  293 + e.preventDefault();
293 if ($this.hasClass('filter')) { 294 if ($this.hasClass('filter')) {
294 295
295 //筛选面板切换状态 296 //筛选面板切换状态
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 color: #fff; 47 color: #fff;
48 } 48 }
49 .limit-tag { 49 .limit-tag {
50 - width: 90rem / $pxConvertRem; 50 + width: 100rem / $pxConvertRem;
51 border: 1px solid #000; 51 border: 1px solid #000;
52 color: #000; 52 color: #000;
53 } 53 }
1 .search-page { 1 .search-page {
2 .search-input { 2 .search-input {
3 position: relative; 3 position: relative;
4 - padding: 7px 98px 7px 15px; 4 + padding: 14rem / $pxConvertRem 196rem / $pxConvertRem 14rem / $pxConvertRem 30rem / $pxConvertRem;
5 background: #f8f8f8; 5 background: #f8f8f8;
6 - 6 + form {
  7 + width: 100%;
  8 + }
7 .search-icon { 9 .search-icon {
8 position: absolute; 10 position: absolute;
9 - font-size: 12px;  
10 - top: 16px;  
11 - left: 24px; 11 + font-size: 24rem / $pxConvertRem;
  12 + top: 32rem / $pxConvertRem;
  13 + left: 48rem / $pxConvertRem;
12 color: #b2b2b2; 14 color: #b2b2b2;
13 } 15 }
14 16
15 input { 17 input {
16 - height: 30px;  
17 - width: 100%;  
18 - border-radius: 15px;  
19 - padding: 0 26px; 18 + height: 60rem / $pxConvertRem;
  19 + width: 468rem / $pxConvertRem;
  20 + border-radius: 30rem / $pxConvertRem;
  21 + padding-left: 52rem / $pxConvertRem;
  22 + font-size: 24rem / $pxConvertRem;
20 background: #fff; 23 background: #fff;
21 border: none; 24 border: none;
22 } 25 }
23 26
24 .clear-input { 27 .clear-input {
25 position: absolute; 28 position: absolute;
26 - top: 12px;  
27 - right: 50px; 29 + top: 24rem / $pxConvertRem;
  30 + right: 110rem / $pxConvertRem;
  31 + font-size: 32rem / $pxConvertRem;
28 color: #b2b2b2; 32 color: #b2b2b2;
29 } 33 }
30 34
31 .search { 35 .search {
32 position: absolute; 36 position: absolute;
33 - top: 12px; 37 + top: 20rem / $pxConvertRem;
34 right: 0; 38 right: 0;
35 border: none; 39 border: none;
36 background: transparent; 40 background: transparent;
37 - font-size: 16px; 41 + font-size: 32rem / $pxConvertRem;
38 } 42 }
39 } 43 }
40 44
41 .search-items { 45 .search-items {
42 - padding: 20px 10px; 46 + padding: 40rem / $pxConvertRem 20rem / $pxConvertRem;
43 47
44 h3 { 48 h3 {
45 - font-size: 12px;  
46 - margin-bottom: 10px; 49 + font-size: 24rem / $pxConvertRem;
  50 + margin-bottom: 20rem / $pxConvertRem;
47 } 51 }
48 52
49 li { 53 li {
50 float: left; 54 float: left;
51 - height: 34px;  
52 - line-height: 34px;  
53 - font-size: 14px;  
54 - height: 34px;  
55 - line-height: 34px;  
56 - margin-right: 10px;  
57 - margin-bottom: 10px;  
58 - padding: 0 10px; 55 + height: 68rem / $pxConvertRem;
  56 + line-height: 68rem / $pxConvertRem;
  57 + font-size: 28rem / $pxConvertRem;
  58 + height: 68rem / $pxConvertRem;
  59 + line-height: 38rem / $pxConvertRem;
  60 + margin-right: 20rem / $pxConvertRem;
  61 + margin-bottom: 20rem / $pxConvertRem;
  62 + padding: 0 20rem / $pxConvertRem;
59 background: #f8f8f8; 63 background: #f8f8f8;
60 color: #000; 64 color: #000;
61 } 65 }
62 66
63 .clear-history { 67 .clear-history {
64 - height: 32px;  
65 - line-height: 32px; 68 + height: 64rem / $pxConvertRem;
  69 + line-height: 64rem / $pxConvertRem;
66 border: 1px solid #e6e6e6; 70 border: 1px solid #e6e6e6;
67 background: #fff; 71 background: #fff;
68 - font-size: 14px; 72 + font-size: 28rem / $pxConvertRem;
69 } 73 }
70 } 74 }
71 } 75 }
@@ -27,4 +27,8 @@ @@ -27,4 +27,8 @@
27 var s = document.getElementsByTagName("script")[0]; 27 var s = document.getElementsByTagName("script")[0];
28 s.parentNode.insertBefore(hm, s); 28 s.parentNode.insertBefore(hm, s);
29 })(); 29 })();
30 -</script>  
  30 +</script>
  31 +
  32 +<script src="http://static.yohobuy.com/js/analytics/analysis.js"></script>
  33 +
  34 +<script src="http://static.yohobuy.com/m/v1/js/om_code.js"></script>