fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 07b31fe016314b69ce037b8dd38c538503026942 2 parents f2eff108 d63da88d

Merge branch 'feature/loginview' into release/6.0.1

Inline Side-by-side
Showing 6 changed files with 29 additions and 10 deletions
1 <div class="international-new-page"> 1 <div class="international-new-page">
2 <div class="top-operation-bar"> 2 <div class="top-operation-bar">
3 - <button class="back iconfont">&#xe72e;</button> 3 + <button class="back iconfont" onclick="javascript:history.go(-1);">&#xe72e;</button>
4 <span class="page-title">海外账号登录</span> 4 <span class="page-title">海外账号登录</span>
5 - <button class="close iconfont">&#xe72d;</button>  
6 </div> 5 </div>
7 <div class="international-form"> 6 <div class="international-form">
8 <div class="form-group mobile"> 7 <div class="form-group mobile">
@@ -3,10 +3,10 @@ @@ -3,10 +3,10 @@
3 <img src="{{image2 banner w=750 h=290}}"> 3 <img src="{{image2 banner w=750 h=290}}">
4 <div class="banner-info"> 4 <div class="banner-info">
5 <div class="top-operation-bar"> 5 <div class="top-operation-bar">
6 - <button class="close iconfont" onclick="location.href='{{backUrl}}'">&#xe72d;</button> 6 + <button class="close iconfont" onclick="location.href='{{backUrl}}'">&#xe72e;</button>
7 <a href="{{registerUrl}}" class="register">注册</a> 7 <a href="{{registerUrl}}" class="register">注册</a>
8 </div> 8 </div>
9 - <div class="tip">Yoho!Family账号可登录Yoho!Buy有货 <i class="iconfont">&#xe639;</i></div> 9 + <div class="tip">Yoho!Family账号可登录Yoho!Buy有货 <i id="showYohoFamilyTip" class="iconfont">&#xe639;</i></div>
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="login-form"> 12 <div class="login-form">
1 <div class="reg-new-page"> 1 <div class="reg-new-page">
2 <div class="top-operation-bar"> 2 <div class="top-operation-bar">
3 - <button class="back iconfont">&#xe72e;</button> 3 + <button class="back iconfont" onclick="javascript:history.go(-1);">&#xe72e;</button>
4 <span class="page-title">注册</span> 4 <span class="page-title">注册</span>
5 - <button class="close iconfont">&#xe72d;</button>  
6 </div> 5 </div>
7 <div class="reg-form"> 6 <div class="reg-form">
8 <div class="form-group mobile"> 7 <div class="form-group mobile">
@@ -3,10 +3,10 @@ @@ -3,10 +3,10 @@
3 <img src="{{image2 banner w=750 h=290}}"> 3 <img src="{{image2 banner w=750 h=290}}">
4 <div class="banner-info"> 4 <div class="banner-info">
5 <div class="top-operation-bar"> 5 <div class="top-operation-bar">
6 - <button class="close iconfont" onclick="location.href='{{backUrl}}'">&#xe72d;</button> 6 + <button class="close iconfont" onclick="location.href='{{backUrl}}'">&#xe72e;</button>
7 <a href="{{registerUrl}}" class="register">注册</a> 7 <a href="{{registerUrl}}" class="register">注册</a>
8 </div> 8 </div>
9 - <div class="tip">Yoho!Family账号可登录Yoho!Buy有货 <i class="iconfont">&#xe639;</i></div> 9 + <div class="tip">Yoho!Family账号可登录Yoho!Buy有货 <i id="showYohoFamilyTip" class="iconfont">&#xe639;</i></div>
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="sms-login-form"> 12 <div class="sms-login-form">
1 const $ = require('yoho-jquery'); 1 const $ = require('yoho-jquery');
2 const $captcha = $('#js-img-check'); 2 const $captcha = $('#js-img-check');
3 const tip = require('plugin/tip'); 3 const tip = require('plugin/tip');
  4 +const Modal2 = require('plugin/modal2');
4 const showErrTip = tip.show; 5 const showErrTip = tip.show;
5 const api = require('../api'); 6 const api = require('../api');
6 const trim = $.trim; 7 const trim = $.trim;
@@ -23,7 +24,8 @@ class Login { @@ -23,7 +24,8 @@ class Login {
23 eyeClose: $('.eye-close'), 24 eyeClose: $('.eye-close'),
24 eyeOpen: $('.eye-open'), 25 eyeOpen: $('.eye-open'),
25 getPswrdBtn: $('#getPswrdBtn'), 26 getPswrdBtn: $('#getPswrdBtn'),
26 - getPasswordBox: $('.get-password-box') 27 + getPasswordBox: $('.get-password-box'),
  28 + showYohoFamilyTip: $('#showYohoFamilyTip')
27 }; 29 };
28 30
29 this.view.loginBtn.on('click', this.login.bind(this)); 31 this.view.loginBtn.on('click', this.login.bind(this));
@@ -31,6 +33,15 @@ class Login { @@ -31,6 +33,15 @@ class Login {
31 this.view.passwordEyeIcon.on('click', this.passwordShowStatus.bind(this)); 33 this.view.passwordEyeIcon.on('click', this.passwordShowStatus.bind(this));
32 this.view.getPswrdBtn.on('click', this.showGetPasswordBox.bind(this)); 34 this.view.getPswrdBtn.on('click', this.showGetPasswordBox.bind(this));
33 this.view.getPasswordBox.on('click', this.hiddenGetPasswordBox.bind(this)); 35 this.view.getPasswordBox.on('click', this.hiddenGetPasswordBox.bind(this));
  36 + this.view.showYohoFamilyTip.on('click', this.showYohoFamilyTip.bind(this));
  37 +
  38 + }
  39 +
  40 + /**
  41 + * 展示弹窗
  42 + */
  43 + showYohoFamilyTip() {
  44 + Modal2.alert('Yoho!Family账号可登录Yoho!Buy有货、Yoho!Now、Mars及SHOW', 'Yoho!Family');
34 } 45 }
35 46
36 /** 47 /**
1 import $ from 'yoho-jquery'; 1 import $ from 'yoho-jquery';
2 import tip from 'plugin/tip'; 2 import tip from 'plugin/tip';
  3 +import Modal2 from 'plugin/modal2';
3 import checkPoint from './check-point'; 4 import checkPoint from './check-point';
4 import Page from 'yoho-page'; 5 import Page from 'yoho-page';
5 import Validate from 'plugin/validata'; 6 import Validate from 'plugin/validata';
@@ -23,7 +24,8 @@ class SmsLoginNew extends Page { @@ -23,7 +24,8 @@ class SmsLoginNew extends Page {
23 verifyCode: $('input[name=verifyCode]'), 24 verifyCode: $('input[name=verifyCode]'),
24 smsLoginBtn: $('#smsLoginBtn'), 25 smsLoginBtn: $('#smsLoginBtn'),
25 getPswrdBtn: $('#getPswrdBtn'), 26 getPswrdBtn: $('#getPswrdBtn'),
26 - getPasswordBox: $('.get-password-box') 27 + getPasswordBox: $('.get-password-box'),
  28 + showYohoFamilyTip: $('#showYohoFamilyTip')
27 }; 29 };
28 30
29 this.init(); 31 this.init();
@@ -46,6 +48,7 @@ class SmsLoginNew extends Page { @@ -46,6 +48,7 @@ class SmsLoginNew extends Page {
46 this.selector.smsLoginBtn.on('click', this.login.bind(this)); 48 this.selector.smsLoginBtn.on('click', this.login.bind(this));
47 this.selector.getPswrdBtn.on('click', this.showGetPasswordBox.bind(this)); 49 this.selector.getPswrdBtn.on('click', this.showGetPasswordBox.bind(this));
48 this.selector.getPasswordBox.on('click', this.hiddenGetPasswordBox.bind(this)); 50 this.selector.getPasswordBox.on('click', this.hiddenGetPasswordBox.bind(this));
  51 + this.selector.showYohoFamilyTip.on('click', this.showYohoFamilyTip.bind(this));
49 52
50 if ($captcha.data('geetest')) { 53 if ($captcha.data('geetest')) {
51 this.selector.getVerifyCodeBtn.on('click', this.getVerifyCode.bind(this)); 54 this.selector.getVerifyCodeBtn.on('click', this.getVerifyCode.bind(this));
@@ -56,6 +59,13 @@ class SmsLoginNew extends Page { @@ -56,6 +59,13 @@ class SmsLoginNew extends Page {
56 } 59 }
57 60
58 /** 61 /**
  62 + * 展示弹窗
  63 + */
  64 + showYohoFamilyTip() {
  65 + Modal2.alert('Yoho!Family账号可登录Yoho!Buy有货、Yoho!Now、Mars及SHOW', 'Yoho!Family');
  66 + }
  67 +
  68 + /**
59 * 图片验证码初始化 69 * 图片验证码初始化
60 */ 70 */
61 imgVerifyInit() { 71 imgVerifyInit() {