diff --git a/app/console/controller/BrandController.php b/app/console/controller/BrandController.php index ebbee64..97d6bcb 100644 --- a/app/console/controller/BrandController.php +++ b/app/console/controller/BrandController.php @@ -58,10 +58,22 @@ class BrandController extends BaseController 'created_at' => date('Y-m-d H:i:s', $item['created_at']), 'updated_at' => date('Y-m-d H:i:s', $item['updated_at']), ]; + if ($item['toppic']) { + $result['toppic_full'] = (new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($item['toppic']); + } + if ($item['descpic']) { + $result['descpic_full'] = (new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($item['descpic']); + } + if ($item['logo']) { + $result['logo_full'] = (new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($item['logo']); + } $banners = BrandBannerModel::with('translation')->where(['brand_id' => $item['id']])->get(); foreach ($banners as $k => $v) { $v['alt'] = isset($v['translation']) ? $v['translation']['alt'] : ''; unset($v['translation']); + if ($v['pic']) { + $v['pic_full'] = (new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($v['pic']); + } $result['banner'][$k] = $v; } $traits = BrandTraitModel::with('translation')->where(['brand_id' => $item['id']])->get(); diff --git a/app/console/model/BrandModel.php b/app/console/model/BrandModel.php index a6361b5..19e1415 100644 --- a/app/console/model/BrandModel.php +++ b/app/console/model/BrandModel.php @@ -47,7 +47,7 @@ class BrandModel extends Model /** * 允许自动填充模型字段 */ - protected $fillable = ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'created_at', 'updated_at']; + protected $fillable = ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'is_hot', 'created_at', 'updated_at']; /** * 不允许自动填充模型字段 diff --git a/app/console/service/BrandService.php b/app/console/service/BrandService.php index 62dae3a..26af93d 100644 --- a/app/console/service/BrandService.php +++ b/app/console/service/BrandService.php @@ -35,7 +35,7 @@ class BrandService extends BaseService 'filters' => [ ['field' => 'status', 'operator' => '=', 'value' => '1'] ], - 'fields' => ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'created_at', 'updated_at'], + 'fields' => ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'is_hot', 'created_at', 'updated_at'], 'relations' => [ 'translation' => ['brand_id', 'name', 'desc','toppic_alt','descpic_alt','logo_alt'], 'banner' => ['id', 'pic', 'sort',],