update for bind mobile. code review by LZF

@@ -9,6 +9,7 @@ var $phoneNum = $('#phone-num'),
     $countrySelect = $('#country-select'),
     $countrySelect = $('#country-select'),
     $areaCode = $('#area-code'),
     $areaCode = $('#area-code'),
     $openId = $('#openId'),
     $openId = $('#openId'),
+    $nickname = $('#nickname'),
     $sourceType = $('#sourceType'),
     $sourceType = $('#sourceType'),
     $btnNext = $('#btn-next');
     $btnNext = $('#btn-next');
 
 
@@ -25,10 +26,16 @@ function nextStep(url, mobileNo, areaCode) {
         url: '/passport/bind/sendBindMsg',
         url: '/passport/bind/sendBindMsg',
         data: {
         data: {
             phoneNum: mobileNo,
             phoneNum: mobileNo,
-            areaCode: areaCode
+            areaCode: areaCode.replace('+', '')
+        },
+        success: function(res) {
+            console.log(res.data);
+            location.href = url;
+        },
+        error: function() {
+            tip.show('出错了，请重试！');
         }
         }
     });
     });
-    location.href = url;
 }
 }
 
 
 api.selectCssHack($('#country-select'));
 api.selectCssHack($('#country-select'));
@@ -50,6 +57,7 @@ $countrySelect.change(function() {
 $btnNext.on('touchstart', function() {
 $btnNext.on('touchstart', function() {
     var pn = trim($phoneNum.val()),
     var pn = trim($phoneNum.val()),
         openId = trim($openId.val()),
         openId = trim($openId.val()),
+        nickname = trim($nickname.val()),
         sourceType = trim($sourceType.val()),
         sourceType = trim($sourceType.val()),
         areaCode = $countrySelect.val();
         areaCode = $countrySelect.val();
 
 
@@ -63,9 +71,10 @@ $btnNext.on('touchstart', function() {
             type: 'POST',
             type: 'POST',
             data: {
             data: {
                 areaCode: areaCode.replace('+', ''),
                 areaCode: areaCode.replace('+', ''),
-                mobile: pn,
+                phoneNum: pn,
                 openId: openId,
                 openId: openId,
-                sourceType: sourceType
+                sourceType: sourceType,
+                nickname: nickname
             },
             },
             success: function(res) {
             success: function(res) {
                 console.log(res);
                 console.log(res);

@@ -14,6 +14,40 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var trim = $.trim;
 var showErrTip = tip.show;
 var showErrTip = tip.show;
 
 
+var nickname = $('#nickname').val(),
+    sourceType = $('#sourceType').val(),
+    openId = $('#openId').val(),
+    phoneNum = $('#phone-num').val(),
+    areaCode = $('#area-code').val().replace('+', '');
+
+function startBind(password) {
+        $.ajax({
+            url: '/passport/bind/bindMobile',
+            type: 'post',
+            data: {
+                areaCode: areaCode.replace('+', ''),
+                phoneNum: phoneNum,
+                openId: openId,
+                sourceType: sourceType,
+                nickname: nickname,
+                password: password
+            },
+            success: function(res) {
+                if (res.code === 200) {
+                    tip.show('登录成功');
+                    setTimeout(function() {
+                        location.href = res.data.refer;
+                    }, 2000);
+                } else {
+                   tip.show(res.message);
+                }
+            },
+            error: function(err) {
+                tip.show('登录失败,请重试！');
+            }
+        });
+    }
+
 api.bindEyesEvt({
 api.bindEyesEvt({
     status: 'open' //默认眼睛打开
     status: 'open' //默认眼睛打开
 });
 });
@@ -36,35 +70,6 @@ $btnSure.on('touchstart', function() {
     if (api.pwdValidate(pwd) === false) {
     if (api.pwdValidate(pwd) === false) {
         showErrTip('密码6-20位，请重新输入');
         showErrTip('密码6-20位，请重新输入');
     } else {
     } else {
-        $.ajax({
-            type: 'POST',
-            url: '/passport/reg/setpassword',
-            data: {
-                password: pwd,
-                phoneNum: $('#phone-num').val(),
-                areaCode: $('#area-code').val(),
-                token: $('#token').val()
-            },
-            success: function(data) {
-                var res;
-
-                if (data.code === 200) {
-                    res = data.data;
-                    showErrTip('注册成功');
-
-                    $.ajax({
-                        url: res.session,
-                        dataType: 'jsonp'
-                    });
-
-                    //1000ms后跳转页面
-                    setTimeout(function() {
-                        location.href = res.href;
-                    }, 1000);
-                } else {
-                    showErrTip(data.message);
-                }
-            }
-        });
+       startBind(pwd);
     }
     }
-});
+});

@@ -9,6 +9,10 @@ module.exports = function(useInRegister, useForBind) {
     var $captcha = $('#captcha'),
     var $captcha = $('#captcha'),
         $btnNext = $('#btn-next'),
         $btnNext = $('#btn-next'),
         $captchaTip = $('#captcha-tip'),
         $captchaTip = $('#captcha-tip'),
+        isReg = parseInt($('#isReg').val()),
+        nickname = $('#nickname').val(),
+        sourceType = $('#sourceType').val(),
+        openId = $('#openId').val(),
         phoneNum = $('#phone-num').val(),
         phoneNum = $('#phone-num').val(),
         areaCode = $('#area-code').val().replace('+', '');
         areaCode = $('#area-code').val().replace('+', '');
 
 
@@ -20,6 +24,34 @@ module.exports = function(useInRegister, useForBind) {
 
 
     var urlMid = useInRegister ? 'reg' : 'back';
     var urlMid = useInRegister ? 'reg' : 'back';
 
 
+    function startBind() {
+        $.ajax({
+            url: '/passport/bind/bindMobile',
+            type: 'post',
+            data: {
+                areaCode: areaCode.replace('+', ''),
+                phoneNum: phoneNum,
+                openId: openId,
+                sourceType: sourceType,
+                nickname: nickname,
+                password: ''
+            },
+            success: function(res) {
+                if (res.code === 200) {
+                    tip.show('登录成功');
+                    setTimeout(function() {
+                        location.href = res.data.refer;
+                    }, 2000);
+                } else {
+                   tip.show(res.message);
+                }
+            },
+            error: function(err) {
+                tip.show('登录失败,请重试！');
+            }
+        });
+    }
+
     function countDown() {
     function countDown() {
         var count = 59,
         var count = 59,
             itime;
             itime;
@@ -77,7 +109,7 @@ module.exports = function(useInRegister, useForBind) {
 
 
         $.ajax({
         $.ajax({
             type: 'POST',
             type: 'POST',
-            url: useForBind ? '/passport/bind/sendBindMsg' : '/passport/' + urlMid + '/verifycode',
+            url: useForBind ? '/passport/bind/checkBindMsg' : '/passport/' + urlMid + '/verifycode',
             data: {
             data: {
                 phoneNum: phoneNum,
                 phoneNum: phoneNum,
                 areaCode: areaCode,
                 areaCode: areaCode,
@@ -85,13 +117,22 @@ module.exports = function(useInRegister, useForBind) {
                 token: $('#token').val()
                 token: $('#token').val()
             },
             },
             success: function(data) {
             success: function(data) {
-                if (data.code === 200) {
-                    location.href = data.data;
-                } else {
+                    if (data.code === 200) {
+                        if (useForBind) {
+                            if (isReg) {
+                                startBind();
+                            } else {
+                                location.href = '/passport/bind/password?phoneNum=' + phoneNum + '&areaCode=' + areaCode + '&openId=' + openId + '&sourceType=' + sourceType + '&nickname=' + nickname;
+                            }
+                        }  else {
+                            location.href = data.data;
+                        }
+                    } else {
+
+                        //验证码不正确，显示提示
+                        showErrTip(data.message);
+                    }
 
 
-                    //验证码不正确，显示提示
-                    showErrTip(data.message);
-                }
             }
             }
         });
         });
     });
     });

 {{> layout/header}}
 {{> layout/header}}
 <div class="reg-code-page passport-page yoho-page">
 <div class="reg-code-page passport-page yoho-page">
+    <input type="hidden" id="isReg" value="{{isReg}}">
+    <input type="hidden" id="openId" value="{{openId}}">
+    <input type="hidden" id="sourceType" value="{{sourceType}}">
+    <input type="hidden" id="nickname" value="{{nickname}}">
     {{> passport/code}}
     {{> passport/code}}
 </div>
 </div>
 {{> layout/footer}}
 {{> layout/footer}}

@@ -2,6 +2,7 @@
 <div class="bind-page passport-page yoho-page">
 <div class="bind-page passport-page yoho-page">
     <input type="hidden" id="openId" value="{{openId}}">
     <input type="hidden" id="openId" value="{{openId}}">
     <input type="hidden" id="sourceType" value="{{sourceType}}">
     <input type="hidden" id="sourceType" value="{{sourceType}}">
+    <input type="hidden" id="nickname" value="{{nickname}}">
     {{> passport/header}}
     {{> passport/header}}
     <div class="content">
     <div class="content">
         {{> passport/country_list}}
         {{> passport/country_list}}

 {{> layout/header}}
 {{> layout/header}}
 <div class="bind-password-page passport-page yoho-page">
 <div class="bind-password-page passport-page yoho-page">
+    <input type="hidden" id="openId" value="{{openId}}">
+    <input type="hidden" id="sourceType" value="{{sourceType}}">
+    <input type="hidden" id="nickname" value="{{nickname}}">
     {{> passport/header}}
     {{> passport/header}}
     <div class="content">
     <div class="content">
         <div class="input-container row has-eye">
         <div class="input-container row has-eye">