fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 12dd1956fdd7f4bfeb19d8cc7216223ab637d4b2 2 parents 795fd2d3 ee5db291

Merge branch 'hotfix/shopPrice'

Inline Side-by-side
Showing 3 changed files with 13 additions and 13 deletions
@@ -76,7 +76,6 @@ class ShopModel @@ -76,7 +76,6 @@ class ShopModel
76 } 76 }
77 77
78 $sknProList = SearchData::searchAll(array('query' => join(',', array_unique($sknList)), 'viewNum' => 20)); 78 $sknProList = SearchData::searchAll(array('query' => join(',', array_unique($sknList)), 'viewNum' => 20));
79 -  
80 if (isset($sknProList['data']['product_list']) && !empty($sknProList['data']['product_list'])) { 79 if (isset($sknProList['data']['product_list']) && !empty($sknProList['data']['product_list'])) {
81 $coverList = array(); 80 $coverList = array();
82 81
@@ -84,9 +83,8 @@ class ShopModel @@ -84,9 +83,8 @@ class ShopModel
84 'imgSize' => array(250, 250), 83 'imgSize' => array(250, 250),
85 'defaultCover' => true 84 'defaultCover' => true
86 )); 85 ));
87 -  
88 foreach ($proList as $prod) { 86 foreach ($proList as $prod) {
89 - $coverList[$prod['skn']] = array('img'=>$prod['thumb'], 'price' => $prod['salePrice'], 'title' => $prod['name']); 87 + $coverList[$prod['skn']] = array('img'=>$prod['thumb'], 'price' => '¥' . number_format(trim($prod['salePrice'], '¥'), 2, '.', ''), 'title' => $prod['name']);
90 } 88 }
91 foreach ($data['newArrivel']['list'] as &$v) { 89 foreach ($data['newArrivel']['list'] as &$v) {
92 if (isset($coverList[$v['productSkn']])) { 90 if (isset($coverList[$v['productSkn']])) {
@@ -584,10 +582,6 @@ class ShopModel @@ -584,10 +582,6 @@ class ShopModel
584 */ 582 */
585 public static function goodsTabBar($data, $parameters) 583 public static function goodsTabBar($data, $parameters)
586 { 584 {
587 - $more = array(  
588 - 'name' => 'MORE',  
589 - 'href' => self::$shopListUrl . '?shopId=' . $parameters['shopId']  
590 - );  
591 $result = array( 585 $result = array(
592 'hot' => array(), 586 'hot' => array(),
593 'new' => array() 587 'new' => array()
@@ -620,8 +614,14 @@ class ShopModel @@ -620,8 +614,14 @@ class ShopModel
620 } 614 }
621 } 615 }
622 616
623 - $result['hot'][] = $more;  
624 - $result['new'][] = $more; 617 + $result['hot'][] = array(
  618 + 'name' => 'MORE',
  619 + 'href' => self::$shopListUrl . '?navBar=2&order=s_n_desc&shopId=' . $parameters['shopId']
  620 + );
  621 + $result['new'][] = array(
  622 + 'name' => 'MORE',
  623 + 'href' => self::$shopListUrl . '?navBar=2&order=s_t_desc&shopId=' . $parameters['shopId']
  624 + );
625 return $result; 625 return $result;
626 } 626 }
627 627
@@ -21,8 +21,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关 @@ -21,8 +21,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关
21 //define('API_OLD', 'http://test2.open.yohobuy.com/'); 21 //define('API_OLD', 'http://test2.open.yohobuy.com/');
22 22
23 #dev环境 23 #dev环境
24 - define('API_URL', 'http://api-test4.yohops.com:9999');  
25 - define('SERVICE_URL', 'http://dev-service.yohops.com:9999/'); 24 + define('API_URL', 'http://api-test2.yohops.com:9999');
  25 + define('SERVICE_URL', 'http://service-test2.yohops.com:9999/');
26 define('YOHOBUY_URL', 'http://www.yohobuy.com/'); 26 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
27 define('SERVICE_NOTIFY', 'http://test2.open.yohobuy.com/'); 27 define('SERVICE_NOTIFY', 'http://test2.open.yohobuy.com/');
28 define('API_OLD', 'http://devservice.yoho.cn:58077/'); 28 define('API_OLD', 'http://devservice.yoho.cn:58077/');
@@ -14,8 +14,8 @@ define('EXHIBITION_TICKET', 51335912);//展览票skn @@ -14,8 +14,8 @@ define('EXHIBITION_TICKET', 51335912);//展览票skn
14 14
15 define('USE_INTER_FACE_SHUNT', false);//分流开关 15 define('USE_INTER_FACE_SHUNT', false);//分流开关
16 16
17 -define('API_URL', 'http://api-test1.yohops.com:9999/');  
18 -define('SERVICE_URL', 'http://service-test1.yohops.com:9999/'); 17 +define('API_URL', 'http://api-test2.yohops.com:9999/');
  18 +define('SERVICE_URL', 'http://service-test2.yohops.com:9999/');
19 define('YOHOBUY_URL', 'http://www.yohobuy.com/'); 19 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
20 define('SERVICE_NOTIFY', 'http://testservice.yoho.cn:28077/'); 20 define('SERVICE_NOTIFY', 'http://testservice.yoho.cn:28077/');
21 define('API_OLD', 'http://test2.open.yohobuy.com/'); 21 define('API_OLD', 'http://test2.open.yohobuy.com/');