dongxiaoqin пре 1 година
родитељ
комит
26dfca4b00
2 измењених фајлова са 13 додато и 3 уклоњено
  1. 2 1
      app/api/controller/GroupActivityController.php
  2. 11 2
      app/api/logic/GroupActivityLogic.php

+ 2 - 1
app/api/controller/GroupActivityController.php

@@ -24,7 +24,8 @@ class GroupActivityController extends BaseApiController
     public function categoryList()
     {
         $id = (int)$this->request->param('id');
-        $result = GroupActivityLogic::categoryList($id);
+        $block_key = (int)$this->request->param('block_key');
+        $result = GroupActivityLogic::categoryList($id,$block_key);
         return $this->data($result);
     }
 

+ 11 - 2
app/api/logic/GroupActivityLogic.php

@@ -30,11 +30,20 @@ class GroupActivityLogic extends BaseLogic
     /**
      * 活动分类数据
      */
-    public static function categoryList($id){
+    public static function categoryList($id,$block_key = ''){
+        
         $detail = GroupActivityCategory::where('id',$id)->where('status',1)->field('id,title,images,block_data')->findOrEmpty()->toArray();
         if($detail) {
-            $detail['images'] = $detail['images'] ? explode(",",$detail['images']) : [];
             $detail['block_data'] = $detail['block_data'] ? json_decode($detail['block_data'],true) : [];
+            if ($block_key) {
+                foreach($detail['block_data'] as $item) {
+                    if ($block_key == $item['block_key']) {
+                        return $item;
+                    }
+                }
+            } else {
+                $detail['images'] = $detail['images']? explode(",",$detail['images']) : [];
+            }
         }
         return $detail;
     }