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

@@ -17,10 +17,10 @@ use Plugin\Cache;
 class Yohobuy
 {
 
-//    /* 正式环境 */
-//    const API_URL = 'http://api2.open.yohobuy.com/';
-//    const SERVICE_URL = 'http://service.api.yohobuy.com/';
-//    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+   // /* 正式环境 */
+   // const API_URL = 'http://api2.open.yohobuy.com/';
+   // const SERVICE_URL = 'http://service.api.yohobuy.com/';
+   // const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
     /* 测试环境 */
     const API_URL = 'http://test2.open.yohobuy.com/';

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Fri Oct 30 10:27:45 2015
+Created by FontForge 20120731 at Sun Nov  1 15:22:48 2015
  By Ads
 </metadata>
 <defs>
@@ -149,12 +149,13 @@ d="M459 754h22h23h20h22h22v-191v-191h191h191v-109h-191h-191v-191v-190h-109v190v1
 d="M77 372h873v-109h-873v109z" />
     <glyph glyph-name="uniE626" unicode="&#xe626;" 
 d="M866.5 663.5q-97.5 97.5 -228 132t-261.5 0t-228.5 -132t-132 -228.5t0 -261.5t132 -228t228.5 -132t261.5 0t228 132t132 228t0 261.5t-132 228.5zM798 115l-101 -101l-187 186l-186 -186l-101 101l186 186l-186 187l101 101l186 -186l187 186l101 -101l-186 -187z" />
+    <glyph glyph-name="uniE627" unicode="&#xe627;" 
+d="M741 258q-23 9 -22 34q6 114 -8 186q-13 68 -37.5 125.5t-48 89.5t-50.5 57t-38 32t-18 10l-7 3l-7 -3q-7 -3 -18 -10t-38 -32t-50.5 -57t-48 -89.5t-37.5 -125.5q-14 -72 -8 -186q1 -25 -22 -34q-19 -9 -37 -19.5t-39 -29.5t-36 -41.5t-25.5 -56t-10.5 -72.5v-16h198
+q2 -22 17.5 -36.5t37.5 -14.5h248q22 0 37.5 14.5t17.5 36.5h198v16q0 48 -14.5 87.5t-39 65t-47 40.5t-47.5 26zM512 442q-31 0 -53 22t-22 53t22 53t53 22q20 0 37.5 -10t27.5 -27t10 -38q0 -31 -22 -53t-53 -22zM453 -61q-14 0 -23.5 -10t-9.5 -24v-83q0 -10 4.5 -17.5
+t12 -12t16.5 -4.5t17 4.5t12.5 12t4.5 17.5v83q0 9 -4.5 17t-12.5 12.5t-17 4.5zM571 -61q-7 0 -13.5 -2.5t-11 -7t-7 -11t-2.5 -13.5v-83q0 -14 10 -24t24 -10q6 0 12.5 2.5t11 7t7 11t2.5 13.5v83q0 9 -4.5 17t-12 12.5t-16.5 4.5z" />
     <glyph glyph-name="uniE628" unicode="&#xe628;" 
 d="M505 776q77 0 148.5 -23.5t129 -67t101 -101.5t67.5 -129.5t24 -147.5q0 -64 -17 -125t-47.5 -112t-74 -94.5t-94.5 -74t-112 -47.5t-125 -17q-95 0 -182 37.5t-150 100.5t-100 150t-37 182t37 182t100 150t150 100t182 37zM505 -104q112 0 206.5 55t149.5 149.5
 t55 206.5q0 37 -6.5 73.5t-19.5 69.5t-30.5 64t-40.5 57.5t-49.5 49.5t-57.5 40.5t-64 30t-69.5 19t-73.5 6.5q-111 0 -205.5 -55t-149.5 -149.5t-55 -206t55 -206t149.5 -149.5t205.5 -55zM528 138v-59h-58v59h58zM470 564h58v-349h-58v349z" />
-    <glyph glyph-name="uniE629" unicode="&#xe629;" 
-d="M442 274h-84v-76h-230v76h-81q-20 0 -33.5 -12.5t-13.5 -31.5v-395q0 -20 13.5 -33.5t33.5 -13.5h395q19 0 31.5 13.5t12.5 33.5v395q0 13 -5.5 23t-15.5 15.5t-23 5.5zM977 812h-81v-77h-230v77h-84q-10 0 -18 -3.5t-14 -10t-9 -15t-3 -18.5v-395q0 -13 5.5 -23
-t15.5 -15.5t23 -5.5h395q20 0 33.5 12.5t13.5 31.5v395q0 20 -13.5 33.5t-33.5 13.5zM977 274h-81v-76h-230v76h-84q-13 0 -23 -5.5t-15.5 -15.5t-5.5 -23v-395q0 -13 5.5 -23.5t15.5 -17t23 -6.5h395q20 0 33.5 13.5t13.5 33.5v395q0 19 -13.5 31.5t-33.5 12.5z" />
     <glyph glyph-name="uniE62A" unicode="&#xe62a;" 
 d="M497 806l-451 -386q-6 -6 -11 -13t-7 -15t-2 -17v-500q0 -32 22.5 -54.5t53.5 -22.5h256v333h308v-333h256q31 0 53.5 22.5t22.5 54.5v500q0 27 -20 45l-451 386q-15 13 -30 0z" />
     <glyph glyph-name="uniE62B" unicode="&#xe62b;" 

@@ -108,7 +108,7 @@ function rePosFooter() {
 }
 
 //页面通用底部位置及status设置
-(function () {
+(function() {
     var $op = $footer.children('.op-row');
 
     var user = getUser();
@@ -135,9 +135,21 @@ function rePosFooter() {
         );
     }
 
+    $op.find('.back-to-top').on('touchend', function() {
+        $(window).scrollTop(0);
+        return false;
+    });
     $footer.removeClass('hide');
 }());
 
+(function() {
+    var uid = getUid();
+
+    uid = uid === 0 ? '' : uid;
+    window._yas(1 * new Date(), '1.0.8', 'yohobuy_m', uid, '');
+}());
+
+
 //暴露公共接口
 window.cookie = cookie;
 

@@ -4,7 +4,7 @@
 
     .op-row {
         position: relative;
-        padding: 0 30px;
+        padding: 0 15px;
         height: 60px;
         line-height: 60px;
 

@@ -152,6 +152,8 @@
     }
 
     .list-nav {
+        border-bottom: 1px solid #e6e6e6;
+
         > li {
             float: left;
             width: 25%;

@@ -12,7 +12,7 @@
 
     .iconfont {
         color: #fff;
-        font-size: 22px;
+        font-size: 18px;
     }
 
     .cart-count {

+ <!-- Google Tag Manager -->
+ <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+ <script>
+     (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+         new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+         j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+         '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+     })(window,document,'script','dataLayer','GTM-W958MG');
+ </script>
+ <!-- End Google Tag Manager -->
+
+<script type="text/javascript">
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
+
+<script>
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
+
+<script type="text/javascript">
+    (function(w,d,s,j,f){
+        w['YohoAcquisitionObject']=f;
+        w[f]=function(){w[f].p=arguments;};
+        var a=d.createElement(s);
+        var m=d.getElementsByTagName(s)[0];
+        a.async=1;
+        a.src=j;
+        m.parentNode.insertBefore(a,m);
+    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
+</script>
\ No newline at end of file

@@ -19,6 +19,8 @@
 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
 <script>seajs.config({base: 'http://localhost:8000/'});</script>
 {{/if}}
+
+{{> layout/analysis}}
 {{> layout/use}}
 </body>
 </html>
\ No newline at end of file

@@ -9,7 +9,7 @@
         <p class="tab-name">分类</p>
     </div>
     <div class="tab-item {{#if guangHome}}current{{/if}}">
-        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="iconfont tab-icon">&#xe627;</p>
         <p class="tab-name">逛</p>
     </div>
     <div class="tab-item {{#if shoppingCartPage}}current{{/if}}">

@@ -31,7 +31,7 @@ class BoysController extends AbstractAction
         $this->_view->display('index', array(
             'boysHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
-            'showFooterTab' => false,
+            'showFooterTab' => true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getBoysFloor(),
             'pageFooter' => true,

@@ -26,7 +26,7 @@ class GirlsController extends AbstractAction
         $this->_view->display('index', array(
             'grilsHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
-            'showFooterTab' => false,
+            'showFooterTab' => true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getGirlsFloor(),
             'pageFooter' => true,

@@ -26,7 +26,7 @@ class KidsController extends AbstractAction
         $this->_view->display('index', array(
             'kidsHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
-            'showFooterTab' => false,
+            'showFooterTab' => true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getKidsFloor(),
             'pageFooter' => true,

@@ -26,7 +26,7 @@ class LifestyleController extends AbstractAction
         $this->_view->display('index', array(
             'lifestyleHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
-            'showFooterTab' => false,
+            'showFooterTab' => true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getLifestyleFloor(),
             'pageFooter' => true,

@@ -66,7 +66,7 @@ class BrandModel
             $build = array();
             foreach ($brand['brandTop'][0]['data'] as $value) {
                 $build['url'] = Helpers::getFilterUrl($value['url']);
-                $build['img'] = Helpers::getImageUrl($value['src'], 640, 300);
+                $build['img'] = Helpers::getImageUrl($value['src'], 640, 310);
                 $build['title'] = $value['title'];
                 $result['bannerTop']['list'][] = $build;
             }