|
@@ -15,7 +15,7 @@ class Info extends Base
|
|
public function all()
|
|
public function all()
|
|
{
|
|
{
|
|
$this->checkUser();
|
|
$this->checkUser();
|
|
-
|
|
|
|
|
|
+
|
|
$this->data['cate'] = Dever::db('task/cate')->state();
|
|
$this->data['cate'] = Dever::db('task/cate')->state();
|
|
|
|
|
|
$data = Dever::db('task/info')->getAll();
|
|
$data = Dever::db('task/info')->getAll();
|
|
@@ -292,12 +292,13 @@ class Info extends Base
|
|
|
|
|
|
} else {
|
|
} else {
|
|
# 判断类别领取次数
|
|
# 判断类别领取次数
|
|
- $cate = Dever::db('task/user_task')->total(array('uid' => $this->data['uid'], 'cate_id' => $data['cate_id'], 'status' => 3));
|
|
|
|
|
|
+ $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']) {
|
|
if ($cate >= $data['cate_num']) {
|
|
$button = 6;
|
|
$button = 6;
|
|
} else {
|
|
} else {
|
|
# 判断商家领取次数
|
|
# 判断商家领取次数
|
|
- $company = Dever::db('task/user_task')->total(array('uid' => $this->data['uid'], 'company_id' => $data['company_id'], 'status' => 3));
|
|
|
|
|
|
+ $company = Dever::db('task/user_task')->total(array('uid' => $this->data['uid'], 'company_id' => $data['company_id'], 'status' => $s));
|
|
if ($company >= $data['company_num']) {
|
|
if ($company >= $data['company_num']) {
|
|
$button = 7;
|
|
$button = 7;
|
|
}
|
|
}
|