修改产品首页接口，小程序首页轮训接口

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

@@ -15,18 +15,10 @@ class ClassifyController extends Controller
     }
 
     public function setHome(Request $request) {
-        $top1 = $request->input("top1");
-        $top2 = $request->input("top2");
-        $top3 = $request->input("top3");
-        $bottom = $request->input("bottom");
         $introduce = $request->input("introduce");
 
-        if($top1 && $top2 && $top3 && $bottom && $introduce) {
+        if($introduce) {
             $homePage = HomePage::find(1);
-            $homePage->top1 = $top1;
-            $homePage->top2 = $top2;
-            $homePage->top3 = $top3;
-            $homePage->bottom = $bottom;
             $homePage->introduce = $introduce;
             $homePage->save();
 
@@ -49,39 +41,28 @@ class ClassifyController extends Controller
      */
     public function home(Request $request)
     {
+        $top = Classify::where("location", "top")->orderBy("updated_at", "desc")->limit(3)->get()->toArray();
+        $bottom = Classify::where("location", "bottom")->orderBy("updated_at", "desc")->first();
         $homePage = HomePage::find(1);
-        $top1 = Classify::find($homePage->top1);
-        $top2 = Classify::find($homePage->top2);
-        $top3 = Classify::find($homePage->top3);
-        $bottom = Classify::find($homePage->bottom);
-        $introduce = $homePage->introduce;
+        $tops = array_map(function ($t) {
+            return [
+                "id" => $t["id"],
+                "server" => $t["server"],
+                "content" => $t["content"],
+                "photo" => $t["photo"],
+                "location" => $t["location"]
+            ];
+        }, $top);
+
         return Response()->json([
-            "top" => [
-                [
-                    "id" => $top1["id"],
-                    "server" => $top1["server"],
-                    "content" => $top1["content"],
-                    "photo" => $top1["photo"],
-                ],
-                [
-                    "id" => $top2["id"],
-                    "server" => $top2["server"],
-                    "content" => $top2["content"],
-                    "photo" => $top2["photo"],
-                ],
-                [
-                    "id" => $top3["id"],
-                    "server" => $top3["server"],
-                    "content" => $top3["content"],
-                    "photo" => $top3["photo"],
-                ]
-            ],
-            "introduce" => $introduce,
+            "top" => $tops,
+            "introduce" => $homePage->introduce,
             "bottom" => [
                 "id" => $bottom["id"],
                 "server" => $bottom["server"],
                 "content" => $bottom["content"],
                 "photo" => $bottom["photo"],
+                "location" => $bottom["location"]
             ]
         ]);
     }

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

@@ -308,6 +308,7 @@ class CommonController extends Controller
             $record = $this->getRecord($order_type, $id);
             if ($record) {
                 $record->price = $price;
+                $record->status = 1;
                 $record->save();
                 return Response()->json([
                     "status" => 0,

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

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\OptionValue;
+use Illuminate\Http\Request;
+use App\Models\OptionKey;
+
+class OptionController extends Controller
+{
+
+    public function option_keys(Request $request,$classify_id) {
+        $classify_id = $request->route("classify_id");
+        if($classify_id) {
+            $options = OptionKey::with("optionValues")->where("classify_id", $classify_id)->get()->toArray();
+            return Response()->json([
+                "status" => 0,
+                "data" => $options
+            ]);
+
+        }
+    }
+
+    public function option_key(Request $request, $id) {
+
+        $option_key_id = $request->route("id");
+        if($option_key_id) {
+            $option_value = OptionKey::with("optionValues")->find($option_key_id);
+            return Response()->json([
+                "status" => 0,
+                "data" => $option_value
+            ]);
+        }
+    }
+
+    public function option_value(Request $request, $id) {
+
+        $option_value_id = $request->route("id");
+        if($option_value_id) {
+            $option_value = OptionValue::with("optionKey")->find($option_value_id);
+            return Response()->json([
+                "status" => 0,
+                "data" => $option_value
+            ]);
+        }
+    }
+}

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

@@ -101,28 +101,18 @@ class ProductController extends Controller
      */
     public function home(Request $request)
     {
-        $homePage = ProductPage::find(1);
-        $top1 = Product::find($homePage->top1);
-        $top2 = Product::find($homePage->top2);
-        $top3 = Product::find($homePage->top3);
+        $top = Product::where("show", 1)->orderBy("updated_at", "desc")->limit(3)->get()->toArray();
+
+        $tops = array_map(function ($t) {
+            return [
+                "id" => $t["id"],
+                "name" => $t["name"],
+                "photo" => $t["photo"]
+            ];
+        }, $top);
+
         return Response()->json([
-            "data" => [
-                [
-                    "id" => $top1["id"],
-                    "name" => $top1["name"],
-                    "photo" => $top1["photo"]
-                ],
-                [
-                    "id" => $top2["id"],
-                    "name" => $top2["name"],
-                    "photo" => $top2["photo"]
-                ],
-                [
-                    "id" => $top3["id"],
-                    "name" => $top3["name"],
-                    "photo" => $top3["photo"]
-                ],
-            ],
+            "data" => $tops,
             "status" => 0,
         ]);
     }

manage-server/app/Models/Classify.php

@@ -23,4 +23,9 @@ class Classify extends Model
         $this->children[$key] = $value;
         return;
     }
+
+
+    public function options() {
+        return $this->hasMany('App\Models\OptionKey', 'classify_id')->withDefault();
+    }
 }

manage-server/app/Models/HomePage.php

@@ -6,11 +6,9 @@ use Illuminate\Database\Eloquent\Model;
 
 class HomePage extends Model
 {
+    public $timestamps = false;
+
     protected $fillable = [
-        'top1',
-        'top2',
-        'top3',
         'introduce',
-        'bottom'
     ];
 }

manage-server/app/Models/OptionKey.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OptionKey extends Model
+{
+    public $timestamps = false;
+
+    protected $fillable = [
+        'key',
+        'classify_id',
+        'type'
+    ];
+
+
+    public function optionValues() {
+        return $this->hasMany('App\Models\OptionValue', 'option_key_id', 'id');
+    }
+}

manage-server/app/Models/OptionValue.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OptionValue extends Model
+{
+    public $timestamps = false;
+
+    protected $fillable = [
+        'value',
+        'option_key_id'
+    ];
+
+    public function optionKey () {
+
+        return $this->belongsTo('App\Models\OptionKey', 'option_key_id')->withDefault();
+    }
+}

manage-server/database/migrations/2018_09_23_070729_create_option_keys_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateOptionKeysTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('option_keys', function (Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('option_keys');
+    }
+}

manage-server/database/migrations/2018_09_23_070740_create_option_values_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateOptionValuesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('option_values', function (Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('option_values');
+    }
+}

manage-server/routes/api.php

@@ -20,15 +20,6 @@ Route::middleware('auth:api')->get('/user', function (Request $request) {
 
 Route::post('/login', 'CommonController@login');
 
-Route::get('/server_info/{id}', 'ClassifyController@server_content');
-Route::get('/classify/{id}', 'ClassifyController@get');
-Route::post('/upload', 'CommonController@upload');
-Route::post('/server/store', 'ServerInfoController@store');
-Route::get('/{order_type}/{order_id}/comments', 'CommonController@comments');
-Route::post('/{order_type}/status', 'CommonController@status');
-Route::get('/{order_type}/{id}', 'CommonController@get')->where('id', '[0-9]+');
-Route::delete('/{order_type}/{id}', 'CommonController@delete')->where('id', '[0-9]+');
-
 Route::get('/classify', 'ClassifyController@list');
 
 Route::get('/campaigns', 'CampaignController@list');
@@ -48,10 +39,24 @@ Route::post('/campaign/store', 'CampaignController@store');
 Route::post('/product/store', 'ProductController@store');
 Route::get('/product/home', 'ProductController@home');
 
-
 Route::post('/payments/wechat-notify', 'PaymentController@notify');
 
 
+Route::get('/classify/{classify_id}/options', 'OptionController@option_keys');
+Route::get('/option/key/{id}', 'OptionController@option_key');
+Route::get('/option/value/{id}', 'OptionController@option_value');
+
+
+Route::get('/server_info/{id}', 'ClassifyController@server_content');
+Route::get('/classify/{id}', 'ClassifyController@get');
+Route::post('/upload', 'CommonController@upload');
+Route::post('/server/store', 'ServerInfoController@store');
+Route::get('/{order_type}/{order_id}/comments', 'CommonController@comments');
+Route::post('/{order_type}/status', 'CommonController@status');
+Route::get('/{order_type}/{id}', 'CommonController@get')->where('id', '[0-9]+');
+Route::delete('/{order_type}/{id}', 'CommonController@delete')->where('id', '[0-9]+');
+
+
 Route::middleware(['token'])->group(function () {
 
     Route::get('/my/orders', 'CommonController@orders');