edit

config/base.php

@@ -124,7 +124,7 @@ $config['template'] = array
 		'help/list'	=> 'help',
 		'help/view' => 'help-article',
 
-		# 剩余我的消息（需要接入消息系统）、资料认证、按钮置灰色
+		# 剩余我的消息（需要接入消息系统）、修改资料
 	),
 	
 );

task/database/user_task.php

@@ -192,7 +192,7 @@ return array
 				'state' => 1,
 			),
 			'type' => 'all',
-			'order' => array('reorder' => 'desc', 'cdate' => 'desc'),
+			'order' => array('cdate' => 'desc'),
 			'page' => array(15, 'list'),
 			'col' => '*',
 		),

task/src/Info.php

@@ -37,10 +37,11 @@ class Info extends Base
 
         $this->data['cate'] = Dever::db('task/cate')->state();
 
-        $data = Dever::db('task/user_task')->getAll();
+        $data = Dever::db('task/user_task')->getAll(array('uid' => $this->data['uid']));
         if ($data) {
             foreach ($data as $k => $v) {
                 $data[$k] = Dever::db('task/info')->one($v['task_id']);
+                $data[$k]['uid'] = $v['uid'];
                 $this->getOne($data[$k]);
             }
         }

task/src/Report.php

@@ -164,7 +164,12 @@ class Report extends Base
             $data['audit_icon'] = 'tk-ft-error';
         }
 
-        $data['img'] = explode(',', $data['pic']);
+        $img = explode(',', $data['pic']);
+        if ($img) {
+            foreach ($img as $k => $v) {
+                $data['img'][$k]['url'] = $v;
+            }
+        }
 
         $data['name'] = '账号：' . $data['username'] . $data['audit'];
     }

task/src/User.php

@@ -13,6 +13,17 @@ class User extends Base
         $this->checkLogin();
     }
 
+    public function config()
+    {
+        # 资料认证
+        $config['submit'] = $this->url('task/user.submit', array('uid' => $this->data['uid']));
+
+        # 完善资料
+        $config['set'] = $this->url('task/user.set', array('uid' => $this->data['uid']));
+
+        return $config;
+    }
+
     /**
      * 用户基本信息
      *
@@ -73,8 +84,8 @@ class User extends Base
     {
         $where['uid'] = $this->data['uid'];
         $user = Dever::db('task/user_score')->one($where);
-
-        if ($user) {
+        $edit = Dever::input('edit');
+        if ($user && !$edit) {
             Dever::alert('你已经填写过资料了');
         }
 
@@ -107,9 +118,12 @@ class User extends Base
             }
         }
 
-        # 设置默认头像
-        $config = Dever::db('main/config-one');
-        Dever::setInput('avatar', $config['avatar']);
+        $avatar = Dever::input('avatar');
+        if (!$avatar) {
+            # 设置默认头像
+            $config = Dever::db('main/config-one');
+            Dever::setInput('avatar', $config['avatar']);
+        }
 
         Dever::load('passport/user')->updateInfo();
 
@@ -188,24 +202,26 @@ class User extends Base
         $wechat = Dever::input('wechat');
         $alipay = Dever::input('alipay');
 
+        $refresh = array('element' => '#submit', 'attr' => 'dever-refresh', 'value' => Dever::load("task/user.config#submit"));
+
         if (!$truename) {
-            Dever::alert('真实姓名不能为空');
+            Dever::alert('真实姓名不能为空', $refresh);
         }
 
         if (!$card) {
-            Dever::alert('身份证号不能为空');
+            Dever::alert('身份证号不能为空', $refresh);
         }
 
         if (!$card_front) {
-            Dever::alert('身份证正面不能为空');
+            Dever::alert('身份证正面不能为空', $refresh);
         }
 
         if (!$card_end) {
-            Dever::alert('身份证反面不能为空');
+            Dever::alert('身份证反面不能为空', $refresh);
         }
 
         if (!$wechat && !$alipay) {
-            Dever::alert('微信号或者支付宝账号不能为空');
+            Dever::alert('微信号或者支付宝账号不能为空', $refresh);
         }
 
         if (!$user) {
@@ -217,7 +233,6 @@ class User extends Base
             $insert['wechat'] = $wechat;
             $insert['alipay'] = $alipay;
             $insert['status'] = 1;
-            return Dever::db('task/user_info')->insert($insert);
         } else {
             $update['truename'] = $truename;
             $update['card'] = $card;
@@ -228,7 +243,8 @@ class User extends Base
             $update['status'] = 1;
             $update['where_id'] = $user['id'];
             Dever::db('task/user_info')->update($update);
-            return $user['id'];
         }
+
+        return Dever::url('user/info', 'main');
     }
 }