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

@@ -443,13 +443,13 @@ class Helpers
      * @param string $areaMobile
      * @param string $areaMobile
      * @return boolean
      * @return boolean
      */
      */
-    public static function verifyAreaMobile($areaMobile)
+    public static function verifyAreaMobile($areaMobile, $area)
     {
     {
         if (empty($areaMobile)) {
         if (empty($areaMobile)) {
             return false;
             return false;
         }
         }
         if (!strpos($areaMobile, '-')) {
         if (!strpos($areaMobile, '-')) {
-            return self::areaMobielVerify($areaMobile);
+            return self::areaMobielVerify($areaMobile, $area);
         } else {
         } else {
             $mobileData = explode('-', $areaMobile);
             $mobileData = explode('-', $areaMobile);
             if (count($mobileData) != 2) {
             if (count($mobileData) != 2) {

@@ -113,7 +113,7 @@ class LoginController extends AbstractAction
 
 
             /* 判断参数是否有效 */
             /* 判断参数是否有效 */
             $verifyEmail = Helpers::verifyEmail($profile);
             $verifyEmail = Helpers::verifyEmail($profile);
-            $verifyMobile = ($area === '86') ? Helpers::verifyMobile($profile) : Helpers::verifyAreaMobile($profile);
+            $verifyMobile = ($area === '86') ? Helpers::verifyMobile($profile) : Helpers::verifyAreaMobile($profile, $area);
             if (!$verifyEmail && !$verifyMobile) {
             if (!$verifyEmail && !$verifyMobile) {
                 break;
                 break;
             }
             }