diff --git a/application/api/controller/Tasks.php b/application/api/controller/Tasks.php
index b227d4ca..88e9beb3 100644
--- a/application/api/controller/Tasks.php
+++ b/application/api/controller/Tasks.php
@@ -74,6 +74,12 @@ class Tasks extends BaseCom
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
 
     }
+    //签到页面
+    public function dailyTasksSignList(){
+        $user_id = $this->uid;
+        $reslut = model('Tasks')->daily_tasks_sign_in($user_id);
+        return  V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
     //今日签到状态
     public function dailyTasksSignStatus(){
         $user_id = $this->uid;
diff --git a/application/api/model/Tasks.php b/application/api/model/Tasks.php
index ade72aa1..df78fa02 100644
--- a/application/api/model/Tasks.php
+++ b/application/api/model/Tasks.php
@@ -171,7 +171,7 @@ class Tasks extends Model
                         $sign_student_list[$i]['tasks_bag_id'] = $v['tasks_bag_id'];
                         $sign_student_list[$i]['student_id'] = $value['student_id'];
                         $student_nickname = db::name('user')->where('id',$value['student_id'])->value('nickname');
-                        $sign_student_list[$i]['task_name'] = '邀请'.$student_nickname."徒弟在{$title}，并送给徒弟特殊礼物";
+                        $sign_student_list[$i]['task_name'] = '邀请 '.$student_nickname." 徒弟在 {$title}，并送给徒弟特殊礼物";
                         $sign_student_list[$i]['reward_str'] = $v['reward_str'];
                         $sign_student_list[$i]['from_id'] = model('api/Room')->task_jump_room_recommend($v['task_id'],$value['student_id']);
                         if($value['status']==0){
@@ -203,6 +203,9 @@ class Tasks extends Model
                 }else{
                     $progress = $user_sign_task['times']-1 ?? 0;
                 }
+            }elseif($v['task_id'] == 26){
+                //情侣任务
+                $user_couple_task = Db::name('vs_user_cp_task')->where(['user_id'=>$user_id,'day'=>date('Y-m-d')])->find();
             }
             $progress = isset($user_daily_tasks['current_progress']) ?  $user_daily_tasks['current_progress'] : 0;
             $v['is_time'] = 0;
@@ -651,9 +654,9 @@ class Tasks extends Model
         }
     }
     /*
-     * 今日签到状态
+     * 签到页面
      */
-    public function daily_tasks_sign_in_status($user_id){
+    public function daily_tasks_sign_in($user_id){
         //查询昨天有没有签到
         $yesterday_sign_in_info = Db::name('vs_user_tasks_sign_in')->where(['user_id'=>$user_id,'sign_in_date'=>date('Y-m-d',strtotime('-1 day'))])->find();
         if(empty($yesterday_sign_in_info)){
@@ -718,4 +721,20 @@ class Tasks extends Model
         return ['code' => 1, 'msg' => '成功','data' => $result];
     }
 
+    /*
+     * 今日签到状态
+     */
+    public function daily_tasks_sign_in_status($user_id){
+        $sign_in_info = Db::name('vs_user_tasks_sign_in')->where(['user_id'=>$user_id,'sign_in_date'=>date('Y-m-d')])->find();
+        $result = [];
+        if ($sign_in_info) {
+            $result['status'] = 1;
+            $result['status_str'] = "已签到";
+        }else{
+            $result['status'] = 0;
+            $result['status_str'] = "未签到";
+        }
+        return ['code' => 1, 'msg' => '成功','data' => $result];
+    }
+
 }
diff --git a/application/cron/controller/Test.php b/application/cron/controller/Test.php
index 52a567ff..3231a50d 100644
--- a/application/cron/controller/Test.php
+++ b/application/cron/controller/Test.php
@@ -203,19 +203,40 @@ class Test
                     if($is_real['code']==1&&$is_real['data']['is_real'] ==1){
                         model('Tasks')->tasks_complete($value['id'],3);
                     }
-                }
-                //任务历史
-                $task_history = db::name('vs_task_history')->where(['task_id'=>$v['id'],'user_id'=>$value['id']])->find();
-                if(empty($task_history)){
-                    //添加任务历史
-                    $task_history_data = [
-                        'task_id' => $v['id'],
-                        'user_id' => $value['id'],
-                        'status' => 1,
-                    ]
+                }elseif($v['id']==4){//完善个人资料-创建相册
+                    $album_list = db::name('user_album')->where(['user_id' => $value['id']])->field('id,name,image,pwd,read_num,like_num')->select();
+                    if(!empty($album_list)){
+                        model('Tasks')->tasks_complete($value['id'],4);
+                    }
+                }elseif($v['id']==5){//完善个人资料- 绑定支付宝或银行卡信息
+                    $user_data = db::name('user_data')->where('user_id',$value['id'])->find();
+                    if(!empty($user_data['alipay_account'])||!empty($user_data['bank_card_number'])){
+                        model('Tasks')->tasks_complete($value['id'],5);
+                    }
+                }elseif($v['id']==6){//第一次签约师傅
+                    $is_sign = db::name('vs_user_sign')->where(['sign_user_id' => $value['id']])->find();
+                    if(!empty($is_sign)){
+                        model('Tasks')->tasks_complete($value['id'],6);
+                    }
+                } elseif($v['id']==7){//第一次送礼
+                    $give_gift = db::name('vs_give_gift')->where(['user_id' => $value['id']])->find();
+                    if(!empty($give_gift)){
+                        model('Tasks')->tasks_complete($value['id'],7);
+                    }
+                }elseif($v['id']==8){//第一次收礼
+                    $give_gift = db::name('vs_give_gift')->where(['gift_user' => $value['id']])->find();
+                    if(!empty($give_gift)){
+                        model('Tasks')->tasks_complete($value['id'],8);
+                    }
+
+                }elseif($v['id']==9){//第一次拍卖关系
+
+                }elseif($v['id']==10){//第一次星球房卡关系（互娱房）
+
+                }elseif($v['id']==11){//第一次 加入公会
+
                 }
             }
-           //
         }
     }