Merge branch 'feature/fcs' into release/5.7

@@ -4,7 +4,7 @@
             <input type="hidden" name="id" value="{{address.addressId}}">
             <label class="username">
                 收 货 人 :
-                <input type="text" name="consignee" maxlength="20" value="{{address.consignee}}">
+                <input type="text" name="consignee" maxlength="21" value="{{address.consignee}}">
             </label>
             <label class="mobile">
                 联系电话:

@@ -5,7 +5,7 @@
     <form class="form edit-address" id="areaForm">
         <div class="form-group">
             <label for="username">收货人：</label>
-            <input name="username" type="text" value="{{consignee}}">
+            <input name="username" type="text" maxlength="21" value="{{consignee}}">
         </div>
          <div class="form-group">
             <label for="mobile">联系电话：</label>

@@ -20,6 +20,8 @@ let $addressForm = $('.edit-address'),
     isSubmiting,
     currentPage = 'edit';
 
+let $usernameInput = $addressForm.find('[name="consignee"]');
+
 let Vue = require('vue');
 let vueAddressAct = require('home/address/address-act.vue');
 
@@ -57,9 +59,16 @@ $backBtn.on('touchend', function(e) {
     }
 });
 
+$usernameInput.bind('input propertychange', function() {
+    if ($usernameInput.val().length > 20) {
+        tip.show('收货人姓名最多支持20个字');
+        $usernameInput.val($usernameInput.val() && $usernameInput.val().substring(0, 20));
+    }
+});
+
 // 提交表单请求
 $addressForm.on('submit', function() {
-    let username = $(this).find('[name="consignee"]').val();
+    let username = $usernameInput.val().replace(/(^\s+)|(\s+$)/g, '');
 
     if (isSubmiting) {
         return false;
@@ -75,13 +84,6 @@ $addressForm.on('submit', function() {
         return false;
     }
 
-    username = username.replace(/(^\s+)|(\s+$)/g, '');
-
-    if (username && username.length > 20) {
-        tip.show('收货人姓名最多支持20个字');
-        return false;
-    }
-
     if (username && !/^[\u4E00-\u9FA5A-Za-z0-9]+$/gi.test(username)) {
         tip.show('收货人姓名不支持特殊符号');
         return false;

@@ -12,6 +12,7 @@ let $btnSure = $('#btnSure');
 let $province = $('input[name=province]');
 let $provinceCode = $('input[name=provinceCode]');
 let $area = $('#area');
+let $usernameInput = $areaForm.find('input[name=username]');
 
 let vueAddressAct = require('home/address/address-act.vue');
 
@@ -34,18 +35,18 @@ $area.on('click', function() {
     addressVact.$children[0].show = true;
 });
 
+$usernameInput.bind('input propertychange', function() {
+    if ($usernameInput.val().length > 20) {
+        tip.show('收货人姓名最多支持20个字');
+        $usernameInput.val($usernameInput.val() && $usernameInput.val().substring(0, 20));
+    }
+});
+
 /**
  * 提交表单
  */
 $btnSure.on('click', function() {
-    let username = $areaForm.find('input[name=username]').val();
-
-    username = username.replace(/(^\s+)|(\s+$)/g, '');
-
-    if (username && username.length > 20) {
-        tip.show('收货人姓名最多支持20个字');
-        return false;
-    }
+    let username = $usernameInput.val().replace(/(^\s+)|(\s+$)/g, '');
 
     if (username && !/^[\u4E00-\u9FA5A-Za-z0-9]+$/gi.test(username)) {
         tip.show('收货人姓名不支持特殊符号');