Authored by 毕凯

完善微信登录样式

@@ -83,10 +83,10 @@ module.exports = function(useInRegister, useForBind, useForRelate) { @@ -83,10 +83,10 @@ module.exports = function(useInRegister, useForBind, useForRelate) {
83 83
84 itime = setInterval(function() { 84 itime = setInterval(function() {
85 if (count === 0) { 85 if (count === 0) {
86 - $captchaTip.text('重发验证码').removeClass('disable'); 86 + $captchaTip.text('重新发送').removeClass('disable');
87 clearInterval(itime); 87 clearInterval(itime);
88 } else { 88 } else {
89 - $captchaTip.text('重发验证码 (' + count-- + '秒)'); 89 + $captchaTip.text('重新发送 (' + count-- + '秒)');
90 } 90 }
91 }, 1000); 91 }, 1000);
92 } 92 }
1 .bind-page { 1 .bind-page {
2 - .bind-tip {  
3 - color: #fff;  
4 - font-size: 15PX;  
5 - }  
6 2
7 #yohood { 3 #yohood {
8 background-image: resolve('yohood.png'); 4 background-image: resolve('yohood.png');
@@ -35,15 +35,4 @@ @@ -35,15 +35,4 @@
35 .clear-input { 35 .clear-input {
36 right: 170PX; 36 right: 170PX;
37 } 37 }
38 -  
39 - .tip {  
40 - margin-top: 30PX;  
41 - color: #fff;  
42 - font-size: 16PX;  
43 - line-height: 2;  
44 -  
45 - a {  
46 - color: #3FB274;  
47 - }  
48 - }  
49 } 38 }
@@ -11,6 +11,29 @@ body.passport-body { @@ -11,6 +11,29 @@ body.passport-body {
11 text-align: center; 11 text-align: center;
12 padding: 0 6%; 12 padding: 0 6%;
13 13
  14 + .bind-tip {
  15 + margin-top: 10PX;
  16 + margin-bottom: 10PX;
  17 + color: #fff;
  18 + font-size: 13PX;
  19 +
  20 + .title {
  21 + font-size: 28PX;
  22 + line-height: 1.5;
  23 + }
  24 + }
  25 +
  26 + .tip {
  27 + margin-top: 30PX;
  28 + color: #fff;
  29 + font-size: 16PX;
  30 + line-height: 2;
  31 +
  32 + a {
  33 + color: #3FB274;
  34 + }
  35 + }
  36 +
14 .header { 37 .header {
15 position: relative; 38 position: relative;
16 height: 40PX; 39 height: 40PX;
@@ -5,18 +5,28 @@ @@ -5,18 +5,28 @@
5 <input type="hidden" id="nickname" value="{{nickname}}"> 5 <input type="hidden" id="nickname" value="{{nickname}}">
6 {{> passport/header}} 6 {{> passport/header}}
7 <div class="content"> 7 <div class="content">
  8 + <p class="bind-tip">您正在使{{platform}}快捷登录,请绑定手机号</p>
8 {{> passport/country_list}} 9 {{> passport/country_list}}
9 <div class="input-container phone-container row has-clear"> 10 <div class="input-container phone-container row has-clear">
10 <span id="area-code" class="area-code">{{areaCode}}</span> 11 <span id="area-code" class="area-code">{{areaCode}}</span>
11 <input id="phone-num" class="input phone-num" type="text" placeholder="手机号"> 12 <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
12 </div> 13 </div>
13 - <span id="btn-next" class="btn btn-next disable row">下一步</span> 14 + <span id="btn-next" class="btn btn-next disable row">发送验证码</span>
14 <div class="other-login"> 15 <div class="other-login">
15 <a class="/passport/login/index"> 16 <a class="/passport/login/index">
16 用其他方式登录 17 用其他方式登录
17 </a> 18 </a>
18 </div> 19 </div>
19 - <p class="bind-tip">绑定手机号码后,可选择{{platform}}和手机号登录此帐号</p> 20 +
  21 + <div class="tip">
  22 + <p>
  23 + 登录注册中遇到问题?请联系客服
  24 + </p>
  25 + <a href="{{serviceUrl}}">
  26 + <span class="iconfont icon">&#xe63c;</span>
  27 + 在线客服
  28 + </a>
  29 + </div>
20 </div> 30 </div>
21 </div> 31 </div>
22 {{> layout/footer}} 32 {{> layout/footer}}
@@ -5,6 +5,12 @@ @@ -5,6 +5,12 @@
5 <input type="hidden" id="nickname" value="{{nickname}}"> 5 <input type="hidden" id="nickname" value="{{nickname}}">
6 {{> passport/header}} 6 {{> passport/header}}
7 <div class="content"> 7 <div class="content">
  8 + {{#if bindPwd}}
  9 + <div class="bind-tip">
  10 + <p class="title">绑定成功!</p>
  11 + 您以后还可以使 机号+密码的形式登录有货哦!
  12 + </div>
  13 + {{/if}}
8 <div class="input-container row has-eye"> 14 <div class="input-container row has-eye">
9 <input id="pwd" class="input pwd" type="text" placeholder="请输入密码" autocomplete="off" maxlength="20"> 15 <input id="pwd" class="input pwd" type="text" placeholder="请输入密码" autocomplete="off" maxlength="20">
10 </div> 16 </div>
@@ -8,17 +8,10 @@ @@ -8,17 +8,10 @@
8 </div> 8 </div>
9 <div class="input-container row has-clear"> 9 <div class="input-container row has-clear">
10 <input id="captcha" class="input captcha" type="text" placeholder="验证码" maxlength="6" autocomplete="off"> 10 <input id="captcha" class="input captcha" type="text" placeholder="验证码" maxlength="6" autocomplete="off">
11 - <div id="captcha-tip" class="captcha-tip disable">重发验证码 (60秒)</div> 11 + <div id="captcha-tip" class="captcha-tip disable">重新发送 (60秒)</div>
12 </div> 12 </div>
13 - <span id="btn-next" class="btn btn-next disable row">下一步</span> 13 + <span id="btn-next" class="btn btn-next disable row">确定</span>
14 <div class="tip"> 14 <div class="tip">
15 - <p>  
16 - 登录注册中遇到问题?请联系客服  
17 - </p>  
18 - <a href="{{serviceUrl}}">  
19 - <span class="iconfont icon">&#xe63c;</span>  
20 - 在线客服  
21 - </a>  
22 {{#if relateCode}} 15 {{#if relateCode}}
23 注:关联的手机号不能用来登录此帐号 16 注:关联的手机号不能用来登录此帐号
24 {{/if}} 17 {{/if}}