hant/car
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
hantao 2025-07-01 18:13:34 +08:00
commit 8c97f46bf2
5 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/controller/Cars.php
View File

@ -233,11 +233,15 @@ class Cars extends Backend
$res = [ $res = [
'title' => $params['title'], 'title' => $params['title'],
'price' => $params['price'], 'price' => $params['price'],
'desc' => $params['desc'],
're_price' => $params['re_price'],
'cover_image' => $params['cover_image'], 'cover_image' => $params['cover_image'],
'contact_id' => $params['contact_id'] ?? $this->auth->id, 'contact_id' => $params['contact_id'] ?? $this->auth->id,
]; ];
$series_id = $params['series_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(); $series = \app\admin\model\Series::where('id',$series_id)->find();
$res ['series_id'] = $series_id; $res ['series_id'] = $series_id;

25
application/admin/view/cars/add.html
View File

@ -6,7 +6,14 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-title" class="form-control" name="row[title]" type="text"> <input id="c-title" data-role="required" class="form-control" name="row[title]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">简介:</label>
<div class="col-xs-12 col-sm-8">
<textarea rows="6" id="c-desc" class="form-control" style="resize: vertical;" name="row[desc]" type="text"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -22,6 +29,12 @@
<input id="c-price" class="form-control" step="0.01" name="row[price]" type="number"> <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number">
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">原价:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-re_price" class="form-control" step="0.01" name="row[re_price]" type="number">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cover_image')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Cover_image')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
@ -58,6 +71,16 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">上牌时间:</label>
<div class="col-xs-12 col-sm-8">
<input name="row[active_at]"
autocomplete="off"
data-date-side-by-side="true"
data-date-autoclose="true"
data-date-format="YYYY-MM-DD" placeholder="上牌时间" class="form-input form-control datetimepicker">
</div>
</div>
</form> </form>
</div> </div>

27
application/admin/view/cars/edit.html
View File

@ -10,6 +10,14 @@
<input id="c-title" class="form-control" name="row[title]" value="{$row.title}" type="text"> <input id="c-title" class="form-control" name="row[title]" value="{$row.title}" type="text">
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">简介:</label>
<div class="col-xs-12 col-sm-8">
<textarea rows="6" id="c-desc" class="form-control" style="resize: vertical;" name="row[desc]" type="text">{$row.desc}</textarea>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Series_id')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Series_id')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
@ -23,6 +31,14 @@
<input id="c-price" class="form-control" step="0.01" name="row[price]" value="{$row.price}" type="number"> <input id="c-price" class="form-control" step="0.01" name="row[price]" value="{$row.price}" type="number">
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">原价(万元):</label>
<div class="col-xs-12 col-sm-8">
<input id="c-re_price" class="form-control" step="0.01" value="{$row.re_price}" name="row[re_price]" type="number">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cover_image')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Cover_image')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
@ -59,6 +75,17 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">上牌时间:</label>
<div class="col-xs-12 col-sm-8">
<input name="row[active_at]" value="{$row.active_at}"
autocomplete="off"
data-date-side-by-side="true"
data-date-autoclose="true"
data-date-format="YYYY-MM-DD" placeholder="上牌时间" class="form-input form-control datetimepicker">
</div>
</div>
</form> </form>
</div> </div>

2
composer.json
View File

@ -30,7 +30,7 @@
"ext-curl": "*", "ext-curl": "*",
"ext-pdo": "*", "ext-pdo": "*",
"ext-bcmath": "*", "ext-bcmath": "*",
"nesbot/carbon": "^3.10" "nesbot/carbon": "*"
}, },
"config": { "config": {
"preferred-install": "dist", "preferred-install": "dist",

8
public/assets/js/backend/cars.js
View File

@ -36,9 +36,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
class: 'autocontent', class: 'autocontent',
formatter: Table.api.formatter.content formatter: Table.api.formatter.content
}, },
{field: 'brand.name', title: __('Brand_id')}, {field: 'brand.name', title: __('Brand_id'), operate: false},
{field: 'series.name', title: __('Series_id')}, {field: 'series.name', title: __('Series_id'), operate: false},
{field: 'price', title: __('Price'), operate: 'BETWEEN'}, {field: 'price', title: __('Price'), operate: 'BETWEEN'},
{field: 're_price', title: '现价(万元)', operate: 'BETWEEN'},
{ {
field: 'cover_image', field: 'cover_image',
title: __('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.nickname', title: __('Contact_name'), operate: 'LIKE'},
{field: 'contact.mobile', title: __('Contact_phone'), operate: 'LIKE'}, {field: 'contact.mobile', title: __('Contact_phone'), operate: 'LIKE'},
{field: 'active_at', title: '上牌时间', operate: 'RANGE',
addclass: 'datetimerange',
autocomplete: false},
{ {
field: 'created_at', field: 'created_at',
title: __('Created_at'), title: __('Created_at'),