打卡操作

@@ -66,7 +66,6 @@ class ActivityController extends AdminBaseController
             'data'=>$list,
             'page'=>$data->render(),
         ]);
-        //dump($list);
         $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
         $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
         $this->assign('keyword', isset($param['keyword']) ? $param['keyword'] : '');

@@ -35,6 +35,7 @@
 				</th>
 				<th width="20">ID</th>
 				<th width="50">标题</th>
+				<th width="50">团队名称</th>
 				<th width="100">活动类型</th>
 				<th width="20">封面图</th>
 				<th width="30">开始时间</th>
@@ -55,6 +56,7 @@
 					</td>
 					<td>{$vo.id}</td>
 					<td>{$vo.activity_name}</td>
+					<td>{:get_team($vo['team_id'],'name')}</td>
 					<td>{$vo.type_name}</td>
 					<td>
 						<notempty name="$vo.thumbnail">
@@ -74,6 +76,8 @@
 							<a data-toggle="tooltip" title="未发布"><i class="fa fa-close"></i></a>
 						</notempty>
 					</td>
+
+
 					<!--<td>{:cmf_replace_content_file_url(htmlspecialchars_decode($vo.content))}</td>-->
 
 					<!--<td>{:date('Y-m-d H:i:s',$vo['end_time'])}</td>-->

@@ -98,7 +98,7 @@
 					<td>
 						<notempty name="vo['select_time']">
 							<volist name="vo['select_time']" id="v1">
-								{$v1.date} {$v1.time} <br />
+								{$v1.date|default=''} {$v1.time|default=''} <br />
 							</volist>
 						</notempty>
 					</td>
@@ -113,7 +113,7 @@
 					<td>
 						<notempty name="vo['apply_food']">
 						<volist name="vo['apply_food']" id="v1">
-							{$v1.date} {$v1.time}<br />
+							{$v1.date|default=''} {$v1.time|default=''}<br />
 						</volist>
 						</notempty>
 					</td>

@@ -38,6 +38,7 @@
 				</th>
 				<th width="20">ID</th>
 				<th width="50">标题</th>
+				<th width="50">团队名称</th>
 				<th width="20">缩略图</th>
 				<th width="20">摘要</th>
 				<th width="30">创建时间</th>
@@ -56,6 +57,7 @@
 					</td>
 					<td>{$vo.id}</td>
 					<td>{$vo.activity_name}</td>
+					<td>{:get_team($vo['id'],'name')}</td>
 					<td>
 						<notempty name="$vo.thumbnail">
 							<a href="javascript:parent.imagePreviewDialog('{:cmf_get_image_preview_url($vo.thumbnail)}');">

@@ -23,6 +23,7 @@
 					<th>{:lang('LAST_LOGIN_TIME')}</th>
 					<th>{:lang('EMAIL')}</th>
 					<th>{:lang('STATUS')}</th>
+					<th>用户团队</th>
 					<th width="130">{:lang('ACTIONS')}</th>
 				</tr>
 			</thead>
@@ -42,6 +43,7 @@
 					</td>
 					<td>{$vo.user_email}</td>
 					<td>{$user_statuses[$vo['user_status']]}</td>
+					<td>{:get_team($vo['team_id'],'name')}</td>
 					<td>
 						<if condition="$vo['id'] eq 1 || $vo['id'] eq cmf_get_current_admin_id()">
 						<font color="#cccccc">{:lang('EDIT')}</font>  <font color="#cccccc">{:lang('DELETE')}</font>

@@ -25,7 +25,13 @@ Route::get('captcha/new', "\\cmf\\controller\\CaptchaController@index");
 
 
 
-
+     function get_team($id,$field){
+         if ($id==''){
+             return '白求恩志愿者培训中心';
+         }
+         $field=\db('team')->where('id',$id)->value($field);
+         return $field;
+     }
 
 
     function sendSubMessage($data,$openId = "openId",$tmpl = "i32dB8tFiNFYRgRGM6bv79aEe4X2_BZ8HunwaoPw58o"){