类型修改

app/Http/Controllers/ConfigCityManagementController.php

@@ -56,9 +56,9 @@ class ConfigCityManagementController extends Controller
     public function create(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'province_id' => 'required|integer',
+            'province_id' => 'required',
             'province_name' => 'required|string',
-            'city_id' => 'required|integer',
+            'city_id' => 'required',
             'city_name' => 'required|string',
             'express_type' => 'required'
         ]);
@@ -74,9 +74,9 @@ class ConfigCityManagementController extends Controller
     {
         $validator = Validator::make($request->all(), [
             'id' => 'required|exists:config_city_management',
-            'province_name' => 'required|string|max:20',
-            'province_id' => 'required|integer',
-            'city_id' => 'required|integer',
+            'province_name' => 'required|string',
+            'province_id' => 'required',
+            'city_id' => 'required',
             'express_type' => 'required',
             'city_name' => 'required|string|max:30',
         ]);

app/Repositories/ConfigCityManagementRepository.php

@@ -17,13 +17,14 @@ class ConfigCityManagementRepository {
     //列表
     public function index($request)
     {
+        $perPage = isset($request['per_page']) ? $request['per_page'] : env('PER_PAGE');
         $where = [];
         if(isset($request['id'])){
             $where[] = ['id', '=', $request['id']];
         }
 
 
-        return $this->configCityManagement->where($where)->orderBy('id', 'asc')->paginate(20);
+        return $this->configCityManagement->where($where)->orderBy('id', 'asc')->paginate($perPage);
 
     }
 
@@ -36,7 +37,6 @@ class ConfigCityManagementRepository {
         $data = [
             'province_id' => $request['province_id'],
             'province_name' => $request['province_name'],
-            'name' => $request['name'],
             'city_id' => $request['city_id'],
             'city_name' => $request['city_name'],
             'express_type' => $request['express_type'],