Merge branch 'feature/bugfix61' into 'release/6.1'

FROM



See merge request !939

@@ -85,6 +85,7 @@ class Reg {
         let inviteCode = req.body.inviteCode || '';
         let inviteCode = req.body.inviteCode || '';
         let isFromMy = _.get(req.session, 'phoneReg.isFromMy', '0');
         let isFromMy = _.get(req.session, 'phoneReg.isFromMy', '0');
         let token = req.body.token;
         let token = req.body.token;
+        let clientIp = req.yoho.clientIp || '';
         let from = req.cookies.from || 'yohobuy';
         let from = req.cookies.from || 'yohobuy';
 
 
         // 购物车key
         // 购物车key
@@ -122,7 +123,7 @@ class Reg {
             }
             }
 
 
             let regMobileAesResult = yield RegService.regMobileAes(area, mobile, password,
             let regMobileAesResult = yield RegService.regMobileAes(area, mobile, password,
-                shoppingKey, smsCode, inviteCode, isFromMy, from);
+                shoppingKey, smsCode, inviteCode, isFromMy, clientIp, from);
 
 
             if (regMobileAesResult.code !== 200 || !regMobileAesResult.data ||
             if (regMobileAesResult.code !== 200 || !regMobileAesResult.data ||
                 !regMobileAesResult.data.uid) {
                 !regMobileAesResult.data.uid) {

@@ -335,7 +335,7 @@ class SmsLogin {
         let resultCopy = null;
         let resultCopy = null;
 
 
         RegService.regMobileAes(area, mobile, password,
         RegService.regMobileAes(area, mobile, password,
-            shoppingKey, registerCode, null, clientIp, from).then(result => {
+            shoppingKey, registerCode, '0', clientIp, from).then(result => {
             if (!result.code || result.code !== 200) {
             if (!result.code || result.code !== 200) {
                 return res.send(result);
                 return res.send(result);
             }
             }

@@ -39,7 +39,7 @@ const BindService = {
             code: code
             code: code
         });
         });
     },
     },
-    bindMobile(openId, sourceType, mobile, area, password, nickname, from) {
+    bindMobile(openId, sourceType, mobile, area, password, from, nickname) {
         let params = {
         let params = {
             method: 'app.passport.bind',
             method: 'app.passport.bind',
             mobile: mobile,
             mobile: mobile,