edit

tm/lib/Controller/EventsController.class.php

@@ -158,6 +158,18 @@ class EventsController extends Controller {
 			if ($userData) {
 				$objLotteryUserFeedback = new LotteryUserFeedback();
 
+				$userData['feedback'] = 2;//未填写反馈
+				$where = array();
+				$where['uid'] = $userData['uid'];
+				$where['events_id'] = $userData['run_time_data']['events']['id'];
+				$where['status'] = 1;
+				
+				$ids = $objLotteryUserFeedback->findIdsBy ( $where, 1, $order = ' id desc');
+				if ($ids) {
+					$userData['feedback'] = 3;//已填写反馈
+				}
+				
+				/*
 				if (isset($userData['express']) && $userData['express']) {
 					$userData['feedback'] = 2;//未填写反馈
 					$where = array();
@@ -172,6 +184,7 @@ class EventsController extends Controller {
 				} else {
 					$userData['feedback'] = 4;//未填写收货地址
 				}
+				*/
 			}
 			
 		}

tm/lib/Controller/Member.class.php

@@ -53,6 +53,18 @@ class Member extends EventsController {
 			$events_ids[$d['run_time_data']['events']['id']] = $d['run_time_data']['events']['id'];
 
 			if (in_array($d['run_time_data']['events']['type'], array(4,0))) {
+
+				$data[$key]['feedback'] = 2;//未填写反馈
+				$where = array();
+				$where['uid'] = $d['uid'];
+				$where['events_id'] = $d['run_time_data']['events']['id'];
+				$where['status'] = 1;
+				
+				$ids = $objLotteryUserFeedback->findIdsBy ( $where, 1, $order = ' id desc');
+				if ($ids) {
+					$data[$key]['feedback'] = 3;//已填写反馈
+				}
+				/*
 				if (isset($d['express']) && $d['express']) {
 					$data[$key]['feedback'] = 2;//未填写反馈
 					$where = array();
@@ -67,6 +79,7 @@ class Member extends EventsController {
 				} else {
 					$data[$key]['feedback'] = 4;//未填写收货地址
 				}
+				*/
 			}
 		}
 
@@ -151,7 +164,20 @@ class Member extends EventsController {
 			$data[$key]['feedback'] = 1;//不需要填写反馈
 			$events_ids[$d['run_time_data']['events']['id']] = $d['run_time_data']['events']['id'];
 
+
 			if (in_array($d['run_time_data']['events']['type'], array(4,0))) {
+				$data[$key]['feedback'] = 2;//未填写反馈
+				$where = array();
+				$where['uid'] = $d['uid'];
+				$where['events_id'] = $d['run_time_data']['events']['id'];
+				$where['status'] = 1;
+				
+				$ids = $objLotteryUserFeedback->findIdsBy ( $where, 1, $order = ' id desc');
+				$info = $objLotteryUserFeedback->gets ( $ids );
+				if ($info) {
+					$data[$key]['feedback'] = 3;//已填写反馈
+				}
+				/*
 				if (isset($d['express']) && $d['express']) {
 					$data[$key]['feedback'] = 2;//未填写反馈
 					$where = array();
@@ -167,6 +193,7 @@ class Member extends EventsController {
 				} else {
 					$data[$key]['feedback'] = 4;//未填写收货地址
 				}
+				*/
 			}
 		}
 

tm/template_dir/admin/activity/user_participate_win.html

@@ -88,10 +88,10 @@
 								<td>
 									获得奖品: <span class="text-muted"><{$data.run_time_data.prize[0].prize_name}></span>&nbsp; 
 
-									<{if $data.express}>
+									<{if $data.express1111}>
 									<br><br>用户收货地址: <span class="text-muted">姓名:<{$data.express.user_name}>  收货地址:<{$data.express.address}> 电话:<{$data.express.phone}></span>&nbsp; 
 
-									<{elseif $newUserExpData[$data.uid].user_name}>
+									<{elseif $newUserExpData[$data.uid].user_name111}>
 									<br><br>用户收货地址: <span class="text-muted">姓名:<{$newUserExpData[$data.uid].user_name}>  收货地址:<{$newUserExpData[$data.uid].address}> 电话:<{$newUserExpData[$data.uid].phone}></span>&nbsp; 
 									<{/if}>