From f3b4740244989834224a8485bc595b4d8c00b369 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Wed, 9 Jul 2025 16:53:45 +0800
Subject: [PATCH] 1

---
 app/apis/controller/AdpController.php   | 1 +
 app/apis/model/AdModel.php              | 2 +-
 app/apis/service/AdpService.php         | 2 +-
 app/console/controller/AdController.php | 1 +
 app/console/model/AdModel.php           | 2 +-
 app/console/service/AdService.php       | 4 ++--
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/apis/controller/AdpController.php b/app/apis/controller/AdpController.php
index 06e0be0..605025d 100644
--- a/app/apis/controller/AdpController.php
+++ b/app/apis/controller/AdpController.php
@@ -46,6 +46,7 @@ class AdpController extends BaseController
             unset($item['translation']);
             $ad = AdModel::with('translation')->where(['adp_id' => $item['id'], 'status' => 1])->limit(8)->get();
             foreach ($ad as $k => $v) {
+                $v['type_txt'] = $v['type'] == 1?'新车' : ($v['type'] == 2?'二手车' : '');
                 $v['alt'] = isset($v['translation']) ? $v['translation']['alt'] : '';
                 $v['title'] = isset($v['translation']) ? $v['translation']['title'] : '';
                 if(!empty($v['img'])){
diff --git a/app/apis/model/AdModel.php b/app/apis/model/AdModel.php
index 05beaa8..cbc0ad9 100644
--- a/app/apis/model/AdModel.php
+++ b/app/apis/model/AdModel.php
@@ -47,7 +47,7 @@ class AdModel extends Model
     /**
      * 允许自动填充模型字段
      */
-    protected $fillable = ['id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
+    protected $fillable = ['id', 'type', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
 
     /**
      * 不允许自动填充模型字段
diff --git a/app/apis/service/AdpService.php b/app/apis/service/AdpService.php
index 5a6c43e..6ecdadb 100644
--- a/app/apis/service/AdpService.php
+++ b/app/apis/service/AdpService.php
@@ -31,7 +31,7 @@ class AdpService extends BaseService
                     'fields' => ['id', 'new_url', 'used_url', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
                     'relations' => [
                         'translation' => ['adp_id', 'title'],
-                        'ad' => ['id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
+                        'ad' => ['id', 'type', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
                         'ad.translation' => ['ad_id', 'alt', 'title'],
                     ],
                     'sorts' => [
diff --git a/app/console/controller/AdController.php b/app/console/controller/AdController.php
index 621b090..18452fe 100644
--- a/app/console/controller/AdController.php
+++ b/app/console/controller/AdController.php
@@ -41,6 +41,7 @@ class AdController extends BaseController
     {
         
         if ($scene === 'default' || $scene === 'show') {
+            $item['type_txt'] = $item['type'] == 1?'新车' : ($item['type'] == 2?'二手车' : '');
             $item['created_at'] = date('Y-m-d H:i:s', $item['created_at']);
             $item['updated_at'] = date('Y-m-d H:i:s', $item['updated_at']);
             $item['alt'] = isset($item['translation']) ? $item['translation']['alt'] : '';
diff --git a/app/console/model/AdModel.php b/app/console/model/AdModel.php
index 4ac008e..6e7db47 100644
--- a/app/console/model/AdModel.php
+++ b/app/console/model/AdModel.php
@@ -47,7 +47,7 @@ class AdModel extends Model
     /**
      * 允许自动填充模型字段
      */
-    protected $fillable = ['id', 'adp_id', 'img', 'price', 'href', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
+    protected $fillable = ['id', 'adp_id', 'type', 'img', 'price', 'href', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
 
     /**
      * 不允许自动填充模型字段
diff --git a/app/console/service/AdService.php b/app/console/service/AdService.php
index b43407d..3d974e6 100644
--- a/app/console/service/AdService.php
+++ b/app/console/service/AdService.php
@@ -33,7 +33,7 @@ class AdService extends BaseService
             'default' => function ($params) {
                 return [
                     'filters' => $params['filters'],
-                    'fields' => ['id', 'adp_id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
+                    'fields' => ['id', 'adp_id', 'type', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
                     'relations' => [
                         'translation' => ['ad_id', 'alt', 'title'],
                     ],
@@ -50,7 +50,7 @@ class AdService extends BaseService
             'show' => function ($params) {
                 return [
                     'filters' => $params['filters'],
-                    'fields' => ['id', 'adp_id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
+                    'fields' => ['id', 'adp_id', 'type', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
                     'relations' => [
                         'translation' => ['ad_id', 'alt', 'title'],
                     ],