刘朕 / volunteer · 提交

转到一个项目

作者 sgj
提交 5a119cf25b86cfb502b4efb9e095e7e7e248f9cd 1 个父辈 51741f12
1 个管道 的构建 通过 耗费 2 秒

接口完成

内嵌 并排对比
正在显示 5 个修改的文件 包含 202 行增加 和 8 行删除
... ... @@ -92,13 +92,17 @@ class ActivityController extends AdminBaseController
$activity[$v['id']]['type_name']=$v['type_name'];
$activity[$v['id']]['id']=$v['id'];
}
$provincedb=db('position_province')->select()->toArray();
foreach ($provincedb as $k=>$v){
$province[$v['id']]['name']=$v['province_name'];
$province[$v['id']]['id']=$v['id'];
}
//dump($province);
$this->assign([
'data'=>$data,
'type'=>$activity,
'area'=>$province,
]);
return $this->fetch();
}
... ... @@ -134,6 +138,21 @@ class ActivityController extends AdminBaseController
->insert($param);
$this->success('添加成功！');
}else{
$activity_type=\db('activity_type')->select()->toArray();
foreach ($activity_type as $k=>$v){
$activity[$v['id']]['type_name']=$v['type_name'];
$activity[$v['id']]['id']=$v['id'];
}
$provincedb=db('position_province')->select()->toArray();
foreach ($provincedb as $k=>$v){
$province[$v['id']]['name']=$v['province_name'];
$province[$v['id']]['id']=$v['id'];
}
$this->assign([
'type'=>$activity,
'area'=>$province,
]);
return $this->fetch();
}
}
... ... @@ -258,6 +277,58 @@ class ActivityController extends AdminBaseController
}
}
public function join(){
$map['j.activity_id']=input('id');
$map['j.delete_time']=0;
$join=\db('join')
->field('j.*,v.name,v.photo')
->alias('j')
->join('volunteer v','v.user_id=j.user_id')
->where($map)
->select();
$this->assign('data',$join);
return $this->fetch();
}
/**
* 审核通过
* @throws \think\Exception
* @throws \think\exception\PDOException\
*/
public function joinPass(){
$map['id']=input('id');
if (empty($map['id'])){
$this->error('参数错误!');
}
$update['status']='1';
$result=\db('join')->where($map)->update($update);
if ($result>0){
$this->success('操作成功!');
}else{
$this->error('操作失败!');
}
}
/**
* 审核不通过
* @throws \think\Exception
* @throws \think\exception\PDOException\
*/
public function joinUnPass(){
$map['id']=input('id');
if (empty($map['id'])){
$this->error('参数错误!');
}
$update['status']='2';
$result=\db('join')->where($map)->update($update);
if ($result>0){
$this->success('操作成功!');
}else{
$this->error('操作失败!');
}
}
... ...
... ... @@ -97,6 +97,31 @@
</div>
</td>
</tr>
<tr>
<th>活动类型</th>
</tr>
<tr>
<td>
<select class="form-control" name="activity_type" id="more-template-select">
<foreach name="type" item="vo">
<option value="{$vo.id}">{$vo.type_name}</option>
</foreach>
</select>
</td>
</tr>
<tr>
<th>活动区域</th>
</tr>
<tr>
<td>
<select class="form-control" name="position_id" id="more-template-select">
<foreach name="area" item="vo">
<option value="{$vo.id}">{$vo.name}</option>
</foreach>
</select>
</td>
</tr>
</table>
</div>
</div>
... ...
... ... @@ -118,11 +118,11 @@
</tr>
<tr>
<td>
<select class="form-control" name="activity_type" id="more-template-select">
<option value="{$data['activity_type']|default=''}">
{$type[$data['activity_type']]['type_name']|default=''}</option>
<foreach name="type" item="vo">
<option value="{$vo.id}">{$vo.type_name}</option>
<select class="form-control" name="position_id" id="more-template-select">
<option value="{$data['position_id']|default=''}">
{$area[$data['position_id']]['name']|default=''}</option>
<foreach name="area" item="vo">
<option value="{$vo.id}">{$vo.name}</option>
</foreach>
</select>
</td>
... ...
... ... @@ -75,6 +75,7 @@
<td>
<a href='{:url("activity/edit",array("id"=>$vo["id"]))}'>{:lang('EDIT')}</a>|
<a class="js-ajax-delete" href="{:url('activity/delete',array('id'=>$vo['id']))}">{:lang('DELETE')}</a>
<a href="{:url('activity/join',array('id'=>$vo['id']))}">查看参加人员</a>
</td>
</tr>
</foreach>
... ...
<include file="public@header" />
</head>
<body>
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li class="active"><a href="{:url('activity/index')}">活动列表</a></li>
<li><a href="{:url('activity/add')}">添加活动</a></li>
</ul>
<form class="well form-inline margin-top-20" method="post" action="{:url('activity/index')}">
关键字:
<input type="text" class="form-control" name="keyword" style="width: 150px;" value="{$keyword|default=''}" placeholder="请输入关键字">
<input type="submit" class="btn btn-primary" value="搜索" />
<a class="btn btn-danger" href="{:url('activity/index')}">清空</a>
</form>
<form class="js-ajax-form" action="" method="post">
<table class="table table-hover table-bordered">
<div class="table-actions">
<button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
data-action="{:url('activity/publish',array('yes'=>1))}" data-subcheck="true">发布
</button>
<button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
data-action="{:url('activity/publish',array('no'=>1))}" data-subcheck="true">取消发布
</button>
<button class="btn btn-danger btn-sm js-ajax-submit"
data-action="{:url('activity/delete')}" data-subcheck="true" data-msg="你确定删除吗？">
{:lang('DELETE')}
</button>
</div>
<thead>
<tr>
<th width="15">
<label>
<input type="checkbox" class="js-check-all" data-direction="x" data-checklist="js-check-x">
</label>
</th>
<th width="20">ID</th>
<th width="50">姓名</th>
<th width="20">头像</th>
<th width="20">状态</th>
<th width="30">参加类型</th>
<th width="30">报名时间</th>
<th width="30">打卡时间</th>
<th width="30">活动时长</th>
<th width="100"><操作></操作></th>
</tr>
</thead>
<tbody>
<foreach name="data" item="vo">
<tr>
<td>
<input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]"
value="{$vo.id}" title="ID:{$vo.id}">
</td>
<td>{$vo.id}</td>
<td>{$vo.name}</td>
<td>
<notempty name="$vo.photo">
<a href="javascript:parent.imagePreviewDialog('{:cmf_get_image_preview_url($vo.photo)}');">
<img style="width: 50px" src="{:cmf_get_image_preview_url($vo.photo)}">
</a>
</notempty>
</td>
<td>
<switch name="$vo.status">
<case value="0">未审核</case>
<case value="1">已通过</case>
<case value="2">未通过</case>
<case value="3">已签到</case>
</switch>
</td>
<td>
<switch name="$vo.type">
<case value="1">线上</case>
<case value="2">线下</case>
<case value="3">线上+线下</case>
</switch>
</td>
<td>{:date('Y-m-d H:i:s',$vo['add_time'])}</td>
<td>{:date('Y-m-d H:i:s',$vo['sgin_time'])}</td>
<td>{$vo['work_time']}</td>
<td>
<a href="{:url('activity/joinPass',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn" data-msg="确定审核通过吗？">通过</a>|
<a href="{:url('activity/joinUnPass',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn" data-msg="确定审核通过吗？">拒绝</a>|
<a href="{:url('activity/join',array('id'=>$vo['id']))}">添加活动时间</a>
</td>
</tr>
</foreach>
</tbody>
</table>
</form>
</div>
<script src="__STATIC__/js/admin.js"></script>
</body>
</html>
\ No newline at end of file
... ...