edit

main/template/mobile/user/edit.php

@@ -10,7 +10,7 @@ $view
 ->set('name', 'password')
 ->fetch('header span', $title)
 
-->fetch('.back@href',    '<{Dever::url("user/set", "main")}>')
+->fetch('.back@href',    '<{Dever::url("user/update", "main")}>')
 
 ->fetch(array('input@id', 0), 'username')
 ->fetch(array('input@name', 0), 'username')

main/template/mobile/user/task.php

@@ -13,7 +13,7 @@ $view
 ->set('nav', 'user_task') 
 # 定义header>span的html为$title
 ->fetch('header span',    $title)
-->append('header', '<a href="<{Dever::url("user/account", "main")}>" class="back"></a>')
+->append('header', '<a style="display:none;" href="<{Dever::url("user/account", "main")}>" class="back"></a>')
 
 
 ->fetch(array('.tabs a@class', 0), '<{Dever::input("type", 1) == 1 ? "cur" : ""}>')

task/database/user_report.php

@@ -244,7 +244,7 @@ return array
 			(
 				'task_id' => 'yes',
 				'uid' => 'yes',
-				'status' => array(3, '!='),
+				//'status' => array(3, '!='),
 				'state' => 1,
 			),
 			'type' => 'count',

task/src/Info.php

@@ -40,6 +40,9 @@ class Info extends Base
         $this->data['cate'] = Dever::db('task/cate')->state();
 
         $type = Dever::input('type', 1);
+        if ($type == 2) {
+            $type = 3;
+        }
         $data = Dever::db('task/user_task')->getAll(array('where_uid' => $this->data['uid'], 'where_status' => $type));
         if ($data) {
             foreach ($data as $k => $v) {

task/src/Score.php

@@ -170,16 +170,17 @@ class Score extends Base
 
         		} elseif ($v['type'] <= 5) {
                     $task = Dever::db('task/info')->one($v['task_id']);
-                    $data[$k]['score'] = '任务#'.$task['name'].'奖励'.$v['score'].$name;
         			$data[$k]['desc'] = '入账时间：' . $this->date($v['cdate']) . '<br />';
                     $data[$k]['info'] = '本次入账：'.$v['score'].$name;
                     $data[$k]['status'] = '已入账';
                     $data[$k]['icon'] = 'wan';
         			if ($v['type'] == 4) {
+                        $data[$k]['score'] = '任务#'.$task['name'].'奖励'.$v['score'].$name;
         				$user = Dever::db('passport/user')->one($v['uid']);
         				# 任务奖励
         				$data[$k]['desc'] .= '来源：'.$user['username'] . '完成任务#'.$task['name'].'的奖励';
         			} elseif ($v['type'] == 5) {
+                        $data[$k]['score'] = '任务#'.$task['name'].'提成奖励'.$v['score'].$name;
         				$user = Dever::db('passport/user')->one($v['group_uid']);
         				# 任务提成
                         $data[$k]['desc'] .= '来源：'.$user['username'] . '完成任务#'.$task['name'].'的提成奖励';