备注

@@ -82,6 +82,15 @@ class ActivityController extends AdminBaseController
                 $where['create_time'] = ['<= time', $endTime];
             }
         }
+
+        if (!empty($param['type'])){
+            $where['activity_type']=$param['type'];
+            $this->assign('type',$param['type']);
+        }else{
+            $this->assign('type','0');
+        }
+
+
         $keyword = empty($param['keyword']) ? '' : $param['keyword'];
         if (!empty($keyword)) {
             $where['activity_name|abstract'] = ['like', "%$keyword%"];

@@ -6,12 +6,21 @@
 		<li class="active"><a href="{:url('activity/news')}">新闻列表</a></li>
 		<li><a href="{:url('activity/addNews')}">添加新闻</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="well form-inline margin-top-20" method="post" action="{:url('news')}">
+		分类:
+		<select class="form-control" name="type" style="width: 140px;">
+			<option value='0'>全部</option>
+			<option value='1' <if condition="$type eq 1">selected</if> >活动资讯</option>
+			<option value='2' <if condition="$type eq 2">selected</if>>媒体报道</option>
+			<option value='3' <if condition="$type eq 3">selected</if>>通知公告</option>
+			<option value='4' <if condition="$type eq 4">selected</if>>志愿随笔</option>
+
+		</select> &nbsp;&nbsp;
+		<input type="submit" class="btn btn-primary" value="搜索"/>
+		<a class="btn btn-danger" href="{:url('news')}">清空</a>
+	</form>
+
 	<form class="js-ajax-form" action="" method="post">
 		<table class="table table-hover table-bordered">
 			<div class="table-actions">