diff --git a/app/admin/controller/BrandController.php b/app/admin/controller/BrandController.php index f917fa5..a265207 100644 --- a/app/admin/controller/BrandController.php +++ b/app/admin/controller/BrandController.php @@ -2,6 +2,7 @@ namespace app\admin\controller; use app\common\controller\BaseController; +use app\common\service\OssService; use app\common\traits\crud\CrudControllerTrait; use app\admin\service\BrandService; @@ -28,6 +29,8 @@ class BrandController extends BaseController $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); if (isset($data['updated_at'])) $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + if (empty($data['logo'])) + $data['logo_full'] = (new OssService)->generatePrivateUrl($data['logo']); return $data; } @@ -43,6 +46,8 @@ class BrandController extends BaseController $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); if (isset($data['updated_at'])) $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + if (empty($data['logo'])) + $data['logo_full'] = (new OssService)->generatePrivateUrl($data['logo']); return $data; } } \ No newline at end of file diff --git a/app/admin/controller/VehColorController.php b/app/admin/controller/VehColorController.php new file mode 100644 index 0000000..0d208ae --- /dev/null +++ b/app/admin/controller/VehColorController.php @@ -0,0 +1,33 @@ +service = new VehColorService(); + } + + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + // protected function indexFormat($data) + // { + // if (isset($data['created_at'])) + // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + // if (isset($data['updated_at'])) + // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + // return $data; + // } +} \ No newline at end of file diff --git a/app/admin/logic/VehColorLogic.php b/app/admin/logic/VehColorLogic.php new file mode 100644 index 0000000..484ba21 --- /dev/null +++ b/app/admin/logic/VehColorLogic.php @@ -0,0 +1,17 @@ +validator; + } +} \ No newline at end of file diff --git a/app/admin/validate/VehColorValidate.php b/app/admin/validate/VehColorValidate.php new file mode 100644 index 0000000..1c619ec --- /dev/null +++ b/app/admin/validate/VehColorValidate.php @@ -0,0 +1,29 @@ + [ + + ], + + 'update' => [ + + ] + ]; +} \ No newline at end of file diff --git a/app/common/model/VehColor.php b/app/common/model/VehColor.php new file mode 100644 index 0000000..9554aa5 --- /dev/null +++ b/app/common/model/VehColor.php @@ -0,0 +1,49 @@ +