Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/hiz

task/lib/Base.php

@@ -17,18 +17,20 @@ class Base
 		$user = new User();
 		$this->user = $user->data();
 
+        $config = Dever::db('main/config')->one();
+        if ($config['avatar']) {
+            $this->data['avatar'] = $config['avatar'];
+        } else {
+            $this->data['avatar'] = Dever::config('host', 'main')->assets . 'mobile/images/avatar.jpg';
+        }
+
 		$this->data['config'] = Dever::db('main/config')->one(1);
 		$this->data['time'] = time();
 		$this->data['uid'] = -1;
 		if ($this->user) {
 			$this->data['uid'] = $this->user['id'];
             if (!$this->user['avatar']) {
-                $config = Dever::db('main/config-one');
-                if ($config['avatar']) {
-                    $this->user['avatar'] = $config['avatar'];
-                } else {
-                    $this->user['avatar'] = Dever::config('host', 'main')->assets . 'mobile/images/avatar.jpg';
-                }
+                $this->user['avatar'] = $this->data['avatar'];
             }
 
             $this->user['avatar'] .= '?v=' . time();

task/src/Group.php

@@ -29,6 +29,9 @@ class Group extends Base
             if ($data) {
                 foreach ($data as $k => $v) {
                     $data[$k]['user'] = Dever::db('passport/user')->one($v['uid']);
+                    if (!$data[$k]['user']['avatar']) {
+                        $data[$k]['user']['avatar'] = $this->data['avatar'];
+                    }
                     $data[$k]['time'] = date('Y-m-d H:i', $v['cdate']);
                 }
             }