|
@@ -169,6 +169,9 @@ class Info extends Base
|
|
*/
|
|
*/
|
|
private function getOne(& $data, $button = false)
|
|
private function getOne(& $data, $button = false)
|
|
{
|
|
{
|
|
|
|
+
|
|
|
|
+ $data['task_score'] = $data['score'];
|
|
|
|
+
|
|
# 链接
|
|
# 链接
|
|
$data['link'] = Dever::url('task/view?id=' . $data['id'], 'main');
|
|
$data['link'] = Dever::url('task/view?id=' . $data['id'], 'main');
|
|
|
|
|
|
@@ -176,13 +179,13 @@ class Info extends Base
|
|
$data['user_num'] = Dever::db('task/user_task')->total(array('task_id' => $data['id']));
|
|
$data['user_num'] = Dever::db('task/user_task')->total(array('task_id' => $data['id']));
|
|
|
|
|
|
# 3 金币/项
|
|
# 3 金币/项
|
|
- $data['list_score'] = '<strong class="ico-coin">' . $data['score'] . ' ' . $this->data['config']['score_name'] . '</strong>/' . $this->data['config']['report_name'];
|
|
|
|
|
|
+ $data['list_score'] = '<strong class="ico-coin">' . $data['task_score'] . ' ' . $this->data['config']['score_name'] . '</strong>/' . $this->data['config']['report_name'];
|
|
|
|
|
|
# 组员贡献 1 金币/项
|
|
# 组员贡献 1 金币/项
|
|
$data['list_group_score'] = '组员贡献<em>' . $data['group_score'] . '</em>' . $this->data['config']['score_name'] . '/' . $this->data['config']['report_name'];
|
|
$data['list_group_score'] = '组员贡献<em>' . $data['group_score'] . '</em>' . $this->data['config']['score_name'] . '/' . $this->data['config']['report_name'];
|
|
|
|
|
|
#3 金币 + 1 金币
|
|
#3 金币 + 1 金币
|
|
- $data['total_score'] = $data['score'] . ' ' . $this->data['config']['score_name'] . ' + ' . $data['group_score'] . ' ' . $this->data['config']['score_name'];
|
|
|
|
|
|
+ $data['total_score'] = $data['task_score'] . ' ' . $this->data['config']['score_name'] . ' + ' . $data['group_score'] . ' ' . $this->data['config']['score_name'];
|
|
|
|
|
|
# 任务类别
|
|
# 任务类别
|
|
$data['cate'] = $this->data['cate'][$data['cate_id']];
|
|
$data['cate'] = $this->data['cate'][$data['cate_id']];
|
|
@@ -195,8 +198,6 @@ class Info extends Base
|
|
$data['button'] = $this->button($data);
|
|
$data['button'] = $this->button($data);
|
|
}
|
|
}
|
|
|
|
|
|
- $data['task_score'] = $data['score'];
|
|
|
|
-
|
|
|
|
if (isset($data['uid']) && $data['uid'] > 0 && $this->data['uid'] > 0 && $data['uid'] == $this->data['uid']) {
|
|
if (isset($data['uid']) && $data['uid'] > 0 && $this->data['uid'] > 0 && $data['uid'] == $this->data['uid']) {
|
|
$data['score'] = $this->score($data);
|
|
$data['score'] = $this->score($data);
|
|
}
|
|
}
|
|
@@ -350,7 +351,7 @@ class Info extends Base
|
|
$result['desc'] = '<p>' . $result['desc'] . '</p>';
|
|
$result['desc'] = '<p>' . $result['desc'] . '</p>';
|
|
} else {
|
|
} else {
|
|
$result['icon'] = 'ico-coin';
|
|
$result['icon'] = 'ico-coin';
|
|
- $result['desc'] = '<p>任务奖励' . $data['score'] . $this->data['config']['score_name'] . '<span>/' . $this->data['config']['report_name'] . '</span></p><p>组员贡献' . $data['group_score'] . $this->data['config']['score_name'] . '<span>/' . $this->data['config']['report_name'] . '</span></p>';
|
|
|
|
|
|
+ $result['desc'] = '<p>任务奖励' . $data['task_score'] . $this->data['config']['score_name'] . '<span>/' . $this->data['config']['report_name'] . '</span></p><p>组员贡献' . $data['group_score'] . $this->data['config']['score_name'] . '<span>/' . $this->data['config']['report_name'] . '</span></p>';
|
|
$result['submit'] = $this->url('task/info.submit', array('id' => $data['id']));
|
|
$result['submit'] = $this->url('task/info.submit', array('id' => $data['id']));
|
|
}
|
|
}
|
|
|
|
|