Merge branch 'fix/issue' into 'develop'

修复注册和绑定手机号时，重复请求验证码的bug

See merge request !56

@@ -20,14 +20,14 @@ var api = require('../api'),
 var trim = $.trim;
 var trim = $.trim;
 var showErrTip = tip.show;
 var showErrTip = tip.show;
 
 
-var requesting = false;
+var requested = false;
 
 
 function nextStep(url, mobileNo, areaCode) {
 function nextStep(url, mobileNo, areaCode) {
-    if (requesting) {
+    if (requested) {
         return false;
         return false;
     }
     }
 
 
-    requesting = true;
+    requested = true;
 
 
     $.ajax({
     $.ajax({
         type: 'POST',
         type: 'POST',
@@ -39,13 +39,10 @@ function nextStep(url, mobileNo, areaCode) {
         success: function(res) {
         success: function(res) {
             console.log(res.data);
             console.log(res.data);
             location.href = url;
             location.href = url;
-
-            requesting = false;
         },
         },
         error: function() {
         error: function() {
             tip.show('出错了，请重试！');
             tip.show('出错了，请重试！');
-
-            requesting = false;
+            requested = false;
         }
         }
     });
     });
 }
 }

@@ -16,6 +16,8 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var trim = $.trim;
 var showErrTip = tip.show;
 var showErrTip = tip.show;
 
 
+var requested = false;
+
 api.selectCssHack($('#country-select'));
 api.selectCssHack($('#country-select'));
 
 
 api.bindClearEvt();
 api.bindClearEvt();
@@ -40,7 +42,15 @@ $btnNext.on('touchstart', function() {
         return;
         return;
     }
     }
 
 
+    if (requested) {
+        return false;
+    }
+
+
     if (api.phoneRegx[areaCode].test(pn)) {
     if (api.phoneRegx[areaCode].test(pn)) {
+
+        requested = true;
+
         $.ajax({
         $.ajax({
             url: '/passport/reg/verifymobile',
             url: '/passport/reg/verifymobile',
             type: 'POST',
             type: 'POST',
@@ -53,10 +63,15 @@ $btnNext.on('touchstart', function() {
                     location.href = data.data;
                     location.href = data.data;
                 } else {
                 } else {
                     showErrTip(data.message);
                     showErrTip(data.message);
+                    requested = false;
                 }
                 }
+            },
+            error: function(err) {
+                showErrTip('出错了，请重试');
+                requested = false;
             }
             }
         });
         });
     } else {
     } else {
         showErrTip('手机号格式不正确，请重新输入');
         showErrTip('手机号格式不正确，请重新输入');
     }
     }
-});
+});