edit

tm/lib/Controller/EventsController.class.php

@@ -23,6 +23,8 @@ use Cas\Dao\LotteryUserExpress;
 use Cas\Dao\LotteryUserHelp;
 use Cas\Dao\LotteryUserHelpLog;
 
+use Cas\Dao\LotteryEventsForms;
+
 /**
  * 活动页面的控制器
  *
@@ -403,6 +405,15 @@ class EventsController extends Controller {
 		if ($t == 1) {
 			print_r($newUserExpData);
 		}
+
+		$objLotteryEventsForms = new LotteryEventsForms();
+		$ids = $objLotteryEventsForms->findIdsBy($condition);
+		$formData = $objLotteryEventsForms->gets($ids);
+		$userFormData = array();
+		foreach($formData as $k => $v){
+			$userFormData[$v['uid']] = $v;
+		}
+
 		$this->setOutput('newUserExpData', $newUserExpData);
 
 		//138****1234 的用户 2018.4.20 15:10 获得 某某某某活动 奖品。
@@ -412,6 +423,11 @@ class EventsController extends Controller {
 			if (isset($v['pic'])) {
 				$data[$k]['pic'] = explode(',', $v['pic']);
 			}
+			$data[$k]['user']['nickname'] = $users[$v['uid']]['nickname'];
+			$key = $v['run_time_data']['events']['forms'][1]['name'];
+			if ($key) {
+				$data[$k]['user']['nickname'] = $userFormData[$v['uid']][$key];
+			}
 
 			if ($v['events_id']) {
 				$d = $objEvents->findIdsBy(array('id' => $v['events_id']));
@@ -427,6 +443,8 @@ class EventsController extends Controller {
 
 			$data[$k]['user']['headimgurl'] = $this->getUserHead($users[$v['uid']]);
 
+			
+
 
 			$data[$k]['user']['ext'] = '';
 			if ($type == 6) {
@@ -440,7 +458,9 @@ class EventsController extends Controller {
 			}
 
 
-			if (isset($v['express']['phone']) && $v['express']['phone']) {
+			if ($type == 4) {
+				$data[$k]['user']['mobile'] = $data[$k]['user']['nickname'];
+			} elseif (isset($v['express']['phone']) && $v['express']['phone']) {
 				$data[$k]['user']['mobile'] = substr_replace($v['express']['phone'],'****',3,4);
 			} elseif (isset($newUserExpData[$v['uid']]['phone']) && $newUserExpData[$v['uid']]['phone']) {
 				$data[$k]['user']['mobile'] = substr_replace($newUserExpData[$v['uid']]['phone'],'****',3,4);