Authored by 毕凯

Merge branch 'feature/loginview' into 'release/6.0.1'

signin



See merge request !823
... ... @@ -13,7 +13,7 @@ module.exports = (req, res, next) => {
return res.json({
code: 400,
message: '抱歉,您暂未登录!',
redirect: '/passport/login'
redirect: '/signin.html'
});
} else if (req.yoho.isApp) {
return next({
... ...
... ... @@ -3,11 +3,11 @@ const $ = require('yoho-jquery');
let reLoginBtn = $('#reLogin');
reLoginBtn.on('click', function() {
window.location.href = '/passport/login';
window.location.href = '/signin.html';
});
$(function() {
setTimeout(function() {
window.location.href = '/passport/login';
window.location.href = '/signin.html';
}, 3000);
});
... ...
... ... @@ -2,7 +2,6 @@
* @Author: Targaryen
* @Date: 2017-04-13 14:43:19
* @Last Modified by: Targaryen
* @Last Modified time: 2017-04-19 14:51:03
*/
/* ***************
... ... @@ -115,7 +114,7 @@ $sureResetBtn.on('click', function() {
}
if (result.code === 402) {
window.location.href = '/passport/login';
window.location.href = '/signin.html';
}
},
error: function() {
... ...
... ... @@ -146,4 +146,31 @@ $disable-gray: $b0b0b0;
color: #fff;
}
}
.full-img-verify {
margin-top: 70px;
.img-check {
background-color: #fff;
margin-top: 0;
margin-bottom: 0;
.img-check-header > span {
color: #444;
font-size: 21.9px;
line-height: 1.5;
}
.img-check-header > .img-check-refresh {
color: #d0021b;
}
.img-check-main > .img-check-pics > .img-check-pic {
width: 136.6px;
height: 136.8px;
background-color: #fff;
border: solid 1px #e0e0e0;
}
}
}
}
... ...