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

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

@@ -14,6 +14,7 @@ use App\Models\Reward;
 use App\Models\ProductOrder;
 use App\Models\ServerInfo;
 use App\Models\WechatInfo;
+use App\Models\Comment;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Carbon\Carbon;
@@ -140,7 +141,20 @@ class CommonController extends Controller
         $order_id = $request->route("order_id");
         $order_type = $request->route("order_type");
         if ($order_id && $order_type) {
-            return Comment::where("order_id", $order_id)->where("type", $order_type)->paginate(20);
+            return Comment::where("order_id", $order_id)->where("order_type", $order_type)->orderBy('id', 'desc')->paginate(20);
+        }
+    }
+
+    /**
+     * 分页获取订单评论
+     * @param Request $request
+     * @return mixed
+     */
+    public function type_comments(Request $request, $order_type)
+    {
+        $order_type = $request->route("order_type");
+        if ($order_type) {
+            return Comment::where("order_type", $order_type)->orderBy('id', 'desc')->paginate(20);
         }
     }
 

manage-server/routes/web.php

@@ -27,7 +27,7 @@ Route::middleware(['manage.token'])->group(function () {
 
     Route::post('/upload', 'CommonController@upload');
     Route::get('/classify/{id}', 'ClassifyController@get');
-    Route::get('/{order_type}/{order_id}/comments', 'CommonController@comments');
+    Route::get('/{order_type}/comments', 'CommonController@type_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]+');