add sort

app/Http/Controllers/Admin/Product/CategoryController.php

@@ -28,7 +28,7 @@ class CategoryController extends Controller
         if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
         $query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));
         }else{
-            $query = $query->pushCriteria(new OrderBy('id','DESC'));
+            $query = $query->pushCriteria(new OrderBy('id','DESC'))->pushCriteria(new OrderBy('sort','DESC'));
         }
         $list = $query->paginate(10);
         return view('admin.product.category.index',compact('list'));

app/Http/Controllers/Admin/Product/InfoController.php

@@ -29,7 +29,7 @@ class InfoController extends Controller
         if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
         $query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));
         }else{
-            $query = $query->pushCriteria(new OrderBy('id','DESC'));
+            $query = $query->pushCriteria(new OrderBy('id','DESC'))->pushCriteria(new OrderBy('sort','DESC'));
         }
         $list = $query->paginate();
         return view('admin.product.info.index',compact('list'));

app/Http/Controllers/Api/V1/HomeController.php

@@ -158,7 +158,7 @@ class HomeController extends Controller
      */
     public function getProducts()
     {
-        $products = ProductCategoryModel::OrderBy('id', 'desc')->get(['id', 'name', 'img']);
+        $products = ProductCategoryModel::OrderBy('sort', 'desc')->get(['id', 'name', 'img']);
         return $this->api($products);
     }
 

app/Models/ProductCategoryModel.php

@@ -38,7 +38,8 @@ class ProductCategoryModel extends BaseModel
     protected $fillable = [
         'name',
         'img',
-        'detail'
+        'detail',
+        'sort'
     ];
 
     public function spec(){

app/Models/ProductInfoModel.php

@@ -41,7 +41,8 @@ class ProductInfoModel extends BaseModel
         'origin_price',
         'current_price',
         'deposit',
-        'service_time'
+        'service_time',
+        'sort'
     ];
 
     public function catename(){

database/migrations/2018_09_14_110219_add_sort_product_category_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSortProductCategoryTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('product_category', function (Blueprint $table) {
+            $table->integer('sort')->after('detail')->nullable()->comment('排序');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('product_category', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2018_09_14_110333_add_sort_product_info_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSortProductInfoTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('product_info', function (Blueprint $table) {
+            $table->integer('sort')->after('service_time')->nullable()->comment('排序');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('product_info', function (Blueprint $table) {
+            //
+        });
+    }
+}

resources/views/admin/product/category/edit.blade.php

@@ -73,6 +73,19 @@
 
                                 </div>
 
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">排序：越大越靠前</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="data_sort" name="data[sort]" class="form-control"
+                                               value="{{ $data['sort'] or ''}}"
+                                               placeholder="">
+
+                                    </div>
+
+                                </div>
+
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">&nbsp;</label>
                                     <div class="col-sm-9">

resources/views/admin/product/info/edit.blade.php

@@ -108,6 +108,19 @@
 
                                 </div>
 
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">排序：越大越靠前</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="data_sort" name="data[sort]" class="form-control"
+                                               value="{{ $data['sort'] or ''}}"
+                                               placeholder="">
+
+                                    </div>
+
+                                </div>
+
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">&nbsp;</label>
                                     <div class="col-sm-9">