wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by yyq
Commit b2a84e814c8e3a94033979195d62463b8505c937 2 parents df1463d6 98bdde69

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuy into release/4.4

Inline Side-by-side
Showing 2 changed files with 13 additions and 18 deletions
@@ -80,39 +80,30 @@ class SearchData @@ -80,39 +80,30 @@ class SearchData
80 return 'http://192.168.102.216:8087/yohosearch/search.json'; 80 return 'http://192.168.102.216:8087/yohosearch/search.json';
81 case 'testing': 81 case 'testing':
82 if ($type == 'sort') { 82 if ($type == 'sort') {
83 - return 'http://192.168.102.216:8087/yohosearch/sortgroup.json';  
84 -// return 'http://10.66.100.4:8080/yohosearch/sortgroup.json'; 83 + return 'http://testing.yohoops.org/yohosearch/sortgroup.json';
85 } 84 }
86 elseif ($type == 'discount') { 85 elseif ($type == 'discount') {
87 - return 'http://192.168.102.216:8087/yohosearch/discount.json';  
88 -// return 'http://10.66.100.4:8080/yohosearch/discount.json'; 86 + return 'http://testing.yohoops.org/yohosearch/discount.json';
89 } 87 }
90 elseif ($type == 'recent') { 88 elseif ($type == 'recent') {
91 - return 'http://192.168.102.216:8087/yohosearch/recent.json';  
92 -// return 'http://10.66.100.4:8080/yohosearch/recent.json'; 89 + return 'http://testing.yohoops.org/yohosearch/recent.json';
93 } 90 }
94 elseif ($type == 'suggest') { 91 elseif ($type == 'suggest') {
95 - return 'http://192.168.102.216:8087/yohosearch/suggest.json';  
96 -// return 'http://10.66.100.4:8080/yohosearch/suggest.json'; 92 + return 'http://testing.yohoops.org/yohosearch/suggest.json';
97 } 93 }
98 else if($type == 'new-shelve') { 94 else if($type == 'new-shelve') {
99 - return 'http://192.168.102.216:8087/yohosearch/new-shelve.json';  
100 -// return 'http://10.66.100.4:8080/yohosearch/new-shelve.json'; 95 + return 'http://testing.yohoops.org/yohosearch/new-shelve.json';
101 } 96 }
102 elseif ($type == 'shop') { 97 elseif ($type == 'shop') {
103 - return 'http://192.168.102.216:8087/yohosearch/shops.json';  
104 -// return 'http://10.66.100.4:8080/yohosearch/shops.json'; 98 + return 'http://testing.yohoops.org/yohosearch/shops.json';
105 } 99 }
106 elseif ($type == 'search') { 100 elseif ($type == 'search') {
107 - return 'http://192.168.102.216:8087/yohosearch/search.json';  
108 -// return 'http://10.66.100.4:8080/yohosearch/search.json'; 101 + return 'http://testing.yohoops.org/yohosearch/search.json';
109 } 102 }
110 elseif ($type == 'brand') { 103 elseif ($type == 'brand') {
111 - return 'http://192.168.102.216:8087/yohosearch/brand/list.json';  
112 -// return 'http://10.66.100.4:8080/yohosearch/brand/list.json'; 104 + return 'http://testing.yohoops.org/yohosearch/brand/list.json';
113 } 105 }
114 - return 'http://192.168.102.216:8087/yohosearch/search.json';  
115 -// return 'http://10.66.100.4:8080/yohosearch/search.json'; 106 + return 'http://testing.yohoops.org/yohosearch/search.json';
116 case 'developer': 107 case 'developer':
117 default: 108 default:
118 if ($type == 'sort') { 109 if ($type == 'sort') {
@@ -106,6 +106,10 @@ class ShopModel @@ -106,6 +106,10 @@ class ShopModel
106 $searchCondition['userInput'] = empty($searchCondition['userInput']) ? array() : $searchCondition['userInput']; 106 $searchCondition['userInput'] = empty($searchCondition['userInput']) ? array() : $searchCondition['userInput'];
107 $param = array_merge($searchCondition['userInput'], array('navBar' => 1)); 107 $param = array_merge($searchCondition['userInput'], array('navBar' => 1));
108 $data['allGoods']['list'] = $result['goods']; 108 $data['allGoods']['list'] = $result['goods'];
  109 + $data['allGoods']['navs'][] = array(
  110 + 'name' => 'MORE',
  111 + 'href' => self::$shopListUrl
  112 + );
109 $data['allGoods']['name'] = '全部商品 ALL'; 113 $data['allGoods']['name'] = '全部商品 ALL';
110 $data['allGoods']['opts'] = $result['opts']; 114 $data['allGoods']['opts'] = $result['opts'];
111 $data['leftContent'] = isset($result['leftContent']) ? $result['leftContent'] : ''; 115 $data['leftContent'] = isset($result['leftContent']) ? $result['leftContent'] : '';