fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 033744308e8334c090e703ca1b7f52b43871ac43 1 parent 7a30aba1

nickname-ad

Inline Side-by-side
Showing 3 changed files with 16 additions and 3 deletions
@@ -37,6 +37,7 @@ const bind = { @@ -37,6 +37,7 @@ const bind = {
37 37
38 let openId = req.query.openId; 38 let openId = req.query.openId;
39 let sourceType = req.query.sourceType; 39 let sourceType = req.query.sourceType;
  40 + let nickname = req.query.nickname;
40 let serviceUrl = helpers.urlFormat('/service/im'); 41 let serviceUrl = helpers.urlFormat('/service/im');
41 42
42 res.render('bind/index', { 43 res.render('bind/index', {
@@ -48,7 +49,8 @@ const bind = { @@ -48,7 +49,8 @@ const bind = {
48 sourceType: sourceType, // 第三方登录来源 49 sourceType: sourceType, // 第三方登录来源
49 platform: Sources[sourceType], 50 platform: Sources[sourceType],
50 isWechatLogin: sourceType === 'wechat', 51 isWechatLogin: sourceType === 'wechat',
51 - openId: openId, // openId 52 + openId: openId, // openId,
  53 + nickname: nickname,
52 areaCode: '+86', // 默认区号 54 areaCode: '+86', // 默认区号
53 countrys: req.ctx(RegServiceModel).getAreaData(), // 国别码 55 countrys: req.ctx(RegServiceModel).getAreaData(), // 国别码
54 serviceUrl: serviceUrl, // 在线客服 56 serviceUrl: serviceUrl, // 在线客服
@@ -62,6 +64,7 @@ const bind = { @@ -62,6 +64,7 @@ const bind = {
62 codePage: (req, res) => { 64 codePage: (req, res) => {
63 let openId = req.query.openId; 65 let openId = req.query.openId;
64 let sourceType = req.query.sourceType; 66 let sourceType = req.query.sourceType;
  67 + let nickname = req.query.nickname;
65 let areaCode = req.query.areaCode || '86'; 68 let areaCode = req.query.areaCode || '86';
66 let isReg = req.query.is_register; 69 let isReg = req.query.is_register;
67 let phoneNum = req.query.phoneNum; 70 let phoneNum = req.query.phoneNum;
@@ -73,6 +76,7 @@ const bind = { @@ -73,6 +76,7 @@ const bind = {
73 isPassportPage: true, 76 isPassportPage: true,
74 sourceType: sourceType, 77 sourceType: sourceType,
75 openId: openId, 78 openId: openId,
  79 + nickname: nickname,
76 isReg: isReg, 80 isReg: isReg,
77 areaCode: areaCode, 81 areaCode: areaCode,
78 phoneNum: phoneNum, 82 phoneNum: phoneNum,
@@ -90,6 +94,7 @@ const bind = { @@ -90,6 +94,7 @@ const bind = {
90 let openId = req.body.openId; 94 let openId = req.body.openId;
91 let areaCode = req.body.areaCode || '86'; 95 let areaCode = req.body.areaCode || '86';
92 let sourceType = req.body.sourceType; 96 let sourceType = req.body.sourceType;
  97 + let nickname = req.body.nickname;
93 98
94 if (_.isNumber(parseInt(phoneNum, 0)) && openId && areaCode && sourceType) { 99 if (_.isNumber(parseInt(phoneNum, 0)) && openId && areaCode && sourceType) {
95 req.ctx(BindServiceModel).bindCheck(phoneNum, openId, sourceType, areaCode).then(result => { 100 req.ctx(BindServiceModel).bindCheck(phoneNum, openId, sourceType, areaCode).then(result => {
@@ -104,6 +109,7 @@ const bind = { @@ -104,6 +109,7 @@ const bind = {
104 is_register: result.data.is_register, 109 is_register: result.data.is_register,
105 openId: openId, 110 openId: openId,
106 sourceType: sourceType, 111 sourceType: sourceType,
  112 + nickname: nickname,
107 areaCode: areaCode, 113 areaCode: areaCode,
108 phoneNum: phoneNum 114 phoneNum: phoneNum
109 }); 115 });
@@ -179,13 +185,15 @@ const bind = { @@ -179,13 +185,15 @@ const bind = {
179 let areaCode = req.body.areaCode || '86'; 185 let areaCode = req.body.areaCode || '86';
180 let sourceType = req.body.sourceType; 186 let sourceType = req.body.sourceType;
181 let code = req.body.code; 187 let code = req.body.code;
  188 + let nickname = req.body.nickname;
182 let password = req.body.password || ''; 189 let password = req.body.password || '';
183 let from = req.cookies.from || 'yohobuy'; 190 let from = req.cookies.from || 'yohobuy';
184 191
185 - if (_.isNumber(parseInt(phoneNum, 0)) && openId && sourceType && areaCode && code) { 192 + if (_.isNumber(parseInt(phoneNum, 0)) && openId && sourceType && nickname && areaCode && code) {
186 req.ctx(BindServiceModel).checkBindCode(areaCode, phoneNum, code).then(result => { 193 req.ctx(BindServiceModel).checkBindCode(areaCode, phoneNum, code).then(result => {
187 if (result && result.code && result.code === 200) { 194 if (result && result.code && result.code === 200) {
188 - return req.ctx(BindServiceModel).bindMobile(openId, sourceType, phoneNum, areaCode, password, from); 195 + return req.ctx(BindServiceModel).bindMobile(openId, sourceType,
  196 + phoneNum, areaCode, password, from, nickname);
189 } else { 197 } else {
190 return { code: 400, message: '短信验证码错误', data: '' }; 198 return { code: 400, message: '短信验证码错误', data: '' };
191 } 199 }
@@ -248,6 +256,7 @@ const bind = { @@ -248,6 +256,7 @@ const bind = {
248 passwordPage: (req, res) => { 256 passwordPage: (req, res) => {
249 let openId = req.query.openId; 257 let openId = req.query.openId;
250 let sourceType = req.query.sourceType; 258 let sourceType = req.query.sourceType;
  259 + let nickname = req.query.nickname;
251 let areaCode = req.query.areaCode || '86'; 260 let areaCode = req.query.areaCode || '86';
252 let phoneNum = req.query.phoneNum; 261 let phoneNum = req.query.phoneNum;
253 let code = req.query.code; 262 let code = req.query.code;
@@ -260,6 +269,7 @@ const bind = { @@ -260,6 +269,7 @@ const bind = {
260 showHeaderImg: true, // 控制显示头部图片 269 showHeaderImg: true, // 控制显示头部图片
261 isPassportPage: true, // 模板中模块标识 270 isPassportPage: true, // 模板中模块标识
262 sourceType: sourceType, // 第三方登录来源 271 sourceType: sourceType, // 第三方登录来源
  272 + nickname: nickname,
263 openId: openId, // openId 273 openId: openId, // openId
264 areaCode: areaCode, // 国别码 274 areaCode: areaCode, // 国别码
265 phoneNum: phoneNum, // 国别码 275 phoneNum: phoneNum, // 国别码
@@ -51,6 +51,7 @@ function doPassportCallback(openId, nickname, sourceType, req, res) { @@ -51,6 +51,7 @@ function doPassportCallback(openId, nickname, sourceType, req, res) {
51 return helpers.urlFormat('/passport/bind/index', { 51 return helpers.urlFormat('/passport/bind/index', {
52 openId: openId, 52 openId: openId,
53 sourceType: sourceType, 53 sourceType: sourceType,
  54 + nickname: nickname,
54 refer: refer 55 refer: refer
55 }); 56 });
56 } else if (result.code === 200 && result.data.uid) { 57 } else if (result.code === 200 && result.data.uid) {
@@ -21,6 +21,7 @@ let sourceType = $('#sourceType').val(), @@ -21,6 +21,7 @@ let sourceType = $('#sourceType').val(),
21 openId = $('#openId').val(), 21 openId = $('#openId').val(),
22 phoneNum = $('#phone-num').val(), 22 phoneNum = $('#phone-num').val(),
23 areaCode = $('#area-code').val().replace('+', ''), 23 areaCode = $('#area-code').val().replace('+', ''),
  24 + nickname = $('#nickname').val(),
24 code = $('#code').val(); 25 code = $('#code').val();
25 26
26 function startBind(password) { 27 function startBind(password) {
@@ -32,6 +33,7 @@ function startBind(password) { @@ -32,6 +33,7 @@ function startBind(password) {
32 phoneNum: phoneNum, 33 phoneNum: phoneNum,
33 openId: openId, 34 openId: openId,
34 sourceType: sourceType, 35 sourceType: sourceType,
  36 + nickname: nickname,
35 password: password, 37 password: password,
36 code: code 38 code: code
37 }, 39 },