用户头像

Application/Home/Controller/AuctionController.class.php

@@ -37,7 +37,7 @@ class AuctionController extends BaseController
 						,'initial_price'=>10
 						,'bid_price'=>10
 						,'enroll_price'=>10
-						,'start_time'=>'2018-09-19 11:30'
+						,'start_time'=>'2018-09-19 20:08'
 						,'end_time'=>''
 						,'status'=>'1'
 				)
@@ -57,7 +57,7 @@ class AuctionController extends BaseController
 					,'initial_price'=>10
 					,'bid_price'=>10
 					,'enroll_price'=>10
-					,'start_time'=>'2018-09-19 14:00'
+					,'start_time'=>'2018-09-19 20:15'
 					,'end_time'=>''
 					,'status'=>'1'
 				)
@@ -78,7 +78,7 @@ class AuctionController extends BaseController
 					,'initial_price'=>10
 					,'bid_price'=>10
 					,'enroll_price'=>10
-					,'start_time'=>'2018-09-19 19:15'
+					,'start_time'=>'2018-09-19 20:30'
 					,'end_time'=>''
 					,'status'=>'1'
 				)

Application/Home/Controller/EntryController.class.php

@@ -33,7 +33,7 @@ class EntryController extends BaseController
                 );
                 $userInfo = M("game_member","",C("LEWAN_HEZI"))->where($reWhere)->find();
                 if(!empty($userInfo)) {
-                    $result = $userModel->inviteTask($uid,$requestData['reid'],$userInfo['user_avatar']);
+                    $result = $userModel->inviteTask($uid,$requestData['reid']);
                 }
             }
 
@@ -79,9 +79,6 @@ class EntryController extends BaseController
         $uid = $token['uid'];
 
         //获取用户昵称
-        // $sql = "select user_nickname from ".get_table("game_member")." where uid=$userid";
-        // $result = $GLOBALS["conn"]->Query($sql);
-        // $userArr = $GLOBALS["conn"]->getOne($result);
         $userArr = M("game_member","",C("LEWAN_HEZI"))->where(array('uid'=>$uid))->field('user_nickname')->find();
 
         $addArr = array(
@@ -92,7 +89,7 @@ class EntryController extends BaseController
             ,'add_time'=>date('Y-m-d H:i:s')
         );
 
-        // add_record($GLOBALS["conn"],"template_formid",$addArr,true);
+        //保存模板消息formid
         M("yl_template_formid","",C("LEWAN_HEZI"))->add($addArr);
         $result = array(
             'c'=>1

Application/Home/Controller/UserController.class.php

@@ -156,6 +156,13 @@ class UserController extends BaseController
                                 }
                                 //设置用户任务进度
                                 $taskList[$key]['list'][$lkey]['status'] = $userReceive[$lval['en_name']]['status'];
+                                //获取用户头像
+                                if($userReceive[$lval['en_name']]['status'] >= 2) {
+                                    $userArr = M("game_member","",C("LEWAN_HEZI"))->where(array('uid'=>$userReceive[$lval['en_name']]['uid']))->field('user_avatar')->find();
+                                    if(!empty($userArr && strstr($uval['user_nickname'], '玩家') != false)) {
+                                        $taskList[$key]['list'][$lkey]['head'] = $userArr['user_avatar'];
+                                    }
+                                }
                             }
                         }
                     }

Application/Home/Model/UserModel.class.php

@@ -346,7 +346,7 @@ class UserModel extends BaseModel
     }
 
     //邀请新用户任务
-    function inviteTask($uid,$reid,$avatar = '') {
+    function inviteTask($uid,$reid) {
         $taskModel  = M("yl_game_task","",$this->__lewan_hezi);
 
         $whereArr = array(
@@ -376,19 +376,15 @@ class UserModel extends BaseModel
                 if($taskArr['schedule'] == 1 && $receiveArr['invite_user2']['status'] == 1) {
                     $receiveArr['invite_user2']['status'] = 2;
                     $receiveArr['invite_user2']['uid'] = $uid;
-                    $receiveArr['invite_user2']['avatar'] = $avatar;
                 } else if($taskArr['schedule'] == 2 && $receiveArr['invite_user3']['status'] == 1) {
                     $receiveArr['invite_user3']['status'] = 2;
                     $receiveArr['invite_user3']['uid'] = $uid;
-                    $receiveArr['invite_user3']['avatar'] = $avatar;
                 } else if($taskArr['schedule'] == 3 && $receiveArr['invite_user4']['status'] == 1) {
                     $receiveArr['invite_user4']['status'] = 2;
                     $receiveArr['invite_user4']['uid'] = $uid;
-                    $receiveArr['invite_user4']['avatar'] = $avatar;
                 } else if($taskArr['schedule'] == 4 && $receiveArr['invite_user5']['status'] == 1) {
                     $receiveArr['invite_user5']['status'] = 2;
                     $receiveArr['invite_user5']['uid'] = $uid;
-                    $receiveArr['invite_user5']['avatar'] = $avatar;
                 }
                 $taskModel->where($whereArr)->save(array('receive_info'=>json_encode($receiveArr)));
 
@@ -396,11 +392,11 @@ class UserModel extends BaseModel
 
         } else {
             $receiveArr = array(
-                'invite_user1'=>array('status'=>2,'uid'=>$uid,'avatar'=>$avatar)
-                ,'invite_user2'=>array('status'=>1,'uid'=>'','avatar'=>'')
-                ,'invite_user3'=>array('status'=>1,'uid'=>'','avatar'=>'')
-                ,'invite_user4'=>array('status'=>1,'uid'=>'','avatar'=>'')
-                ,'invite_user5'=>array('status'=>1,'uid'=>'','avatar'=>'')
+                'invite_user1'=>array('status'=>2,'uid'=>$uid)
+                ,'invite_user2'=>array('status'=>1,'uid'=>'')
+                ,'invite_user3'=>array('status'=>1,'uid'=>'')
+                ,'invite_user4'=>array('status'=>1,'uid'=>'')
+                ,'invite_user5'=>array('status'=>1,'uid'=>'')
             );
             //添加今日任务记录
             $taddArr = array(