Authored by hf

Merge remote-tracking branch 'origin/develop'

... ... @@ -63,7 +63,7 @@ class BackData
$param['code'] = $code;
// 默认返回的不是json类型数据,是html
return Yohobuy::post(Yohobuy::YOHOBUY_URL.'passport/back/update', $param, true);
return Yohobuy::get(Yohobuy::YOHOBUY_URL.'passport/back/update', $param, true);
}
... ...
... ... @@ -129,7 +129,8 @@ class BackController extends AbstractAction
$data = BackData::modifyPasswordByEmail($pwd, $code);
$result = array('code'=>200);
$result = array('code'=>200, 'data' => '/signin.html');
print_r($data);
if(strpos($data, 'history.back') !== false)
{
$result['code'] = 400;
... ...