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

@@ -27,10 +27,10 @@ class Yohobuy
     const API_URL = 'http://testapi.yoho.cn:28078/';
     const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    const YOHOBUY_ORDER = 'http://192.168.102.205:8084/order/';        //我的订单
-    const API_URL_MYCENTER = 'http://192.168.102.205:8081/users/'; // 我的个人中心接口URL
+    const YOHOBUY_ORDER = 'http://192.168.102.209:8084/order/';        //我的订单
+    const API_URL_MYCENTER = 'http://192.168.102.207:8081/users/'; // 我的个人中心接口URL
     const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
-    const API_URL_PRODUCTDETAIL = 'http://192.168.102.205:8083/product/'; // 商品详情页
+    const API_URL_PRODUCTDETAIL = 'http://192.168.102.212:8083/product/'; // 商品详情页
     const API_URL_LOGISTICS = 'http://192.168.102.205:8080/gateway'; //查看物流接口URL
 
     /**

@@ -34,6 +34,10 @@ class FloorProcess
 
         $build = array();
         foreach ($data['list'] as $v) {
+	        if (empty($v)) {
+		        continue;
+	        }
+
             $fun = $v['template_name'];
             if (empty($v['data']) || !is_callable("self::$fun")) {
                 continue;

@@ -10,24 +10,12 @@ var $searchBox = $('.search-box'),
     $box = $('.box'),
     $indexSearch = $('.index-search'),
     $indexLogo = $('.index-logo'),
-    $channelLink = $('.index-channel a'),
-    $win = $(window),
-    $doc = $(document),
-    $appFloatLayer = $('#float-layer-app');
+    $channelLink = $('.index-channel a');
 
 var $search = $searchBox.children('input[type="text"]'),
         $cancelSearch = $box.children('.no-search'),
         $searchIcon = $searchBox.children('.search-icon');
 
-// variables for calculate the app download layer position
-var layerInit = false,
-    windowViewHeight = 0,
-    layerContentHeight = $appFloatLayer.height(),
-    layerPaddingTop = parseInt($appFloatLayer.css('padding-top')),
-    layerPaddingBottom = parseInt($appFloatLayer.css('padding-bottom')),
-    layerHeight = layerContentHeight + layerPaddingTop + layerPaddingBottom,
-    layerNewPos;
-
 require('../common');
 
 $search.on('focus', function() {
@@ -81,40 +69,3 @@ $channelLink.on('touchstart', function() {
         borderColor: '#fff'
     });
 });
-
-
-function updateLayerPosition() {
-    var winHeight = window.innerHeight,
-        bodyHeight = $doc.height(),
-        scrollTopPosition = $win.scrollTop();
-
-    if (layerInit) {
-
-        //keyboard is shown
-        if (windowViewHeight - winHeight > 200) {
-            if (scrollTopPosition + windowViewHeight + layerHeight >= bodyHeight) {
-                layerNewPos = 0;
-            } else {
-                layerNewPos = bodyHeight - windowViewHeight - scrollTopPosition - layerHeight;
-            }
-        } else {
-            layerNewPos = bodyHeight - winHeight - scrollTopPosition;
-        }
-
-    } else {
-        windowViewHeight = winHeight;
-        layerNewPos = bodyHeight - winHeight - scrollTopPosition + layerHeight;
-        layerInit = true;
-    }
-
-    $appFloatLayer.css({
-        position: 'relative',
-        bottom: layerNewPos + 'px'
-    });
-}
-
-$(window).scroll(function() {
-    window.requestAnimationFrame(updateLayerPosition);
-});
-
-$doc.on('ready', updateLayerPosition);

@@ -51,8 +51,9 @@ class HomeController extends AbstractAction
         $uid = $this->getUid(true);
         if ($uid) {
             $data['isLogin'] = true;
+	        $udid = $this->getUdid();
             $data += UserModel::getUserProfileData($uid);
-            $data += UserModel::getInfoNumData($uid);
+            $data += UserModel::getInfoNumData($uid, $udid);
         }
 
         $this->_view->display('index', $data);