Merge branch 'hotfix/smslogin-improve' into release/5.2

@@ -125,14 +125,14 @@ exports.tokenBefore = (req, res, next) => {
     let captcha2 = (req.query.captcha || '').trim();
 
 
-    if (!req.xhr && !captcha1) {
+    if (!req.xhr) {
         return next(404);
     }
 
-    if ([area, mobile, captcha2].some(val => val === '')) {
+    if ([area, mobile].some(val => val === '')) {
         return res.json({
             code: 401,
-            message: '请求参数，无法处理'
+            message: '手机号 必填'
         });
     }
 
@@ -140,6 +140,13 @@ exports.tokenBefore = (req, res, next) => {
 
     // step1 要 校验图形验证码
     if (step === 1) {
+        if (!captcha2) {
+            return res.json({
+                code: 400,
+                message: '请填写验证码'
+            });
+        }
+
         if (captcha1 !== captcha2) {
             return res.json({
                 code: 400,