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
return 'http://192.168.102.216:8087/yohosearch/search.json';
case 'testing':
if ($type == 'sort') {
return 'http://192.168.102.216:8087/yohosearch/sortgroup.json';
// return 'http://10.66.100.4:8080/yohosearch/sortgroup.json';
return 'http://testing.yohoops.org/yohosearch/sortgroup.json';
}
elseif ($type == 'discount') {
return 'http://192.168.102.216:8087/yohosearch/discount.json';
// return 'http://10.66.100.4:8080/yohosearch/discount.json';
return 'http://testing.yohoops.org/yohosearch/discount.json';
}
elseif ($type == 'recent') {
return 'http://192.168.102.216:8087/yohosearch/recent.json';
// return 'http://10.66.100.4:8080/yohosearch/recent.json';
return 'http://testing.yohoops.org/yohosearch/recent.json';
}
elseif ($type == 'suggest') {
return 'http://192.168.102.216:8087/yohosearch/suggest.json';
// return 'http://10.66.100.4:8080/yohosearch/suggest.json';
return 'http://testing.yohoops.org/yohosearch/suggest.json';
}
else if($type == 'new-shelve') {
return 'http://192.168.102.216:8087/yohosearch/new-shelve.json';
// return 'http://10.66.100.4:8080/yohosearch/new-shelve.json';
return 'http://testing.yohoops.org/yohosearch/new-shelve.json';
}
elseif ($type == 'shop') {
return 'http://192.168.102.216:8087/yohosearch/shops.json';
// return 'http://10.66.100.4:8080/yohosearch/shops.json';
return 'http://testing.yohoops.org/yohosearch/shops.json';
}
elseif ($type == 'search') {
return 'http://192.168.102.216:8087/yohosearch/search.json';
// return 'http://10.66.100.4:8080/yohosearch/search.json';
return 'http://testing.yohoops.org/yohosearch/search.json';
}
elseif ($type == 'brand') {
return 'http://192.168.102.216:8087/yohosearch/brand/list.json';
// return 'http://10.66.100.4:8080/yohosearch/brand/list.json';
return 'http://testing.yohoops.org/yohosearch/brand/list.json';
}
return 'http://192.168.102.216:8087/yohosearch/search.json';
// return 'http://10.66.100.4:8080/yohosearch/search.json';
return 'http://testing.yohoops.org/yohosearch/search.json';
case 'developer':
default:
if ($type == 'sort') {
... ...
... ... @@ -106,6 +106,10 @@ class ShopModel
$searchCondition['userInput'] = empty($searchCondition['userInput']) ? array() : $searchCondition['userInput'];
$param = array_merge($searchCondition['userInput'], array('navBar' => 1));
$data['allGoods']['list'] = $result['goods'];
$data['allGoods']['navs'][] = array(
'name' => 'MORE',
'href' => self::$shopListUrl
);
$data['allGoods']['name'] = '全部商品 ALL';
$data['allGoods']['opts'] = $result['opts'];
$data['leftContent'] = isset($result['leftContent']) ? $result['leftContent'] : '';
... ...