fe / YOHOBUYPC · Commits

Go to a project

Authored by lore-w
Commit 90f4e87ca23a24fb3755beb854bc8d5349ae52ad 1 parent aed46b9a

完善信息页面提取公共partials

Inline Side-by-side
Showing 6 changed files with 136 additions and 61 deletions
1 {{> layout/header}} 1 {{> layout/header}}
2 -<div class="login-page passport-page yoho-page clearfix"> 2 +<div class="passport-page yoho-page clearfix">
3 {{# passport}} 3 {{# passport}}
4 {{> passport/cover}} 4 {{> passport/cover}}
5 <div class="content"> 5 <div class="content">
6 - <div class="register-page">  
7 - <form id="register-form" class="register-form" method="POST" action="{{actionUrl}}" autocomplete="off">  
8 - <ul>  
9 - <li class="clearfix">  
10 - <select id="region" class="region" name="region">  
11 - {{#each region}}  
12 - <option {{#if selected}}selected="selected"{{/if}} value="{{id}}">{{name}}</option>  
13 - {{/each}}  
14 - </select>  
15 - </li>  
16 - <li class="clearfix" data-index="0">  
17 - <span id="country-code" class="country-code">{{location}}</span>  
18 - <input value="" id="phone-num" class="input va phone-num" type="text" name="phoneNum" placeholder="请输入手机号码" autocomplete="off">  
19 - </li>  
20 - <li class="w330 clearfix" data-index="1">  
21 - <input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="图形验证码" autocomplete="off" maxlength="4">  
22 - <img id="captcha-img" class="captcha-img" src="{{captchaUrl}}" alt="">  
23 - <a class="link change-captcha">换一张</a>  
24 - </li>  
25 - <li class="clearfix" data-index="2">  
26 - <input id="msg-captcha" class="input va msg-captcha" type="text" name="msgCaptcha" placeholder="短信验证码" autocomplete="off" maxlength="4">  
27 - <input id="send-captcha" class="btn send-captcha disable" type="button" value="获取短信验证码">  
28 - <span id="msg-tip" class="hide msg-tip">短信验证码已发送至您的手机，请查收</span>  
29 - </li>  
30 - <li class="clearfix" data-index="3">  
31 - <input id="pwd" class="input va pwd" name="pwd" placeholder="设置密码" autocomplete="off" maxlength="20" type="password">  
32 - <div class="pwd-intensity-container">  
33 - <span class="pwd-intensity low">低</span>  
34 - <span class="pwd-intensity mid">中</span>  
35 - <span class="pwd-intensity high">高</span>  
36 - </div>  
37 - <div id="pwd-tips" class="hide pwd-tips">  
38 - <div class="default" id="pwd-tip1"><i></i>密码只支持6-20位字符</div>  
39 - <div class="default" id="pwd-tip2"><i></i>建议由字母、 数字、 符号两种以上组合</div>  
40 - </div>  
41 - </li>  
42 -  
43 - <li class="items-container clearfix">  
44 - <input id="agree-terms" class="agree-terms" type="checkbox" checked="">  
45 - <span>  
46 - 我已阅读并同意遵守  
47 - <a class="link go-yoho-items" href="{{itemUrl}}">YOHO!有货服务条款</a>  
48 - </span>  
49 - </li>  
50 - <li class="clearfix">  
51 - <input name="refer" id="refer" type="hidden" value="{{referUrl}}">  
52 - <input id="register-btn" class="btn register-btn disable" type="submit" value="立即注册" disabled="">  
53 - </li>  
54 - <li class="quick-login-container">  
55 - 我已注册YOHO!有货账号  
56 - <a class="link go-login" href="{{loginUrl}}">快速登录</a>  
57 - </li>  
58 - </ul>  
59 - <div id="err-tip" class="err-tip hide">  
60 - <span></span>  
61 - <b></b>  
62 - </div>  
63 - </form>  
64 - </div> 6 + {{> passport/register}}
65 </div> 7 </div>
66 {{/ passport}} 8 {{/ passport}}
67 </div> 9 </div>
  1 +{{> layout/header}}
  2 +<div class="passport-page yoho-page clearfix">
  3 + {{# passport}}
  4 + {{> passport/cover}}
  5 + <div class="content">
  6 + {{> passport/register}}
  7 + </div>
  8 + {{/ passport}}
  9 +
  10 + <div class="page-tip clearfix">为了给您更好的购物体验， 建议您创建YOHO!Family账号</div>
  11 +
  12 +</div>
  13 +{{> layout/footer}}
  1 +<div class="register-page">
  2 + <form id="register-form" class="register-form" method="POST" action="{{actionUrl}}" autocomplete="off">
  3 + <ul>
  4 + <li class="clearfix">
  5 + <select id="region" class="region" name="region">
  6 + {{#each region}}
  7 + <option {{#if selected}}selected="selected"{{/if}} value="{{id}}">{{name}}</option>
  8 + {{/each}}
  9 + </select>
  10 + </li>
  11 + <li class="clearfix" data-index="0">
  12 + <span id="country-code" class="country-code">{{location}}</span>
  13 + <input value="" id="phone-num" class="input va phone-num" type="text" name="phoneNum" placeholder="请输入手机号码" autocomplete="off">
  14 + </li>
  15 + <li class="w330 clearfix" data-index="1">
  16 + <input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="图形验证码" autocomplete="off" maxlength="4">
  17 + <img id="captcha-img" class="captcha-img" src="{{captchaUrl}}" alt="">
  18 + <a class="link change-captcha">换一张</a>
  19 + </li>
  20 + <li class="clearfix" data-index="2">
  21 + <input id="msg-captcha" class="input va msg-captcha" type="text" name="msgCaptcha" placeholder="短信验证码" autocomplete="off" maxlength="4">
  22 + <input id="send-captcha" class="btn send-captcha disable" type="button" value="获取短信验证码">
  23 + <span id="msg-tip" class="hide msg-tip">短信验证码已发送至您的手机，请查收</span>
  24 + </li>
  25 + <li class="clearfix" data-index="3">
  26 + <input id="pwd" class="input va pwd" name="pwd" placeholder="设置密码" autocomplete="off" maxlength="20" type="password">
  27 + <div class="pwd-intensity-container">
  28 + <span class="pwd-intensity low">低</span>
  29 + <span class="pwd-intensity mid">中</span>
  30 + <span class="pwd-intensity high">高</span>
  31 + </div>
  32 + <div id="pwd-tips" class="hide pwd-tips">
  33 + <div class="default" id="pwd-tip1"><i></i>密码只支持6-20位字符</div>
  34 + <div class="default" id="pwd-tip2"><i></i>建议由字母、 数字、 符号两种以上组合</div>
  35 + </div>
  36 + </li>
  37 +
  38 + <li class="items-container clearfix">
  39 + <input id="agree-terms" class="agree-terms" type="checkbox" checked="">
  40 + <span>
  41 + 我已阅读并同意遵守
  42 + <a class="link go-yoho-items" href="{{itemUrl}}">YOHO!有货服务条款</a>
  43 + </span>
  44 + </li>
  45 + <li class="clearfix">
  46 + <input name="refer" id="refer" type="hidden" value="{{referUrl}}">
  47 + <input id="register-btn" class="btn register-btn disable" type="submit" value="{{regBtnText}}" disabled="">
  48 + </li>
  49 + {{# loginUrl}}
  50 + <li class="quick-login-container">
  51 + 我已注册YOHO!有货账号
  52 + <a class="link go-login" href="{{.}}">完善信息</a>
  53 + </li>
  54 + {{/loginUrl}}
  55 +
  56 + {{# skipUrl}}
  57 + <li class="skip-user-info">
  58 + <a href="{{.}}">跳过此步</a>
  59 + </li>
  60 + {{/skipUrl}}
  61 +
  62 + </ul>
  63 + <div id="err-tip" class="err-tip hide">
  64 + <span></span>
  65 + <b></b>
  66 + </div>
  67 + </form>
  68 +</div>
@@ -172,6 +172,20 @@ $tip: sprite-map("passport/tip/*.png", $spacing: 10px); @@ -172,6 +172,20 @@ $tip: sprite-map("passport/tip/*.png", $spacing: 10px);
172 margin-right: 5px; 172 margin-right: 5px;
173 } 173 }
174 } 174 }
  175 +
  176 + /*完善信息提示框*/
  177 + .page-tip {
  178 + display: block;
  179 + width: 100%;
  180 + height: 30px;
  181 + line-height: 30px;
  182 + text-align: center;
  183 + font-size: 20px;
  184 + font-weight: bold;
  185 + color: #ccc;
  186 + clear: both;
  187 + margin-bottom: 15px;
  188 + }
175 } 189 }
176 190
177 .passport-cover { 191 .passport-cover {
@@ -200,6 +200,15 @@ @@ -200,6 +200,15 @@
200 text-align: right; 200 text-align: right;
201 white-space: nowrap; 201 white-space: nowrap;
202 } 202 }
  203 +
  204 + &.skip-user-info {
  205 + font-size: 18px;
  206 + text-align: center;
  207 + a {
  208 + color: #ff1901;
  209 + text-decoration: underline;
  210 + }
  211 + }
203 } 212 }
204 213
205 .err-tip { 214 .err-tip {
@@ -25,12 +25,41 @@ class RegisterController extends WebAction @@ -25,12 +25,41 @@ class RegisterController extends WebAction
25 'referUrl' => $refer, 25 'referUrl' => $refer,
26 'loginUrl' => '/signin.html?refer='.$refer, 26 'loginUrl' => '/signin.html?refer='.$refer,
27 'coverHref' => $cover['url'], 27 'coverHref' => $cover['url'],
28 - 'coverImg' => $cover['img'] 28 + 'coverImg' => $cover['img'],
  29 + 'regBtnText' => '快速登录'
29 ) 30 )
30 ); 31 );
31 $this->setCookie('refer', $refer); 32 $this->setCookie('refer', $refer);
32 $this->_view->display('index', $data); 33 $this->_view->display('index', $data);
33 } 34 }
  35 +
  36 +
  37 + /**
  38 + * 第三方登录
  39 + */
  40 + public function thirdAction()
  41 + {
  42 + $refer = $this->get('refer', SITE_MAIN);
  43 + $cover = PassportModel::getLeftBanner(PassportModel::REGISTER_LEFT_BANNER_CODE);
  44 + $this->setSession('effective_time', time() + 1800);
  45 + $data = array(
  46 + 'registerPage' => true,
  47 + 'passport' => array(
  48 + 'actionUrl' => '/passport/register/mobileregister',
  49 + 'region' => RegData::getAreasData(),
  50 + 'location' => '+86',
  51 + 'captchaUrl' => 'http://web.dev.yohobuy.com/passport/images?t=1449799445',
  52 + 'itemUrl' => '##',
  53 + 'referUrl' => $refer,
  54 + 'skipUrl' => '/signin.html?refer='.$refer,
  55 + 'coverHref' => $cover['url'],
  56 + 'coverImg' => $cover['img'],
  57 + 'regBtnText' => '完善信息'
  58 + )
  59 + );
  60 + $this->setCookie('refer', $refer);
  61 + $this->_view->display('third-register', $data);
  62 + }
34 63
35 /** 64 /**
36 * 检测手机号 65 * 检测手机号