Merge branch 'hotfix/login' into 'gray'

Hotfix/login



See merge request !345

@@ -419,16 +419,19 @@ let setPassword = (req, res, next) => {
 
 
     RegService.regMobileAes(area, mobile, password, shoppingKey, smsCode, isFromMy).then((result) => {
     RegService.regMobileAes(area, mobile, password, shoppingKey, smsCode, isFromMy).then((result) => {
         if (!result.code || result.code !== 200) {
         if (!result.code || result.code !== 200) {
-            return Promise.reject(result);
+            return res.send(result);
         }
         }
         if (!result.data || !result.data.uid) {
         if (!result.data || !result.data.uid) {
-            return Promise.reject(result);
+            return res.send(result);
         }
         }
 
 
         resultCopy = result;
         resultCopy = result;
 
 
         return AuthHelper.syncUserSession(result.data.uid, req, res);
         return AuthHelper.syncUserSession(result.data.uid, req, res);
     }).then(() => {
     }).then(() => {
+        if (!resultCopy) {
+            return;
+        }
         // 返回跳转到来源页面
         // 返回跳转到来源页面
         let refer = req.cookies.refer;
         let refer = req.cookies.refer;