Merge branch 'feature/loginview' into 'release/6.0.1'
signin See merge request !823
Showing
4 changed files
with
31 additions
and
5 deletions
@@ -13,7 +13,7 @@ module.exports = (req, res, next) => { | @@ -13,7 +13,7 @@ module.exports = (req, res, next) => { | ||
13 | return res.json({ | 13 | return res.json({ |
14 | code: 400, | 14 | code: 400, |
15 | message: '抱歉,您暂未登录!', | 15 | message: '抱歉,您暂未登录!', |
16 | - redirect: '/passport/login' | 16 | + redirect: '/signin.html' |
17 | }); | 17 | }); |
18 | } else if (req.yoho.isApp) { | 18 | } else if (req.yoho.isApp) { |
19 | return next({ | 19 | return next({ |
@@ -3,11 +3,11 @@ const $ = require('yoho-jquery'); | @@ -3,11 +3,11 @@ const $ = require('yoho-jquery'); | ||
3 | let reLoginBtn = $('#reLogin'); | 3 | let reLoginBtn = $('#reLogin'); |
4 | 4 | ||
5 | reLoginBtn.on('click', function() { | 5 | reLoginBtn.on('click', function() { |
6 | - window.location.href = '/passport/login'; | 6 | + window.location.href = '/signin.html'; |
7 | }); | 7 | }); |
8 | 8 | ||
9 | $(function() { | 9 | $(function() { |
10 | setTimeout(function() { | 10 | setTimeout(function() { |
11 | - window.location.href = '/passport/login'; | 11 | + window.location.href = '/signin.html'; |
12 | }, 3000); | 12 | }, 3000); |
13 | }); | 13 | }); |
@@ -2,7 +2,6 @@ | @@ -2,7 +2,6 @@ | ||
2 | * @Author: Targaryen | 2 | * @Author: Targaryen |
3 | * @Date: 2017-04-13 14:43:19 | 3 | * @Date: 2017-04-13 14:43:19 |
4 | * @Last Modified by: Targaryen | 4 | * @Last Modified by: Targaryen |
5 | - * @Last Modified time: 2017-04-19 14:51:03 | ||
6 | */ | 5 | */ |
7 | 6 | ||
8 | /* *************** | 7 | /* *************** |
@@ -115,7 +114,7 @@ $sureResetBtn.on('click', function() { | @@ -115,7 +114,7 @@ $sureResetBtn.on('click', function() { | ||
115 | } | 114 | } |
116 | 115 | ||
117 | if (result.code === 402) { | 116 | if (result.code === 402) { |
118 | - window.location.href = '/passport/login'; | 117 | + window.location.href = '/signin.html'; |
119 | } | 118 | } |
120 | }, | 119 | }, |
121 | error: function() { | 120 | error: function() { |
@@ -146,4 +146,31 @@ $disable-gray: $b0b0b0; | @@ -146,4 +146,31 @@ $disable-gray: $b0b0b0; | ||
146 | color: #fff; | 146 | color: #fff; |
147 | } | 147 | } |
148 | } | 148 | } |
149 | + | ||
150 | + .full-img-verify { | ||
151 | + margin-top: 70px; | ||
152 | + | ||
153 | + .img-check { | ||
154 | + background-color: #fff; | ||
155 | + margin-top: 0; | ||
156 | + margin-bottom: 0; | ||
157 | + | ||
158 | + .img-check-header > span { | ||
159 | + color: #444; | ||
160 | + font-size: 21.9px; | ||
161 | + line-height: 1.5; | ||
162 | + } | ||
163 | + | ||
164 | + .img-check-header > .img-check-refresh { | ||
165 | + color: #d0021b; | ||
166 | + } | ||
167 | + | ||
168 | + .img-check-main > .img-check-pics > .img-check-pic { | ||
169 | + width: 136.6px; | ||
170 | + height: 136.8px; | ||
171 | + background-color: #fff; | ||
172 | + border: solid 1px #e0e0e0; | ||
173 | + } | ||
174 | + } | ||
175 | + } | ||
149 | } | 176 | } |
-
Please register or login to post a comment