Merge remote-tracking branch 'remotes/origin/master' into hotfix/gNmPrcs

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.2.20",
+  "version": "5.2.21",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -210,7 +210,7 @@ Filter.prototype = {
             return data;
             return data;
         }
         }
         return data.filter(function(item) {
         return data.filter(function(item) {
-            regex = new RegExp('^' + key, 'i');
+            regex = new RegExp(key, 'i');
             return regex.test(item[that.__feild__]);
             return regex.test(item[that.__feild__]);
         });
         });
     },
     },

@@ -75,7 +75,7 @@ $loginBtn.on('touchstart', function() {
 
 
     $loginBtn.text('正在登录...').addClass('disable');
     $loginBtn.text('正在登录...').addClass('disable');
 
 
-    if (api.phoneRegx[areaCode].test(pn) && api.pwdValidate(pwd)) {
+    if ((api.phoneRegx[areaCode].test(pn) || areaCode !== '+86') && api.pwdValidate(pwd)) {
         $.ajax({
         $.ajax({
             type: 'POST',
             type: 'POST',
             url: '/passport/login/auth',
             url: '/passport/login/auth',

@@ -86,7 +86,7 @@ $btnNext.on('touchstart', function() {
     }
     }
 
 
 
 
-    if (api.phoneRegx[areaCode].test(pn)) {
+    if (api.phoneRegx[areaCode].test(pn) || areaCode !== '+86') {
 
 
         requested = true;
         requested = true;