fe / YOHOBUYWAP · Commits

Go to a project

Authored by Rock Zhang
Commit 469f49df123239ed4f9b07fd0a390e187af7988b 2 parents a7ca13d2 a950f5ef

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

Inline Side-by-side
Showing 5 changed files with 26 additions and 22 deletions
... ... @@ -6,7 +6,7 @@
<div class="send-tips"><i class="iconfont">&#xe61e;</i>我们已经把验证邮件发送至您的邮箱，请在24小时内通过邮件内的<br>链接继续设置新的密码。</div>
<div class="no-find">没有收到？到您邮箱的垃圾邮件里找找。</div>
<div class="to-my-email">
<a href="http://mail.qq.com" target="_blank" class="btn_b_ar_r">去我的邮箱&gt;</a>
<a href="{{email}}" target="_blank" class="btn_b_ar_r">去我的邮箱&gt;</a>
</div>
</div>
... ...
... ... @@ -4448,8 +4448,8 @@ function phoneAjaxFn(page, callback) {
data = {
mobile: $pn.val(),
area: $region.text().split('+')[1],
openId: 1,
sourceType: 'QQ'
openId: $('#open-id').val(),
sourceType: $('#source-type').val()
};
}
... ...
This diff could not be displayed because it is too large.
... ... @@ -20,7 +20,7 @@ class BackController extends WebAction {
'coverImg' => $banner ['img'],
'countryCode' => '86',
'countryName' => '中国',
'captchaUrl' => '/passport/images?t=1449799445',
'captchaUrl' => SITE_MAIN.'/passport/images?t=1449799445',
'countryList' => RegData::getAreasData()
)
);
... ... @@ -34,7 +34,7 @@ class BackController extends WebAction {
{
$phoneNum = $this->post('phoneNum', '');
$area = intval($this->post('area', '86'));
$verifyCode = $this->post('verifyCode', '');
$verifyCode = $this->post('verifyCode', '');//图形验证码
$data = array(
'code' => 200,
'message' => '验证成功'
... ... @@ -66,7 +66,7 @@ class BackController extends WebAction {
public function emailAction() {
$phoneNum = $this->post ('phoneNum', '');
$area = intval ($this->post('area', '86'));
$verifyCode = $this->post('verifyCode', '');
$verifyCode = $this->post('verifyCode', '');//图形验证码
if (Helpers::verifyEmail($phoneNum)) { // 验证邮箱
$email = $phoneNum;
$data = BackData::sendCodeToEmail($email);
... ... @@ -100,7 +100,7 @@ class BackController extends WebAction {
{
$mobile = $this->post ('mobile', '');
$area = intval ($this->post( 'area', '86' ));
$verifyCode = $this->post ('verifyCode', '');
$verifyCode = $this->post ('verifyCode', '');//图形验证码
$data = array('code' => 400, 'message' =>'验证失败');
if(Helpers::verifyMobile($mobile) && PassportModel::verifyCode($verifyCode)) { // 验证手机号
$data = BackData::sendCodeToMobile($mobile, $area);
... ... @@ -117,12 +117,21 @@ class BackController extends WebAction {
$this->redirect ('index');
}
$banner = PassportModel::getLeftBanner(PassportModel::BACK_LFFT_BANNER_CODE);
$emailArr = explode('@', $email);
$emailUrl = '';//邮箱地址
$emailUrls = array('yoho.cn' =>'http://smail.yoho.cn');
if(in_array($emailArr[1], $emailUrls)){
$emailUrl = $emailUrls[$emailArr[1]];//邮箱后缀
} else {
$emailUrl = 'http://mail.'.$emailArr[1];
}
$data = array (
'simpleHeader' => PassportModel::getSimpleHeader(false),
'sendEmail' => array (
'coverHref' => $banner ['url'],
'coverImg' => $banner ['img'],
'countrys' => array ()
'countrys' => array (),
'email' => $emailUrl
)
);
$this->_view->display('send-email', $data);
... ... @@ -133,7 +142,7 @@ class BackController extends WebAction {
*/
public function backcodeAction()
{
$code = $this->get('code');
$code = $this->get('code');//加密code兼容以前参数
$info = $this->checkCode($code);
$verifyState = false;//验证状态
$ret = array();
... ... @@ -172,7 +181,7 @@ class BackController extends WebAction {
*/
public function updateAction()
{
$code = $this->post('code');
$code = $this->post('code');//加密code兼容以前参数
$password = $this->post('pwd');
$info = $this->checkCode($code);
if (Helpers::verifyPassword ($password)) {
... ... @@ -224,7 +233,7 @@ class BackController extends WebAction {
{
$mobile = $this->getSession ('mobile');
$area = $this->getSession ('area');
$verifyCode = $this->getSession ('verifyCode');
$verifyCode = $this->getSession ('verifyCode');//图形验证码
if (empty ($mobile)) {
$this->redirect ('index');
}
... ... @@ -251,8 +260,8 @@ class BackController extends WebAction {
{
$mobile = $this->post ( 'mobile' );
$area = $this->post ( 'area' );
$verifyCode = $this->post ( 'verifyCode' );
$code = $this->post ( 'code' ); // code
$verifyCode = $this->post ( 'verifyCode' );//图形验证码
$code = $this->post ( 'code' ); //手机验证码
$data = array('code'=> 400, 'message' => '验证码错误!','data' => SITE_MAIN.'/passport/back/index');
if ($this->getSession ( 'mobile' ) == $mobile && $this->getSession ( 'area' ) == $area && ! empty($code)) {
$result = BackData::validateMobileCode ( $mobile, $code, $area );
... ...
... ... @@ -19,13 +19,13 @@ class RegisterController extends WebAction
'registerPage' => true,
'simpleHeader' => PassportModel::getSimpleHeader(false),
'passport' => array(
'actionUrl' => '/passport/register/mobileregister',
'actionUrl' => SITE_MAIN.'/passport/register/mobileregister',
'region' => RegData::getAreasData(),
'location' => '+86',
'captchaUrl' => '/passport/images?t=1449799445',
'captchaUrl' => SITE_MAIN.'/passport/images?t=1449799445',
'itemUrl' => 'http://www.yohobuy.com/help/?category_id=9',
'referUrl' => $refer,
'loginUrl' => '/signin.html?refer='.$refer,
'loginUrl' => SITE_MAIN.'/signin.html?refer='.$refer,
'coverHref' => $cover['url'],
'coverImg' => $cover['img'],
'regBtnText' => '立即注册'
... ... @@ -183,14 +183,9 @@ class RegisterController extends WebAction
$mobile = trim($this->post('mobile'), ' ');//mobile
$area = intval(trim($this->post('area'), ' '));//area
$verifyCode = strtolower(trim($this->post('verifyCode'),' '));//图形验证码
$code = trim($this->post('code'),'');//code
$code = trim($this->post('code'),'');//手机验证码
$password = $this->post('password');
$url = '/passport/register/index';
$refer = $this->getCookie('refer');
$data = array('code' => 400, 'message' => '', 'data' => '');
if(!empty($refer)) {
$refer = $url.'?refer='.$refer;
}
do
{
/* 判断参数是否合法 */
... ...