Merge branch 'feature/article' into develop

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'])){

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'];
 
     /**
      * 不允许自动填充模型字段

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' => [

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'] : '';

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'];
 
     /**
      * 不允许自动填充模型字段

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'],
                     ],