diff --git a/application/adminapi/controller/Activities.php b/application/adminapi/controller/Activities.php
index 8e9e0a5e..1b76640d 100644
--- a/application/adminapi/controller/Activities.php
+++ b/application/adminapi/controller/Activities.php
@@ -619,9 +619,9 @@ class Activities extends adminApi
                 $lists[$key]['gift_id'] = "--";
                 $lists[$key]['gift_name'] = "--";
                 $lists[$key]['base_image'] = "--";
-                $lists[$key]['quantity'] = 0;
-                $lists[$key]['quantity_str'] = "0";
-                $lists[$key]['gift_price'] = $value['gold'];
+                $lists[$key]['quantity'] = $value['quantity'];
+                $lists[$key]['quantity_str'] = $value['quantity']."个";
+                $lists[$key]['gift_price'] = $value['gold']*$value['gold_price'];
             }
             $lists[$key]['createtime'] = date('Y-m-d H:i:s', $value['createtime']);
 
diff --git a/application/api/controller/Dailytasks.php b/application/api/controller/Dailytasks.php
index ba0acd0a..76218d72 100644
--- a/application/api/controller/Dailytasks.php
+++ b/application/api/controller/Dailytasks.php
@@ -21,7 +21,7 @@ class Dailytasks extends BaseCom
     public function dailyTasksList()
     {
         $user_id = $this->uid;
-        $reslut = model('Tasks')->dailyTasksList($user_id);
+        $reslut = model('DailyTasks')->dailyTasksList($user_id);
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
 
     }
@@ -34,7 +34,7 @@ class Dailytasks extends BaseCom
         if (!$task_id) {
             return V(0,'请选择任务');
         }
-        $reslut = model('Tasks')->tasks_complete($user_id,$task_id);
+        $reslut = model('DailyTasks')->tasks_complete($user_id,$task_id);
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
     }
     //领取每日任务金币奖励
@@ -45,7 +45,7 @@ class Dailytasks extends BaseCom
         if (!$task_id) {
             return V(0,'请选择任务');
         }
-        $reslut = model('Tasks')->daily_tasks_receive($user_id,$task_id);
+        $reslut = model('DailyTasks')->daily_tasks_receive($user_id,$task_id);
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
     }
     //开启礼盒
@@ -56,14 +56,14 @@ class Dailytasks extends BaseCom
         if (!$gift_box_id) {
             return V(0,'请选择礼盒');
         }
-        $reslut = model('Tasks')->open_gift_box($user_id,$gift_box_id);
+        $reslut = model('DailyTasks')->open_gift_box($user_id,$gift_box_id);
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
     }
     //礼盒记录
     public function dailyTasksBoxRecord()
     {
         $user_id = $this->uid;
-        $reslut = model('Tasks')->gift_bag_receive_list($user_id);
+        $reslut = model('DailyTasks')->gift_bag_receive_list($user_id);
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
     }
     //签到
diff --git a/application/api/controller/Tasks.php b/application/api/controller/Tasks.php
new file mode 100644
index 00000000..496ea6e8
--- /dev/null
+++ b/application/api/controller/Tasks.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\BaseCom;
+use think\Controller;
+/*
+ * 每日任务
+ *
+ */
+class Tasks extends BaseCom
+{
+    //初始化
+    protected function initialize()
+    {
+        //允许跨域
+        header('Access-Control-Allow-Origin: *');
+    }
+
+    //每日任务列表
+    public function dailyTasksList()
+    {
+        $user_id = $this->uid;
+        $reslut = model('Tasks')->dailyTasksList($user_id);
+        return  V($reslut['code'],$reslut['msg'], $reslut['data']);
+
+    }
+
+    //完成每日任务
+    public function dailyTasksComplete()
+    {
+        $user_id = $this->uid;
+        $task_id = input('task_id');
+        if (!$task_id) {
+            return V(0,'请选择任务');
+        }
+        $reslut = model('Tasks')->tasks_complete($user_id,$task_id);
+        return  V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+    //领取每日任务金币奖励
+    public function dailyTasksReceive()
+    {
+        $user_id = $this->uid;
+        $task_id = input('task_id');
+        if (!$task_id) {
+            return V(0,'请选择任务');
+        }
+        $reslut = model('Tasks')->daily_tasks_receive($user_id,$task_id);
+        return  V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+    //开启礼盒
+    public function dailyTasksOpenBox()
+    {
+        $user_id = $this->uid;
+        $gift_box_id = input('gift_box_id');
+        if (!$gift_box_id) {
+            return V(0,'请选择礼盒');
+        }
+        $reslut = model('Tasks')->open_gift_box($user_id,$gift_box_id);
+        return  V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+    //礼盒记录
+    public function dailyTasksBoxRecord()
+    {
+        $user_id = $this->uid;
+        $reslut = model('Tasks')->gift_bag_receive_list($user_id);
+        return  V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+    //签到
+    public function dailyTasksSign(){
+        $user_id = $this->uid;
+        $reslut = model('DailyTasks')->sign_in($user_id);
+        return  V($reslut['code'],$reslut['msg'], $reslut['data']);
+
+    }
+    //今日签到状态
+    public function dailyTasksSignStatus(){
+        $user_id = $this->uid;
+        $reslut = model('DailyTasks')->daily_tasks_sign_in_status($user_id);
+        return  V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+
+}
diff --git a/application/api/model/Tasks.php b/application/api/model/Tasks.php
index 09102dec..c7213b0d 100644
--- a/application/api/model/Tasks.php
+++ b/application/api/model/Tasks.php
@@ -165,15 +165,6 @@ class Tasks extends Model
                     $v['task_type_str'] = "去签到";
                 }
             }
-//            if($v['task_id'] == 17){
-//                if($user_sign_task['status'] == 0){
-//                    $v['task_status'] = 2;
-//                    $v['task_type_str'] = "领取钻石";
-//                }else{
-//                    $v['task_status'] = 3;
-//                    $v['task_type_str'] = "已领取";
-//                }
-//            }
             $v['jump_type_str'] = $this->jump_type[$v['jump_type']];
             $v['from_id'] = 0;
             $v['is_time'] = 0;
@@ -189,7 +180,20 @@ class Tasks extends Model
                 $v['processing_type_str'] = $this->processing_type_str[$v['processing_type']];
             }
             //奖励详情
-            $v['reward_str'] = "25金币，笨笨狗x1,仙女之星头像框,三八大杠";
+            $v['reward_str'] = "";
+            $reward_info = db::name('vs_gift_bag_detail')->where('gift_bag_id',$v['tasks_bag_id'])->select();
+            foreach ($reward_info as $key => $value) {
+                if($value['type'] == 1){
+                    $reward_name = $value['gold'].$value['name'];
+                }elseif($value['type'] == 2){
+                    $reward_name = $value['name'].'x'.$value['num'];
+                }elseif($value['type'] == 4){
+                    $reward_name = $value['name'].'x'.$value['days'].'天';
+                }else{
+                    $reward_name = $value['gold'].$value['name'];
+                }
+                $v['reward_str'] =$v['reward_str'].$reward_name;
+            }
             //返回任务列表
             $reslut['tasks'][$v['task_type']-1]['task_list'][] = $v;
         }