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

- Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
+ Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05

@@ -145,6 +145,8 @@ function rePosFooter() {
 
     uid = uid === 0 ? '' : uid;
 
+    window._ozuid = uid;//暴露ozuid
+
     if (window._yas) {
         window._yas(1 * new Date(), '1.0.8', 'yohobuy_m', uid, '');
     }

@@ -263,6 +263,7 @@ navHammer.on('tap', function(e) {
         navType,
         $active;
 
+    e.preventDefault();
     if ($this.hasClass('filter')) {
 
         //筛选面板切换状态

@@ -290,6 +290,7 @@ navHammer.on('tap', function(e) {
         navType,
         $active;
 
+    e.preventDefault();
     if ($this.hasClass('filter')) {
 
         //筛选面板切换状态

@@ -47,7 +47,7 @@
             color: #fff;
         }
         .limit-tag {
-            width: 90rem / $pxConvertRem;
+            width: 100rem / $pxConvertRem;
             border: 1px solid #000;
             color: #000;
         }

 .search-page {
     .search-input {
         position: relative;
-        padding: 7px 98px 7px 15px;
+        padding: 14rem / $pxConvertRem 196rem / $pxConvertRem 14rem / $pxConvertRem 30rem / $pxConvertRem;
         background: #f8f8f8;
-
+        form {
+            width: 100%;
+        }
         .search-icon {
             position: absolute;
-            font-size: 12px;
-            top: 16px;
-            left: 24px;
+            font-size: 24rem / $pxConvertRem;
+            top: 32rem / $pxConvertRem;
+            left: 48rem / $pxConvertRem;
             color: #b2b2b2;
         }
 
         input {
-            height: 30px;
-            width: 100%;
-            border-radius: 15px;
-            padding: 0 26px;
+            height: 60rem / $pxConvertRem;
+            width: 468rem / $pxConvertRem;
+            border-radius: 30rem / $pxConvertRem;
+            padding-left: 52rem / $pxConvertRem;
+            font-size: 24rem / $pxConvertRem;
             background: #fff;
             border: none;
         }
 
         .clear-input {
             position: absolute;
-            top: 12px;
-            right: 50px;
+            top: 24rem / $pxConvertRem;
+            right: 110rem / $pxConvertRem;
+            font-size: 32rem / $pxConvertRem;
             color: #b2b2b2;
         }
 
         .search {
             position: absolute;
-            top: 12px;
+            top: 20rem / $pxConvertRem;
             right: 0;
             border: none;
             background: transparent;
-            font-size: 16px;
+            font-size: 32rem / $pxConvertRem;
         }
     }
 
     .search-items {
-        padding: 20px 10px;
+        padding: 40rem / $pxConvertRem 20rem / $pxConvertRem;
 
         h3 {
-            font-size: 12px;
-            margin-bottom: 10px;
+            font-size: 24rem / $pxConvertRem;
+            margin-bottom: 20rem / $pxConvertRem;
         }
 
         li {
             float: left;
-            height: 34px;
-            line-height: 34px;
-            font-size: 14px;
-            height: 34px;
-            line-height: 34px;
-            margin-right: 10px;
-            margin-bottom: 10px;
-            padding: 0 10px;
+            height: 68rem / $pxConvertRem;
+            line-height: 68rem / $pxConvertRem;
+            font-size: 28rem / $pxConvertRem;
+            height: 68rem / $pxConvertRem;
+            line-height: 38rem / $pxConvertRem;
+            margin-right: 20rem / $pxConvertRem;
+            margin-bottom: 20rem / $pxConvertRem;
+            padding: 0 20rem / $pxConvertRem;
             background: #f8f8f8;
             color: #000;
         }
 
         .clear-history {
-            height: 32px;
-            line-height: 32px;
+            height: 64rem / $pxConvertRem;
+            line-height: 64rem / $pxConvertRem;
             border: 1px solid #e6e6e6;
             background: #fff;
-            font-size: 14px;
+            font-size: 28rem / $pxConvertRem;
         }
     }
 }
\ No newline at end of file

@@ -27,4 +27,8 @@
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
     })();
-</script>
\ No newline at end of file
+</script>
+
+<script src="http://static.yohobuy.com/js/analytics/analysis.js"></script>
+
+<script src="http://static.yohobuy.com/m/v1/js/om_code.js"></script>
\ No newline at end of file