wesmiler 报恩寺项目提交

app/Http/Controllers/Api/v1/ActivityController.php

@@ -40,6 +40,14 @@ class ActivityController extends BaseController
     }
 
     /**
+     * 详情
+     * @return array|mixed
+     */
+    public function info(){
+        return $this->service->getInfo();
+    }
+
+    /**
      * 活动报名
      * @param Request $request
      * @param ActivityValidator $validate

app/Http/Controllers/Api/v1/SiyuanController.php

@@ -37,7 +37,7 @@ class SiyuanController extends BaseController
      */
     public function info(){
         $this->service->updateVisit($this->userId);
-        return parent::info();
+        return $this->service->getInfo();
     }
 
     /**

app/Services/ActivityService.php

@@ -101,6 +101,26 @@ class ActivityService extends BaseService
     }
 
     /**
+     * 详情
+     * @return array
+     */
+    public function getInfo(){
+        // 记录ID
+        $id = request()->input("id", 0);
+        $info = [];
+        if ($id) {
+            $info = $this->model->getInfo($id);
+        }
+        if($info){
+            if(isset($info['content'])){
+                $info['content'] = $info['content']? str_replace("\n","<br/>", $info['content']) :'';
+            }
+        }
+
+        return message(MESSAGE_OK, true, $info);
+    }
+
+    /**
      * 添加或编辑
      * @return array
      * @since 2020/11/11

app/Services/SiyuanService.php

@@ -98,6 +98,26 @@ class SiyuanService extends BaseService
     }
 
     /**
+     * 详情
+     * @return array
+     */
+    public function getInfo(){
+        // 记录ID
+        $id = request()->input("id", 0);
+        $info = [];
+        if ($id) {
+            $info = $this->model->getInfo($id);
+        }
+        if($info){
+            if(isset($info['content'])){
+                $info['content'] = $info['content']? str_replace("\n","<br/>", $info['content']) :'';
+            }
+        }
+
+        return message(MESSAGE_OK, true, $info);
+    }
+
+    /**
      * 获取分类选项列表
      * @param int $num
      * @return array