Merge branch 'feature/passport' into feature/encryptionUid
Showing
3 changed files
with
15 additions
and
10 deletions
@@ -32,6 +32,7 @@ passport.use(new LocalStrategy({ | @@ -32,6 +32,7 @@ passport.use(new LocalStrategy({ | ||
32 | passwordField: 'password', | 32 | passwordField: 'password', |
33 | passReqToCallback: true | 33 | passReqToCallback: true |
34 | }, (req, username, password, done) => { | 34 | }, (req, username, password, done) => { |
35 | + | ||
35 | let area = req.body.areaCode || '86'; | 36 | let area = req.body.areaCode || '86'; |
36 | 37 | ||
37 | if (isNaN(parseInt(area, 0)) || _.isEmpty(username) || _.isEmpty(password)) { | 38 | if (isNaN(parseInt(area, 0)) || _.isEmpty(username) || _.isEmpty(password)) { |
@@ -77,20 +77,20 @@ a { | @@ -77,20 +77,20 @@ a { | ||
77 | 77 | ||
78 | .yoho-tip { | 78 | .yoho-tip { |
79 | position: fixed; | 79 | position: fixed; |
80 | - top: 50%; | ||
81 | - left: 50%; | ||
82 | - z-index: 4; | ||
83 | display: none; | 80 | display: none; |
84 | - padding: 68px 0; | ||
85 | - max-width: 600px; | 81 | + text-align: center; |
86 | width: 70%; | 82 | width: 70%; |
87 | - border: none; | ||
88 | - border-radius: 20px; | 83 | + padding: 34PX 0; |
84 | + top: 50%; | ||
85 | + left: 50%; | ||
86 | + margin-left: -35%; | ||
87 | + margin-top: -45PX; | ||
89 | background-color: rgba(0, 0, 0, 0.7); | 88 | background-color: rgba(0, 0, 0, 0.7); |
90 | color: #fff; | 89 | color: #fff; |
91 | - text-align: center; | ||
92 | - font-size: 36px; | ||
93 | - transform: translate(-50%, -50%); | 90 | + font-size: 18PX; |
91 | + border: none; | ||
92 | + z-index: 4; | ||
93 | + border-radius: 10PX; | ||
94 | } | 94 | } |
95 | 95 | ||
96 | .order-failure { | 96 | .order-failure { |
-
Please register or login to post a comment