chenchao / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit 0ed9d86af70dd71756555269078e7483039553c1 2 parents 444e4978 7e53b795

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

Inline Side-by-side
Showing 2 changed files with 2 additions and 1 deletions
@@ -34,7 +34,7 @@ class SearchData @@ -34,7 +34,7 @@ class SearchData
34 case 'preview': 34 case 'preview':
35 case 'developer': 35 case 'developer':
36 default: 36 default:
37 - return 'http://192.168.10.64:8080/yohosearch/search.json';//'http://101.200.31.165/yohosearch/search.json'; 37 + return 'http://101.200.31.165/yohosearch/search.json';//return 'http://192.168.10.64:8080/yohosearch/search.json';
38 } 38 }
39 } 39 }
40 40
@@ -16,6 +16,7 @@ class RegisterController extends WebAction @@ -16,6 +16,7 @@ class RegisterController extends WebAction
16 $this->setSession('effective_time', time() + 1800); 16 $this->setSession('effective_time', time() + 1800);
17 $data = array( 17 $data = array(
18 'registerPage' => true, 18 'registerPage' => true,
  19 + 'simpleHeader' => PassportModel::getSimpleHeader(false),
19 'passport' => array( 20 'passport' => array(
20 'actionUrl' => '/passport/register/mobileregister', 21 'actionUrl' => '/passport/register/mobileregister',
21 'region' => RegData::getAreasData(), 22 'region' => RegData::getAreasData(),