接口大体完成

@@ -9,4 +9,32 @@ use think\Model;
 class ActivityModel extends Model
 {
 
+    /**
+     * thumbnail 自动转化
+     * @param $value
+     * @return array
+     */
+    public function getThumbnailAttr($value)
+    {
+        return cmf_get_image_url($value);
+    }
+    /**
+     * time 自动转化
+     * @param $value
+     * @return array
+     */
+    public function getTimeAttr($value)
+    {
+        return date('Y-m-d',$value);
+    }
+    /**
+     * content 自动转化
+     * @param $value
+     * @return array
+     */
+    public function getContentAttr($value)
+    {
+        return cmf_replace_content_file_url(htmlspecialchars_decode($value));
+    }
+
 }
\ No newline at end of file

@@ -967,25 +967,30 @@ class SecondController extends RestBaseController
      * @method POST
      *
      *
-     *@param name:id type:int require:1 other: desc:订单id
+     *@param name:status type:int require:1 other: desc:1,进行中2,已完成
      *@header name:XX-Token require:1 default: desc:token
      *
-     *@return order_sn:订单号
-     *@return content_info:虚拟订单信息
-     *@return is_real:是否为虚拟订单
-     *@return expend:消耗工时
-     *@return good:商品信息
+     *@return activity_name:活动名称
+     *@return date:日期
+     *@return start_clock_time:开始时间
+     *@return end_clock_time:结束时间
+     *@return activity.thumbnail:缩略图
      *
      *@throws
      */
     public function activityList(){
+        $type=input('type',1);
+        if ($type==1){
+            $map['status']=['in','0,1'];
+        }else{
+            $map['status']=2;
+        }
         $userId=$this->getUserId();
         $Clock=new ClockModel();
         $map['user_id']=$userId;
         $info=$Clock->where($map)->with(['activity'])->select();
         $this->success('',$info);
     }
-
     /**
      * @title 开始打卡
      * @description 开始打卡
@@ -1104,8 +1109,4 @@ class SecondController extends RestBaseController
     }
 
 
-
-
-
-
 }
\ No newline at end of file