Merge branch 'jielong' of https://git.yidian-inc.com:8021/bp/goods into jielong

application/services/user/UserService.php

@@ -164,7 +164,7 @@ class UserService
         }
         $userInfo['user_id'] = $userId;
         $userInfo['phone'] = $phoneNumber;
-        $userInfo['is_pop_up'] = !empty($user) ? 0 : 1;
+        $userInfo['is_pop_up'] = !empty($user) ? 2 : 1;
         $userInfo['pop_up_text'] = "";
         return $userInfo;
     }