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

@@ -18,18 +18,18 @@ class Yohobuy
 {
     
 //   /* 正式环境 */
-//   const API_URL = 'http://api2.open.yohobuy.com/';
-//   const API_URL2 = 'http://api.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 API_URL2 = 'http://api.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/';
-     const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
-     const YOHOBUY_URL = 'http://www.yohobuy.com/';
-     const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL
-     const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
-     const API_URL_PRODUCTDETAIL = 'http://172.16.6.145:8080/'; // 商品详情页
+    const API_URL = 'http://test2.open.yohobuy.com/';
+    const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
+    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+    const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL
+    const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
+    const API_URL_PRODUCTDETAIL = 'http://172.16.6.145:8080/'; // 商品详情页
 
     /**
      * 私钥列表

@@ -214,7 +214,7 @@ function tsAnimate() {
 
 setTimeout(tsAnimate, 3000);
 
-$('.home-header .search-btn').on('touchstart', function() {
+$('.home-header .iconfont').on('touchstart', function() {
     $(this).addClass('highlight');
 }).on('touchend touchcancel', function() {
     $(this).removeClass('highlight');

@@ -75,10 +75,10 @@
             font-size: 40rem / $pxConvertRem;
             line-height: 90rem / $pxConvertRem;
         }
+    }
 
-        &.highlight {
-            background: rgba(200,200,200,.4);
-        }
+    .iconfont.highlight {
+        background: rgba(200,200,200,.4);
     }
 }
 

@@ -21,15 +21,15 @@
         </div>
         <div class="my-link clearfix {{^isLogin}}no-login{{/isLogin}}">
             <a class="link-item" href="/home/favorite">
-                {{#if product_favorite_total}}{{product_favorite_total}}{{/if}}
+                {{#isLogin}}{{product_favorite_total}}{{/isLogin}}
                 <p>收藏的商品</p>
             </a>
             <a class="link-item" href="/home/favorite?tab=brand">
-                {{#if brand_favorite_total}}{{brand_favorite_total}}{{/if}}
+                {{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
                 <p>收藏的品牌</p>
             </a>
             <a class="link-item" href="/home/">
-                {{#if product_browse}}{{product_browse}}{{/if}}
+                {{#isLogin}}{{product_browse}}{{/isLogin}}
                 <p>浏览记录</p>
             </a>
         </div>

@@ -48,11 +48,11 @@ class HomeController extends AbstractAction
 		    'myIndexPage' => true,
 		    'pageFooter' => true
 	    );
-	    echo $this->getRequest()->getActionName();
+	    // echo $this->getRequest()->getActionName();
         $uid = $this->getUid();
 	    if ($uid) {
 		    $data['isLogin'] = true;
-		    $uid = 8826435;
+            $uid = 8826435;
 		    $data += \Index\UserModel::getUserProfileData($uid);
 		    $data += \Index\UserModel::getInfoNumData($uid);