Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -7,7 +7,7 @@ var $ = require('yoho.zepto');
 
 
 var $phoneNum = $('#phone-num'),
 var $phoneNum = $('#phone-num'),
     $countrySelect = $('#country-select'),
     $countrySelect = $('#country-select'),
-    $countryCode = $('#country-code'),
+    $areaCode = $('#area-code'),
     $btnNext = $('#btn-next');
     $btnNext = $('#btn-next');
 
 
 var api = require('../api');
 var api = require('../api');
@@ -29,23 +29,23 @@ $phoneNum.bind('input', function() {
 });
 });
 
 
 $countrySelect.change(function() {
 $countrySelect.change(function() {
-    $countryCode.text($countrySelect.val());
+    $areaCode.text($countrySelect.val());
 });
 });
 
 
 $btnNext.on('touchstart', function() {
 $btnNext.on('touchstart', function() {
     var pn = trim($phoneNum.val()),
     var pn = trim($phoneNum.val()),
-        country = $countrySelect.val();
+        areaCode = $countrySelect.val();
 
 
     if ($btnNext.hasClass('disable')) {
     if ($btnNext.hasClass('disable')) {
         return;
         return;
     }
     }
 
 
-    if (api.phoneRegx[country].test(pn)) {
+    if (api.phoneRegx[areaCode].test(pn)) {
         $.ajax({
         $.ajax({
             url: '/passport/reg/verifymobile',
             url: '/passport/reg/verifymobile',
             type: 'POST',
             type: 'POST',
             data: {
             data: {
-                areaCode: country.split('+')[1],
+                areaCode: areaCode.split('+')[1],
                 phoneNum: pn
                 phoneNum: pn
             },
             },
             success: function(data) {
             success: function(data) {

@@ -4,7 +4,7 @@
     <div class="content">
     <div class="content">
         {{> passport/country_list}}
         {{> passport/country_list}}
         <div class="input-container phone-container row has-clear">
         <div class="input-container phone-container row has-clear">
-            <span id="country-code" class="country-code">{{countryCode}}</span>
+            <span id="area-code" class="area-code">{{areaCode}}</span>
             <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
             <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
         </div>
         </div>
         <span id="btn-next" class="btn btn-next disable row">下一步</span>
         <span id="btn-next" class="btn btn-next disable row">下一步</span>