|
@@ -37,11 +37,12 @@ class Task extends Api
|
|
|
$where["type_id"] = 2;
|
|
|
$where["is_show"] = 1;
|
|
|
|
|
|
- $taskList = $this->taskModel
|
|
|
+ $taskList = Db::name('task')
|
|
|
->field("id,type_id,image,name,exp,number,".$jump_url." as jump_url,url_type")
|
|
|
->where($where)
|
|
|
->autopage()
|
|
|
->select();
|
|
|
+ $taskList = list_domain_image($taskList,['image']);
|
|
|
|
|
|
$today = strtotime(date("Y-m-d 00:00:00"));
|
|
|
|
|
@@ -81,13 +82,14 @@ class Task extends Api
|
|
|
$where = [];
|
|
|
$where["a.type_id"] = 1;
|
|
|
$where["a.is_show"] = 1;
|
|
|
- $taskList = $this->taskModel->alias("a")
|
|
|
+ $taskList = Db::name('task')->alias("a")
|
|
|
->field("a.id,a.type_id,a.image,a.name,a.exp,a.number,a.".$jump_url." as jump_url,a.url_type,l.pace,l.is_reward,l.is_finish,l.finish_number")
|
|
|
->join("task_log l", "l.task_id = a.id and l.user_id = ".$this->auth->id, "left")
|
|
|
->where($where)
|
|
|
->autopage()
|
|
|
->order("is_finish","asc")
|
|
|
->select();
|
|
|
+ $taskList = list_domain_image($taskList,['image']);
|
|
|
|
|
|
if($taskList) {
|
|
|
foreach($taskList as $k => $v) {
|