edit

task/database/info.php

@@ -358,7 +358,7 @@ return array
 				'level_id' => 'yes',
 				'cate_id' => 'yes',
 				'end' => array('yes-edate', '<'),
-				//'status' => 1,
+				'status' => 1,
 				'state' => 1,
 			),
 			'type' => 'all',

task/src/Info.php

@@ -269,9 +269,6 @@ class Info extends Base
         } elseif ($this->data['time'] < $data['sdate']) {
             # 任务未开始
             $button = 10;
-        } elseif ($data['user_num'] >= $data['num']) {
-            # 抢光了
-            $button = 3;
         } elseif (isset($this->data['uid']) && $this->data['uid']) {
             # 判断等级
             $level = Dever::db('task/level')->one($data['level_id']);
@@ -299,16 +296,21 @@ class Info extends Base
                     }
 
                 } else {
-                    # 判断类别领取次数
-                    $s = 1;
-                    $cate = Dever::db('task/user_task')->total(array('uid' => $this->data['uid'], 'cate_id' => $data['cate_id'], 'status' => $s));
-                    if ($cate >= $data['cate_num']) {
-                        $button = 6;
+                    if ($button > $data['user_num'] >= $data['num']) {
+                        # 抢光了
+                        $button = 3;
                     } else {
-                        # 判断商家领取次数
-                        $company = Dever::db('task/user_task')->total(array('uid' => $this->data['uid'], 'company_id' => $data['company_id'], 'status' => $s));
-                        if ($company >= $data['company_num']) {
-                            $button = 7;
+                        # 判断类别领取次数
+                        $s = 1;
+                        $cate = Dever::db('task/user_task')->total(array('uid' => $this->data['uid'], 'cate_id' => $data['cate_id'], 'status' => $s));
+                        if ($cate >= $data['cate_num']) {
+                            $button = 6;
+                        } else {
+                            # 判断商家领取次数
+                            $company = Dever::db('task/user_task')->total(array('uid' => $this->data['uid'], 'company_id' => $data['company_id'], 'status' => $s));
+                            if ($company >= $data['company_num']) {
+                                $button = 7;
+                            }
                         }
                     }
                 }