Merge branch 'feature/passportctx' into 'release/6.3'

nickname-ad



See merge request !1141

@@ -37,6 +37,7 @@ const bind = {
 
         let openId = req.query.openId;
         let sourceType = req.query.sourceType;
+        let nickname = req.query.nickname;
         let serviceUrl = helpers.urlFormat('/service/im');
 
         res.render('bind/index', {
@@ -48,7 +49,8 @@ const bind = {
             sourceType: sourceType, // 第三方登录来源
             platform: Sources[sourceType],
             isWechatLogin: sourceType === 'wechat',
-            openId: openId, // openId
+            openId: openId, // openId,
+            nickname: nickname,
             areaCode: '+86', // 默认区号
             countrys: req.ctx(RegServiceModel).getAreaData(), // 国别码
             serviceUrl: serviceUrl, // 在线客服
@@ -62,6 +64,7 @@ const bind = {
     codePage: (req, res) => {
         let openId = req.query.openId;
         let sourceType = req.query.sourceType;
+        let nickname = req.query.nickname;
         let areaCode = req.query.areaCode || '86';
         let isReg = req.query.is_register;
         let phoneNum = req.query.phoneNum;
@@ -73,6 +76,7 @@ const bind = {
             isPassportPage: true,
             sourceType: sourceType,
             openId: openId,
+            nickname: nickname,
             isReg: isReg,
             areaCode: areaCode,
             phoneNum: phoneNum,
@@ -90,6 +94,7 @@ const bind = {
         let openId = req.body.openId;
         let areaCode = req.body.areaCode || '86';
         let sourceType = req.body.sourceType;
+        let nickname = req.body.nickname;
 
         if (_.isNumber(parseInt(phoneNum, 0)) && openId && areaCode && sourceType) {
             req.ctx(BindServiceModel).bindCheck(phoneNum, openId, sourceType, areaCode).then(result => {
@@ -104,6 +109,7 @@ const bind = {
                         is_register: result.data.is_register,
                         openId: openId,
                         sourceType: sourceType,
+                        nickname: nickname,
                         areaCode: areaCode,
                         phoneNum: phoneNum
                     });
@@ -179,13 +185,15 @@ const bind = {
         let areaCode = req.body.areaCode || '86';
         let sourceType = req.body.sourceType;
         let code = req.body.code;
+        let nickname = req.body.nickname;
         let password = req.body.password || '';
         let from = req.cookies.from || 'yohobuy';
 
-        if (_.isNumber(parseInt(phoneNum, 0)) && openId && sourceType && areaCode && code) {
+        if (_.isNumber(parseInt(phoneNum, 0)) && openId && sourceType && nickname && areaCode && code) {
             req.ctx(BindServiceModel).checkBindCode(areaCode, phoneNum, code).then(result => {
                 if (result && result.code && result.code === 200) {
-                    return req.ctx(BindServiceModel).bindMobile(openId, sourceType, phoneNum, areaCode, password, from);
+                    return req.ctx(BindServiceModel).bindMobile(openId, sourceType,
+                        phoneNum, areaCode, password, from, nickname);
                 } else {
                     return { code: 400, message: '短信验证码错误', data: '' };
                 }
@@ -248,6 +256,7 @@ const bind = {
     passwordPage: (req, res) => {
         let openId = req.query.openId;
         let sourceType = req.query.sourceType;
+        let nickname = req.query.nickname;
         let areaCode = req.query.areaCode || '86';
         let phoneNum = req.query.phoneNum;
         let code = req.query.code;
@@ -260,6 +269,7 @@ const bind = {
             showHeaderImg: true, // 控制显示头部图片
             isPassportPage: true, // 模板中模块标识
             sourceType: sourceType, // 第三方登录来源
+            nickname: nickname,
             openId: openId, // openId
             areaCode: areaCode, // 国别码
             phoneNum: phoneNum, // 国别码

@@ -51,6 +51,7 @@ function doPassportCallback(openId, nickname, sourceType, req, res) {
                 return helpers.urlFormat('/passport/bind/index', {
                     openId: openId,
                     sourceType: sourceType,
+                    nickname: nickname,
                     refer: refer
                 });
             } else if (result.code === 200 && result.data.uid) {

@@ -21,6 +21,7 @@ let sourceType = $('#sourceType').val(),
     openId = $('#openId').val(),
     phoneNum = $('#phone-num').val(),
     areaCode = $('#area-code').val().replace('+', ''),
+    nickname = $('#nickname').val(),
     code = $('#code').val();
 
 function startBind(password) {
@@ -32,6 +33,7 @@ function startBind(password) {
             phoneNum: phoneNum,
             openId: openId,
             sourceType: sourceType,
+            nickname: nickname,
             password: password,
             code: code
         },