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

manage-server/.env

@@ -1,5 +1,5 @@
 APP_NAME=Laravel
-APP_ENV=production
+APP_ENV=local
 APP_KEY=base64:FfKu0AEc1IrobR6yoKsUoSbyU3VzSNXiP6LrcygS/OU=
 APP_DEBUG=true
 APP_URL=https://wechat.sotype.com

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

@@ -9,26 +9,11 @@ class ClassifyController extends Controller
 {
     public function list(Request $request)
     {
-        $classify_array = [];
         $classifys = Classify::all();
 
-        $root = new Classify();
-        $root->id = 0;
-        $root->pid = 0;
-        $root->name = '/';
-        $classify_array[0] = $root;
-
-        foreach ($classifys as $classify) {
-            $classify_array[$classify->id] = $classify;
-        }
-
-        foreach ($classify_array as $key=>$value) {
-            $classify_array[$value->getPid()]->children[$key] = $value;
-        }
-
         return response()->json([
             "status" => 0,
-            "data" => $root
+            "data" => $classifys
         ]);
     }
 }

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

@@ -26,8 +26,18 @@ class CommonController extends Controller
         $miniProgram = app("wechat.mini_program");
 
         $auth = $miniProgram->auth->session($code);
-        if($auth->open)
-        return response()->json($auth);
+        if(isset($auth->openid)) {
+            return response()->json([
+                "status" => 0,
+                "data" => [
+                    "openid" => $auth->openid,
+                    "session_key" => $auth->session_key
+                ]]);
+        } else if(isset($auth->errcode)){
+            return response()->json([
+                "status" => $auth->errcode,
+                "message" => $auth->errmsg]);
+        }
     }
 
     /**

manage-server/app/Models/Classify.php

@@ -12,4 +12,9 @@ class Classify extends Model
     ];
 
     protected $children = [];
+
+    public function setChildren($key, $value) {
+        $this->children[$key] = $value;
+        return;
+    }
 }

manage-server/database/migrations/2018_08_20_014238_create_classifys_table.php → manage-server/database/migrations/2018_08_20_075456_create_classifies_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateClassifysTable extends Migration
+class CreateClassifiesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,11 +13,11 @@ class CreateClassifysTable extends Migration
      */
     public function up()
     {
-        Schema::create('classifys', function (Blueprint $table) {
+        Schema::create('classifies', function (Blueprint $table) {
             $table->increments('id');
             $table->timestamps();
-            $table->unsignedInteger('pid'); // 父id
-            $table->string('name'); // 名称
+            $table->unsignedInteger('pid');
+            $table->string('name');
         });
     }
 
@@ -28,6 +28,6 @@ class CreateClassifysTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('classifys');
+        Schema::dropIfExists('classifies');
     }
 }