Showing
3 changed files
with
37 additions
and
5 deletions
@@ -140,10 +140,10 @@ const bind = { | @@ -140,10 +140,10 @@ const bind = { | ||
140 | return {code: 201, message: result.message, data: {user: user}}; | 140 | return {code: 201, message: result.message, data: {user: user}}; |
141 | }); | 141 | }); |
142 | } else if (result.code === 200 && result.data.is_register === 3) { | 142 | } else if (result.code === 200 && result.data.is_register === 3) { |
143 | - let nextUrl = helpers.urlFormat('/passport/thirdlogin/relate'); | ||
144 | - | ||
145 | // 关联流程 | 143 | // 关联流程 |
146 | - return {code: 203, message: result.message, data: {next: nextUrl}}; | 144 | + return userService.getUserInfo(area, mobile).then(user => { |
145 | + return {code: 203, message: result.message, data: {user: user}}; | ||
146 | + }); | ||
147 | } else if (result.code === 506 || result.code === 505) { | 147 | } else if (result.code === 506 || result.code === 505) { |
148 | return userService.getUserInfo(area, mobile).then(user => { | 148 | return userService.getUserInfo(area, mobile).then(user => { |
149 | // 绑定流程:code=506 手机号码注册过,而且该手机号码也已经绑定过该类型第三方 | 149 | // 绑定流程:code=506 手机号码注册过,而且该手机号码也已经绑定过该类型第三方 |
@@ -133,4 +133,23 @@ | @@ -133,4 +133,23 @@ | ||
133 | <div class="backdrop" style="display:none"></div> | 133 | <div class="backdrop" style="display:none"></div> |
134 | </div> | 134 | </div> |
135 | 135 | ||
136 | +<div id="norelate" style="display:none"> | ||
137 | + <div class="mask"> | ||
138 | + <div class="bindconfrimwrapper"> | ||
139 | + <div class="topwrapper"> | ||
140 | + <img src="" alt="" class="userphoto" id="userphoto-relate"> | ||
141 | + <span class="username"> | ||
142 | + 用户名: <i id="username-relate"></i> | ||
143 | + </span> | ||
144 | + </div> | ||
145 | + <h2 class="usertaginfo"> | ||
146 | + 手机号 | ||
147 | + <span id="registphone-relate"></span> | ||
148 | + 已经被以上账户注册。 | ||
149 | + </h2> | ||
150 | + <h1 class="usertagremind">您可以更换一个新的手机号码绑定该账号,也可以使用该手机号码直接登录</h1> | ||
151 | + </div> | ||
152 | + </div> | ||
153 | +</div> | ||
154 | + | ||
136 | {{> gee-captcha}} | 155 | {{> gee-captcha}} |
@@ -381,8 +381,21 @@ function nextStep() { | @@ -381,8 +381,21 @@ function nextStep() { | ||
381 | circleTime($('#mobile').val()); | 381 | circleTime($('#mobile').val()); |
382 | } else if (data.code === 203) { | 382 | } else if (data.code === 203) { |
383 | // 已注册 可关联 | 383 | // 已注册 可关联 |
384 | - $('#bindmobileform').attr('action', data.data.next); | ||
385 | - $('#bindmobileform').submit(); | 384 | + |
385 | + $('#registphone-relate').text(mobile); | ||
386 | + $('#username-relate').text(username); | ||
387 | + if (headImg === '') { | ||
388 | + $('#userphoto-relate').attr('src', 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/' + | ||
389 | + '01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100'); | ||
390 | + } else { | ||
391 | + $('#userphoto-relate').attr('src', headImg); | ||
392 | + } | ||
393 | + | ||
394 | + $('#norelate .mask').css({ | ||
395 | + 'padding-top': winHeight > 440 ? winHeight / 2 : 217 | ||
396 | + }); | ||
397 | + $('#norelate').show(); | ||
398 | + | ||
386 | } else if (data.code === 205) { | 399 | } else if (data.code === 205) { |
387 | // 未注册 不可关联 | 400 | // 未注册 不可关联 |
388 | username = data.data.user.username; | 401 | username = data.data.user.username; |
-
Please register or login to post a comment