wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit b6b0f7daf9e39c8a4aa88497c01bbf09cd21d949 2 parents f3832b90 5c2abdce

Merge branch 'hotfix/apichange-bug' into develop 

Code Review By Rock Zhang
Inline Side-by-side
Showing 3 changed files with 6 additions and 7 deletions
@@ -602,9 +602,8 @@ class HomeController extends AbstractAction @@ -602,9 +602,8 @@ class HomeController extends AbstractAction
602 //显示网站导航头部信息 602 //显示网站导航头部信息
603 $this->setNavHeader('会员等级'); 603 $this->setNavHeader('会员等级');
604 604
605 - $gender = Helpers::getGenderByCookie();  
606 $channel = Helpers::getChannelByCookie(); 605 $channel = Helpers::getChannelByCookie();
607 - $data = GradeModel::getGrade($gender, $channel, $this->_uid); 606 + $data = GradeModel::getGrade($channel, $this->_uid);
608 $data['pageFooter'] = true; 607 $data['pageFooter'] = true;
609 608
610 $this->_view->display('vip-grade', $data); 609 $this->_view->display('vip-grade', $data);
@@ -237,7 +237,7 @@ class UserModel @@ -237,7 +237,7 @@ class UserModel
237 $product = array(); 237 $product = array();
238 foreach ($val['new_product'] as $one) { 238 foreach ($val['new_product'] as $one) {
239 $product = array(); 239 $product = array();
240 - $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : ''; 240 + $product['link'] = isset($val['goodsList'][0]) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsList'][0]['id'] . '/' . $val['cnAlphabet'] . '.html') : '';
241 $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : ''; 241 $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
242 $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0; 242 $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
243 $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0; 243 $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0;
@@ -23,16 +23,16 @@ class NewsaleModel @@ -23,16 +23,16 @@ class NewsaleModel
23 /* 男生频道取新品到着及折扣专区数据的位置码 */ 23 /* 男生频道取新品到着及折扣专区数据的位置码 */
24 24
25 const CODE_TOP_NEW_BOYS = '3cf2c1be5217fbab6009ce83959e1e12'; 25 const CODE_TOP_NEW_BOYS = '3cf2c1be5217fbab6009ce83959e1e12';
26 - const CODE_TOP_SALE_BOYS = '153180b9a88c0b565848850c523bb637'; 26 + const CODE_TOP_SALE_BOYS = 'e9c9be32d72e2906d404a72ee24cb523';
27 /* 女生频道取新品到着及折扣专区数据的位置码 */ 27 /* 女生频道取新品到着及折扣专区数据的位置码 */
28 const CODE_TOP_NEW_GIRLS = '1cf7f9f10e2a2670e73d05c568793ad9'; 28 const CODE_TOP_NEW_GIRLS = '1cf7f9f10e2a2670e73d05c568793ad9';
29 - const CODE_TOP_SALE_GIRLS = '0b2d133419a0f7c381306fd3522365e1'; 29 + const CODE_TOP_SALE_GIRLS = '785c0e6aab746949073c4ffb9d5106ac';
30 /* 潮童频道取新品到着及折扣专区数据的位置码 */ 30 /* 潮童频道取新品到着及折扣专区数据的位置码 */
31 const CODE_TOP_NEW_KIDS = '57457adececa6c748b29c90cad0ae940'; 31 const CODE_TOP_NEW_KIDS = '57457adececa6c748b29c90cad0ae940';
32 - const CODE_TOP_SALE_KIDS = 'de23648d28ee1e8a3f087a9dbac506f8'; 32 + const CODE_TOP_SALE_KIDS = 'ad1bb67a6007819c86f737d74172fd2e';
33 /* 创意生活频道取新品到着及折扣专区数据的位置码 */ 33 /* 创意生活频道取新品到着及折扣专区数据的位置码 */
34 const CODE_TOP_NEW_LIFESTYLE = '04953a61cbf1db426a681e55d496d2fe'; 34 const CODE_TOP_NEW_LIFESTYLE = '04953a61cbf1db426a681e55d496d2fe';
35 - const CODE_TOP_SALE_LIFESTYLE = '01269e498ff5b07756e0733ec0e88c75'; 35 + const CODE_TOP_SALE_LIFESTYLE = '8132c7db3adbeb7b0d0002de9691c753';
36 36
37 /** 37 /**
38 * 获取新品到着的焦点图资源数据 38 * 获取新品到着的焦点图资源数据