fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit 6ce92f53a564533577286e7de27002411b55df37 2 parents c01961d8 ad978eaa

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

Inline Side-by-side
Showing 4 changed files with 10 additions and 54 deletions
@@ -27,10 +27,10 @@ class Yohobuy @@ -27,10 +27,10 @@ class Yohobuy
27 const API_URL = 'http://testapi.yoho.cn:28078/'; 27 const API_URL = 'http://testapi.yoho.cn:28078/';
28 const SERVICE_URL = 'http://testservice.yoho.cn:28077/'; 28 const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
29 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 29 const YOHOBUY_URL = 'http://www.yohobuy.com/';
30 - const YOHOBUY_ORDER = 'http://192.168.102.205:8084/order/'; //我的订单  
31 - const API_URL_MYCENTER = 'http://192.168.102.205:8081/users/'; // 我的个人中心接口URL 30 + const YOHOBUY_ORDER = 'http://192.168.102.209:8084/order/'; //我的订单
  31 + const API_URL_MYCENTER = 'http://192.168.102.207:8081/users/'; // 我的个人中心接口URL
32 const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL 32 const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
33 - const API_URL_PRODUCTDETAIL = 'http://192.168.102.205:8083/product/'; // 商品详情页 33 + const API_URL_PRODUCTDETAIL = 'http://192.168.102.212:8083/product/'; // 商品详情页
34 const API_URL_LOGISTICS = 'http://192.168.102.205:8080/gateway'; //查看物流接口URL 34 const API_URL_LOGISTICS = 'http://192.168.102.205:8080/gateway'; //查看物流接口URL
35 35
36 /** 36 /**
@@ -34,6 +34,10 @@ class FloorProcess @@ -34,6 +34,10 @@ class FloorProcess
34 34
35 $build = array(); 35 $build = array();
36 foreach ($data['list'] as $v) { 36 foreach ($data['list'] as $v) {
  37 + if (empty($v)) {
  38 + continue;
  39 + }
  40 +
37 $fun = $v['template_name']; 41 $fun = $v['template_name'];
38 if (empty($v['data']) || !is_callable("self::$fun")) { 42 if (empty($v['data']) || !is_callable("self::$fun")) {
39 continue; 43 continue;
@@ -10,24 +10,12 @@ var $searchBox = $('.search-box'), @@ -10,24 +10,12 @@ var $searchBox = $('.search-box'),
10 $box = $('.box'), 10 $box = $('.box'),
11 $indexSearch = $('.index-search'), 11 $indexSearch = $('.index-search'),
12 $indexLogo = $('.index-logo'), 12 $indexLogo = $('.index-logo'),
13 - $channelLink = $('.index-channel a'),  
14 - $win = $(window),  
15 - $doc = $(document),  
16 - $appFloatLayer = $('#float-layer-app'); 13 + $channelLink = $('.index-channel a');
17 14
18 var $search = $searchBox.children('input[type="text"]'), 15 var $search = $searchBox.children('input[type="text"]'),
19 $cancelSearch = $box.children('.no-search'), 16 $cancelSearch = $box.children('.no-search'),
20 $searchIcon = $searchBox.children('.search-icon'); 17 $searchIcon = $searchBox.children('.search-icon');
21 18
22 -// variables for calculate the app download layer position  
23 -var layerInit = false,  
24 - windowViewHeight = 0,  
25 - layerContentHeight = $appFloatLayer.height(),  
26 - layerPaddingTop = parseInt($appFloatLayer.css('padding-top')),  
27 - layerPaddingBottom = parseInt($appFloatLayer.css('padding-bottom')),  
28 - layerHeight = layerContentHeight + layerPaddingTop + layerPaddingBottom,  
29 - layerNewPos;  
30 -  
31 require('../common'); 19 require('../common');
32 20
33 $search.on('focus', function() { 21 $search.on('focus', function() {
@@ -81,40 +69,3 @@ $channelLink.on('touchstart', function() { @@ -81,40 +69,3 @@ $channelLink.on('touchstart', function() {
81 borderColor: '#fff' 69 borderColor: '#fff'
82 }); 70 });
83 }); 71 });
84 -  
85 -  
86 -function updateLayerPosition() {  
87 - var winHeight = window.innerHeight,  
88 - bodyHeight = $doc.height(),  
89 - scrollTopPosition = $win.scrollTop();  
90 -  
91 - if (layerInit) {  
92 -  
93 - //keyboard is shown  
94 - if (windowViewHeight - winHeight > 200) {  
95 - if (scrollTopPosition + windowViewHeight + layerHeight >= bodyHeight) {  
96 - layerNewPos = 0;  
97 - } else {  
98 - layerNewPos = bodyHeight - windowViewHeight - scrollTopPosition - layerHeight;  
99 - }  
100 - } else {  
101 - layerNewPos = bodyHeight - winHeight - scrollTopPosition;  
102 - }  
103 -  
104 - } else {  
105 - windowViewHeight = winHeight;  
106 - layerNewPos = bodyHeight - winHeight - scrollTopPosition + layerHeight;  
107 - layerInit = true;  
108 - }  
109 -  
110 - $appFloatLayer.css({  
111 - position: 'relative',  
112 - bottom: layerNewPos + 'px'  
113 - });  
114 -}  
115 -  
116 -$(window).scroll(function() {  
117 - window.requestAnimationFrame(updateLayerPosition);  
118 -});  
119 -  
120 -$doc.on('ready', updateLayerPosition);  
@@ -51,8 +51,9 @@ class HomeController extends AbstractAction @@ -51,8 +51,9 @@ class HomeController extends AbstractAction
51 $uid = $this->getUid(true); 51 $uid = $this->getUid(true);
52 if ($uid) { 52 if ($uid) {
53 $data['isLogin'] = true; 53 $data['isLogin'] = true;
  54 + $udid = $this->getUdid();
54 $data += UserModel::getUserProfileData($uid); 55 $data += UserModel::getUserProfileData($uid);
55 - $data += UserModel::getInfoNumData($uid); 56 + $data += UserModel::getInfoNumData($uid, $udid);
56 } 57 }
57 58
58 $this->_view->display('index', $data); 59 $this->_view->display('index', $data);