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
<div class="international-new-page">
<div class="top-operation-bar">
<button class="back iconfont">&#xe72e;</button>
<button class="back iconfont" onclick="javascript:history.go(-1);">&#xe72e;</button>
<span class="page-title">海外账号登录</span>
<button class="close iconfont">&#xe72d;</button>
</div>
<div class="international-form">
<div class="form-group mobile">
... ...
... ... @@ -3,10 +3,10 @@
<img src="{{image2 banner w=750 h=290}}">
<div class="banner-info">
<div class="top-operation-bar">
<button class="close iconfont" onclick="location.href='{{backUrl}}'">&#xe72d;</button>
<button class="close iconfont" onclick="location.href='{{backUrl}}'">&#xe72e;</button>
<a href="{{registerUrl}}" class="register">注册</a>
</div>
<div class="tip">Yoho!Family账号可登录Yoho!Buy有货 <i class="iconfont">&#xe639;</i></div>
<div class="tip">Yoho!Family账号可登录Yoho!Buy有货 <i id="showYohoFamilyTip" class="iconfont">&#xe639;</i></div>
</div>
</div>
<div class="login-form">
... ...
<div class="reg-new-page">
<div class="top-operation-bar">
<button class="back iconfont">&#xe72e;</button>
<button class="back iconfont" onclick="javascript:history.go(-1);">&#xe72e;</button>
<span class="page-title">注册</span>
<button class="close iconfont">&#xe72d;</button>
</div>
<div class="reg-form">
<div class="form-group mobile">
... ...
... ... @@ -3,10 +3,10 @@
<img src="{{image2 banner w=750 h=290}}">
<div class="banner-info">
<div class="top-operation-bar">
<button class="close iconfont" onclick="location.href='{{backUrl}}'">&#xe72d;</button>
<button class="close iconfont" onclick="location.href='{{backUrl}}'">&#xe72e;</button>
<a href="{{registerUrl}}" class="register">注册</a>
</div>
<div class="tip">Yoho!Family账号可登录Yoho!Buy有货 <i class="iconfont">&#xe639;</i></div>
<div class="tip">Yoho!Family账号可登录Yoho!Buy有货 <i id="showYohoFamilyTip" class="iconfont">&#xe639;</i></div>
</div>
</div>
<div class="sms-login-form">
... ...
const $ = require('yoho-jquery');
const $captcha = $('#js-img-check');
const tip = require('plugin/tip');
const Modal2 = require('plugin/modal2');
const showErrTip = tip.show;
const api = require('../api');
const trim = $.trim;
... ... @@ -23,7 +24,8 @@ class Login {
eyeClose: $('.eye-close'),
eyeOpen: $('.eye-open'),
getPswrdBtn: $('#getPswrdBtn'),
getPasswordBox: $('.get-password-box')
getPasswordBox: $('.get-password-box'),
showYohoFamilyTip: $('#showYohoFamilyTip')
};
this.view.loginBtn.on('click', this.login.bind(this));
... ... @@ -31,6 +33,15 @@ class Login {
this.view.passwordEyeIcon.on('click', this.passwordShowStatus.bind(this));
this.view.getPswrdBtn.on('click', this.showGetPasswordBox.bind(this));
this.view.getPasswordBox.on('click', this.hiddenGetPasswordBox.bind(this));
this.view.showYohoFamilyTip.on('click', this.showYohoFamilyTip.bind(this));
}
/**
* 展示弹窗
*/
showYohoFamilyTip() {
Modal2.alert('Yoho!Family账号可登录Yoho!Buy有货、Yoho!Now、Mars及SHOW', 'Yoho!Family');
}
/**
... ...
import $ from 'yoho-jquery';
import tip from 'plugin/tip';
import Modal2 from 'plugin/modal2';
import checkPoint from './check-point';
import Page from 'yoho-page';
import Validate from 'plugin/validata';
... ... @@ -23,7 +24,8 @@ class SmsLoginNew extends Page {
verifyCode: $('input[name=verifyCode]'),
smsLoginBtn: $('#smsLoginBtn'),
getPswrdBtn: $('#getPswrdBtn'),
getPasswordBox: $('.get-password-box')
getPasswordBox: $('.get-password-box'),
showYohoFamilyTip: $('#showYohoFamilyTip')
};
this.init();
... ... @@ -46,6 +48,7 @@ class SmsLoginNew extends Page {
this.selector.smsLoginBtn.on('click', this.login.bind(this));
this.selector.getPswrdBtn.on('click', this.showGetPasswordBox.bind(this));
this.selector.getPasswordBox.on('click', this.hiddenGetPasswordBox.bind(this));
this.selector.showYohoFamilyTip.on('click', this.showYohoFamilyTip.bind(this));
if ($captcha.data('geetest')) {
this.selector.getVerifyCodeBtn.on('click', this.getVerifyCode.bind(this));
... ... @@ -56,6 +59,13 @@ class SmsLoginNew extends Page {
}
/**
* 展示弹窗
*/
showYohoFamilyTip() {
Modal2.alert('Yoho!Family账号可登录Yoho!Buy有货、Yoho!Now、Mars及SHOW', 'Yoho!Family');
}
/**
* 图片验证码初始化
*/
imgVerifyInit() {
... ...