分类

application/api/controller/Announcement.php

@@ -25,11 +25,6 @@ class Announcement extends Api
         $this->success('', $announcementModel::getTypeList());
     }
 
-    //获取子分类
-    public function getSubtype(AnnouncementType $announcementType){
-        $typeId = $this->request->param('type_id', 1, 'intval');
-        $this->success('', $announcementType::getSubTypeByPId($typeId));
-    }
 
     //列表
     public function list(AnnouncementModel $announcementModel, AnnouncementType $announcementType)

application/common/model/AnnouncementModel.php

@@ -47,15 +47,19 @@ class AnnouncementModel  extends Model
 
 
     public static function getTypeList()
-    {
-        return [1 => __('官方公告'), 2 => __('系统信息'), 3 => __('茶说'), 4 => __('新闻中心')];
+    {   
+        $typeList = [['key'=>1, 'value' => __('官方公告')], ['key'=>2, 'value' => __('系统信息')], ['key'=>3 , 'value'=> __('茶说')], ['key'=>4,'value' => __('新闻中心')]];
+        foreach ($typeList as $key=>$item) {
+            $typeList[$key]['sun_type_name'] = AnnouncementType::getSubTypeByPId($item['key']);
+        }
+        return $typeList;
     }
 
 
     public function getCreatetimeTextAttr($value, $data)
     {
-          $value = $value ? $value : (isset($data['createtime']) ? $data['createtime'] : '');
-          return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+        $value = $value ? $value : (isset($data['createtime']) ? $data['createtime'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
     }
 
 

application/common/model/AnnouncementType.php

@@ -13,58 +13,52 @@ use think\Model;
 class AnnouncementType extends Model
 {
 
-    protected $name = "announcement_type";
+      protected $name = "announcement_type";
 
-   
-    // 开启自动写入时间戳字段
-    protected $autoWriteTimestamp = 'int';
-    //定义时间戳字段名
-    protected $createTime = 'createtime';
-    protected $updateTime = 'updatetime';
-    
-    // 追加属性
-    protected $append = [
-        'createtime_text',
-        'updatetime_text'
-    ];
+      
+      // 开启自动写入时间戳字段
+      protected $autoWriteTimestamp = 'int';
+      //定义时间戳字段名
+      protected $createTime = 'createtime';
+      protected $updateTime = 'updatetime';
+      
+      // 追加属性
+      protected $append = [
+            'createtime_text',
+            'updatetime_text'
+      ];
 
-    //获取子分类
-    public static function getSubTypeById(object $data){
+      //获取子分类
+      public static function getSubTypeById(object $data){
 
-      foreach ($data as &$item) {
-           $item->sub_type_name = '';
-           if(!empty($item->sub_type_id)) $item->sub_type_name = self::whereIn('id', $item->sub_type_id)->field('id,title,color')->select();
+            foreach ($data as &$item) {
+            $item->sub_type_name = '';
+            if(!empty($item->sub_type_id)) $item->sub_type_name = self::whereIn('id', $item->sub_type_id)->field('id,title,color')->select();
+            }
+            return $data;
       }
-      return $data;
-    }
 
-      //获取大分类子分类
-      public static function getSubTypeByPId(int $typeId){
 
-            return self::where('pid', $typeId)->column('id,title');
+      public function getCreatetimeTextAttr($value, $data)
+      {
+            $value = $value ? $value : (isset($data['createtime']) ? $data['createtime'] : '');
+            return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
       }
-    
 
-    public function getCreatetimeTextAttr($value, $data)
-    {
-          $value = $value ? $value : (isset($data['createtime']) ? $data['createtime'] : '');
-          return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
 
+      public function getUpdatetimeTextAttr($value, $data)
+      {
+            $value = $value ? $value : (isset($data['updatetime']) ? $data['updatetime'] : '');
+            return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+      }
 
-    public function getUpdatetimeTextAttr($value, $data)
-    {
-          $value = $value ? $value : (isset($data['updatetime']) ? $data['updatetime'] : '');
-          return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
-    protected function setCreatetimeAttr($value)
-    {
-          return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
+      protected function setCreatetimeAttr($value)
+      {
+            return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+      }
 
-    protected function setUpdatetimeAttr($value)
-    {
-          return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
+      protected function setUpdatetimeAttr($value)
+      {
+            return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+      }
 }