|
@@ -99,7 +99,7 @@ class Task extends Api
|
|
|
$v["finish_number"] || $taskList[$k]["finish_number"] = 0;
|
|
|
$v["is_reward"] || $taskList[$k]["is_reward"] = 0;
|
|
|
if($v["is_finish"] != 1 && $v["pace"] != 0) {
|
|
|
- $taskList[$k]["pace_txt"] = $v["finish$_number"]."/".$v["number"];
|
|
|
+ $taskList[$k]["pace_txt"] = $v["finish_number"]."/".$v["number"];
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -140,7 +140,7 @@ class Task extends Api
|
|
|
Db::startTrans();
|
|
|
try{
|
|
|
//增加用户金币
|
|
|
- $res1 = model('wallet')->lockChangeAccountRemain($this->auth->id,0, 'jewel', $taskInfo["exp"], 20, '完成' . $taskInfo['name'] . '任务', 'task_log', $tasklogInfo['id']);
|
|
|
+ $res1 = model('wallet')->lockChangeAccountRemain($this->auth->id,0, 'gold', $taskInfo["exp"], 20, '完成' . $taskInfo['name'] . '任务', 'task_log', $tasklogInfo['id']);
|
|
|
if ($res1['status'] === false) {
|
|
|
Db::rollback();
|
|
|
$this->error($res1['msg']);
|