diff --git a/application/admin/controller/Cars.php b/application/admin/controller/Cars.php index c5e20f7..f1becbb 100644 --- a/application/admin/controller/Cars.php +++ b/application/admin/controller/Cars.php @@ -233,11 +233,15 @@ class Cars extends Backend $res = [ 'title' => $params['title'], 'price' => $params['price'], + 'desc' => $params['desc'], + 're_price' => $params['re_price'], 'cover_image' => $params['cover_image'], 'contact_id' => $params['contact_id'] ?? $this->auth->id, ]; $series_id = $params['series_id']; - + if ($params['active_at']){ + $res['active_at'] = $params['active_at']; + } $series = \app\admin\model\Series::where('id',$series_id)->find(); $res ['series_id'] = $series_id; diff --git a/application/admin/view/cars/add.html b/application/admin/view/cars/add.html index 9b38ee2..ec21000 100644 --- a/application/admin/view/cars/add.html +++ b/application/admin/view/cars/add.html @@ -6,7 +6,14 @@
- + +
+
+ +
+ +
+
@@ -22,6 +29,12 @@
+
+ +
+ +
+
@@ -58,6 +71,16 @@
+
+ +
+ +
+
diff --git a/application/admin/view/cars/edit.html b/application/admin/view/cars/edit.html index f2faac1..725af2b 100644 --- a/application/admin/view/cars/edit.html +++ b/application/admin/view/cars/edit.html @@ -10,6 +10,14 @@ + +
+ +
+ +
+
+
@@ -23,6 +31,14 @@
+ +
+ +
+ +
+
+
@@ -59,6 +75,17 @@
+ +
+ +
+ +
+
diff --git a/composer.json b/composer.json index 3888800..e0e010e 100755 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "ext-curl": "*", "ext-pdo": "*", "ext-bcmath": "*", - "nesbot/carbon": "^3.10" + "nesbot/carbon": "*" }, "config": { "preferred-install": "dist", diff --git a/public/assets/js/backend/cars.js b/public/assets/js/backend/cars.js index b0d6dda..763bf0d 100644 --- a/public/assets/js/backend/cars.js +++ b/public/assets/js/backend/cars.js @@ -36,9 +36,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function class: 'autocontent', formatter: Table.api.formatter.content }, - {field: 'brand.name', title: __('Brand_id')}, - {field: 'series.name', title: __('Series_id')}, + {field: 'brand.name', title: __('Brand_id'), operate: false}, + {field: 'series.name', title: __('Series_id'), operate: false}, {field: 'price', title: __('Price'), operate: 'BETWEEN'}, + {field: 're_price', title: '现价(万元)', operate: 'BETWEEN'}, { field: 'cover_image', title: __('Cover_image'), @@ -48,6 +49,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function }, {field: 'contact.nickname', title: __('Contact_name'), operate: 'LIKE'}, {field: 'contact.mobile', title: __('Contact_phone'), operate: 'LIKE'}, + {field: 'active_at', title: '上牌时间', operate: 'RANGE', + addclass: 'datetimerange', + autocomplete: false}, { field: 'created_at', title: __('Created_at'),