|
@@ -73,7 +73,6 @@ class TaskService extends BaseService
|
|
|
if($datas){
|
|
|
foreach ($datas as &$item){
|
|
|
$item['status'] = 1;
|
|
|
- $item['log_num'] = 0;
|
|
|
if($power<=0){
|
|
|
$power = $item['power'];
|
|
|
}
|
|
@@ -81,15 +80,16 @@ class TaskService extends BaseService
|
|
|
$logNum = $this->getLogNum($userId, $item['id'], $item['type']);
|
|
|
|
|
|
// 次数
|
|
|
+ $item['log_num'] = $logNum;
|
|
|
if($item['check_type'] == 1 && $item['num']<=$logNum){
|
|
|
$item['status'] = 2;
|
|
|
- $item['log_num'] = $logNum;
|
|
|
+ $item['log_num'] = $item['num'];
|
|
|
$complete++;
|
|
|
}
|
|
|
// 时长
|
|
|
else if($item['check_type'] == 2 && $logNum>0){
|
|
|
$item['status'] = 2;
|
|
|
- $item['log_num'] = $logNum;
|
|
|
+ $item['log_num'] = 1;
|
|
|
$complete++;
|
|
|
}
|
|
|
}
|