Merge branch 'master' of http://git.sotype.com/chenxiqiang/houseworking

manage-server/app/Http/Controllers/CommonController.php

@@ -26,16 +26,21 @@ class CommonController extends Controller
         $miniProgram = app("wechat.mini_program");
 
         $auth = $miniProgram->auth->session($code);
-        if(isset($auth->openid)) {
+        if(array_key_exists("openid", $auth)) {
             return response()->json([
                 "status" => 0,
                 "data" => [
                     "token" => sha1($auth->openid . $auth->access_token)
                 ]]);
-        } else if(isset($auth->errcode)){
+        } else if(array_key_exists("errcode", $auth)){
             return response()->json([
                 "status" => $auth->errcode,
                 "message" => $auth->errmsg]);
+        } else {
+            return response()->json([
+                "status" => -1, 
+                "data" => $auth
+            ]);
         }
     }