Merge branch 'feature/remove-relate' into relesae/6.0.2

@@ -140,10 +140,10 @@ const bind = {
                     return {code: 201, message: result.message, data: {user: user}};
                 });
             } else if (result.code === 200 && result.data.is_register === 3) {
-                let nextUrl = helpers.urlFormat('/passport/thirdlogin/relate');
-
                 // 关联流程
-                return {code: 203, message: result.message, data: {next: nextUrl}};
+                return userService.getUserInfo(area, mobile).then(user => {
+                    return {code: 203, message: result.message, data: {user: user}};
+                });
             } else if (result.code === 506 || result.code === 505) {
                 return userService.getUserInfo(area, mobile).then(user => {
                     // 绑定流程：code=506 手机号码注册过，而且该手机号码也已经绑定过该类型第三方

@@ -133,4 +133,27 @@
     <div class="backdrop" style="display:none"></div>
 </div>
 
+<div id="norelate" style="display:none">
+    <div class="mask">
+        <div class="bindconfrimwrapper">
+            <div class="topwrapper">
+                <img src="" alt="" class="userphoto" id="userphoto-relate">
+                <span class="username">
+                    用户名: <i id="username-relate"></i>
+                </span>
+            </div>
+            <h2 class="usertaginfo">
+                手机号
+                <span id="registphone-relate"></span>
+                已经被以上账户注册。
+            </h2>
+            <h1 class="usertagremind">您可以更换一个新的手机号码绑定该账号，也可以使用该手机号码直接登录</h1>
+            <div class="gobindbottomwrapper">
+                <a href="javascript:;" class="logindirectly" id="yohobindbtn3">绑定其他手机号</a>
+                <a href="http://www.yohobuy.com/signin.html" class="logindirectly" id="logindirectly3">使用手机号直接登录</a>
+            </div>
+        </div>
+    </div>
+</div>
+
 {{> gee-captcha}}

@@ -12,30 +12,10 @@
                     已经被以上账户注册,点击
                     <a href="{{bindLogin}}" target="_blank">登录该账号</a>
                 </h3>
-                <p>您可以使用此号码进行账户关联或更换一个新的手机号码</p>
+                <p>您可以更换一个新的手机号码绑定该账号，</p><p>也可以使用该手机号码直接登录</p>
             </div>
             <div class="option-btn">
-                <a id="next-step-btn">关联此手机号</a>
                 <a href="{{changeHref}}">更换新手机号</a>
             </div>
-            <p class="remind-tips">注：关联的手机号码不能用来登录此账户</p>
 	    </div>
-        <div id="code-validate" class="code-validate hide">
-            <div class="action-link">短信验证码已发送至<span>{{phoneNum}}</span></div>
-            <div class="validate-wrapper action-link">
-                <div class="code-name">短信验证码</div>
-                <input type="text" class="msg-code">
-                <label class="get-code">免费获取短信验证码</label>
-                <label class="count-down"><span>60</span>秒后可重新操作</label>
-                <div class="code-error hide">
-                    <i></i>
-                    验证码错误
-                </div>
-            </div>
-            <div class="action-link">
-                <button id="relate-btn" class="relate-btn left">确定</button>
-                <a class="perv-step" href="javascript:void(0)">返回上一步</a>
-            </div>
-        </div>
-        <div id="hide-info" data-mobile="{{phoneNum}}" data-area="{{areaCode}}" data-refer="{{refer}}"></div>
 </div>

@@ -196,6 +196,12 @@ function yohoBindBtn() {
         $('#alreayregist').hide();
         $('.backdrop').hide();
     });
+
+    $(document).on('click', '#yohobindbtn3', function() {
+        $('.phonenum').val('');
+        $('#norelate').hide();
+        $('.backdrop').hide();
+    });
 }
 
 /**
@@ -381,8 +387,21 @@ function nextStep() {
                     circleTime($('#mobile').val());
                 } else if (data.code === 203) {
                     // 已注册 可关联
-                    $('#bindmobileform').attr('action', data.data.next);
-                    $('#bindmobileform').submit();
+
+                    $('#registphone-relate').text(mobile);
+                    $('#username-relate').text(username);
+                    if (headImg === '') {
+                        $('#userphoto-relate').attr('src', 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/' +
+                            '01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100');
+                    } else {
+                        $('#userphoto-relate').attr('src', headImg);
+                    }
+
+                    $('#norelate .mask').css({
+                        'padding-top': winHeight > 440 ? winHeight / 2 : 217
+                    });
+                    $('#norelate').show();
+
                 } else if (data.code === 205) {
                     // 未注册 不可关联
                     username = data.data.user.username;