no message

src/main/webapp/WEB-INF/pages/activity/activitylist.jsp

@@ -38,11 +38,27 @@
 					</button>
 					
 					<button class="btn btn-sm btn-success">
-						<i class="icon-star-half-full bigger-110"></i>
+						<i class="icon-ban-circle bigger-110"></i>
 						禁用
 					</button>
 		
 					
+				</div>
+				
+				<div class="pull-right">
+					
+							<select class="" id="type" name="type">
+									<option value="">请选择</option>
+									<option value="1" <c:if test="${activityVo.type==1}">selected</c:if>>采血</option>
+									<option value="2" <c:if test="${activityVo.type==2}">selected</c:if>>公益</option>
+									<option value="3" <c:if test="${activityVo.type==3}">selected</c:if>>彩虹</option>
+									<option value="4" <c:if test="${activityVo.type==4}">selected</c:if>>其他</option>
+							</select>
+						
+							<input type="text" placeholder="查询" class="nav-search-input" id="searchStr" value="${activityVo.searchStr}" autocomplete="off">
+							<a href="javascript:void(0);" id="searchBtn"><i class="icon-search nav-search-icon"></i></a>
+						
+						
 				</div>
 			</div>
 			
@@ -91,8 +107,13 @@
 							</td>
 							<td title="">${activity.addr}</td>
 							<td title=""><fmt:formatDate value='${activity.day}' pattern='yyyy-MM-dd HH:mm' /></td>
-							<td title="">${activity.max}</td>
-							<td title="">${activity.crowd}</td>
+							<td title=""><c:if test="${activity.max==0}">所有</c:if><c:if test="${activity.max!=0}">${activity.max}</c:if></td>
+							<td title="">
+							<c:if test="${activity.crowd == 0}">所有人</c:if>
+							<c:if test="${activity.crowd == 1}">捐献志愿者</c:if>
+							<c:if test="${activity.crowd == 2}">未采血用户</c:if>
+							
+							</td>
 							<td title="">${activity.contacts}</td>
 							<td title="">${activity.tel}</td>
 							<td title=""> <c:if test="${activity.available}"><font color=green>正常</font></c:if><c:if test="${!activity.available}"><font color=red>关闭</font></c:if></td>
@@ -127,7 +148,11 @@
 					</tbody>
 				</table>
 											
-											
+						<webpage:page totalCount="${activityPage.recordTotal}"
+												pageCount="${pageCount}" currentPage="${pageNumber}"
+												action="/activity/list"
+												className="pageable-div pagination" 
+												innerStyle=" float: left; width: 100%" /> 								
 											
 					
 			</div>
@@ -142,3 +167,4 @@
 	
 </div>
 
+<script src="<webpath:path/>/resources/js/activity/activity.js" type="text/javascript"></script>
\ No newline at end of file

src/main/webapp/WEB-INF/pages/activity/saveactivity.jsp

@@ -121,8 +121,8 @@
 						<div class="col-sm-9">
 							<select name="available" id="available" class="col-xs-10 col-sm-10">  
 							    
-								<option value="true" <c:if test="${activity.available}">selected</c:if>>正常</option>
-								<option value="false" <c:if test="${activity.available}">selected</c:if>>关闭</option>
+								<option value="true" <c:if test="${activity.available==true}">selected</c:if>>正常</option>
+								<option value="false" <c:if test="${activity.available==false}">selected</c:if>>关闭</option>
 								
 							</select>  
 							

src/main/webapp/resources/js/activity/activity.js

 var isSubmit = true;
 $(document).ready(function(){
-	
+	$("#searchBtn").bind("click",function(){
+		activity.search();
+	});
 	if ($('#activityForm').length>0){
 		$('#activityForm').validate({
 			
@@ -72,14 +74,17 @@ $(document).ready(function(){
 	        
 		});
 		
+		
+		laydate.render({
+			  elem: '#day'
+			  ,type: 'datetime'
+			});
+		
 	}
 	
 
 	
-	laydate.render({
-	  elem: '#day'
-	  ,type: 'datetime'
-	});
+	
 	
 	
 	
@@ -157,6 +162,29 @@ var activity = {
 			
 
 		
+	},
+	search : function(){
+		var type = $("#type").val();
+		var searchStr = $("#searchStr").val();
+		var url = webPath + "/activity/list";
+		
+		if(type!="" || searchStr!=""){
+			var param = "?"
+			if (type != ""){
+				param = param + "type=" + type ;
+			}
+			
+			if (searchStr != ""){
+				if (param == "?"){
+					param = param + "searchStr=" + searchStr;
+				} else {
+					param = param + "&searchStr=" + searchStr;
+				}
+				
+			}
+			url = url + param;
+		}
+		window.location.href = url;
 	}
 	
 }