Authored by 毕凯

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

... ... @@ -34,7 +34,7 @@ class SearchData
case 'preview':
case 'developer':
default:
return 'http://192.168.10.64:8080/yohosearch/search.json';//'http://101.200.31.165/yohosearch/search.json';
return 'http://101.200.31.165/yohosearch/search.json';//return 'http://192.168.10.64:8080/yohosearch/search.json';
}
}
... ...
... ... @@ -16,6 +16,7 @@ class RegisterController extends WebAction
$this->setSession('effective_time', time() + 1800);
$data = array(
'registerPage' => true,
'simpleHeader' => PassportModel::getSimpleHeader(false),
'passport' => array(
'actionUrl' => '/passport/register/mobileregister',
'region' => RegData::getAreasData(),
... ...