整合三个系统的前端页面

Signed-off-by: ying.rong <ying.rong@cloudcross.com>

.settings/org.eclipse.core.resources.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/webapp/assets/back/css/public-head.css=UTF-8
-encoding/<project>=UTF-8

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/BannerTemplateController.java

@@ -140,9 +140,12 @@ public class BannerTemplateController extends SimpleController {
 		//获取创意的列表
 		List<BannerTemplate> bannerTemplateList = bannerTemplateService.findByParams2(
 				paramMap, pager);
+		//获取尺寸的列表
+		List<Size> sizeList = sizeService.findAllSize();
 		model.addAllAttributes(paramMap);
 		model.addAttribute("pager", pager);
 		model.addAttribute("bannerTemplateList", bannerTemplateList);
+		model.addAttribute("sizeList", sizeList);
 		return page("list");
 	}
 

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/CampaignController.java

@@ -67,7 +67,6 @@ public class CampaignController extends SimpleController {
 	@RequestMapping("/list")
 	public String list(Model model,
 			@RequestParam HashMap<String, Object> paramMap,
-			@RequestParam Long orderId,
 			@RequestParam(defaultValue="2") int status,
 			@RequestParam(defaultValue = "1") int page) {
 		

src/main/java/com/cloudcross/ssp/web/back/main/ap/PlaceController.java

@@ -1,219 +1,225 @@
-package com.cloudcross.ssp.web.back.main.ap;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.cloudcross.ssp.base.web.SimpleController;
-import com.cloudcross.ssp.common.utils.Pager;
-import com.cloudcross.ssp.common.utils.SqlHelper;
-import com.cloudcross.ssp.model.Place;
-import com.cloudcross.ssp.model.PlaceClass;
-import com.cloudcross.ssp.model.PlaceClassInformation;
-import com.cloudcross.ssp.model.PlaceOperator;
-import com.cloudcross.ssp.service.IPlaceClassInformationService;
-import com.cloudcross.ssp.service.IPlaceClassService;
-import com.cloudcross.ssp.service.IPlaceOperatorService;
-import com.cloudcross.ssp.service.IPlaceService;
-
-/**
- * 场景相关控制器
- * @author chenyou
- *
- */
-@Controller("back.placeController")
-@RequestMapping("/back/main/ap/place")
-public class PlaceController extends SimpleController {
-	@Autowired
-	private IPlaceService placeService;
-	@Autowired
-	private IPlaceOperatorService placeOperatorService;
-	@Autowired
-	private IPlaceClassInformationService placeClassInformationService;
-	@Autowired
-	private IPlaceClassService placeClassService;
-	
-	/**
-	 * 新增数聚场景页
-	 * @param model
-	 * @return
-	 */
-	@RequestMapping("/unclassfiedPlaceName")
-	public String unclassfiedPlaceName(Model model) {
-		//待分类数聚子场景
-		List<Place> placeList = placeService.findUnclassfiedPlace();
-		
-		//查找所有的数聚场景
-		List<PlaceClassInformation> placeClassInformationList = placeClassInformationService.findAll();
-		
-		model.addAttribute("placeList", placeList);
-		model.addAttribute("placeClassInformationList", placeClassInformationList);
-		return page("unclassfiedPlaceName");
-	}
-	
-	/**
-	 * 将待分类数聚子场景添加到数聚场景里面
-	 * @param placeId 数聚子场景的id组成的字符串，格式为"1-2-3"
-	 * @param placeClassId 数聚场景的id
-	 * @return
-	 */
-	@RequestMapping("/add")
-	public String add(@RequestParam String placeId, @RequestParam Long placeClassId) {
-		//判断传递过来的参数是不是为空
-		if(null == placeId || "".equals(placeId) || null == placeClassId) {
-			System.out.println("传入的参数有错");
-		} else {
-			String[] placeIdString = placeId.split("-");
-			
-			for(int i = 0; i < placeIdString.length; i++) {
-				PlaceClass placeClass = new PlaceClass();
-				placeClass.setClassId(placeClassId);
-				placeClass.setPlaceId(Long.parseLong(placeIdString[i]));
-				
-				placeClassService.add(placeClass);
-			}
-			
-			
-		}
-		
-		
-		return redirect(page("unclassfiedPlaceName"));
-	}
-	
-	/**
-	 * 得到所有的数聚子场景
-	 * @param placeId
-	 * @return
-	 */
-	@RequestMapping("/get-place")
-	public @ResponseBody
-	List<Place> getPlace() {
-		
-		List<Place> placeList = placeService.findAll();
-		return placeList;
-	}
-	
-	/**
-	 * 删除数聚场景下的数聚子场景
-	 * @param model
-	 * @param id 数聚子场景的id数组
-	 * @return
-	 */
-	@RequestMapping("/delete-place")
-	public @ResponseBody String deletePlace(Model model, @RequestParam Long[] id) {
-		//传递的参数是不是为空
-		if(null == id) {
-			System.out.println("传递的参数有误");
-			return ERROR;
-		}
-		
-		for(int i = 0; i < id.length; i++) {
-			placeClassService.deletePlaceClass(id[i]);
-		}
-		
-		return OK;
-	}
-	
-	
-	/**
-	 * 用户场景定义页面
-	 * @param model
-	 * @param paramMap
-	 * @param page
-	 * @return
-	 */
-	@RequestMapping("place-sort")
-	public String placeSort(Model model, @RequestParam HashMap<String, Object> paramMap,
-			@RequestParam(defaultValue = "1") int page) {
-		String place = null;
-		String place1 = null;
-		// 对传递过来的场景名称做处理，如果传递的为空或者是空字符串，则让它等于空
-		if (null == paramMap.get("place")
-				|| "".equals(paramMap.get("place"))) {
-			paramMap.put("place", null);
-		} else {
-			try {
-				place = new String(String.valueOf(paramMap.get("place")).trim().getBytes("ISO-8859-1"), "UTF-8");
-				place1 = place;
-			} catch (UnsupportedEncodingException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			paramMap.put("place", SqlHelper.doLike(place));
-		}
-
-		int totalRow = 0;
-		Pager pager = null;
-		pager = new Pager();
-		// 查询符合条件的总的条数
-		totalRow = placeOperatorService.countUnclassfiedPlace(paramMap);
-		pager.setPage(page);
-		pager.setTotalRow(totalRow);
-		
-		paramMap.put("pager", pager);
-		List<PlaceOperator> placeOperatorList = placeOperatorService.findUnclassfiedPlace(paramMap);
-		
-		//将传递过来的搜索参数回传
-		if(null != place) {
-			model.addAttribute("place", place1);
-		}
-		model.addAttribute("placeOperatorList", placeOperatorList);
-		model.addAllAttributes(paramMap);
-		return page("place-sort");
-	}
-	
-	/**
-	 * 根据数聚场景id得到其对应的所有数聚子场景
-	 * @return
-	 */
-	@RequestMapping("/placeName")
-	public @ResponseBody List<Place> findAllPlaceName(Long placeClassId) {
-		List<Place> placeList = placeService.findPlaceByPlaceClassId(placeClassId);
-		return placeList;
-	}
-	
-	
-	/**
-	 * 用户场景分类的保存
-	 * 这里要传递两个变量，一个是t_place_operator的id字符串(变量名为id)，另一个就是数聚场景id(变量名叫placeId)
-	 * 注：字符串格式像"1-4-5",就是id以-号划分，当有多个id的时候;
-	 * @param model
-	 * @param paramMap
-	 * @return
-	 */
-	@RequestMapping("/save")
-	public String placeSort(Model model, @RequestParam HashMap<String, Object> paramMap) {
-		Long[] id = null;
-		Long placeId = null;
-		//当传递过来的是空值或者是空字符串时，则什么也不做
-		if(null == paramMap.get("id") || "".equals(paramMap.get("id"))
-				|| null == paramMap.get("placeId") || "".equals(paramMap.get("placeId"))) {
-			return redirect(page("place-sort"));
-		} else {
-			String idString = String.valueOf(paramMap.get("id"));
-			String[] idArray = idString.split("-");
-			placeId = Long.parseLong(String.valueOf(paramMap.get("placeId")));
-			id = new Long[idArray.length];
-			
-			for(int i = 0; i < id.length; i++) {
-				id[i] = Long.parseLong(idArray[i]);
-			}
- 		}
-		
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("idList", id);
-		map.put("placeId", placeId);
-		placeOperatorService.update(map);
-		
-		return redirect(page("place-sort"));
-	}
-	
-}
+package com.cloudcross.ssp.web.back.main.ap;
+
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.cloudcross.ssp.base.web.SimpleController;
+import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.common.utils.SqlHelper;
+import com.cloudcross.ssp.model.Place;
+import com.cloudcross.ssp.model.PlaceClass;
+import com.cloudcross.ssp.model.PlaceClassInformation;
+import com.cloudcross.ssp.model.PlaceOperator;
+import com.cloudcross.ssp.service.IPlaceClassInformationService;
+import com.cloudcross.ssp.service.IPlaceClassService;
+import com.cloudcross.ssp.service.IPlaceOperatorService;
+import com.cloudcross.ssp.service.IPlaceService;
+
+/**
+ * 场景相关控制器
+ * @author chenyou
+ *
+ */
+@Controller("back.placeController")
+@RequestMapping("/back/main/ap/place")
+public class PlaceController extends SimpleController {
+	@Autowired
+	private IPlaceService placeService;
+	@Autowired
+	private IPlaceOperatorService placeOperatorService;
+	@Autowired
+	private IPlaceClassInformationService placeClassInformationService;
+	@Autowired
+	private IPlaceClassService placeClassService;
+	
+	/**
+	 * 新增数聚场景页
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping("/unclassfiedPlaceName")
+	public String unclassfiedPlaceName(Model model) {
+		//待分类数聚子场景
+		List<Place> placeList = placeService.findUnclassfiedPlace();
+		
+		//查找所有的数聚场景
+		List<PlaceClassInformation> placeClassInformationList = placeClassInformationService.findAll();
+		
+		//所有的数聚子场景
+		List<Place> allplaceList = placeService.findAll();
+		
+		model.addAttribute("placeList", placeList);
+		model.addAttribute("placeClassInformationList", placeClassInformationList);
+		model.addAttribute("allplaceList", allplaceList);
+		return page("unclassfiedPlaceName");
+	}
+	
+	/**
+	 * 将待分类数聚子场景添加到数聚场景里面
+	 * @param placeId 数聚子场景的id组成的字符串，格式为"1-2-3"
+	 * @param placeClassId 数聚场景的id
+	 * @return
+	 */
+	@RequestMapping("/add")
+	public String add(@RequestParam String placeId, @RequestParam Long placeClassId) {
+		//判断传递过来的参数是不是为空
+		if(null == placeId || "".equals(placeId) || null == placeClassId) {
+			System.out.println("传入的参数有错");
+		} else {
+			String[] placeIdString = placeId.split("-");
+			
+			for(int i = 0; i < placeIdString.length; i++) {
+				PlaceClass placeClass = new PlaceClass();
+				placeClass.setClassId(placeClassId);
+				placeClass.setPlaceId(Long.parseLong(placeIdString[i]));
+				
+				placeClassService.add(placeClass);
+			}
+			
+			
+		}
+		
+		
+		return redirect(page("unclassfiedPlaceName"));
+	}
+	
+	/**
+	 * 得到所有的数聚子场景
+	 * @param placeId
+	 * @return
+	 */
+	@RequestMapping("/get-place")
+	public @ResponseBody
+	List<Place> getPlace() {
+		
+		List<Place> placeList = placeService.findAll();
+		return placeList;
+	}
+	
+	/**
+	 * 删除数聚场景下的数聚子场景
+	 * @param model
+	 * @param id 数聚子场景的id数组
+	 * @return
+	 */
+	@RequestMapping("/delete-place")
+	public @ResponseBody String deletePlace(HttpServletRequest request, Long[] id) {
+		//传递的参数是不是为空
+		if(null == id) {
+			System.out.println("传递的参数有误");
+			return ERROR;
+		}
+		
+		for(int i = 0; i < id.length; i++) {
+			placeClassService.deletePlaceClass(id[i]);
+		}
+		
+		return OK;
+	}
+	
+	
+	/**
+	 * 用户场景定义页面
+	 * @param model
+	 * @param paramMap
+	 * @param page
+	 * @return
+	 */
+	@RequestMapping("place-sort")
+	public String placeSort(Model model, @RequestParam HashMap<String, Object> paramMap,
+			@RequestParam(defaultValue = "1") int page) {
+		String place = null;
+		String place1 = null;
+		// 对传递过来的场景名称做处理，如果传递的为空或者是空字符串，则让它等于空
+		if (null == paramMap.get("place")
+				|| "".equals(paramMap.get("place"))) {
+			paramMap.put("place", null);
+		} else {
+			try {
+				place = new String(String.valueOf(paramMap.get("place")).trim().getBytes("ISO-8859-1"), "UTF-8");
+				place1 = place;
+			} catch (UnsupportedEncodingException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			paramMap.put("place", SqlHelper.doLike(place));
+		}
+
+		int totalRow = 0;
+		Pager pager = null;
+		pager = new Pager();
+		// 查询符合条件的总的条数
+		totalRow = placeOperatorService.countUnclassfiedPlace(paramMap);
+		pager.setPage(page);
+		pager.setTotalRow(totalRow);
+		
+		paramMap.put("pager", pager);
+		List<PlaceOperator> placeOperatorList = placeOperatorService.findUnclassfiedPlace(paramMap);
+		
+		//将传递过来的搜索参数回传
+		if(null != place) {
+			model.addAttribute("place", place1);
+		}
+		model.addAttribute("placeOperatorList", placeOperatorList);
+		model.addAllAttributes(paramMap);
+		return page("place-sort");
+	}
+	
+	/**
+	 * 根据数聚场景id得到其对应的所有数聚子场景
+	 * @return
+	 */
+	@RequestMapping("/placeName")
+	public @ResponseBody List<Place> findAllPlaceName(Long placeClassId) {
+		List<Place> placeList = placeService.findPlaceByPlaceClassId(placeClassId);
+		return placeList;
+	}
+	
+	
+	/**
+	 * 用户场景分类的保存
+	 * 这里要传递两个变量，一个是t_place_operator的id字符串(变量名为id)，另一个就是数聚场景id(变量名叫placeId)
+	 * 注：字符串格式像"1-4-5",就是id以-号划分，当有多个id的时候;
+	 * @param model
+	 * @param paramMap
+	 * @return
+	 */
+	@RequestMapping("/save")
+	public String placeSort(Model model, @RequestParam HashMap<String, Object> paramMap) {
+		Long[] id = null;
+		Long placeId = null;
+		//当传递过来的是空值或者是空字符串时，则什么也不做
+		if(null == paramMap.get("id") || "".equals(paramMap.get("id"))
+				|| null == paramMap.get("placeId") || "".equals(paramMap.get("placeId"))) {
+			return redirect(page("place-sort"));
+		} else {
+			String idString = String.valueOf(paramMap.get("id"));
+			String[] idArray = idString.split("-");
+			placeId = Long.parseLong(String.valueOf(paramMap.get("placeId")));
+			id = new Long[idArray.length];
+			
+			for(int i = 0; i < id.length; i++) {
+				id[i] = Long.parseLong(idArray[i]);
+			}
+ 		}
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("idList", id);
+		map.put("placeId", placeId);
+		placeOperatorService.update(map);
+		
+		return redirect(page("place-sort"));
+	}
+	
+}

src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/create.ftl

@@ -1,259 +1,132 @@
 <@override name="head">	
-	<title>创建广告主</title>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/uploadFile.js"></script>
-	
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ace.min.css"/>
-	
-	<style>
-		.spanVaildate{
-			margin: 8px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript">
-	 	$(document).ready(function(){
-	 		<!--以下从数据库中获得下拉列表需要显示的数据-->
-	 		$('#advertiser_son_ul').val("");
-	 		$('#advertiser_son_ul').hide(); //初始ul隐藏
-			 $("#advertiser_son_ul").append("<li value='0'>请选择所属行业</li>");
-			 var url = "${ctx}/widget/selector/provide/industry?parentId=ADVERTISER";
-			 $.getJSON( url, function(data) {
-				var data_1 = data.allIndustry;
-				$.each( data_1, function( key, val ) {
-					$("#advertiser_son_ul").append('<li value='+ val.value +'>' + val.label + '</li>');
-				});
-			});
-	 		$("#advertiserul_span").click(function(){
-	 			if($('#advertiser_son_ul').height()>210){
-	 				$('#advertiser_son_ul').css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-	 			};
-		 		$('#advertiser_son_ul').show(); //ul显示
-		 	});
-		 	$('ul#advertiser_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#industryId").val($(this).attr("value"));
-				$('#advertiser_son_ul').hide(); //ul隐藏
-			});
-			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').hide(); //ul隐藏
-		 		if($("#industryId").val() == "" || $("#industryId").val() == 0){
-					$("#main_advertiserul").css("box-shadow","20px 0 6px red").attr("title","请选择所属行业");
-					$("#advertiserul_selectdiv").find('span.spanVaildate').html("请选择所属行业");
-				}else{
-					$("#main_advertiserul").css("box-shadow","none").attr("title","");
-					$("#advertiserul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		 	
-		 	//初始化加载上传控件
-		 	initFile($("#icp_input_id"),null);initFile($("#licencePath_input_id"),null);initFile($("#idPath_input_id"),null);initFile($("#orgPath_input_id"),null);
-		 	$('#cpiPathUploadfilestr').unbind('click').click(function() {
-		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"icp_input_id","cpiPath_div","cpiPath",null,null,null);
-		 		}else if($(this).html() == "预览"){
-		 			if($("#cpiPath").val() != ""){
-		 				bootbox.dialog({
-							message:'<img src="'+$("#cpiPath").val()+'"/>',
-							title: "浏览素材",
-							locale: 'zh_CN'
-						});
-		 			}
-				}
-		 	});
-		 	$('#licencePathUploadfilestr').unbind('click').click(function() {
-		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"licencePath_input_id","licencePath_div","licencePath",null,null,null);
-		 		}else if($(this).html() == "预览"){
-		 			if($("#licencePath").val() != ""){
-		 				bootbox.dialog({
-							message:'<img src="'+$("#licencePath").val()+'"/>',
-							title: "浏览素材",
-							locale: 'zh_CN'
-						});
-		 			}
-		 		}
-		 	});
-		 	$('#idPathUploadfilestr').unbind('click').click(function() {
-		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"idPath_input_id","idPath_div","idPath",null,null,null);
-		 		}else if($(this).html() == "预览"){
-		 			if($("#idPath").val() != ""){
-		 				bootbox.dialog({
-							message:'<img src="'+$("#idPath").val()+'"/>',
-							title: "浏览素材",
-							locale: 'zh_CN'
-						});
-		 			}
-		 		}
-		 	});
-		 	$('#orgPathUploadfilestr').unbind('click').click(function() {
-		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"orgPath_input_id","orgPath_div","orgPath",null,null,null);
-		 		}else if($(this).html() == "预览"){
-		 			if($("#orgPath").val() != ""){
-		 				bootbox.dialog({
-							message:'<img src="'+$("#orgPath").val()+'"/>',
-							title: "浏览素材",
-							locale: 'zh_CN'
-						});
-		 			}
-		 		}
-		 	});
-		 	
-		 	$("#validation-form").autovalidate();
-			$(".btn3").click(function(){
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				if($("#industryId").val() == "" || $("#industryId").val() == 0 ){
-					$("#main_advertiserul").css("box-shadow","20px 0 6px red").attr("title","请选择所属行业");
-					$("#advertiserul_selectdiv").find('span.spanVaildate').html("请选择所属行业");
-					return false;
-				}
-			});
-			
-			$(".btn4").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/advertiser/list";
-			});
-			
-	 	});
- 	</script>
- 
+<title>创建广告主</title>
+<link rel="stylesheet" href="${ctx}/assets/css/ace.min.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/uploadFile.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/advertiser.js"></script>
 </@override>	
-	
 <@override name="body">
 <div id=content_bg>
- 		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent" style="padding-bottom:40px;">
-			<div id="handler">
-				<ul style="padding-top:20px;margin-left:9px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size3">创建广告主</li>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">创建广告主</li>
 				</ul>  
-			</div>
-			<div id="mycontent" style="margin:0 20px;padding-top:1px;">
-			<div id="createForm">
-				<form id="validation-form" action="${ctx}/advertiser/main/ad/advertiser/save" method="post">
-					<input type="hidden" id="industryId" name="industryId" value="">
-					<input type="hidden" id="agentId" name="agentId" value=${agentId!}>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>广告主名称：</label>
-						<input class="input-text" autocomplete="off" id="name" name="name" type="text" value="" verify="china-english-num/32/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group" id="advertiserul_selectdiv">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>广告主行业：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_advertiserul" style="margin-bottom:0px;">
-						  <li class="select_box" id="advertiserul_select_box">
-						    <span id="advertiserul_span">请选择所属行业</span>
-						    <ul class="son_ul" id="advertiser_son_ul" style="margin-left:0px;"></ul>
-						  </li>
-						</ul>
-					</div>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>公司注册名：</label>
-						<input class="input-text" autocomplete="off" id="regName" name="regName" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;网址：</label>
-						<input class="input-text" autocomplete="off" id="homePage" name="homePage" type="text" value="" verify="website/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系人：</label>
-						<input class="input-text" autocomplete="off" id="contacts" name="contacts" type="text" value="" verify="china-english-num/32/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;联系电话：</label>
-						<input class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="" verify="mobile/11/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;E-mail：</label>
-						<input class="input-text" autocomplete="off" id="email" name="email" type="text" value="" verify="email/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;备注：</label>
-						<input class="input-text" autocomplete="off" id="memo" name="memo" type="text" value="" verify="unspecial/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group" id="upload_qulifications">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;上传资质：</label>
-							 <table border="1" id="uploadTable">
-							 	<thead>
-								 	<tr>
-								 		<th style="width:15%;">企业资质</th>
-								 		<th style="width:20%;">素材</th>
-								 	</tr>
-							    </thead>
-							    <tbody>
-							    	<tr>
-										<td>ICP</td>
-										<td>
-											<div id="cpiPath_div" class="selectFile_div">
-												<input id="cpiPath" type="hidden" name="cpiPath" value=""/>
-												<input id="icp_input_id" type="file" name="file"/>
-												<button id="cpiPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>	
-											</div>
-										</td>	
-							    	</tr>
-							    	<tr>
-										<td>企业营业执照</td>
-										<td>
-											<div id="licencePath_div" class="selectFile_div">
-												<input id="licencePath" type="hidden" name="licencePath" value=""/>
-												<input id="licencePath_input_id" type="file" name="file"/>
-												<button id="licencePathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
-											</div>
-										</td>
-							    	</tr>
-							    	<tr>
-										<td>法人代表身份证</td>
-										<td>
-											<div id="idPath_div" class="selectFile_div">
-												<input id="idPath" type="hidden" name="idPath" value=""/>
-												<input id="idPath_input_id" type="file" name="file"/>
-												<button id="idPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
-											</div>
-										</td>
-							    	</tr>
-							    	
-							    	<tr>
-										<td>企业机构代码证</td>
-										<td>
-											<div id="orgPath_div" class="selectFile_div">
-												<input id="orgPath" type="hidden" name="orgPath" value=""/>
-												<input id="orgPath_input_id" type="file" name="file"/>
-												<button id="orgPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
-											</div>
-										</td>	
-							    	</tr>
-							    </tbody>
-							 </table>
-						</div>	
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/advertiser/save" method="post">
+	 			<input type="hidden" id="agentId" name="agentId" value="${agentId!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>广告主名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="industryul_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>广告主行业：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_industryul">
+						<li class="select_box" id="industryul_select_box">
+						   	<span id="industryul_span">请选择所属行业</span>
+						    <ul class="son_ul" id="industry_son_ul"></ul>
+						 </li>
+					</ul>
+					<input type="hidden" id="industryId" name="industryId" value=""/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>公司注册名：</label>
+					<input class="input-text" tabindex="2" id="regName" name="regName" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>网址：</label>
+					<input class="input-text" tabindex="3" id="homePage" name="homePage" type="text" value="" verify="website/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系人：</label>
+					<input class="input-text" tabindex="4" id="contacts" name="contacts" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>联系电话：</label>
+					<input class="input-text" tabindex="5" id="tel" name="tel" type="text" value="" verify="tel-mobile/12/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>E-mail：</label>
+					<input class="input-text" tabindex="6" id="email" name="email" type="text" value="" verify="email/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>备注：</label>
+					<input class="input-text" tabindex="7" id="memo" name="memo" type="text" value="" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="upload_qulifications">
+					<label class="input-label"><span class="lbl-no"></span>上传资质：</label>
+					<table border="1" class="uploadTable">
+						<thead>
+							<tr>
+								 <th style="width:15%;">企业资质</th>
+								 <th style="width:20%;">素材</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>ICP</td>
+								<td>
+									<div id="cpiPath_div" class="selectFile_div">
+										<input id="cpiPath" type="hidden" name="cpiPath" value=""/>
+										<input id="icp_input_id" type="file" name="file"/>
+										<button id="cpiPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>	
+									</div>
+								</td>	
+							</tr>
+							<tr>
+								<td>企业营业执照</td>
+								<td>
+									<div id="licencePath_div" class="selectFile_div">
+										<input id="licencePath" type="hidden" name="licencePath" value=""/>
+										<input id="licencePath_input_id" type="file" name="file"/>
+										<button id="licencePathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<td>法人代表身份证</td>
+								<td>
+									<div id="idPath_div" class="selectFile_div">
+										<input id="idPath" type="hidden" name="idPath" value=""/>
+										<input id="idPath_input_id" type="file" name="file"/>
+										<button id="idPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<td>企业机构代码证</td>
+								<td>
+									<div id="orgPath_div" class="selectFile_div">
+										<input id="orgPath" type="hidden" name="orgPath" value=""/>
+										<input id="orgPath_input_id" type="file" name="file"/>
+										<button id="orgPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
+									</div>
+								</td>	
+							</tr>
+						</tbody>
+					</table>
+				</div>	
 						
-						<div class="btnall">
-							<button  class="btn3" type="submit">保存</button>
-							<button  class="btn4" type="reset">取消</button>
-						</div>
-				</form>
-			 </div>			
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
 		</div>
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>		
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/edit.ftl

@@ -1,274 +1,133 @@
 <@override name="head">	
-	<title>编辑广告主</title>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/uploadFile.js"></script>
-	
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ace.min.css"/>
-	<style>
-		.spanVaildate{
-			margin: 8px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript">
-	 	$(document).ready(function(){
-	 		<!--以下从数据库中获得下拉列表需要显示的数据-->
-	 		$('#advertiser_son_ul').hide(); //初始ul隐藏
-			 $("#advertiser_son_ul").append("<li value='0'>请选择所属行业</li>");
-			 var url = "${ctx}/widget/selector/provide/industry?parentId=ADVERTISER";
-			 $.getJSON( url, function(data) {
-				var data_1 = data.allIndustry;
-				$.each( data_1, function( key, val ) {
-					$("#advertiser_son_ul").append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
-				});
-			});
-	 		$("#advertiserul_span").click(function(){
-	 			if($('#advertiser_son_ul').height()>210){
-	 				$('#advertiser_son_ul').css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-	 			};
-		 		$('#advertiser_son_ul').show(); //ul显示
-		 	});
-		 	$('ul#advertiser_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#industryId").val($(this).attr("value"));
-				$('#advertiser_son_ul').hide(); //ul隐藏
-			});
-			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').hide(); //ul隐藏
-		 		if($("#industryId").val() == "" || $("#industryId").val() == 0){
-					$("#main_advertiserul").css("box-shadow","20px 0 6px red").attr("title","请选择所属行业");
-					$("#advertiserul_selectdiv").find('span.spanVaildate').html("请选择所属行业");
-				}else{
-					$("#main_advertiserul").css("box-shadow","none").attr("title","");
-					$("#advertiserul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		 	
-		 	//初始化加载上传控件
-			initFile($("#icp_input_id"),$("#cpiPath").val());
-		 	if($("#cpiPath").val() != "" && $("#cpiPath").val() != "noFiles"){
-		 		$('#cpiPathUploadfilestr').html("预览");
-		 	}
-		 	$('#cpiPathUploadfilestr').unbind('click').click(function() {
-		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"icp_input_id","cpiPath_div","cpiPath");
-		 		}else if($(this).html() == "预览"){
-		 			if($("#cpiPath").val() != ""){
-		 				bootbox.dialog({
-							message:'<img src="'+$("#cpiPath").val()+'"/>',
-							title: "浏览素材",
-							locale: 'zh_CN'
-						});
-		 			}
-				}
-		 	});
-		 	initFile($("#licencePath_input_id"),$("#licencePath").val());
-		 	if($("#licencePath").val() != "" && $("#licencePath").val() != "noFiles"){
-		 		$('#licencePathUploadfilestr').html("预览");
-		 	}
-		 	$('#licencePathUploadfilestr').unbind('click').click(function() {
-		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"licencePath_input_id","licencePath_div","licencePath");
-		 		}else if($(this).html() == "预览"){
-		 			if($("#licencePath").val() != ""){
-		 				bootbox.dialog({
-							message:'<img src="'+$("#licencePath").val()+'"/>',
-							title: "浏览素材",
-							locale: 'zh_CN'
-						});
-		 			}
-		 		}
-		 	});
-		 	initFile($("#idPath_input_id"),$("#idPath").val());
-		 	if($("#idPath").val() != "" && $("#idPath").val() != "noFiles"){
-		 		$('#idPathUploadfilestr').html("预览");
-		 	}
-		 	$('#idPathUploadfilestr').unbind('click').click(function() {
-		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"idPath_input_id","idPath_div","idPath");
-		 		}else if($(this).html() == "预览"){
-		 			if($("#idPath").val() != ""){
-		 				bootbox.dialog({
-							message:'<img src="'+$("#idPath").val()+'"/>',
-							title: "浏览素材",
-							locale: 'zh_CN'
-						});
-		 			}
-		 		}
-		 	});
-		 	initFile($("#orgPath_input_id"),$("#orgPath").val());
-		 	if($("#orgPath").val() != "" && $("#orgPath").val() != "noFiles"){
-		 		$('#orgPathUploadfilestr').html("预览");
-		 	}
-		 	$('#orgPathUploadfilestr').unbind('click').click(function() {
-		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"orgPath_input_id","orgPath_div","orgPath");
-		 		}else if($(this).html() == "预览"){
-		 			if($("#orgPath").val() != ""){
-		 				bootbox.dialog({
-							message:'<img src="'+$("#orgPath").val()+'"/>',
-							title: "浏览素材",
-							locale: 'zh_CN'
-						});
-		 			}
-		 		}
-		 	});
-			
-		 	$("#validation-form").autovalidate();
-			$(".btn3").click(function(){
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				if($("#industryId").val() == "" || $("#industryId").val() == 0 ){
-					$("#main_advertiserul").css("box-shadow","20px 0 6px red").attr("title","请选择所属行业");
-					$("#advertiserul_selectdiv").find('span.spanVaildate').html("请选择所属行业");
-					return false;
-				}
-			});
-			
-			$(".btn4").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/advertiser/list";
-			});
-		
-	 	});
- 	</script>
- 
+<title>编辑广告主</title>
+<link rel="stylesheet" href="${ctx}/assets/css/ace.min.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/uploadFile.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/advertiser.js"></script>
 </@override>	
-	
 <@override name="body">
 <div id=content_bg>
- 		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent" style="padding-bottom:40px;">
-			<div id="handler">
-				<ul style="padding-top:20px;margin-left:9px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size3">编辑广告主</li>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">编辑广告主</li>
 				</ul>  
-			</div>
-			<div id="mycontent" style="margin:0 20px;padding-top:1px;">
-			<div id="createForm">
-				<form id="validation-form" action="${ctx}/advertiser/main/ad/advertiser/save" method="post">
-					<input type="hidden" name="id" value="${advertiser.id}">
-					<input type="hidden" id="industryId" name="industryId" value="${advertiser.industryId}">
-					<input type="hidden" id="agentId" name="agentId" value="${advertiser.agentId}">
-					<input type="hidden" id="industryName" name="industryName" value="${industryName}">
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>广告主名称：</label>
-						<input class="input-text" autocomplete="off" id="name" name="name" type="text" value="${advertiser.name}" verify="china-english-num/32/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group" id="advertiserul_selectdiv">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>广告主行业：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_advertiserul" style="margin-bottom:0px;">
-						  <li class="select_box" id="advertiserul_select_box">
-						    <span id="advertiserul_span">${industryName}</span>
-						    <ul class="son_ul" id="advertiser_son_ul" style="margin-left:0px;"></ul>
-						  </li>
-						</ul>
-					</div>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>公司注册名：</label>
-						<input class="input-text" autocomplete="off" id="regName" name="regName" type="text" value="${advertiser.regName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;网址：</label>
-						<input class="input-text" autocomplete="off" id="homePage" name="homePage" type="text" value="${advertiser.homePage}" verify="website/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系人：</label>
-						<input class="input-text" autocomplete="off" id="contacts" name="contacts" type="text" value="${advertiser.contacts}" verify="china-english-num/32/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;联系电话：</label>
-						<input class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="${advertiser.tel}" verify="mobile/11/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;E-mail：</label>
-						<input class="input-text" autocomplete="off" id="email" name="email" type="text" value="${advertiser.email}" verify="email/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;备注：</label>
-						<input class="input-text" autocomplete="off" id="memo" name="memo" type="text" value="${advertiser.memo}" verify="unspecial/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group" id="upload_qulifications">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;上传资质：</label>
-							 <table border="1" id="uploadTable">
-							 	<thead>
-								 	<tr>
-								 		<th style="width:15%;">企业资质</th>
-								 		<th style="width:20%;">素材</th>
-								 	</tr>
-							    </thead>
-							    <tbody>
-							    	<tr>
-										<td>ICP</td>
-										<td>
-											<div id="cpiPath_div" class="selectFile_div">
-												<input id="cpiPath" type="hidden" name="cpiPath" value="${advertiser.cpiPath!}"/>
-												<input id="icp_input_id" type="file" name="file"/>
-												<button id="cpiPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>	
-											</div>
-										</td>	
-							    	</tr>
-							    	<tr>
-										<td>企业营业执照</td>
-										<td>
-											<div id="licencePath_div" class="selectFile_div">
-												<input id="licencePath" type="hidden" name="licencePath" value="${advertiser.licencePath!}"/>
-												<input id="licencePath_input_id" type="file" name="file"/>
-												<button id="licencePathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
-											</div>
-										</td>
-							    	</tr>
-							    	<tr>
-										<td>法人代表身份证</td>
-										<td>
-											<div id="idPath_div" class="selectFile_div">
-												<input id="idPath" type="hidden" name="idPath" value="${advertiser.idPath!}"/>
-												<input id="idPath_input_id" type="file" name="file"/>
-												<button id="idPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
-											</div>
-										</td>
-							    	</tr>
-							    	
-							    	<tr>
-										<td>企业机构代码证</td>
-										<td>
-											<div id="orgPath_div" class="selectFile_div">
-												<input id="orgPath" type="hidden" name="orgPath" value="${advertiser.orgPath!}"/>
-												<input id="orgPath_input_id" type="file" name="file"/>
-												<button id="orgPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
-											</div>
-										</td>	
-							    	</tr>
-							    </tbody>
-							 </table>
-						</div>
-					
-						<div class="btnall">
-							<button  class="btn3" type="submit">保存</button>
-							<button  class="btn4" type="reset">取消</button>
-						</div>
-				</form>
-			 </div>			
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/advertiser/save" method="post">
+	 			<input type="hidden" name="id" value="${advertiser.id!}"/>
+				<input type="hidden" id="agentId" name="agentId" value="${advertiser.agentId!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>广告主名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="${advertiser.name!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="industryul_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>广告主行业：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_industryul">
+						<li class="select_box" id="industryul_select_box">
+						   	<span id="industryul_span">${industryName!}</span>
+						    <ul class="son_ul" id="industry_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" id="industryId" name="industryId" value="${advertiser.industryId!}"/>
+					<input type="hidden" id="industryName" name="industryName" value="${industryName!}"/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>公司注册名：</label>
+					<input class="input-text" tabindex="2" id="regName" name="regName" type="text" value="${advertiser.regName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>网址：</label>
+					<input class="input-text" tabindex="3" id="homePage" name="homePage" type="text" value="${advertiser.homePage!}" verify="website/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系人：</label>
+					<input class="input-text" tabindex="4" id="contacts" name="contacts" type="text" value="${advertiser.contacts!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>联系电话：</label>
+					<input class="input-text" tabindex="5" id="tel" name="tel" type="text" value="${advertiser.tel!}" verify="motel-mobile/12/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>E-mail：</label>
+					<input class="input-text" tabindex="6" id="email" name="email" type="text" value="${advertiser.email!}" verify="email/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>备注：</label>
+					<input class="input-text" tabindex="7" id="memo" name="memo" type="text" value="${advertiser.memo!}" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="upload_qulifications">
+					<label class="input-label"><span class="lbl-no"></span>上传资质：</label>
+					<table border="1" class="uploadTable">
+						<thead>
+							<tr>
+								 <th style="width:15%;">企业资质</th>
+								 <th style="width:20%;">素材</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>ICP</td>
+								<td>
+									<div id="cpiPath_div" class="selectFile_div">
+										<input id="cpiPath" type="hidden" name="cpiPath" value="${advertiser.cpiPath!}"/>
+										<input id="icp_input_id" type="file" name="file"/>
+										<button id="cpiPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>	
+									</div>
+								</td>	
+							</tr>
+							<tr>
+								<td>企业营业执照</td>
+								<td>
+									<div id="licencePath_div" class="selectFile_div">
+										<input id="licencePath" type="hidden" name="licencePath" value="${advertiser.licencePath!}"/>
+										<input id="licencePath_input_id" type="file" name="file"/>
+										<button id="licencePathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<td>法人代表身份证</td>
+								<td>
+									<div id="idPath_div" class="selectFile_div">
+										<input id="idPath" type="hidden" name="idPath" value="${advertiser.idPath!}"/>
+										<input id="idPath_input_id" type="file" name="file"/>
+										<button id="idPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<td>企业机构代码证</td>
+								<td>
+									<div id="orgPath_div" class="selectFile_div">
+										<input id="orgPath" type="hidden" name="orgPath" value="${advertiser.orgPath!}"/>
+										<input id="orgPath_input_id" type="file" name="file"/>
+										<button id="orgPathUploadfilestr" class="uploadOrView" type="button" href="${ctx}/advertiser/main/ad/advertiser/fileUpload">上传</button>
+									</div>
+								</td>	
+							</tr>
+						</tbody>
+					</table>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
 		</div>
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>		
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/list.ftl

@@ -1,196 +1,97 @@
 <@override name="head">
-	<title>投放管理-广告主管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
-	<script type="text/javascript">
-		//搜索按钮的实现2015.10.18更新了在某个行业某个状态下的搜索
-		function picsubmit(){
-			var $searchValue = $("#search-form input[name=searchValue]");
-			if($searchValue.val() == "请输入关键字"){
-				$searchValue.val(null);
-			};
-            url = "${ctx}/advertiser/main/ad/advertiser/list";  
-            param=$searchValue.val();
-            status=${status};
-			var page = $("#search-form input[name=page]").val();
-            industryId=${industryId};
-            location.href=url+"?searchValue="+param+"&status="+status+"&industryId="+industryId+"&page="+page;
- 		}  
-		
- 		$(document).ready(function(){
- 			//行业
-	 		var p=${status};
-	 		var f=${industryId};
-	 		if(f==0){
-			    $(".hyqb").removeClass("hangye1").addClass("hangyeall");
-			}
-			var url = "${ctx}/widget/selector/provide/industry";
-			$.ajax({
-			    url: url,
-			    type: "post",
-			    contentType: "application/json",
-			    dataType:"json",
-			    success: function (data) {
-			    	for(i=0;i<data.allIndustry.length;i++){
-				    	a=data.allIndustry[i].id;
-				    	b=data.allIndustry[i].name;
-				    	c=data.allIndustry[i].value;
-				    	if(f==a){
-				    		$(".hyqb").removeClass("hangyeall").addClass("hangye1"); 
-				    		$("#hangye").append('<a href="${ctx}/advertiser/main/ad/advertiser/list?status='+p+'&industryId='+a+'"><li onclick="choosehy(this.id)" id="lisubmit'+a+'" class="hangyeall hy" >'+b+'<form id="hangyesubmit'+a+'" method="post"><input type="hidden" name="industryId" value="'+c+'"></form></li></a>');   
-				    	}else{
-				    		$("#hangye").append('<a href="${ctx}/advertiser/main/ad/advertiser/list?status='+p+'&industryId='+a+'"><li onclick="choosehy(this.id)" id="lisubmit'+a+'" class="hangye1 hy" >'+b+'<form id="hangyesubmit'+a+'" method="post"><input type="hidden" name="industryId" value="'+c+'"></form></li></a>');   
-				    	}
-			      	}
-			  	 }
-			});
-	
- 			//状态全部、开启、停用
-			var p=${status};
-			if (p==2){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtqb").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==1){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtty").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else {
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtzhch").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}	
- 
-			//开启,暂停
-			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/advertiser/main/ad/advertiser/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/advertiser/main/ad/advertiser/disable";
-				}else if($(this).attr("id") == "btn-delete"){
-					url = "${ctx}/advertiser/main/ad/advertiser/delete";
-				}
-				singleOper($(this),url,"${ctx}/advertiser/main/ad/advertiser/list");
-			});
-			
-			//批量开启,批量暂停
-			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/advertiser/main/ad/advertiser/enable";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/advertiser/main/ad/advertiser/disable";
-				}else if($(this).attr("id") == "all-btn-delete"){
-					url = "${ctx}/advertiser/main/ad/advertiser/delete";
-				}
-				batchOpear($(this),url,"${ctx}/advertiser/main/ad/advertiser/list");
-			});
-			
-		});
-
-</script>	
-
+<title>广告主管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/advertiser.js"></script>
 </@override> 
 <@override name="body">
 <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent" style="padding-bottom:85px;">
-    	<div id="third">
-				<ul style="padding-top:20px;margin:0px;">
-				    <li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2">广告主管理</li>
-				 </ul>  
-	 		</div>
-			<div id="class23">	   
-				<div id="class2" style="border-bottom:none;clear:both;">
-					<ul id="hangye" style="margin:0px;">
-						<li class="hangye2" style="border-bottom:none;margin-left:5px;">行业：</li>
-						<a  href="${ctx}/advertiser/main/ad/advertiser/list" ><li class="hangye1 hyqb">全部</li></a>
-					</ul>	
-				</div>  
-				<div id="class3" style="border-bottom:none;">
-					<ul id="zhuangtai" style="margin-left:5px;">
-						<li class="zhuangtai2" style="border-bottom:none;margin-left:0px;">状态：</li>
-						<a  href="${ctx}/advertiser/main/ad/advertiser/list?status=2&industryId=${industryId}" ><li class="zhuangtai1 zht zhtqb">全部</li></a>
-						<a  href="${ctx}/advertiser/main/ad/advertiser/list?status=0&industryId=${industryId}" ><li class="zhuangtai1 zhtzhch">正常</li></a>
-						<a  href="${ctx}/advertiser/main/ad/advertiser/list?status=1&industryId=${industryId}" ><li class="zhuangtai1 zhtty">停用</li></a>
-					</ul>
-				</div> 
-			</div>       
-		    <div id="class4" style="height:34px;">
-				<div id="button">					
-					<a style="margin:0px 5px 0 10px;" class="abtn" href="${ctx}/advertiser/main/ad/advertiser/create"><button  class="btn1">创建广告主</button></a>
-					<button style="margin-right:5px;" class="btn1" id="all-btn-enable" >批量开启</button>
-					<button style="margin-right:5px;" class="btn1" id="all-btn-disable" >批量停用</button>
-					<button style="margin:0px;" class="btn1" id="all-btn-delete">批量删除</button>
-				</div>
-				<form  method="post" id="search-form">
-					<div  id="search" style="float:right;margin-right:30px;">
-						<input  id="page" autocomplete="off"   type="hidden" name="page" value="${pager.page}"> 
-						<input id="searchKey"   autocomplete="off"   type="hidden" name="searchKey" value="${searchKey!'contactName'}">
-						<input id="search1" autocomplete="off"   type="text" name="searchValue" value="请输入关键字" >
-						<img id="search_img" onclick="picsubmit()" src="${ctx}/assets/advertiser/images/fangdajing.png"/>
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">广告主管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/advertiser/list" method="post">
+ 				<input type="hidden" id="status" name="status" value="${status!}"/>
+ 				<input type="hidden" id="industryId" name="industryId" value="${industryId!}"/>
+	 			<div id="selectBar_industry" class="selectBar">
+	 				<span>行业：</span>
+					<a value="0">全部</a>
+			    </div>
+			    <div id="selectBar_status" class="selectBar">
+	 				<span>状态：</span>
+					<a value="2">全部</a>
+					<a value="0">正常</a>
+					<a value="1">停用</a>
+			    </div>
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/ad/advertiser/create" class="btn2">创建广告主</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量停用</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
 					</div>
-				</form>
-			</div>
-		  	<div id="class5" style="width:99.8%;margin:20px;float:none;">
-				<table  border="1" class="table1" style="float:none;">
+				</div>
+				<table border="1" class="tableFig">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th class="th11" style="width:7%;"><div class="fxk"></div></th>
-							<th class="td1" style="width:5%;">ID</th>
-							<th class="td1" style="width:13%;">广告主名称</th>
-							<th class="td1" style="width:9%;">行业</th>
-							<th class="td1" style="width:9%;">类型</th>
-							<th class="td1" style="width:14%;">最后更新日期</th>
-							<th class="td1" style="width:9%;">启用状态</th>
-							<th class="td1" style="width:41%;" >操作</th>
-						</tr>
+						<tr class="theadTr">
+			            	<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			                <th class="theadTh" style="width:5%;">ID</th>
+			                <th class="theadTh" style="width:13%;">广告主名称</th>
+			                <th class="theadTh" style="width:9%;">行业</th>
+			                <th class="theadTh" style="width:9%;">类型</th>
+			                <th class="theadTh" style="width:14%;">最后更新日期</th>
+			                <th class="theadTh" style="width:9%;">状态</th>
+			                <th class="theadTh" style="width:41%;">操作</th>
+			            </tr> 
 					</thead>
-					<tbody id="tbody1">
+					<tbody>
 						<#if advertiserList ??>
 						<#list advertiserList as advertiser>
-							<tr id="nuh" class="">
-								<td class="td22" ><div class="fxk1" id="#{advertiser.id}"></div></td>
-								<td class="td2" ">${advertiser.id!}</td>
-								<td class="td2">${advertiser.name!}</td>
-								<td class="td2">${advertiser.industryName!}</td>
-								<td class="td2"><a href="${ctx}/advertiser/main/ad/order?advertiserId=${advertiser.id}&advertiserName=${advertiser.name}" style="color:#36aeea; text-decoration: underline;">${advertiser.orderNum!}个订单</a></td>
-								<td class="td2"><a href="${ctx}/advertiser/main/ad/advertiser/update?advertiserId=${advertiser.id}" style="color:#36aeea; text-decoration: underline;">${advertiser.updated?datetime}</a></td>
-								<td class="td2"><#if advertiser.status==0>正常<#else>停用</#if></td>
-								<td class="td3" >
-									<div class="zabtn" >
-										<a href="${ctx}/advertiser/main/ad/advertiser/edit/${advertiser.id}"><button style="margin-right:5px;" class="btn122">编辑</button></a>
-										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiser.id}&selectedadvertiserName=${advertiser.name}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
+							<tr id="tbodyTr">
+								<td class="tbodyTd"><div class="checkboxStyleTd" id="${advertiser.id!}"></div></td>
+								<td class="tbodyTd">${advertiser.id!}</td>
+								<td class="tbodyTd">${advertiser.name!}</td>
+								<td class="tbodyTd">${advertiser.industryName!}</td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/order?advertiserId=${advertiser.id}&advertiserName=${advertiser.name}" class="tableTdStyle">${advertiser.orderNum!}个订单</a></td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/advertiser/update?advertiserId=${advertiser.id}" class="tableTdStyle">${advertiser.updated!?datetime}</a></td>
+								<td class="tbodyTd"><#if advertiser.status==0>正常<#else>停用</#if></td>
+								<td class="tbodyTd">
+									<div id="listButtons">
+										<a href="${ctx}/advertiser/main/ad/advertiser/edit/${advertiser.id!}" class="btn3">编辑</a>
+										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiser.id!}" class="btn3">查看报表</a>
 										<#if advertiser.status==0>
-										<button style="margin:0px;" id="btn-disable" value=${advertiser.id} class="btn122">停用</button>
+										<a id="btn-disable" value=${advertiser.id!} class="btn3">停用</a>
 										<#elseif advertiser.status=1>
-										<button style="margin:0px;" id="btn-enable" value=${advertiser.id} class="btn122">开启</button>
+										<a id="btn-enable" value=${advertiser.id!} class="btn3">开启</a>
 										</#if>
-										<button id="btn-delete"  value=${advertiser.id} class="btn122">删除</button>
-									<div>
+										<a id="btn-delete" value=${advertiser.id!} class="btn3">删除</a>
+									</div>
 								</td>
 							</tr>
 						</#list>
 						</#if>
 					</tbody>
 				</table>
-				 
-				<div id="daochu">
-					<a style="text-decoration: none;" href="${ctx}/advertiser/main/ad/advertiser/exportDataReportExcel?industryId=${industryId}&status=${status}"><div class="btn2">导出Excel</div></a> 
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_list()">导出Excel</a>
 				</div>
-							
-				<div id="pageDiv" style="margin:0px 35px 20px 0px;">
+				<div id="pageDiv">
 					<#include "/common/pagination/simple.ftl"/>
 				</div>
-				
-			</div>
+			</form>
 		</div>
 	</div>
 </div>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/update.ftl

@@ -1,90 +1,58 @@
 <@override name="head">
-	<title>广告主信息修改记录</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/advertiser/exportLogExcel?advertiserId=${advertiserId}");
-		};
-		
-	</script>
-	
-</@override>
-
+<title>广告主信息修改记录</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+</@override> 
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul style="padding-top:20px;margin-left:9px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">广告主信息修改记录</li>
-			</ul>  
-		</div>
-		<form id="formPage" action="${ctx}/advertiser/main/ad/advertiser/update?advertiserId=${advertiserId}" method="post">
-			<input  id="page" type="hidden" name="page" value="${pager.page}"> 
-			<div id="account-table" style="margin-top:10px;">
-				<table border="1" class="tablefig" id="tablefig">
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">广告主信息修改记录</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/advertiser/update?advertiserId=${advertiserId!}" method="post">
+ 				<input  id="page" type="hidden" name="page" value="${pager.page}"/>
+				<table border="1" class="tableFig tableUpdate">
 					<thead>
-						<tr>
-							<th class="th1" style="width:15%;">变更时间</th>
-				   	   	 	<th class="th2" style="width:10%;">操作人</th>
-				   	   	 	<th class="th3" style="width:15%;">登录IP</th>
-				   	   	 	<th class="th4" style="width:10%;">操作类型</th>
-				   	   	 	<th style="width:30%;">变更详情</th>
-						</tr>
+						<tr class="theadTr">
+			                <th class="theadTh" style="width:15%;">变更时间</th>
+			                <th class="theadTh" style="width:10%;">操作人</th>
+			                <th class="theadTh" style="width:15%;">登录IP</th>
+			                <th class="theadTh" style="width:10%;">操作类型</th>
+			                <th class="theadTh" style="width:30%;">变更详情</th>
+			            </tr> 
 					</thead>
 					<tbody>
-					<#if logList ??>
-					<#list logList as log>
-			   	        <tr class="odd">
-						<td >${log.operTime?datetime!}</td>
-			   	   	 	<td >${log.userRealName!}</td>
-			   	   	 	<td >${log.userIp!}</td>
-			   	   	 	<td >${log.actionType!}</td>
-			   	   	 	<td >${log.action!}</td>
-			   	   	 	</tr>
-					</#list>
-					</#if>
+						<#if logList ??>
+						<#list logList as log>
+							<tr id="tbodyTr">
+								<td class="tbodyTd">${log.operTime?datetime!}</td>
+								<td class="tbodyTd">${log.userRealName!}</td>
+								<td class="tbodyTd">${log.userIp!}</td>
+								<td class="tbodyTd">${log.actionType!}</td>
+								<td class="tbodyTd">${log.action!}</td>
+							</tr>
+						</#list>
+						</#if>
 					</tbody>
 				</table>
-			
-				<div id="daochu" style="margin-left:20px;">
-					<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-					<a style="margin:-34px 0 0 180px;" class="ljbtn2 backbtn" href="${ctx}/advertiser/main/ad/advertiser/list">返回</a>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="${ctx}/advertiser/main/ad/advertiser/exportLogExcel?advertiserId=${advertiserId!}">导出Excel</a>
+					<a class="btn-back" href="${ctx}/advertiser/main/ad/advertiser/list">返回</a>
 				</div>
-							
 				<div id="pageDiv">
-	               	<#include "/common/pagination/simple.ftl"/>
-	            </div>	
-            
-            </div>
-		</form>
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
 	</div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/banner-template/index.ftl

@@ -1,432 +0,0 @@
-<@override name="head">
-	<title>广告投放系统</title>
-	<!--css-->
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/bootstrap.min.css">
-	<!--公共头的样式-->
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/public-head.css"/>
-	<!--这个页面的样式-->
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/banner-template-list.css"/>
-	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	
-<style>
-
-    .replace-file {
-display:block;
-overflow:hidden;
-position:relative;
- background-color: #36aeea;
- border: medium none;
- border-radius: 5px;
- color: #ffffff;
- font-size: 12px;
- height: 34px;
- width: 90px;
- float:left;
- text-align:center;
- line-height:34px;
-}
-.replace-file input{
-opacity:0;
-filter:alpha(opacity=0);
-font-size:100px;
-position:absolute;
-top:0;
-right:0;
-width:90px
-}
-
-</style>
-
-</@override>
-<@override name="body">
-
-	<#include "/advertiser/main/public-head.ftl">
-
-<div id= "pagecontent">
-	<div id="shortcutBar">
-		<ul style="padding-top:20px;margin:0 0 -5px 20px;">
-			<li ><i class="icon-home" style="background-image:none;"></i> <a class="homepage" href="${ctx}/advertiser/main/dashboard">首页</a>
-			<span class="divider1"><i class="icon-angle-right"></i></span></li>
-			<li style="margin:-21px 0 0 75px;"><a class="homepage2" href="#">素材审核</a></li>			         
-		</ul>  
-	</div>
-	<div id="pullDownList">
-		<select id="selectedAdvertiserId" name="selectedAdvertiserId">
-			<option value="-1">全部广告主</option>
-		</select>		
-	</div>
-
-	<div id="selectCondition">
-        <div >
-			<label>创意尺寸：</label>
-			<a name="size" value="0">全部</a>
-			<#if sizeList ??>
-			<#list sizeList as size>	
-                	<a name="size" value="${size.width}X${size.height}">
-                		${size.width}X${size.height}
-                	</a>
-			</#list>
-			</#if>           
-		</div>
-		
-        <div>
-            <label>创意类型：</label>
-               <a name="type" value="0">全部</a>
-               <a name="type" value="1">Flash</a>   
-               <a name="type" value="2">图片</a>      
-               <a name="type" value="3">视频</a>
-		</div>
-		
-        <div >
-            <label>状态：</label>
-               <a name="status" value="-1">全部</a>
-               <a name="status" value="0">正常</a>
-               <a name="status" value="1">停用</a>
-           </div>
-       </div>
-      
-     
-
-       <div id="searchBar" >
-         	<div>
-	           <button href="${ctx}/advertiser/main/ad/banner-template/upload" >创建创意素材</button>
-	           <button href="${ctx}/advertiser/main/ad/banner-template/enable">批量开启</button>
-	           <button href="${ctx}/advertiser/main/ad/banner-template/disable">批量停用</button>
-	           <button href="${ctx}/advertiser/main/ad/banner-template/delete" >批量删除</button>
-	           <input type="file" name="files" id="fileupload_input"  multiple="multiple" style="display:none"/> 
-	      	</div>
-		      	
-			<form action="${ctx}/advertiser/main/ad/banner-template/list" class="search-form" method="post">
-				<input type="hidden" name="page" value="${pager.page!}">
-				<input type="hidden" name="searchKey" value="name">
-				<input type="text" name="searchValue" value="请输入需要搜索的内容" onkeydown="if(event.keyCode==13){return false;}">
-				<img id="serachData_img" src="${ctx}/assets/advertiser/images/fangdajing1.png"/>
-			</form>
-		</div>
-
-	<div id="tableList">
-        <#include "list.ftl">
-	</div>
-</div>
-
-</@override>
-<@extends name="/common/simple.ftl"/>
-
-
-<!--linked js-->
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.min.js"></script>
-<script type="text/javascript">
-	<!--修改个人信息js 控制上下切换-->
-	$(document).ready(function(){
-		$("#search-input").keydown(function(e){
-		    if(!e){
-		        e=window.event;
-		        }
-	        if((e.keyCode||e.which)===13){
-	          //  $(":button").click();//回车键按下执行的方法
-	            $('#searchBar img').trigger("click");
-	        
-	    }
-	});
-		
-	  //个人信息栏的js控制
-		$("#divselect").click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-		
-		//搜索输入框的样式改变
-		$("#searchBar input[name='searchValue']").focus(function(){
-			$(this).val("");
-		});
-		$("#searchBar input[name='searchValue']").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入需要搜索的内容");
-			}
-		});
-		
-		//checkbox是否选中
-		$(document).on('click' ,'table th input:checkbox', function(){
-			var that = this;
-			$(this).closest('table').find('tr > td:first-child input:checkbox')
-				.each(function(){
-				this.checked = that.checked;
-			});
-		});
-		
-		//搜索按钮
-		$('#searchBar img').click(function(){
-			var _form = $('#searchBar .search-form');
-			var $searchValue = $("#searchBar .search-form input[name=searchValue]")
-			if($searchValue.val() == "请输入需要搜索的内容"){
-				$searchValue.val(null);
-			};
-			var _url = _form.attr('action');
-			var _param = $('#tableList form').serialize();
-			_param = _form.serialize() + "&" + _param;
-			console.log("search url:"+_url+", param:"+_param);
-			//window.location.assign(_url + "?" + _param);
-			$.post(_url, _param, function(data) {
-				$('#tableList').html(data);
-			});
-			if($searchValue.val() == ''){
-				$searchValue.val("请输入需要搜索的内容");
-			};
-			return false;
-		});
-		
-		// 以下是实现创意尺寸，创意类型，创意状态的筛选。
-		$('#selectCondition a').click(function() {	
-			console.log('aaa');
-			var _href = $(this).attr('href');
-			var _name = $(this).attr('name');
-			var _value = $(this).attr('value');
-			if(_name == 'size') {
-				var _width = null;
-				var _height = null;
-				if(_value != 0) {
-					var _size = _value.split('X',2);
-					console.info('_size:'+_size);
-					_width = _size[0];
-					_height = _size[1];
-				}
-				$("#tableList form input[name=width]").val(_width);
-				$("#tableList form input[name=height]").val(_height);
-			}
-			if(_name == 'type'){
-				if(_value != 0) {
-					$("#tableList form input[name=type]").val(_value);
-				} else {
-					$("#tableList form input[name=type]").val(null);
-				}
-			}
-			if(_name == 'position'){
-				if(_value != 0) {
-					$("#tableList form input[name=position]").val(_value);
-				} else {
-					$("#tableList form input[name=position]").val(null);
-				}
-			}
-			if(_name == 'status'){
-				if(_value != -1) {
-					$("#tableList form input[name=status]").val(_value);
-				} else {
-					$("#tableList form input[name=status]").val(null);
-				}
-			}
-			$(this).siblings().css('border-bottom','2px solid #f4f5f7');	
-			$(this).css('border-bottom','2px solid #36aeea');
-			$('#searchBar img').click();
-		});
-		
-		
-		// 绑定表格中编辑/取代码/查看报表/开启停用得按钮点击事件
-		$(document).on('click','#tableList button',function() {
-			var _href = $(this).attr('href');
-			var btn = $(this);
-			
-			// 防止二次点击
-			$(this).attr('disabled', 'disabled');		
-			// 停用开启时需要提醒
-			if (btn.text() && (btn.text().indexOf("暂停")>-1
-				||btn.text().indexOf("开启")>-1 
-				||btn.text().indexOf("删除")>-1)) {
-				var _text = btn.text();
-				bootbox.confirm("确定" + _text + "吗?", function(ensure) {
-					if (ensure) {			
-						$.get(_href,function(data){
-							$('#searchBar img').click();
-						});	
-					} else {
-						btn.removeAttr('disabled');
-					}
-				});
-			} else if(btn.text().indexOf("替换素材")>-1){
-				btn.removeAttr('disabled');
-				console.info("替换素材");
-				$(this).parent().children('input').click();				
-			} else{
-				btn.removeAttr('disabled');
-				console.log('bbbb');
-				var $nameInput = $(this).parent().siblings(".bannerName").find("input");
-				$nameInput.css({'border':'1px solid #000000','background-color':'#ffffff'});
-				var oldName = $nameInput.val();
-				$nameInput.removeAttr('readonly');
-				$nameInput.val('');
-				$nameInput.focus().val(oldName);
-				$nameInput.keydown(function(event){ 
-					if(event.which == 13){
-						var _url = _href + "&name=" + $nameInput.val();
-						$.ajax({
-							type : 'get',
-							url : _url,
-							async : false,
-							success : function(){
-								$nameInput.css({'border':'none','background-color':'transparent'});
-								$nameInput.attr('readonly','readonly')
-							}
-						});
-					}
-				});
-				$nameInput.blur(function(){
-					if($nameInput.attr('readonly') != 'readonly'){
-						$nameInput.val(oldName);
-						$nameInput.css({'border':'none','background-color':'transparent'});
-						$nameInput.attr('readonly','readonly');
-					}
-				}); 
-			}				
-			return false;
-		});
-		
-		// 批量启用/禁用按钮
-	 	$(document).on('click','#searchBar button',function() {
-				var _checkboxes = $('table tbody input:checkbox:checked');
-				var _url = $(this).attr('href');
-				var _param = _checkboxes.serialize();
-				// 批量开启停用删除时需要提醒
-				if ($(this).text() 
-					&& ($(this).text().indexOf("批量开启")>-1
-					||$(this).text().indexOf("批量停用")>-1
-					||$(this).text().indexOf("批量删除")>-1)) {
-					if(_checkboxes.size()>0){
-						var _text = $(this).text();
-						bootbox.confirm("确定" +_text + "吗?", function(ensure) {					
-							if (ensure) {	
-								console.info("url::" + _url + "param::" + _param);		
-								$.post(_url, _param, function(data) {
-									$('#searchBar img').click();
-								});
-							}
-						});
-					}
-				} else {
-					selectValue = $("#selectedAdvertiserId").val();
-					if(selectValue != -1){
-					$('#fileupload_input').trigger('click');
-					}else{
-						alert("请选择广告主");
-					}
-				}
-		});
-		
-		// 分页中超链接跳转
-		$(document).on('click','#pagecontent .pagination ul li a[href]',function(){
-			console.info('aaaa');
-			var _page = $(this).attr('href').substr(1);
-			var _form = $('#pagecontent .search-form');
-			_form.find('input:hidden[name="page"]').val(_page);
-			_form.find('img').click();
-			return false;
-		});
-		
-	});
-	
-</script>
-
- 
-<script src="${ctx}/assets/advertiser/js/jquery.ui.widget.js"></script>
-<script src="${ctx}/assets/advertiser/js/jquery.iframe-transport.js"></script>
-<script src="${ctx}/assets/advertiser/js/jquery.fileupload.js"></script>
-<script type="text/javascript">
-$("#fileupload_input").on('click',function(){
-	var advertiserId=$('#selectedAdvertiserId').val();
-	 $("#fileupload_input").fileupload({
-	    	autoUpload: true,
-		    url:"${ctx}/advertiser/main/ad/banner-template/upload",//文件上传地址，当然也可以直接写在input的data-url属性内
-		    formData:{advertiserId:advertiserId},
-		    //如果需要额外添加参数可以在这里添加
-		    done:function(e,data){
-		    	alert(data.result);
-		        //done方法就是上传完毕的回调函数，其他回调函数可以自行查看api
-		    
-		        //注意result	要和jquery的ajax的data参数区分，这个对象包含了整个请求信息
-		        //返回的数据在result.result中，假设我们服务器返回了一个json对象
-		        window.location.reload();
-		        console.log(JSON.stringify(data.result));
-		    }
-		})
-   
-	})
-
-</script>
-
-<!-- 以下实现下拉框联动,以及表格数据联动 -->
-<script type="text/javascript">
-	//给下拉列表框准备数据
-	function loadDataForPullDownList(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		
-		controlView.empty();
-		//增加一个默认的列
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-		
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			//console.log(data);
-			//console.log(data[parentId]);
-			//遍历后端传回来的json数据，追加在select后面，value是id，label是值
-			$.each(data[parentId], function(key, val) {
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-			});
-		});
-		//设置默认显示的列是-1；
-		controlView.val("-1");
-	}
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	//调用loadDataForPullDownList，给广告主准备数据
-	function loadAdvertiser(agentId) {
-		loadDataForPullDownList($('#selectedAdvertiserId'), "advertiserList", "/ssp_web/widget/selector/provide/advertiser?parentId=" + agentId, "全部广告主");
-	}
-	
-	$(document).ready(function(){
-		
-		var role = '${role}';//获取角色
-		if(role == "agent"){
-			var agentId = '${userSession.agentId}';//代理商id
-			//这里设置获取该代理商下的广告主，请求的地址后面参数为：?parentId="+agentId;
-			//进入页面首先将广告主的下拉列表数据拿出来
-			loadAdvertiser(agentId);
-			$('#searchBar img').trigger('click');
-		}else if(role == "advertiser"){
-			var advertiserName = '${advertiserName}';//广告主名称
-			var advertiserId = '${userSession.advertiserId}';//广告主id
-			$("#tableList form input[name=advertiserId]").val(advertiserId);
-		    // 这里设置：下拉框的值为advertiserName
-			//清空下拉框列表
-			$('#selectedAdvertiserId').empty();
-			//增加一个列
-			$('#selectedAdvertiserId').append(
-					'<option value=' + advertiserId + '>' + advertiserName + '</option>'
-			);
-			loadCampaignGroup(advertiserId);
-			$('#searchBar img').trigger('click');
-		}
-		
-		//广告主value change调用此函数， 清除活动列表和策略列表
-		$('#selectedAdvertiserId').change(function() {
-			var id = $(this).val();
-			if(id == -1){
-				$("#tableList form input[name=advertiserId]").val(null);
-			} else {
-				$("#tableList form input[name=advertiserId]").val(id);
-			}
-			$('#searchBar img').trigger('click');
-		});
-		
-	});
-</script>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/banner-template/list.ftl

@@ -1,82 +1,134 @@
-<table class="table">
-    <thead>
-        <tr>
-            <th class="center" style="width:5%">
-			<label>&nbsp;&nbsp;&nbsp;<input  autocomplete="off"   type="checkbox"><span class="lbl"></span></label>
-			</th>
-            <th style="width:5%" >ID</th>
-            <th style="width:7%">创意</th>
-            <th class="dataToggle hide-piece" style="width:7%">创意名称</th>
-            <th style="width:7%">创意尺寸</th>
-            <th style="width:7%">创意类型</th>
-            <!--<th class="hidden-480">创意子类型</th>--> 
-            <th style="width:15%" class="hidden-480">上传时间</th>
-            <th style="width:9%">创意状态</th>
-            <th style="width:30%">操作</th>
-        </tr>
-    </thead>
-    <tbody>
-		<#if bannerTemplateList ??>
-        <#list bannerTemplateList as bannerTemplate>
-        <tr class="">
-            <td style="width:5%" class="center">
-				<label>&nbsp;&nbsp;&nbsp;<input  autocomplete="off"   type="checkbox" name="id" value="#{bannerTemplate.id}"><span class="lbl"></span></label>
-			</td>
-            <td style="width:5%">${bannerTemplate.id!}</td>
-            <td style="width:7%" class="hidden-480"><img src='${bannerTemplate.pathSmall!}'></td>
-            <td style="width:7%" class='bannerName'>
-            	<input readonly="readonly" value='${bannerTemplate.name!}' title="${bannerTemplate.name!}" style="width:150px"/>
-            </td>
-            <td style="width:7%">${bannerTemplate.width!}x${bannerTemplate.height!}</td>
-            <td style="width:7%">
-            	<#if bannerTemplate.type == 1>Flash<#elseif bannerTemplate.type == 2>图片<#else>视频</#if>
-            </td>
-            <td style="width:15%" class="hidden-480">${bannerTemplate.updated?datetime}</td>
-            <td style="width:5%"><#if bannerTemplate.status==0>开启<#else>停用</#if></td>
-            <td style="width:40%">
-            	<span class="replace-file">替换素材<input type="file" id="file${bannerTemplate.id}" valueId="${bannerTemplate.id!}"></span>     
-                <button href="${ctx}/advertiser/main/ad/banner-template/alterName?id=${bannerTemplate.id!}" style="margin:0 5px 0 5px;">修改名称</button>
-                <#if bannerTemplate.status==0>
-                <button class="btn-status" data-toggle="dropdown" href="${ctx}/advertiser/main/ad/banner-template/disable?id=${bannerTemplate.id!}" style="margin-right:5px;">暂停</button>
-				<#elseif bannerTemplate.status==1>
-                <button class="btn-status" data-toggle="dropdown" href="${ctx}/advertiser/main/ad/banner-template/enable?id=${bannerTemplate.id!}" style="margin-right:5px;">开启</button>
-				</#if>
-				<button class="btn-status" data-toggle="dropdown" href="${ctx}/advertiser/main/ad/banner-template/delete?id=${bannerTemplate.id!}">删除</button>
-            </td>
-        </tr>
-        </#list>
-		</#if>           
-    </tbody>
-</table>
-
-<form class="selectParam">
-	<input type="hidden" name="width" value="${width!}">
-	<input type="hidden" name="height" value="${height!}">
-	<input type="hidden" name="type" value="${type!}">
-	<input type="hidden" name="status" value="${status!}">
-	<input id="advertiserId" type="hidden" name="advertiserId" value="${advertiserId!}">
-</form>
-
-<div id="footBar">
-	<div id="paged">
-       <#include "/common/pagination/simple.ftl"/>
-    </div>
+<@override name="head">
+<title>创意中心</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.ui.widget.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.iframe-transport.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.fileupload.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/banner.js"></script>
+</@override> 
+<@override name="body">
+<div id=content_bg>
+	<#include "/advertiser/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">创意中心</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/banner-template/list" method="post">
+ 				<input type="hidden" id="status" name="status" value="${status!}"/>
+ 				<input type="hidden" id="width" name="width" value="${width!}"/>
+				<input type="hidden" id="height" name="height" value="${height!}"/>
+				<input type="hidden" id="type" name="type" value="${type!}"/>
+				<input type="hidden" id="size" name="size" value="${size!}"/>
+ 				<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="advertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+				</div>
+				<div id="selectBar_size" class="selectBar">
+	 				<span>创意尺寸：</span>
+					<a value="">全部</a>
+					<#if sizeList ??>
+					<#list sizeList as size>	
+                	<a value="${size.width!}X${size.height!}">${size.width!}X${size.height!}</a>
+					</#list>
+					</#if>
+			    </div>
+			    <div id="selectBar_type" class="selectBar">
+	 				<span>创意类型：</span>
+					<a value="">全部</a>
+		            <a value="1">Flash</a>   
+		            <a value="2">图片</a>      
+		            <a value="3">视频</a>
+			    </div>
+			    <div id="selectBar_status" class="selectBar">
+	 				<span>状态：</span>
+					<a value="">全部</a>
+					<a value="0">正常</a>
+					<a value="1">停用</a>
+			    </div>
+			    <div id="navButtons">
+					<div id="button">					
+						<a class="btn2" id="all-btn-upload">创建创意素材</a>
+						<input type="file" id="all-input-file" multiple="mltiple"/>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量停用</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:5%;">ID</th>
+							<th class="theadTh" style="width:12%;">创意</th>
+							<th class="theadTh" style="width:12%;text-align:left;">创意名称</th>
+							<th class="theadTh" style="width:6%;">创意尺寸</th>
+							<th class="theadTh" style="width:6%;">创意类型</th>
+							<th class="theadTh" style="width:12%;">上传时间</th>
+							<th class="theadTh" style="width:7%;">创意状态</th>
+							<th class="theadTh" style="width:35%;">操作</th>
+						</tr> 
+					</thead>
+					<tbody>
+						<#if bannerTemplateList ??>
+						<#list bannerTemplateList as bannerTemplate>
+						<tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${bannerTemplate.id!}"></div></td>
+							<td class="tbodyTd">${bannerTemplate.id!}</td>
+							<td class="tbodyTd"><img src='${bannerTemplate.pathSmall!}'></td>
+							<td class="tbodyTd" style="text-align:left;">
+								<div class="input-group-td" id="input-group-td-first"><input class="input-text-edit" value="${bannerTemplate.name!}" title="${bannerTemplate.name!}" valueId="${bannerTemplate.id!}" disabled="true"/></div>
+							</td>
+							<td class="tbodyTd">${bannerTemplate.width!}x${bannerTemplate.height!}</td>
+							<td class="tbodyTd"><#if bannerTemplate.type == 1>Flash<#elseif bannerTemplate.type == 2>图片<#else>视频</#if></td>
+							<td class="tbodyTd">${bannerTemplate.updated!?datetime}</td>
+							<td class="tbodyTd"><#if bannerTemplate.status==0>开启<#else>停用</#if></td>
+							<td class="tbodyTd">
+								<div id="listButtons">
+									<a class="btn3" id="btn-edit">替换素材</a>
+									<input type="file" id="file${bannerTemplate.id!}" valueId="${bannerTemplate.id!}" class="banner-file"/>
+									<a class="btn3" id="btn-editName" value="${bannerTemplate.id!}">修改名称</a>
+									<#if bannerTemplate.status==0>
+									<a id="btn-disable" value="${bannerTemplate.id!}" class="btn3">停用</a>
+									<#elseif bannerTemplate.status==1>
+									<a id="btn-enable" value="${bannerTemplate.id!}" class="btn3">开启</a>
+									</#if>
+									<a id="btn-delete" value="${bannerTemplate.id!}" class="btn3">删除</a>
+								</div>
+							</td>
+						</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_list()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
+	</div>
 </div>
-
-<script type="text/javascript">
-$(function () {
-	$('.replace-file input').each(function(){
-		var bannerTemplateId = $(this).attr("valueId");
-		$(this).fileupload({
-		autoUpload: true,
-		url: '${ctx}/advertiser/main/ad/banner-template/replace',
-		formData:{bannerTemplateId:bannerTemplateId},
-		done:function(e,result){
-			alert(result.result);
-			$('#pagecontent .search-form').find('img').click();
-	        console.log(JSON.stringify(result.result));            
-	          }
-		})
-	});
-})
-</script> 
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/create.ftl

@@ -1,117 +1,49 @@
-<@override name="head">
-	<title>创建订单</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript">
-		$(function(){
-			$("#validation-form").autovalidate();
-			$(".btn3").click(function(){
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				var falg = validateMoney();
-				if(falg == false){
-					return false;
-				}
-			});
-			$(".btn4").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/order/list?advertiserId="+$("#advertiserId").val();
-			});
-			
-	    	$("#validation-form input[name='budget']").blur(function(){
-				validateMoney();
-			});
-		});
-		
-		function validateMoney(){
-			var reg=/^\d{1,8}\.?\d{0,2}$/;
-			var $this = $("#yusuan");
-			if($this.val().match(reg)!=null){
-				if(($this.val().indexOf('.') == -1 && $this.val().length > 8) || $this.val() < 0){
-					$this.css("box-shadow","0 0 6px red").attr('title','总预算金额整数位最多8位');
-					$this.parent("div").find("span.spanVaildate").html("总预算金额整数位最多8位").css("color","red");
-					return false;
-				}else if($this.val() > parseInt($("#balance").val())){
-					$this.css("box-shadow","0 0 6px red").attr('title','总预算不能大于该广告主的余额');
-					$this.parent("div").find("span.spanVaildate").html("总预算不能大于该广告主的余额").css("color","red");
-					return false;
-				}else{
-					$this.css("box-shadow","none").attr('title','');
-					$this.parent("div").find("span.spanVaildate").html("");
-				}
-			}else{
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算金额整数位最多8位且最多有2位小数');
-				$this.parent("div").find("span.spanVaildate").html("总预算金额整数位最多8位且最多有2位小数").css("color","red");
-				return false;
-			}
-		}
-	</script>
-		
-</@override>
+<@override name="head">	
+<title>创建订单</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/order.js"></script>
+</@override>	
 <@override name="body">
 <div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-    	<div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">创建订单</li>
-			</ul>  
-	 	</div>
-		<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/ad/order/save" method="post">
-			<input type="hidden" id="balance" value="${balance!}"/>
-			<div class="all">
-				<div class="line1">
-					<label class="label1" style="width:100px;"><span style="color:dodgerblue;">*</span>订单名称：</label>
-					<div class="xianzhi">
-						<input class="shuru1" autocomplete="off" id="shuru1" name="name" type="text" value="" verify="unspecial/64/1/0"><span class="spanVaildate"></span>
-					</div>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">创建订单</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/order/save" method="post">
+	 			<input type="hidden" id="balance" value="${balance!}"/>
+	 			<input type="hidden" id="advertiserId" value="${advertiserId!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>订单名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>总预算：</label>
+					<input class="input-text" tabindex="2" id="budget" name="budget" type="text" value="" verify="float/11/1/2"/><span class="input-span">元</span><span class="spanVaildate"></span>
 				</div>
-				<div class="line2" style="clear:both;">
-					<label class="label2" style="width:100px;"><span style="color:dodgerblue;">*</span>总预算：</label>
-						<input class="shuru2" autocomplete="off" id="yusuan" name="budget" type="text" value="" verify="float/11/1/2">
-						<input id="ys" class="yusuanyu" value="元" style="width:20px;"><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>备注：</label>
+					<input class="input-text" tabindex="3" id="comment" name="comment" type="text" value="" verify="unspecial/1000/0/0"/><span class="spanVaildate"></span>
 				</div>
-				<div class="line3">
-					<label class="label3" style="width:100px;">&nbsp;&nbsp;备注：</label>
-					<div>
-						<input class="shuru3" autocomplete="off" id="comment" name="comment" type="text" value="" verify="unspecial/1000/0/0"><span style="margin-top:8px;" class="spanVaildate"></span>
-					</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
 				</div>
-			</div>	
-			<div class="btnall" style="margin-top:80px;">
-				<button  class="btn3" type="submit">保存</button>
-				<button  class="btn4" type="reset">取消</button>
-			</div>
-				
-			<input  autocomplete="off" id="advertiserId"  type="hidden" name="advertiserId" value="${advertiserId}">
-			<input  autocomplete="off" id="agentId"  type="hidden" name="agentId" value="${agentId}">
-		</form>
-	</div>		
-</div>	
+			</form>
+		</div>
+    </div>
+</div>
 </@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/edit.ftl

@@ -1,119 +1,49 @@
-<@override name="head">
-	<title>编辑订单</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript">
-		$(function(){
-			$("#validation-form").autovalidate();
-			$(".btn3").click(function(){
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				var falg = validateMoney();
-				if(falg == false){
-					return false;
-				}
-			});
-			$(".btn4").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/order/list?advertiserId="+$("#advertiserId").val();
-			});
-			
-			$("#validation-form input[name='budget']").blur(function(){
-				validateMoney();
-			});
-		});
-		
-		function validateMoney(){
-			var reg=/^\d{1,8}\.?\d{0,2}$/;
-			var $this = $("#yusuan");
-			if($this.val().match(reg)!=null){
-				if(($this.val().indexOf('.') == -1 && $this.val().length > 8) || $this.val() < 0){
-					$this.css("box-shadow","0 0 6px red").attr('title','总预算金额整数位最多8位');
-					$this.parent("div").find("span.spanVaildate").html("总预算金额整数位最多8位").css("color","red");
-					return false;
-				}else if($this.val() > parseInt($("#balance").val())){
-					$this.css("box-shadow","0 0 6px red").attr('title','总预算不能大于该广告主的余额');
-					$this.parent("div").find("span.spanVaildate").html("总预算不能大于该广告主的余额").css("color","red");
-					return false;
-				}else{
-					$this.css("box-shadow","none").attr('title','');
-					$("#totalBudget_span").html("");
-				}
-			}else{
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算金额整数位最多8位且最多有2位小数');
-				$this.parent("div").find("span.spanVaildate").html("总预算金额整数位最多8位且最多有2位小数").css("color","red");
-				return false;
-			}
-		}
-	</script>
-</@override>
-
+<@override name="head">	
+<title>编辑订单</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/order.js"></script>
+</@override>	
 <@override name="body">
 <div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-    	<div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${order.advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">编辑订单</li>
-			</ul>  
-	 	</div>
-	 	
-	 	<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/ad/order/save" method="post">
-			<input type="hidden" id="balance" value="${balance!}"/>
-			<div class="all">
-				<div class="line1">
-					<label class="label1" style="width:100px;"><span style="color:dodgerblue;">*</span>订单名称：</label>
-					<div class="xianzhi">
-						<input class="shuru1" autocomplete="off" id="shuru1" name="name" type="text" value="${order.name}" verify="unspecial/64/1/0"><span class="spanVaildate"></span>
-					</div>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${order.advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">编辑订单</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/order/save" method="post">
+	 			<input type="hidden" id="balance" value="${balance!}"/>
+	 			<input type="hidden" id="advertiserId" value="${order.advertiserId!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>订单名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="${order.name!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>总预算：</label>
+					<input class="input-text" tabindex="2" id="budget" name="budget" type="text" value="${order.budget!}" verify="float/11/1/2"/><span class="input-span">元</span><span class="spanVaildate"></span>
 				</div>
-				<div class="line2" style="clear:both;">
-					<label class="label2" style="width:100px;"><span style="color:dodgerblue;">*</span>总预算：</label>
-						<input class="shuru2" autocomplete="off" id="yusuan" name="budget" type="text" value="${order.budget}" verify="float/11/1/2">
-						<input id="ys" class="yusuanyu" value="元" style="width:20px;"><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>备注：</label>
+					<input class="input-text" tabindex="3" id="comment" name="comment" type="text" value="${order.comment!}" verify="unspecial/1000/0/0"/><span class="spanVaildate"></span>
 				</div>
-				<div class="line3">
-					<label class="label3" style="width:100px;">&nbsp;&nbsp;备注：</label>
-					<div>
-						<input class="shuru3" autocomplete="off" id="comment" name="comment" type="text" value="${order.comment!}" verify="unspecial/1000/0/0"><span style="margin-top:8px;" class="spanVaildate"></span>
-					</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
 				</div>
-			</div>	
-			<div class="btnall" style="margin-top:80px;">
-				<button  class="btn3" type="submit">保存</button>
-				<button  class="btn4" type="reset">取消</button>
-			</div>
-				
-			<!--在点击确定时自动向controller传对应的id-->
-            <input  autocomplete="off"   type="hidden" name="id" value="${order.id}">
-	        <input id="advertiserId"  autocomplete="off"   type="hidden" name="advertiserId" value="${order.advertiserId}">
-		</form>
-	</div>
+			</form>
+		</div>
+    </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/list.ftl

@@ -1,203 +1,108 @@
 <@override name="head">
-	<title>投放管理-订单管理</title>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript">
- 		$(document).ready(function(){
-
- 			//搜索按钮的实现,2015.10.18更新了在某个状态下的搜索
-			$("#search_img").click(function(){
-				var $searchValue = $(".search-form input[name=searchValue]");
-				if($searchValue.val() == "请输入关键字"){
-					$searchValue.val(null);
-				};
-				page=$(".search-form input[name=page]").val();
-				a=${advertiserId};
-            	url = "${ctx}/advertiser/main/ad/order/list?advertiserId="+a;  
-            	param=$searchValue.val();
-            	status=${status};
-            	location.href=url+"&searchValue="+param+"&status="+status+"&page="+page;
-			});
- 			//状态全部、开启、停用
-			var p=${status};
-			if (p==2){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtqb").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==1){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtty").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else {
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtzhch").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}	
-		 	
-			//开启,暂停,删除
-			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/advertiser/main/ad/order/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/advertiser/main/ad/order/disable";
-				}else if($(this).attr("id") == "btn-delete"){
-					url = "${ctx}/advertiser/main/ad/order/delete";
-				}
-				singleOper($(this),url,"${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}");
-			});
-			
-			//批量开启,批量暂停,批量删除
-			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/advertiser/main/ad/order/enable";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/advertiser/main/ad/order/disable";
-				}else if($(this).attr("id") == "all-btn-delete"){
-					url = "${ctx}/advertiser/main/ad/order/delete";
-				}
-				batchOpear($(this),url,"${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}");
-			});
-			
-			/*
-			 * 实现分页跳转
-			 */
-			$("#pageDiv .pagination ul li a[href]").click(function(){
-				var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-				var _form = $('.search-form');
-				_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-				_form.find('img').click();//触发搜索
-				//return false;
-			});
-			
-			$(".btn1").click(function(){
-				if($("#advertiserId").val() == "" || $("#advertiserId").val() == -1){
-					$("#btnCreatelink").attr("href","javascript:void(0);");
-					bootbox.alert("请选择广告主！");
-					$("#btnCreatelink").attr("title","请选择广告主");
-					return false;
-				}
-			});
-		
-			$('ul#advertiser_son_ul li').live("click",function(){
-				window.location.href="${ctx}/advertiser/main/ad/order/list?advertiserId="+$("#advertiserId").val()+"&status=${status}";
-	 		});
-		});
-</script>			
-
-</@override>
+<title>订单管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/order.js"></script>
+</@override> 
 <@override name="body">
 <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent" style="padding-bottom:80px;">
-      	<div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size3">订单管理</li>
-			</ul>  
-	 	</div>
-     	<div id="selectuls" style=" margin: 0 0 0 10px;">
-			<ul id="main_advertiserul">
-				<li class="select_box" id="advertiserul_box">
-					<span id="advertiserul_span">${selectedadvertiserName!}</span>
-					<ul class="son_ul" id="advertiser_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-		</div> 		
-		<div id="class3" style="border-bottom:none;">
-			<ul id="zhuangtai" style="margin-left:5px;">
-				<li class="zhuangtai2" style="border-bottom:none;margin-left:0px;margin-bottom:15px;">状态：</li>
-				<a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}&status=2" ><li class="zhuangtaiall zhtqb">全部</li></a>
-				<a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}&status=0" ><li class="zhuangtai1 zhtzhch">正常</li></a>
-				<a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}&status=1"><li class="zhuangtai1 zhtty">停用</li></a>
-			</ul>
-		</div> 
-		<div id="class4" style="height:34px;clear:both;">
-			<div id="button">					
-				<a id="btnCreatelink" style="margin:0px 5px 0 10px;" href="${ctx}/advertiser/main/ad/order/create?advertiserId=${advertiserId}"><button  class="btn1" >创建订单</button></a>												
-				<button style="margin-right:5px;" class="btn1" id="all-btn-enable" >批量开启</button>
-				<button style="margin-right:5px;" class="btn1" id="all-btn-disable" >批量停用</button>
-				<button style="margin:0px;" class="btn1" id="all-btn-delete">批量删除</button>
-			</div>
-			<form  method="post" class="search-form">
-				<input type="hidden" id="role" value="${role}">
-				<input type="hidden" id="agentId" value="${userSession.agentId}">
-				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-				<div  id="search" style="float:right;margin-right:30px;"> 
-					<input id="page" autocomplete="off"   type="hidden" name="page" value="${pager.page}"> 
-					<input id="searchKey" autocomplete="off" type="hidden" name="searchKey" value="${searchKey!'contactName'}">
-					<input id="advertiserId" type="hidden" name="advertiserId" value="${advertiserId!}">
-					
-					<input id="search1" autocomplete="off" type="text" name="searchValue" value="请输入关键字" >
-					<img id="search_img" src="${ctx}/assets/advertiser/images/fangdajing.png"/>
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+				    <li class="navDiv_currentLi">订单管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}" method="post">
+ 				<input type="hidden" id="status" name="status" value="${status!}"/>
+ 				<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="advertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+				</div>
+			    <div id="selectBar_status" class="selectBar">
+	 				<span>状态：</span>
+					<a value="2">全部</a>
+					<a value="0">正常</a>
+					<a value="1">停用</a>
+			    </div>
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/ad/order/create?advertiserId=${advertiserId!}" class="btn2" id="btn-create">创建订单</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量停用</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+			            	<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			                <th class="theadTh" style="width:5%;">ID</th>
+			                <th class="theadTh" style="width:13%;">订单名称</th>
+			                <th class="theadTh" style="width:9%;">总预算</th>
+			                <th class="theadTh" style="width:9%;">活动</th>
+			                <th class="theadTh" style="width:14%;">最后更新日期</th>
+			                <th class="theadTh" style="width:9%;">状态</th>
+			                <th class="theadTh" style="width:41%;">操作</th>
+			            </tr> 
+					</thead>
+					<tbody>
+						<#if orderList ??>
+						<#list orderList as order>
+							<tr id="tbodyTr">
+								<td class="tbodyTd"><div class="checkboxStyleTd" id="${order.id!}"></div></td>
+								<td class="tbodyTd">${order.id!}</td>
+								<td class="tbodyTd">${order.name!}</td>
+								<td class="tbodyTd">${order.budget!}</td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${order.id!}&advertiserId=${advertiserId!}" class="tableTdStyle">${order.campaignNumber!}个活动</a></td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/order/update?orderId=${order.id!}" class="tableTdStyle">${order.updated!?datetime}</a></td>
+								<td class="tbodyTd"><#if order.status==0>正常<#else>停用</#if></td>
+								<td class="tbodyTd">
+									<div id="listButtons">
+										<a href="${ctx}/advertiser/main/ad/order/edit/${order.id!}" class="btn3">编辑</a>
+										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId!}&selectedorderId=${order.id!}" class="btn3">查看报表</a>
+										<#if order.status==0>
+										<a id="btn-disable" value="${order.id!}" class="btn3">停用</a>
+										<#elseif order.status=1>
+										<a id="btn-enable" value="${order.id!}" class="btn3">开启</a>
+										</#if>
+										<a id="btn-delete" value="${order.id!}" class="btn3">删除</a>
+									</div>
+								</td>
+							</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_list()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
 				</div>
 			</form>
 		</div>
-    	<div id="class5" style="width:99.8%;margin:20px;float:none;">
-			<table  width="100%" border="1" class="table1" style="float:none;">
-				<thead>
-					<tr class="tr1" id ='tr11'>
-						<th class="th11" style="width:7%;"><div class="fxk"></div></th>
-						<th class="td1" style="width:7%;">ID</th>
-						<th class="td1" style="width:12%;">订单名称</th>
-						<th class="td1" style="width:9%;">总预算</th>
-						<th class="td1" style="width:9%;">活动</th>
-						<th class="td1" style="width:14%;">最后更新日期</th>
-						<th class="td1" style="width:9%;">状态</th>
-						<th class="td1" style="width:41%;" >操作</th>
-					</tr>
-				</thead>
-				<tbody id="tbody1">
-					<#if orderList ??>
-					<#list orderList as order>
-						<tr id="nuh" class="">
-							<td class="td2"><div class="fxk1" id="#{order.id}"></div></td>
-							<td class="td2">${order.id!}</td>
-							<td class="td2">${order.name!}</td>
-							<td class="td2">${order.budget!}</td>
-							<td class="td2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${order.id}&advertiserId=${advertiserId}" style="color:#36aeea; text-decoration: underline;">${order.campaignNumber!}个活动</a></td>
-							<td class="td2"><a href="${ctx}/advertiser/main/ad/order/update?orderId=${order.id}" style="color:#36aeea; text-decoration: underline;">${order.updated?datetime}</a></td>
-							<td class="td2"><#if order.status==0>正常<#else>停用</#if></td>
-							<td class="td2" >
-								<a   href="${ctx}/advertiser/main/ad/order/edit/${order.id}"><button style="margin:0px 5px 0 0;" class="btn122">编辑</button></a>
-								<a   href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId}&selectedadvertiserName=${selectedadvertiserName}&selectedorderId=${order.id}&selectedorderName=${order.name}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
-								<#if order.status==0>
-								<button style="margin:0px;" id="btn-disable" value=${order.id} class="btn122">停用</button>
-								<#elseif order.status=1>
-								<button style="margin:0px;" id="btn-enable" value=${order.id} class="btn122">开启</button>
-								</#if>
-								<button id="btn-delete"  value=${order.id} class="btn122">删除</button>
-							</td>
-						</tr>
-					</#list>
-					</#if>
-				</tbody> 															
-			</table>
-			
-			<div id="daochu">
-				<a style="text-decoration: none;" href="${ctx}/advertiser/main/ad/order/exportDataReportExcel?advertiserId=${advertiserId}&status=${status}"><div class="btn2">导出Excel</div></a>
-			</div>
-			
-			<div id="pageDiv" style="margin:0px 35px 20px 0px;">
-				<#include "/common/pagination/simple.ftl"/>
-			</div>
-		</div>
 	</div>
 </div>
 </@override>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/update.ftl

@@ -1,95 +1,63 @@
 <@override name="head">
-	<title>订单信息修改记录</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/order/exportLogExcel?orderId=${orderId}");
-		};
-		
-	</script>
-	
-</@override>
-
+<title>订单信息修改记录</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+</@override> 
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul style="padding-top:20px;margin-left:9px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${order.advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">订单信息修改记录</li>
-			</ul>  
-		</div>
-		<form id="formPage" action="${ctx}/advertiser/main/ad/order/update?orderId=${orderId}" method="post">
-			<input  id="page" type="hidden" name="page" value="${pager.page}">
-			<input  id="page" type="hidden" name="advertiserId" value="${order.advertiserId}"> 
-			<div id="account-table" style="margin-top:10px;">
-				<table border="1" class="tablefig" id="tablefig">
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">订单信息修改记录</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/order/update?orderId=${orderId!}" method="post">
+ 				<input id="page" type="hidden" name="page" value="${pager.page}"/>
+ 				<input id="advertiserId" type="hidden" name="advertiserId" value="${order.advertiserId!}"/> 
+				<table border="1" class="tableFig tableUpdate">
 					<thead>
-						<tr>
-							<th class="th1" style="width:15%;">变更时间</th>
-				   	   	 	<th class="th2" style="width:10%;">操作人</th>
-				   	   	 	<th class="th3" style="width:15%;">登录IP</th>
-				   	   	 	<th class="th4" style="width:10%;">操作类型</th>
-				   	   	 	<th style="width:30%;">变更详情</th>
-						</tr>
+						<tr class="theadTr">
+			                <th class="theadTh" style="width:15%;">变更时间</th>
+			                <th class="theadTh" style="width:10%;">操作人</th>
+			                <th class="theadTh" style="width:15%;">登录IP</th>
+			                <th class="theadTh" style="width:10%;">操作类型</th>
+			                <th class="theadTh" style="width:30%;">变更详情</th>
+			            </tr> 
 					</thead>
 					<tbody>
-					<#if logList ??>
-					<#list logList as log>
-			   	        <tr class="odd">
-						<td >${log.operTime?datetime!}</td>
-			   	   	 	<td >${log.accountName!}</td>
-			   	   	 	<td >${log.userIp!}</td>
-			   	   	 	<td >${log.actionType!}</td>
-			   	   	 	<td >${log.action!}</td>
-			   	   	 	</tr>
-					</#list>
-					</#if>
+						<#if logList ??>
+						<#list logList as log>
+							<tr id="tbodyTr">
+								<td class="tbodyTd">${log.operTime?datetime!}</td>
+								<td class="tbodyTd">${log.userRealName!}</td>
+								<td class="tbodyTd">${log.userIp!}</td>
+								<td class="tbodyTd">${log.actionType!}</td>
+								<td class="tbodyTd">${log.action!}</td>
+							</tr>
+						</#list>
+						</#if>
 					</tbody>
 				</table>
-			
-				<div id="daochu" style="margin-left:20px;">
-					<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-					<a style="margin:-34px 0 0 180px;" class="ljbtn2 backbtn" href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">返回</a>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="${ctx}/advertiser/main/ad/order/exportLogExcel?orderId=${orderId!}">导出Excel</a>
+					<a class="btn-back" href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">返回</a>
 				</div>
-							
 				<div id="pageDiv">
-	               	<#include "/common/pagination/simple.ftl"/>
-	            </div>	
-            
-            </div>
-		</form>
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
 	</div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report.ftl

@@ -1,232 +1,188 @@
 <@override name="head">
-	<title>总体报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>
+<title>总体报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#" style="text-decoration:none">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">数据报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="date">
-				<ul id="main_dimensionul" style="float:left; margin-right:10px;">
-					<li class="select_box" id="dimensionul_box">
-						<span id="dimensionul_span">${selecteddimensionName!}</span>
-						<ul class="son_ul" id="dimension_son_ul" style="margin-left:20px;"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selecteddimensionId" id="dimensionId" value="${dimensionId!}">
-				<input type="hidden" name="selecteddimensionName" id="dimensionName" value="${selecteddimensionName!}">
-				
-		        <a id="a-dimension" href="${ctx}/advertiser/main/ad/report/advertiser-report/dimension">维度管理</a>
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a> 
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   	</div>
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		
-		   		<div id="date-radio" style="float:right;margin-right:20px;">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a class="selectBar_change" href="${ctx}/advertiser/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">数据报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/advertiser/main/ad/report/advertiser-report" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="content_choose">	
+					<ul id="main_dimensionul">
+						<li class="select_box" id="dimensionul_box">
+							<span id="dimensionul_span">${selecteddimensionName!}</span>
+							<ul class="son_ul" id="dimension_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selecteddimensionId" id="dimensionId" value="${dimensionId!}">
+					<input type="hidden" name="selecteddimensionName" id="dimensionName" value="${selecteddimensionName!}">
+		        	<a class="btn-dimension" href="${ctx}/advertiser/main/ad/report/advertiser-report/dimension">维度管理</a>
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>
-		  	</div>
-		   		
-			<div id="table" style="clear:both;">
-				<table border="1" class="tablefig" id="tablefig">
+	 			<div id="selectuls_report">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+			   		<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
+		  		</div>
+				<table border="1" class="tableFig tableReport">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
+						<tr class="theadTr">
 							<#if dimensionLength ??>
-								<th style="text-align:center; width:5%" colspan="${dimensionLength}"></th>
-		            		<#else>
-		            			<th style="text-align:center; width:5%" colspan=1></th>
-		            		</#if>
-		                    <th style="text-align:center; width:5%" class="hidden-impression">曝光</th>
-		                    <th style="text-align:center; width:10%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:10%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:10%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:10%" class="hidden-consume" colspan=2>花费</th>
+								<th style="width:5%" colspan="${dimensionLength!}"></th>
+			            	<#else>
+			            		<th style=" width:5%" colspan=1></th>
+			            	</#if>
+				        	<th class="theadTh hidden-impression" style="width:5%">曝光</th>
+				            <th class="theadTh hidden-click" style="width:10%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:10%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:10%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:10%" colspan=2>花费</th>
 						</tr>
-						<tr>
+						<tr class="theadTr">
 							<#if dimensionTarget ??>
 							<#list dimensionTarget as dimension>
-								<td style="text-align:center; width:5%">${dimension.dimension}</td>
+								<td class="theadTd" style="width:5%">${dimension.dimension!}</td>
 							</#list>
 		            		<#else>
-		            			<td style="text-align:center; width:5%">日期</td>
+		            			<td class="theadTd" style="width:5%">日期</td>
 		            		</#if>
-			                <td style="text-align:center; width:5%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:5%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:5%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:5%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:5%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:5%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:5%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:5%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:5%" class="hidden-consume">花费</td>
+			                <td class="theadTd hidden-impression" style="width:5%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:5%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:5%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:5%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:5%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:5%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:5%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:5%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:5%">花费</td>
 			            </tr>
-			            <tr>
+			            <tr class="theadTr">
 			            	<#if dimensionTarget ??>
 							<#list dimensionTarget as dimension>
-								<td style="text-align:center; width:5%">总计</td>
+								<td class="theadTd">总计</td>
 							</#list>
 		            		<#else>
-		            			<td style="text-align:center;">总计</td>
+		            			 <td class="theadTd">总计</td>
 		            		</#if>
-		                    <td style="text-align:center;" class="hidden-impression">${reportMap.impressionSum!}</td>
-		                    <td style="text-align:center;" class="hidden-click">${reportMap.clickSum!}</td>
-		                    <td style="text-align:center;" class="hidden-click">${reportMap.clickRatesum!}%</td> 
-		                    <td style="text-align:center;" class="hidden-visit">${reportMap.visitSum!}</td>
-		                    <td style="text-align:center;" class="hidden-visit">${reportMap.visitRatesum!}%</td>   
-		                    <td style="text-align:center;" class="hidden-conversion">${reportMap.conversionSum!}</td>
-		                    <td style="text-align:center;" class="hidden-conversion">${reportMap.conversionRatesum!}%</td>  
-		                    <td style="text-align:center;" class="hidden-consume">${reportMap.eCmpSum!}</td>
-		                    <td style="text-align:center;" class="hidden-consume">${reportMap.consumeSum!}</td>
+		                    <td class="theadTd hidden-impression">${reportMap.impressionSum!}</td>
+		                    <td class="theadTd hidden-click">${reportMap.clickSum!}</td>
+		                    <td class="theadTd hidden-click">${reportMap.clickRatesum!}%</td> 
+		                    <td class="theadTd hidden-visit">${reportMap.visitSum!}</td>
+		                    <td class="theadTd hidden-visit">${reportMap.visitRatesum!}%</td>   
+		                    <td class="theadTd hidden-conversion">${reportMap.conversionSum!}</td>
+		                    <td class="theadTd hidden-conversion">${reportMap.conversionRatesum!}%</td>  
+		                    <td class="theadTd hidden-consume">${reportMap.eCmpSum!}</td>
+		                    <td class="theadTd hidden-consume">${reportMap.consumeSum!}</td>
 	                	</tr>
 					</thead>
 					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
+						<#if reportList ??>
+		            	<#list reportList as report>
+						<tr id="tbodyTr">
 							<#if dimensionTarget ??>
 							<#list dimensionTarget as dimension>
 								<#if dimension.dimensionTarget == "reportDate">
 								<#setting datetime_format="yyyy-MM-dd"/> 
-									<td style="text-align:center;">${report[dimension.dimensionTarget]?datetime}</td> 
+									<td class="tbodyTd">${report[dimension.dimensionTarget]!?datetime}</td> 
 								<#else>
-									<td style="text-align:center;">${report[dimension.dimensionTarget]!}</td> 
+									<td class="tbodyTd">${report[dimension.dimensionTarget]!}</td> 
 								</#if>
 							</#list>
 		            		<#else>
 		            			<#setting datetime_format="yyyy-MM-dd"/> 
-		            			<td style="text-align:center;">${report.reportDate!?datetime}</td>
+		            			<td class="tbodyTd">${report.reportDate!?datetime}</td>
 		            		</#if>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			                <td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-conversion">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-conversion">${report.conversionRate!}%</td>
+			               	<td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
-					</#list>
-					</#if>
+						</#list>
+						</#if>
 					</tbody>
 				</table>
-				<div id="hourrpt">
-					<#if rptZoneHourList ??>
-			    	<#list rptZoneHourList as hourrpt>
-				    <div class="hourrpt_son">
-				    	<div name="hr">${hourrpt.hour!}</div>
-				        <div name="hr">${hourrpt.pv!}</div>
-				        <div name="hr">${hourrpt.uv!}</div>
-				        <div name="hr">${hourrpt.impression!}</div>
-				        <div name="hr">${hourrpt.click!}</div>
-				        <div name="hr">${hourrpt.income!}</div>
-				    </div>
-				    </#list>  
-			    	</#if>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('total','${ctx}/advertiser/main/ad/report/advertiser-report/exportDataReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
 				</div>
-	        </div>
-			<div id="daochu" style="margin-left:20px;margin-top:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('total','${ctx}/advertiser/main/ad/report/advertiser-report/exportDataReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv"  style="margin-right:37px !important;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
-            
-            </form>
+           </form>
 		</div>
-		
     </div>
 </div>
 </@override>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/create.ftl

@@ -1,139 +1,53 @@
 <@override name="head">
-	<title>新增维度</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:10px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			function isExist(){
-				var flag = false;
-				var Dimension = new Object();//账号对象
-				Dimension['accountId'] = ${accountId};
-				Dimension['name'] = $("#name").val();
-				Dimension['content'] = $("#selected_ops").val();
-				$.ajax({
-		           	type: "POST",
-		            url: "${ctx}/advertiser/main/ad/report/advertiser-report/isExist",
-		            async: false,
-		            data: Dimension,
-		             success: function(data){
-				 		if(data == "YES"){
-				 			$("#name").css("box-shadow","0 0 6px red").attr('title','你输入的维度名称或方案已存在！');
-				 			$("#name").parent("div").find("span.spanVaildate").html("你输入的维度名称或方案已存在！");
-				 			flag = true;
-				 		}else{
-				 			$("#name").css("box-shadow","none").attr('title','');
-				 			$("#name").parent("div").find("span.spanVaildate").html("");
-				 			flag = false;
-				 		}
-		             }
-				});
-				return flag;
-			}
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				var Dimension = new Object();//账号对象
-				Dimension['name'] = $("#name").val();
-				Dimension['content'] = $("#selected_ops").val();
-				Dimension['isDefault'] = 0;
-				Dimension['accountId'] = ${accountId};
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				var flag = isExist();
-				if(flag) return false;
-				if($("#selected_ops").val() == ""){
-					bootbox.alert("请选择维度方案！");
-					return false;
-				}
-				$.ajax({
-				    type: "POST",
-				    url: "${ctx}/advertiser/main/ad/report/advertiser-report/save",
-				    data: Dimension,
-				    success: function(data){
-						location.href = "${ctx}/advertiser/main/ad/report/advertiser-report/dimension";
-				    }
-				});	
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/ad/report/advertiser-report/dimension";
-			});
-			
-			$("#name").blur(function(){
-				isExist();
-			});
-		});
-	</script>
-	
-</@override>
-
+<title>新增维度</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/dimension.js"></script>
+</@override> 
 <@override name="body">
 	<!-- PAGE CONTENT BEGINS HERE -->
 	<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id= "pagecontent">
 		<div id="content">
-			<div id="handler">
-				<ul style="margin-left:-15px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/dimension">维度管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">新增维度</li>
+			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report/dimension">维度管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">新增维度</li>
 				</ul>  
-			</div>
-			
-			<div id="createForm">
-				<form id="validation-form" class="form-horizontal">
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>维度名称：</label>
-						<input class="input-text" autocomplete="off" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<ul class="choosen" id="chooseing" style="margin:0px;">
-							<li value="2">广告主</li>
-							<li value="3">订单</li>
-							<li value="4">活动</li>
-							<li value="5">投放</li>
-							<li value="6">创意</li>
-							<li value="1">日期</li>	
-						</ul>
-						<span id="showspan" style="float:left;margin:131px 0 0 54px;color:red;display:block;">请将左侧维度加入此处</span>
-						<ul class="show" id="selected" ></ul>
-						<input type="hidden" id="selected_ops" name="content" value=""/>
-						<input type="hidden" name="accountId" value=${accountId}/>
-					</div>
-					
-					<div id="btn-class" class="form-actions1" style="float:both;">
-						<div id="create-btn-save">保存</div>
-					    <div id="create-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
+ 			</div>
+			<form id="validateForm" action="${ctx}/advertiser/main/ad/report/advertiser-report/save" method="post">
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>维度名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<ul id="dimension-chooseing">
+						<li value="2">广告主</li>
+						<li value="3">订单</li>
+						<li value="4">活动</li>
+						<li value="5">投放</li>
+						<li value="6">创意</li>
+						<li value="1">日期</li>	
+					</ul>
+					<span id="dimension-showspan">请将左侧维度加入此处</span>
+					<ul id="dimension-selected"></ul>
+					<input type="hidden" id="selected_ops" name="content" value=""/>
+					<input type="hidden" id="accountId" name="accountId" value="${accountId!}"/>
+					<input type="hidden" name="isDefault" value="0"/>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
 		</div>
 	</div>
 </div>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/dimension.ftl

@@ -1,156 +1,70 @@
 <@override name="head">
-	<title>维度管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-	
-		$(function(){
-		
-			//新增维度
-			$("#btn-add").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/ad/report/advertiser-report/create";
-			});
-			
-			//编辑
-			$("#btn-edit").live("click", function() {
-				var id = parseInt($(this).attr("value"));
-				location.href = "${ctx}/advertiser/main/ad/report/advertiser-report/edit?id="+id;
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-			
-			//设置默认值
-			$("#input-radio").live("click", function() {
-				var id = $(this).attr("value");
-				$.post("${ctx}/advertiser/main/ad/report/advertiser-report/updateDimensionDefault", {dimensionId:id}, function(data) {
-					$('#formPage').submit();
-				});
-			});
-
-			//批量删除
-			$("#all-btn-delete").click(function(){
-				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
-				var _param = checkboxs.serialize();
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							$.post("${ctx}/advertiser/main/ad/report/advertiser-report/delete", _param, function(data) {
-								$('#formPage').submit();
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要删除的维度！");
-				}
-			});
-			
-			//删除
-			$('#btn-delete').live('click' ,function(){
-				var id = parseInt($(this).attr("value"));
-				$.post("${ctx}/advertiser/main/ad/report/advertiser-report/delete", {id:id}, function(data) {
-					$('#formPage').submit();
-				});
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-	</script>
-	
-</@override>
-
+<title>维度管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/dimension.js"></script>
+</@override> 
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="content">
-			<div id="handler">
-				<ul style="margin-left:-15px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span></li>
-					<li class="size3" id="handlerName">维度管理</li>
+    <div id="pagecontent">
+   		<div id="contentOther">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">维度管理</li>
 				</ul>  
-			</div>
-			<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/dimension" method="post">
-			<input type="hidden" id="page" name="page" value="${pager.page}">
-		  	<div id="buttons">
-		  		<div id="btn-add" class="btn1">新增维度</div>      
-		        <div id="all-btn-delete" class="btn1">批量删除</div>  
-		    </div>
-		</div>
-		<div id="account-table">
-			<table border="1" class="tablefig" id="tablefig">
-				<thead>
-					<tr>
-						<th width="10%">
-							<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-						</th>
-						<th width="20%">名称</th>
-						<th width="25%">维度</th>
-						<th width="20%">默认</th>
-						<th width="25%">操作</th>
-					</tr>
-				</thead>
-				<tbody>
-				<#if dimensionList ??>
-				<#list dimensionList as dimension>
-					<tr class="">
-						<td class="center">
-							<label><input  autocomplete="off" type="checkbox" name="id" value="#{dimension.id!}"><span class="lbl"></span></label>
-						</td>
-						<td class="breakword">${dimension.name!}</td>
-						<td class="breakword">${dimension.content!}</td>
-						<td class="breakword">
-							 <input name="isDefault" id="input-radio" type="radio" value="${dimension.id}" <#if dimension.isDefault==1>checked</#if> style="margin:-3px 5px 0 0;"><span  class="lbl">设为默认</span>
-						</td>
-						<td>
-							<div id="btndiv">
-								<div id="btn-edit" class="btn11" value="${dimension.id}">编辑</div>
-								<div id="btn-delete" class="btn11" value="${dimension.id}">删除</div>
-							</div>
-						</td>
-					</tr>
-				</#list>
-				</#if>
-			</tbody>
-			</table>
-						
-			<div id="pageDiv">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>	
-            
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/report/advertiser-report/dimension" method="post">
+ 				<input type="hidden" id="page" name="page" value="${pager.page}"/>
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/ad/report/advertiser-report/create" class="btn2">新增维度</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+				</div>
+				<table border="1" class="tableFig tableDimension">
+					<thead>
+						<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%;"><div class="checkboxStyleTh"></div></th>
+			                <th class="theadTh" style="width:20%;">名称</th>
+			                <th class="theadTh" style="width:25%;">维度</th>
+			                <th class="theadTh" style="width:20%;">默认</th>
+			                <th class="theadTh" style="width:25%;">操作</th>
+			            </tr> 
+					</thead>
+					<tbody>
+						<#if dimensionList ??>
+						<#list dimensionList as dimension>
+							<tr id="tbodyTr">
+								<td class="tbodyTd"><div class="checkboxStyleTd" id="${dimension.id!}"></div></td>
+								<td class="tbodyTd">${dimension.name!}</td>
+								<td class="tbodyTd">${dimension.content!}</td>
+								<td class="tbodyTd">
+									<input name="isDefault" id="input-radio" type="radio" value="${dimension.id!}" <#if dimension.isDefault==1>checked</#if>>设为默认
+								</td>
+								<td class="tbodyTd">
+									<div id="listButtons">
+										<a href="${ctx}/advertiser/main/ad/report/advertiser-report/edit?id=${dimension.id!}" class="btn3">编辑</a>
+										<a id="btn-delete" value="${dimension.id!}" class="btn3">删除</a>
+									</div>
+								</td>
+							</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="pageDiv-other">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
 			</form>
-			
 		</div>
 	</div>
-<!-- PAGE CONTENT ENDS HERE --/>
-</div><!--/row-->
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/edit.ftl

@@ -1,163 +1,59 @@
 <@override name="head">
-	<title>新增维度</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:10px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			function isExist(){
-				var flag = false;
-				var lis = $('#selected li');
- 	    		for(var i=0; i<lis.length;i++) {
- 		   			if(i == 0){
-						$("#selected_ops").val($(lis[i]).text());
-					}else{
-						$("#selected_ops").val($("#selected_ops").val()+"-"+$(lis[i]).text());
-					}		   
-    			}
-				var Dimension = new Object();//账号对象
-				Dimension['id'] = $("#dimensionId").val();
-				Dimension['name'] = $("#name").val();
-				Dimension['content'] = $("#selected_ops").val();
-				Dimension['accountId'] = ${accountId};
-				$.ajax({
-		           	type: "POST",
-		            url: "${ctx}/advertiser/main/ad/report/advertiser-report/isExist",
-		            async: false,
-		            data: Dimension,
-		             success: function(data){
-				 		if(data == "YES"){
-				 			$("#name").css("box-shadow","0 0 6px red").attr('title','你输入的维度名称或方案已存在！');
-				 			$("#name").parent("div").find("span.spanVaildate").html("你输入的维度名称或方案已存在！");
-				 			flag = true;
-				 		}else{
-				 			$("#name").css("box-shadow","none").attr('title','');
-				 			$("#name").parent("div").find("span.spanVaildate").html("");
-				 			flag = false;
-				 		}
-		             }
-				});
-				return flag;
-			}
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				var lis = $('#selected li');
- 	    		for(var i=0; i<lis.length;i++) {
- 		   			if(i == 0){
-						$("#selected_ops").val($(lis[i]).text());
-					}else{
-						$("#selected_ops").val($("#selected_ops").val()+"-"+$(lis[i]).text());
-					}		   
-    			}
-				var Dimension = new Object();//账号对象
-				Dimension['id'] = $("#dimensionId").val();
-				Dimension['name'] = $("#name").val();
-				Dimension['content'] = $("#selected_ops").val();
-				Dimension['accountId'] = ${accountId};
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				var flag = isExist();
-				if(flag) return false;
-				if($("#selected_ops").val() == ""){
-					bootbox.alert("请选择维度方案！");
-					return false;
-				}
-				$.ajax({
-				    type: "POST",
-				    url: "${ctx}/advertiser/main/ad/report/advertiser-report/save",
-				    data: Dimension,
-				   	success: function(data){
-						location.href = "${ctx}/advertiser/main/ad/report/advertiser-report/dimension";
-				    }
-				});	
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/ad/report/advertiser-report/dimension";
-			});
-			
-			$("#name").blur(function(){
-				isExist();
-			});
-		});
-	</script>
-	
-</@override>
-
+<title>编辑维度</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/dimension.js"></script>
+</@override> 
 <@override name="body">
 	<!-- PAGE CONTENT BEGINS HERE -->
 	<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id= "pagecontent">
 		<div id="content">
-			<div id="handler">
-				<ul style="margin-left:-15px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/dimension">维度管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">编辑维度</li>
+			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report/dimension">维度管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">编辑维度</li>
 				</ul>  
-			</div>
-			
-			<div id="createForm">
-				<form id="validation-form" class="form-horizontal">
-				<input id="dimensionId"  type="hidden" name="id" value="${dimension.id}"/>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>维度名称：</label>
-						<input class="input-text" autocomplete="off" id="name" name="name" type="text" value="${dimension.name}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<ul class="choosen" id="chooseing" style="margin:0px;">
-							<#if notdimensionTypeList ??>
-							<#list notdimensionTypeList as typename>
-								<li>${typename}</li>
-							</#list>
-							</#if>
-						</ul>
-						<span id="showspan" style="float:left;margin:131px 0 0 54px;color:red;display:block;">请将左侧维度加入此处</span>
-						<ul class="show" id="selected" >
-							<#if dimensionTypeList ??>
-							<#list dimensionTypeList as typename>
-								<li>${typename}<input type='button' class='movedel'/><input type='button' class='movedown'/><input type='button' class='moveup'/></li>
-							</#list>
-							</#if>
-						</ul>
-						<input type="hidden" id="selected_ops" name="content" value="${dimension.content}"/>
-						<input type="hidden" name="accountId" value=${accountId}/>
-					</div>
-					
-					<div id="btn-class" class="form-actions1" style="float:both;">
-						<div id="create-btn-save">保存</div>
-					    <div id="create-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
+ 			</div>
+			<form id="validateForm" action="${ctx}/advertiser/main/ad/report/advertiser-report/save" method="post">
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>维度名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="${dimension.name!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<ul id="dimension-chooseing">
+					<#if notdimensionTypeList ??>
+					<#list notdimensionTypeList as typename>
+						<li>${typename!}</li>
+					</#list>
+					</#if>	
+					</ul>
+					<span id="dimension-showspan">请将左侧维度加入此处</span>
+					<ul id="dimension-selected">
+					<#if dimensionTypeList ??>
+					<#list dimensionTypeList as typename>
+						<li>${typename!}<input type='button' class='movedel'/><input type='button' class='movedown'/><input type='button' class='moveup'/></li>
+					</#list>
+					</#if>
+					</ul>
+					<input type="hidden" id="selected_ops" name="content" value="${dimension.content!}"/>
+					<input type="hidden" id="accountId" name="accountId" value="${accountId!}"/>
+					<input type="hidden" name="isDefault" value="${dimension.isDefault!}"/>
+					<input id="dimensionId" type="hidden" name="id" value="${dimension.id!}"/>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
 		</div>
 	</div>
 </div>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/ideaReport.ftl

@@ -1,171 +1,144 @@
 <@override name="head">
-	<title>创意报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>
+<title>创意报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#" style="text-decoration:none">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">创意报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a>
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a class="selectBar_change" href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">创意报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+	 			</div>
+				<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
 				</div>
-		  	</div>
-		   		
-			<div id="table">
-				<table border="1" class="tablefig" id="tablefig">
+				<table border="1" class="tableReport-advertiser">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%"></th>
+		                    <th class="theadTh hidden-impression" style="width:18%" colspan=2>曝光</th>
+				            <th class="theadTh hidden-click" style="width:18%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:18%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:18%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:18%" colspan=2>花费</th>
 						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+						<tr class="theadTr">
+			               	<td class="theadTd" style="width:10%"></td>     
+			                <td class="theadTd hidden-impression" style="width:9%">曝光占比</td>
+			                <td class="theadTd hidden-impression" style="width:9%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:9%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:9%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:9%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:9%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:9%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:9%">花费</td>
 			            </tr>
 					</thead>
 					<tbody>
 					<#if reportList ??>
 		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;">${report.bannerName!}</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+						<tr class="tbodyTr">
+			            	<td class="tbodyTd">${report.bannerName!}</td> 
+			                <td class="tbodyTd hidden-impression">${report.impressionRate!}%</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			              	<td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-visit">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-visit">${report.conversionRate!}%</td>
+			                <td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
 					</#list>
 					</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px; margin-top:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin-right:37px !important;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('idea','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-		</form>
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/osReport.ftl

@@ -1,173 +1,144 @@
 <@override name="head">
-	<title>系统报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>
+<title>系统报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#" style="text-decoration:none">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">系统报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a>
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a class="selectBar_change" href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">系统报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+	 			</div>
+				<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
 				</div>
-		  	</div>
-		   		
-			<div id="table">
-				<table border="1" class="tablefig" id="tablefig">
+				<table border="1" class="tableReport-advertiser">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%"></th>
+		                    <th class="theadTh hidden-impression" style="width:18%" colspan=2>曝光</th>
+				            <th class="theadTh hidden-click" style="width:18%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:18%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:18%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:18%" colspan=2>花费</th>
 						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+						<tr class="theadTr">
+			               	<td class="theadTd" style="width:10%"></td>     
+			                <td class="theadTd hidden-impression" style="width:9%">曝光占比</td>
+			                <td class="theadTd hidden-impression" style="width:9%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:9%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:9%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:9%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:9%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:9%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:9%">花费</td>
 			            </tr>
 					</thead>
 					<tbody>
 					<#if reportList ??>
 		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;"><#if report.os==1>iOS<#elseif report.os==2>Android<#elseif report.os==3>WP<#elseif report.os==4>Symbian<#elseif report.os==5>MAC OS<#elseif report.os==6>Windows<#elseif report.os==7>other</#if></td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+						<tr class="tbodyTr">
+			            	<td class="tbodyTd"><#if report.os==1>iOS<#elseif report.os==2>Android<#elseif report.os==3>WP<#elseif report.os==4>Symbian<#elseif report.os==5>MAC OS<#elseif report.os==6>Windows<#elseif report.os==7>other</#if></td> 
+			                <td class="tbodyTd hidden-impression">${report.impressionRate!}%</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			              	<td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-visit">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-visit">${report.conversionRate!}%</td>
+			                <td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
 					</#list>
 					</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;margin-top:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('system','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin-right:37px !important;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('system','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-		</form>
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/regionReport.ftl

@@ -1,173 +1,144 @@
 <@override name="head">
-	<title>地域报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>
+<title>地域报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#" style="text-decoration:none">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">地域报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a> 
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report">总体报表</a>
+				<a class="selectBar_change" href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">地域报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+	 			</div>
+				<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
 				</div>
-		  	</div>
-		   		
-			<div id="table">
-				<table border="1" class="tablefig" id="tablefig">
+				<table border="1" class="tableReport-advertiser">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%"></th>
+		                    <th class="theadTh hidden-impression" style="width:18%" colspan=2>曝光</th>
+				            <th class="theadTh hidden-click" style="width:18%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:18%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:18%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:18%" colspan=2>花费</th>
 						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+						<tr class="theadTr">
+			               	<td class="theadTd" style="width:10%"></td>     
+			                <td class="theadTd hidden-impression" style="width:9%">曝光占比</td>
+			                <td class="theadTd hidden-impression" style="width:9%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:9%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:9%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:9%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:9%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:9%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:9%">花费</td>
 			            </tr>
 					</thead>
 					<tbody>
 					<#if reportList ??>
 		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;">${report.location!}</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+						<tr class="tbodyTr">
+			            	<td class="tbodyTd">${report.location!}</td> 
+			                <td class="tbodyTd hidden-impression">${report.impressionRate!}%</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			              	<td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-visit">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-visit">${report.conversionRate!}%</td>
+			                <td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
 					</#list>
 					</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;margin-top:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('location','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin-right:37px !important;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('location','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-		</form>
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/sceneReport.ftl

@@ -1,173 +1,144 @@
 <@override name="head">
-	<title>场景报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>
+<title>场景报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#" style="text-decoration:none">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">场景报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a>
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a class="selectBar_change" href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">场景报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+	 			</div>
+				<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
 				</div>
-		  	</div>
-		   		
-			<div id="table">
-				<table border="1" class="tablefig" id="tablefig">
+				<table border="1" class="tableReport-advertiser">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%"></th>
+		                    <th class="theadTh hidden-impression" style="width:18%" colspan=2>曝光</th>
+				            <th class="theadTh hidden-click" style="width:18%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:18%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:18%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:18%" colspan=2>花费</th>
 						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+						<tr class="theadTr">
+			               	<td class="theadTd" style="width:10%"></td>     
+			                <td class="theadTd hidden-impression" style="width:9%">曝光占比</td>
+			                <td class="theadTd hidden-impression" style="width:9%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:9%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:9%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:9%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:9%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:9%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:9%">花费</td>
 			            </tr>
 					</thead>
 					<tbody>
 					<#if reportList ??>
 		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;">${report.placeName!}</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+						<tr class="tbodyTr">
+			            	<td class="tbodyTd">${report.placeName!}</td> 
+			                <td class="tbodyTd hidden-impression">${report.impressionRate!}%</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			              	<td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-visit">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-visit">${report.conversionRate!}%</td>
+			                <td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
 					</#list>
 					</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;margin-top:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin-right:37px !important;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-		</form>
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/create.ftl

@@ -1,1217 +1,267 @@
 <@override name="head">	
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/create.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/style.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/geo.css">
-    <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker1.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.validate.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.common.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.geo.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/areas_popup.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-ui-1.10.4.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.cxselect.js"></script>
-	<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:560%;;}
-		.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-		.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-		.modal-foot{text-algin:center;width:560px;height:40px;}
-		.modal-head{height:25px; }
-		.modal-content{height:380px;}
-		label{font-size:14px;}
-		modal-dialog{backgroud:#ffffff 100% 100% repeat;}
-		#wifitab{float:left;margin-left:10px;}
-		/**搜索和已选wifi列表**/ 
-		.wifilist{
-		 height: 320px; 
-		 width:320px; 
-		 display:block;
-		}
-		#wifitabul { margin:0; padding:0; list-style:none; overflow:hidden; float:left;margin-left:0 20px 0 0; width:320px;border-bottom:1px solid #E9E9E9;}
-        #wifitabul li {float:left;line-height:30px;color:#3469E2;border-radius: 5px 5px 0px 0px;display:block;cursor:pointer;width:85px;text-align:center;border:1px solid #E9E9E9;}
-        #wifitabul li a { color:#3469E2; text-decoration:none; }
-        #wifitabul li.current { background-color:#eeeeee;}
-        #wifipage{height:320px;width:360px;}
-		#divLBS{width:900px;height:540px;background-color:#ffffff;}
-		#mapdistance{width:35px;}
-		#divmapsearch{height:35px;}
-		#mapview{width:520px;height:360px;margin-top:10px;}
-		#wifimap{width:520px;height:360px;float:left;}
-		#address{width:180px;}
-		#divselectedwifi{width:320px;margin-top:15px;font-size:14px;}
-		#divsearchedwifi{width:320px;margin-top:15px;font-size:14px;}
-		#prov{width:91px;}
-		#city{width:91px;}
-		#wifitab{height:380px;}
-		#distance{width:80px;}
-		#content{position:absolut;}
-		.pagination-wifi{float:left;margin-left:10px;width:320px;padding-top:10px;}
-		.pagination-mini-wifi{margin:0; padding:0; list-style:none; overflow:hidden; float:left;  border:solid 1px #E9E9E9;border-radius: 5px;}
-		.pagination-mini-wifi li{margin:0px; padding:3px; list-style:none; overflow:hidden; float:left; width:20px;height:20px;border:solid 1px #E9E9E9;text-align:center; }
-		#third{
-		margin-left:-60px;
-		margin-top:-16px;
-		}
-		.control-group{
-			margin-left:-25px;
-		}
-		.time_tit{
-  	height:30px;
-  	line-height:30px;
-  }
-  .time_tit p{
-  	float: left;
-	width: 150px;
-	text-align: center;
-	border: 1px solid #d5d5d5;
-	height:30px;
-	line-height:30px;
-  }
-  .time_add{
-  	width: 302px;
-	border: 1px solid;
-	text-align: center;
-	height: 30px;
-	line-height: 30px;
-	border: 1px solid #d5d5d5;
-  }
-  .time_item{
-  	height:32px;
-  	clear:both;
-  }
-  .tr_data{
-  	height:32px;
-  	float:left;
-  }
- .time_box .inp{
- 	display:block;
-  	float: left;
-  	height:30px;
-  	line-height:30px;
-	width: 150px;
-	overflow:hidden;
-	text-align: center;
-	border: 1px solid #d5d5d5;
-  }
-  .time_box .inp input{
-  	width:150px;
-  	height:30px;
-  	line-height:30px;
-  	text-align:center;
-  	border:none;
-  	padding:0;
-  	overflow:hidden;
-  }
-  
-  .time_quantum{
-    width:300px;
-    float:left;
-    margin-top:3px;
-    -moz-border-radius:4px; 
-    -webkit-border-radius:4px;
-    border-radius:4px; 
-    background-color:#e7eaee;
-    border: solid #d5d5d5 1px; 
-    margin-left: 20px;
-  } 
-  .time_quantum div p a{
-    color:#4da8e1;
-    font-size:12px;
-  } 
-  .time_quantum p{
-     float:right;
-     margin:0 5px 0 0;
-  }
-  .quantum_title{
-    height:26px;
-    line-height:26px;
-    color:#4da8e1;
-  }
-	.quantum_list{
-		overflow:hidden;
-	}
-  .quantum_list p{
-    float:left;
-    width:98px;
-    font-size:12px;
-    color:#4da8e1;
-    border: solid #d5d5d5 1px; 
-    text-align:center;
-    padding:0px;
-    margin:0px;
-    height:26px;
-    cursor:pointer;
-    line-height:26px;
-  }
-  .pitchon{
-    background-color:red;
-    background:url(/ssp_web/assets/images/duihao.png) no-repeat right bottom;
-    background-size:16%;
-  }
-  
-  .btn_del{
-  	width:90px;
-  	height:30px;
-  	line-height:30px;
-  	border: 1px solid #36aeea;
-    border-radius: 5px;
-    color: #36aeea;
-    background-color: white;
-    margin-left:20px;
-  }
-  
-  .btn_del:hover{
-  	color: white;
-    background-color: #36aeea;
-  }
-  .i1{
-  cursor:text !important;
-  }
-  .btn2:hover{
-		background-color: #4c637b;
-	}
-</style>
+<title>创建投放</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/time_adGroup.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/wifi.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/style.css">
+<link rel="stylesheet" href="${ctx}/assets/css/geo.css">
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker1.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.common.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.geo.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/areas_popup.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-ui-1.10.4.custom.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.cxselect.js"></script>
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/wifi.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/adGroup.js"></script>
 
-<script type="text/javascript">
-
-     $(document).ready(function(){
-	 			
-	 	$('#id-date-picker-1').dateRangePicker({
-	 		separator : ' to ',
-	 		inline:true,
-			container: '#divdaterangepick', 
-			alwaysOpen:false
- 		});	
- 		
-		$('#city_custom').cxSelect({
-			selects: ['prov', 'city'],
-			required: true,
-			url:'${ctx}/advertiser/main/ad/target/ad-group/getLocations'
-		});
-
-		$( "#btn-toggle" ).click(function( event ) {
-			$( "#divLBS" ).dialog( "open" );
-				try{
-					map = new AMap.Map('mapview',{level:12});
-					if($('#cacheSelected').val().length>2){
-						loadselectwifi(1);
-					}
-				}
-				catch(e){alert('加载已选wifi时出错')}
-				map.plugin(['AMap.MarkerClusterer'], function(){
-				var cl = new AMap.MarkerClusterer(map, initMarker($("#cacheSelected")[0]));
-			});
-		});
-		
-		$( "#divLBS" ).dialog({
-			autoOpen: false,
-			width: 900,
-			modal: true,
-			open: function (event, ui) {
-			    $(".ui-dialog-titlebar-close", $(this).parent()).hide();
-             }
-		
-		});	
-		
-	$('#validation-form').validate({
-	    errorElement: 'span',
-	    errorClass: 'help-inline',
-	    focusInvalid: false,
-	    onfocusout: function(element) {
-	                    $(element).valid();
-	                },
-		ignore:".ignore",
-	    rules: {
-	        adGroupName: {
-	            required: true,
-	            maxlength:50
-	        },
-	        price:{
-	         number:true,
-	         required:true
-	        },
-	        dailyBudget:{
-	            number:true
-	        },
-	        maxImpression:{
-	            number:true
-	        },
-	        maxClick:{
-	            number:true
-	        },
-	        dailyMaxImpression:{
-	            digits:true
-	        },
-	        dailyMaxclick:{
-	            digits:true
-	        },
-	        dailyMaxConversion:{
-	            digits:true
-	        },
-	        maxSessionImpression:{
-	            digits:true
-	        },
-	        maxUserImpression:{
-	            digits:true
-	        },
-	        
-	    },
-	    messages: {
-	        adGroupName:{
-	            required:"请输入内容！",
-	            maxlength:"输入的长度大于50超出范围！"
-	        },
-	         price:{
-	          required:"请输入内容！",
-	         number:"请输入数字！"
-	        },
-	        dailyBudget:{
-	            number:"请输入正确格式"
-	        },
-	        maxImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        maxClick:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxclick:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxConversion:{
-	            digits:"请输入正确格式"
-	        },
-	        maxSessionImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        maxUserImpression:{
-	            digits:"请输入正确格式"
-	        } 
-	    },
-	   invalidHandler: function (event, validator) { //display error alert on form submit
-	        $('.alert-error', $('.login-form')).show();
-	    },
-	    highlight: function (e) {
-	        $(e).closest('.control-group').removeClass('info').addClass('error');
-	        $(e).closest('.control-group').find("span.note").addClass('hidden');
-	    },
-	    success: function (e) {
-	        $(e).closest('.control-group').removeClass('error').addClass('info');
-	        $(e).closest('.control-group').find("span.note").removeClass('hidden');
-	        $(e).remove();
-	    },
-	    errorPlacement: function (error, element) {
-	        if(element.is(':checkbox') || element.is(':radio')) {
-	            var controls = element.closest('.controls');
-	            if(controls.find(':checkbox,:radio').length > 1) controls.append(error);
-	            else error.insertAfter(element.nextAll('.lbl').eq(0));
-	        }
-	        else if(element.is('.chzn-select')) {
-	            error.insertAfter(element.nextAll('[class*="chzn-container"]').eq(0));
-	        }
-	        else error.insertAfter(element);
-	    },
-	     submitHandler:function(form){form.submit();}
-	    /*
-
-	    submitHandler: function (form) {
-	    	var startDate = $('input[name=startDate]').val();
-	        var endDate = $('input[name=endDate]').val();
-	        if(startDate!==""&&endDate!==""){
-	        	if(datefalg){
-					// 防止表单二次提交
-					$('button:submit').attr('disabled', 'disabled');
-					var _url = $('form').attr('action');
-					var _param = $('form').serialize();
-					$.post(_url,_param,function(data) {
-						$('#main-content').html(data);
-					});
-				}
-	        }else{
-	            $('input[name=startDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-	            $('input[name=endDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-	        }
-	    },
-	    */
-	    
-	});
-
-var datefalg = true;
-
-
-});
-</script> 
 </@override>	
-	
 <@override name="body">
-<!-- PAGE CONTENT BEGINS HERE -->
 <div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl"> 	
-<div id= "pagecontent">
-	<div id="content">
-		<div id="third">
-			<ul style="">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
 					<#if role == "agent">
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a>
-					<span class="divider3" ><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a style="margin-left:15px !important" href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span></li>
-					<li class="size3">创建投放</li>
-					<#elseif role == "advertiser">
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span></li>
-					<li class="size3">创建投放</li>
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
 					</#if>
-				</ul> 
-			</div> 
-		<form id="validation-form" action="${ctx}/advertiser/main/ad/target/ad-group/save" method="post">   
-		<div class="control-group">
-				<label class="clname" for="form-field-1"><sup style="color:red">*</sup>投放名称：</label>
-				<div class="inputtext">
-					<input class="i1" autocomplete="off"   type="text" name="adGroupName" id="form-field-1" placeholder="">
-	                <span class="help-inline" for="form-field-1">支持输入1～50个字符</span>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">创建投放</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/ad-group/save" method="post">
+	 			<input type="hidden" id="adGroupId" name="id" value=""/>
+	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
+	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>
+	 			<input type="hidden" id="campaignId" name="campaignId" value="${campaignId!}"/>
+	 			<input type="hidden" name="agentId" value="${agentId!}"/>
+				<input type="hidden" name="zoneIdString" value="1,12"/>
+				<input type="hidden" name="selectedwifi" id="selectedwifi" value=""/>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>投放名称：</label>
+					<input class="input-text" tabindex="1" id="adGroupName" name="adGroupName" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
 				</div>
-				
-		</div>
-
-         <div class="control-group">
-            <label class="clname" for="id-date-picker-1"><sup style="color:red">*</sup>活动周期：</label>
-			<div class="inputtext">
-             <div class="row-fluid input-append date row-fluid-revise">
-			<input   class="input1" autocomplete="off"   name="activeTime"  id="id-date-picker-1" type="text" value="" />    
-             <div id="divdaterangepick" style="width:456px; position: absolute;margin: -17px 0 0 115px;"></div>
-             </div>
-            </div>
-        </div>
-        
-       
-
-		<div class="control-group">
-			<label class="clname" style="margin-top:-14px" for="form-field-2"><sup style="color:red">*</sup>总预算：&nbsp;</label>
-			<div class="inputtext">
-				<input class="i1"  autocomplete="off"   name="totalBudget" type="text" id="form-field-2" placeholder="">
-				<input name="budget" type="hidden" id="budget" value="${budget!}"/>
-                 <span class="help-inline1" style="margin-top:-30px" >元</span>
-                <span id="totalBudget_span" style="position:absolute;margin:-9px 0 0 5px;color:#595959;" for="form-field-2">总预算不能大于订单总预算</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-3"><sup style="color:red">*</sup>投放模式：</label>
-			<label style="float:left;margin:-27px 0 0 115px;"><input id="input-radio-cpm" autocomplete="off" name="mode" type="radio" value="1" checked="checked"><span style="position:absolute;margin:3px 0 0 5px;">CPM</span></label> 
-			<label style="float:left;margin:-27px 0 0 200px;"><input id="input-radio-cpc" autocomplete="off" name="mode" type="radio" value="2"><span style="position:absolute;margin:3px 0 0 5px;">CPC</span></label>
-		</div>
-
-		<div class="control-group" style="clear:both;">
-			<label class="control-label" style="margin-top:28px" for="form-field-3"><sup style="color:red">*</sup>单价(CPM)：</label>
-			<div class="inputtext">
-				<input class="i1" autocomplete="off"   name="price" type="text" id="form-field-3" placeholder="">
-                <span class="help-inline1" style="margin-top:-46px"  >元</span>
-                <span  style="margin-top:-46px"  class="help-inline" for="form-field-3">单价</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-4">每日预算：</label>
-			<div class="controls3">
-				<input class="i1" autocomplete="off"   name="dailyBudget" type="text" id="form-field-4" placeholder="">
-                <span class="help-inline1" style="margin-top:-46px" >元</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-4">若不设置，系统默认将总预算在投放周期内的均值作为每日预算</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-5">曝光总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxImpression" type="text" id="form-field-5" placeholder="">
-				 <span class="help-inline1" style="margin-top:-46px" >千次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-5">整个投放期，广告最多被曝光多少千次</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-6">点击总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxClick" type="text" id="form-field-6" placeholder="">
-				 <span class="help-inline1" style="margin-top:-46px" >次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-6">整个投放期，广告最多被点击多少次</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-7">转化总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxConversion" type="text" id="form-field-7" placeholder="">
-				 <span class="help-inline1" style="margin-top:-46px" >次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-7">整个投放期，广告最多被转化多少次</span>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label" for="form-field-8">每日曝光上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxImpression" id="form-field-8" placeholder="">
-                <span class="help-inline1" style="margin-top:-46px" >千次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-8">每天，广告最多被曝光多少千次</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-9">每日点击上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxClick" id="form-field-9" placeholder="">
-               <span class="help-inline1" style="margin-top:-46px" >次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-9">每天，广告最多被点击多少次</span>
-                
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-10">每日转换上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxConversion" id="form-field-10" placeholder="">
-                <span class="help-inline1" style="margin-top:-46px" >次</span>
-                <span class="help-inline" style="margin-top:-46px"  for="form-field-10">每天，广告最多被转换多少次</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-11">单人曝光频次：</label>
-			<div class="controls-reset">
-                <select id="form-field-11" name="perImpressionType">
-                    <option value="0">请选择曝光类型</option>
-                    <option value="1">每天</option>
-                    <option value="2">投放周期</option>
-                </select>
-	         </div>
-	         <div class="controls">
-				<input class="i1" autocomplete="off"   type="text" name="perImpression" id="form-field-11" placeholder="">
-	            <span class="help-inline" style="margin-top:-48px" for="form-field-11">单人曝光频次</span>
-			</div>
-			
-		</div>
-			<div class="control-group">
-			<label class="control-label" for="form-field-12">单人点击频次：</label>
-			<div class="controls-reset">
-                <select id="form-field-12" name="perClickType">
-                    <option value="0">请选择曝光类型</option>
-                    <option value="1">每天</option>
-                    <option value="2">投放周期</option>
-                </select>
-	         </div>
-	         <div class="controls">
-				<input class="i1" autocomplete="off"   type="text" name="perClick" id="form-field-12" placeholder="">
-	            <span class="help-inline" style="margin-top:-48px" for="form-field-12">单人点击频次</span>
-			</div>
-		</div>
-		
-		
-		<div class="control-group">
-			<label class="control-label">点击找回：</label>
-			<div class="controls">
-				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:153px;margin-top:0px;" name="retarget" type="radio" value="1"><div style="margin-left:117px;margin-top:-29px;" id="singleclick"  class="lbl"> 未设置</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>活动周期：</label>
+					<span id="input-calendar">
+						<i class="icon-calendar"></i>   
+						<input type="text" tabindex="2" name="activeTime" id="dateRangePicker" value="" verify="date-to/24/1/0"/><span class="spanVaildate"></span>
+					</span>
 				</div>
-				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:135px;margin-top:0px;"  name="retarget" type="radio" value="2"><div style="margin-left:214px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过本广告主广告</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>总预算：</label>
+					<input name="budget" type="hidden" id="budget" value="${budget!}"/>
+					<input class="input-text" tabindex="3" id="totalBudget" name="totalBudget" type="text" value="" verify="float/11/1/2"/>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span><span class="spanVaildate"></span>
 				</div>
-				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:212px;margin-top:0px;"  name="retarget" type="radio" value="3"><div  style="margin-left:431px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过广告</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>投放模式：</label>
+					<input class="input-radio" name="mode" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">CPM</span>
+					<input class="input-radio" name="mode" type="radio" value="2"><span class="input-radio-span otherspan">CPC</span>
 				</div>
-				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:161px;margin-top:0px;"  name="retarget" type="radio" value="4"><div style="margin-left:558px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过本订单广告</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>单价(CPM)：</label>
+					<input class="input-text" tabindex="4" id="price" name="price" type="text" value="" verify="float/11/1/2"/><span class="spanVaildate"></span>
 				</div>
-				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:200px;margin-top:0px;"  name="retarget" type="radio" value="5"><div style="margin-left:710px;margin-top:-50px;" id="singleclick"  class="lbl"> 点击过本活动广告</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日预算：</label>
+					<input class="input-text" tabindex="5" id="dailyBudget" name="dailyBudget" type="text" value="" verify="float/11/0/2"/>
+					<span class="input-span">元</span><span class="help-inline">若不设置，系统默认将总预算在投放周期内的均值作为每日预算</span>
 				</div>
-			</div>
-		</div>
-		
-				
-		<div class="control-group" style="margin-top:-10px;">
-			<label class="control-label"><sup></sup>访客分类：</label>
-			<div class="inputtext">
-				<label class="form-align-radio">
-					<input id="i1" style="margin:-72px 0 0 178px;" autocomplete="off" name="site" type="checkbox" value="1"><li style="margin-top:-25px;margin-left:135px;"  id="singleclick">全站访客</li>
-				</label>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-13">访客投放期：</label>
-			<div class="controls7">
-				<input class="i1 inputtext" autocomplete="off"   type="text" name="period" id="form-field-13" placeholder="">
-                <span class="help-inline" style="margin-top:-48px;" for="form-field-13">1-90天</span>
-			</div>
-		</div>
-		<div class="hr hr32"></div>
-		
-		<!-- 前端需要传输给后端的地域定向的数据值放在value里面 -->
-		<div class="control-group" style="margin-top:-15px;">
-		    <label style="margin-top:37px;margin-left:0px;"  class="control-label">地域定向：</label>
-		
-		    <div class="inputtext">
-		         <div class="dashed">
-		            <input class="ignore" type="hidden" id="areas" name="areas" value="">
-		            <input type="button" style="width:150px;margin-top:-45px;margin-left:116px;"  class="btn-Directed btn1" id="btn-areas" value="地域设定">
-		            <div class="geo">
-		                <div class="geo-selected"  id="geo-selected-areas" style="display: none;margin:-63px 0 0 300px;position: absolute;">
-		                    <span class="area-direct"></span><span >您已经设定了<strong id="count-areas">0</strong>个地域条件</span>
-		                </div>
-		                <div class="geo-all" id="geo-all-areas" style="display: block;margin:-63px 0 0 300px;position: absolute;">
-		                    <span class="area-direct"></span><span class="default_text">不限</span>
-		                </div>
-		            </div>
-		
-		        </div>
-		          
-		    </div>
-		           
-		</div>
-		<br>
-	<div id="timediv" class="control-group" style="margin-top:-60px;">
-		<label style="margin-top:-48px;margin-left:2px;"  class="control-label">时段定向：</label>
-		<div class="controls">
-		    <div class="setting" style="float:left;margin:-25px 0 20px 115px;">
-		       	<div class="time_tit">
-		       		<p>开始时间</p>
-		            <p>结束时间</p>
-		       	</div>
-		        <input type="hidden" name="sdayParting" id="sdayParting" value=""/>
-		        <div class="clear"></div>
-		        <div class="time_box"></div>
-		      	<div class="time_add"><p id="setting_list"  class="dateRangePicker" href="">新增时间段</p></div>
-	     	</div>
-     	</div>
-  	</div>
-		
-		<br>
-		<div class="control-group" id="placediv" style="clear:both;">
-			<sup style="color:red">*</sup>场景：
-			<div class="controls6" style="margin-left: 25px;margin-top: -18px;width:auto;">
-				<#if placeList ??>
-				<#list placeList as place>
-				<div style="display:inline-block; margin-left:100px;margin-bottom:20px;">
-					<input  autocomplete="off" style="float:left;display:inline-block;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">
-					<li style="float:left;width:120px;position: relative;top:-3px;left:10px;" >${place.name}</li>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>曝光总上限：</label>
+					<input class="input-text" tabindex="6" id="maxImpression" name="maxImpression" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>点击总上限：</label>
+					<input class="input-text" tabindex="7" id="maxClick" name="maxClick" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被点击多少次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>转化总上限：</label>
+					<input class="input-text" tabindex="8" id="maxConversion" name="maxConversion" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日曝光总上限：</label>
+					<input class="input-text" tabindex="9" id="dailyMaxImpression" name="dailyMaxImpression" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">每天，广告最多被曝光多少千次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日点击总上限：</label>
+					<input class="input-text" tabindex="10" id="dailyMaxClick" name="dailyMaxClick" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被点击多少次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日转化总上限：</label>
+					<input class="input-text" tabindex="11" id="dailyMaxConversion" name="dailyMaxConversion" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被转换多少次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>单人点击频次：</label>
+					<ul id="main_perClickul">
+						<li class="select_box" id="perClickul_box">
+							<span id="perClickul_span">请选择点击类型</span>
+							<ul class="son_ul" id="perClick_son_ul">
+								<li value="0">请选择点击类型</li>
+                    			<li value="1">每天</li>
+                    			<li value="2">投放周期</li>
+							</ul>
+						</li>
+					</ul>
+					<input id="perClickType" name="perClickType" type="hidden" value="" />
+					<input class="input-text-small" tabindex="12" id="perClick" name="perClick" type="text" value="" verify="number/11/0/0"/><span class="input-span">次</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>单人曝光频次：</label>
+					<ul id="main_perImpressionul">
+						<li class="select_box" id="perImpressionul_box">
+							<span id="perImpressionul_span">请选择曝光类型</span>
+							<ul class="son_ul" id="perImpression_son_ul">
+								<li value="0">请选择曝光类型</li>
+                    			<li value="1">每天</li>
+                    			<li value="2">投放周期</li>
+							</ul>
+						</li>
+					</ul>
+					<input id="perImpressionType" name="perImpressionType" type="hidden" value="" />
+					<input class="input-text-small" tabindex="13" id="perImpression" name="perImpression" type="text" value="" verify="number/11/0/0"/><span class="input-span">次</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>点击找回：</label>
+					<input class="input-radio" name="retarget" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">未设置</span>
+					<input class="input-radio" name="retarget" type="radio" value="2"><span class="input-radio-span otherspan">点击过本广告主广告</span>
+					<input class="input-radio" name="retarget" type="radio" value="3"><span class="input-radio-span otherspan">点击过广告</span>
+					<input class="input-radio" name="retarget" type="radio" value="4"><span class="input-radio-span otherspan">点击过本订单广告</span>
+					<input class="input-radio" name="retarget" type="radio" value="5"><span class="input-radio-span otherspan">点击过本活动广告</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>访客投放期：</label>
+					<input class="input-text" tabindex="14" id="period" name="period" type="text" value="" verify="number/2/0/0"/>
+					<span class="input-span">1-90天</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>访客分类：</label>
+					<input class="input-checkbox" name="site" type="checkbox" value="1"><span class="input-checkbox-span otherspan">全站访客</span>
+				</div>
+				<div class="input-group" id="areasDiv">
+					<label class="input-label-other"><span class="lbl-no"></span>地域定向：</label>
+					<input class="ignore" type="hidden" id="areas" name="areas" value=""/>
+					<a id="btn-areas" class="btn2">地域设定</a>
+		            <label id="geo-selected-areas"><span class="area-direct"></span><span>您已经设定了<strong id="count-areas">0</strong>个地域条件</span></label>
+		            <label id="geo-all-areas"><span class="area-direct"></span><span class="default_text">不限</span></label>
+				</div>
+				<div id="timediv" class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>时段定向：</label>
+					<div class="setting">
+						<div class="time_tit">
+					    	<p>开始时间</p>
+					        <p>结束时间</p>
+					    </div>
+					    <input type="hidden" name="sdayParting" id="sdayParting" value=""/>
+					    <div class="clear"></div>
+					    <div class="time_box"></div>
+					    <div class="time_add"><p id="setting_list" class="dateRangePicker" href="">新增时间段</p></div>
+				    </div>
+			  	</div>
+			  	<div class="input-group" id="placeDiv">
+					<label class="input-label-other"><span class="lbl-yes">*</span>场景：</label>
+					<div class="input-checkboxsDiv">
+						<#if placeList ??>
+						<#list placeList as place>
+						<div class="single_div">
+							<input class="single_div_checkbox" name="place" type="checkbox" value="${place.id!}"><span class="single_div_span">${place.name!}</span>
+						</div>
+						</#list>
+						</#if>
 					</div>
-				</#list>
-				</#if>
-			</div>
-		</div>
-		
-		<div  >
-		<div class="control-group">
-			<label  style="position:relative;" class="control-label"><sup></sup>位置：</label>
-			<div class="controls" style="position:absolute; margin:-30px 0 0 98px;width:auto;">
-				<div class="form-align-radio1" style="margin-right:100px;">
-					<input  autocomplete="off"  style="line-height:30px;margin:0px 5px 0 0;border:none;" name="position" type="checkbox" id= "1position" value="1"><span class="lb2"> 全部</span>
 				</div>
-				<div class="form-align-radio1" style="margin-right:85px;">
-					<input  autocomplete="off" style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "2position" value="2"><span class="lb2"> 认证页</span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>访客分类：</label>
+					<input class="input-checkbox" name="position" type="checkbox" value="1"><span class="input-checkbox-span otherspan">全部</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="2"><span class="input-checkbox-span otherspan">认证页</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="3"><span class="input-checkbox-span otherspan">认证页后</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="4"><span class="input-checkbox-span otherspan">上网过程</span>
 				</div>
-				<div class="form-align-radio1" style="margin-right:70px;">
-					<input  autocomplete="off"   style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "3position" value="3"><span class="lb2"> 认证页后</span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>LBS定向：</label>
+					<a id="btn-toggle" class="btn2">LBS定向</a>
+					<span id="spanselectedhint"></span>
 				</div>
-				<div class="form-align-radio1">
-					<input  autocomplete="off"  style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "4position" value="4"><span class="lb2"> 上网过程</span>
-				</div>				
-			</div>
-		</div>
-		
-		
-
-			<div class="control-group">
-			    <lable style="margin-top:107px;margin-left:-660px;" class="control-label">
-			        <span style="color:red;">*</span>代表必填项
-			    </lable>
-			</div>
-		
-<div class="control-group">
-    <lable style="margin-top:107px;" class="control-label">
-        <input type="button" class="btn1"  style="width:150px;" id="btn-toggle" value="LBS定向"> <span id="spanselectedhint" style="display:none;margin-left:7px;"></span>
-    </lable>
-</div>
-
-	
-<div class="control-group">
-			<input style="width:150px;margin-right:15px;" type="submit" value="保存" class="btn2" id="btnsave"/>
-			<button class="btn2"  href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" style="background-color:#36aeea;" id="btncancel"><i class="icon-undo"></i> 取消</button>
-		</div>
-		
-		
-		<input  autocomplete="off"   type="hidden" name="campaignId" value="${campaignId}">
-		<input  autocomplete="off"   type="hidden" name="orderId" value="${orderId}">
-		<input  autocomplete="off"   type="hidden" name="advertiserId" value="${advertiserId}">
-		<input  autocomplete="off"   type="hidden" name="agentId" value="${agentId}">
-		<input  autocomplete="off"   type="hidden" name="zoneIdString" value="1,12">
-		<input type="hidden" name="selectedwifi" id="selectedwifi" value="">
-</form>
-<div  id="divLBS" >
-	<div class="modal-dialog">
-		<div class="modal-head"> LBS 设定</div>
-		<div class="modal-content">
-			<div class="modal-body" style="height:400px;">
-							<div id="wifimap">
-								<div id="divmapsearch">
-									<form name="frmwifisearch" id="frmWifiSearch" action="${ctx}/advertiser/main/ad/target/ad-group/wifiList">
+				<div id="divLBS">
+					<div class="wifi-modal-dialog">
+						<div class="wifi-modal-head">
+							<lable>LBS 设定</label>
+							<span id="wifi-headclose" class="close-tag"></span>
+						</div>
+						<div class="wifi-modal-content">
+							<div class="wifi-modal-body">
+								<div id="wifimap">
+									<div id="divmapsearch">
 										<fieldset id="city_custom">
-											<input type="text" class="form-control" name="address" id="address" onkeydown="if(event.keyCode==13){return false;}">
-											<select name="prov" id="prov" class="prov" ></select>&nbsp;&nbsp;
+											<select name="prov" id="prov" class="prov" ></select>
 											<select name="city" id="city" class="city"></select>
-											<#--&nbsp;&nbsp;距离
+											<input type="text" class="input-text-small" name="address" id="address" onkeydown="if(event.keyCode==13){return false;}">
+											<#--距离
 											<select name="distance" id="mapdistance" >
 												<option value="1">1Km</option>
 												<option value="2">2Km</option><option value="3">3Km</option>
 												<option value="4">4Km</option><option value="5" selected>5Km</option>
 												<option value="6">6Km</option><option value="10">10Km</option>
 												<option value="20">20Km</option>
-											</select>-->&nbsp;<input type="button" name="mapSearch" id="btnmapSearch" style="margin-top:-10px;background:#36aeea;" class="btn btn-primary" value="搜索"></fieldset>
-									</form>
-									<input type="hidden" name="cacheSearched" id="cacheSearched" >	<input type="hidden" name="cacheSelected" id="cacheSelected" value=''><!--[{"id":1,"address":"上海体育馆","lat":121.535816,"lng":31.24231},{"id":2,"address":"上海市八万人体育场","lat":121.526224,"lng":31.238806},{"id":3,"address":"上海市卢湾区体育馆","lat":121.523198,"lng":31.235045},{"id":9,"address":"智造局一期国际服务外包产业","lat":121.478716, "lng":31.206612},{"id":10,"address":"上海市红房子妇产科医院","lat":121.483587, "lng":31.213861},{"id":11,"address":"上海东仁商贸中","lat":121.499101, "lng":31.220265}]-->
-									<input type="hidden" id="searchedPage"><input type="hidden" id="selectedPage">
-								</div>
-								<div id="mapview"  >
-									
+											</select>-->
+											<input type="button" name="mapSearch" id="btnmapSearch" style="margin-top:-10px;background:#36aeea;" class="btn btn-primary" value="搜索">
+										</fieldset>
+										<!--[{"id":1,"address":"上海体育馆","lat":121.535816,"lng":31.24231},{"id":2,"address":"上海市八万人体育场","lat":121.526224,"lng":31.238806},{"id":3,"address":"上海市卢湾区体育馆","lat":121.523198,"lng":31.235045},{"id":9,"address":"智造局一期国际服务外包产业","lat":121.478716, "lng":31.206612},{"id":10,"address":"上海市红房子妇产科医院","lat":121.483587, "lng":31.213861},{"id":11,"address":"上海东仁商贸中","lat":121.499101, "lng":31.220265}]-->
+										<input type="hidden" name="cacheSearched" id="cacheSearched"/>	
+										<input type="hidden" name="cacheSelected" id="cacheSelected" value=''/>
+										<input type="hidden" id="searchedPage"><input type="hidden" id="selectedPage"/>
+									</div>
+									<div id="mapview"></div>
 								</div>
-							</div>
-							<div id="wifitab" >
-								<ul class="nav navtab" id="wifitabul" >
-							        <li  id="mnusearchedwifi"  ><a href="javascript:" onclick="tabshow(this,'mnusearchedwifi')">搜索wifii</a></li>
-							        <li  id="mnuselectedwifi" class="current"><a href="javascript:"  onclick="tabshow(this,'mnuselectedwifi')">已选wifi</a></li>
-							    </ul><br class="clearfix">
+								<div id="wifitab" >
+									<ul class="nav navtab" id="wifitabul" >
+							        	<li id="mnusearchedwifi"><a href="javascript:" onclick="tabshow(this,'mnusearchedwifi')">搜索wifii</a></li>
+							        	<li id="mnuselectedwifi" class="current"><a href="javascript:"  onclick="tabshow(this,'mnuselectedwifi')">已选wifi</a></li>
+							    	</ul>
             						<div id="divselectedwifi" class="in fade">没有选中wifi</div>
 									<div id="divsearchedwifi" class="in fade" style="display:none;">没有相关数据</div>
+								</div>
 							</div>
-			</div>
-
+						</div>
+						<div class="wifi-modal-foot">
+							<button id="wifi-btn-save" class="btn-save" type="submit">确定</button>
+							<button id="wifi-btn-cancel" class="btn-cancel" type="button">取消</button>
+						</div>
+					</div>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>代表必填项</label>
+				</div>
+				<div id="footBtn">
+					<button id="create-btn-save" class="btn-save" type="submit">保存</button>
+					<button id="create-btn-cancel" class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
 		</div>
-		<br class="clearfix"><br class="clearfix">
-		<div class="modal-foot" style="width:300px;height:34px;position:absloute;margin-left:300px;"><input type="button" value="确定" class="btn122" onclick='savewifi();$("#divLBS").dialog("close");'style="width:100px;position:absloute;height:30px;">&nbsp;<input type="button" class="btn2" value="取消" onclick='$("#divLBS").dialog("close");' style="width:100px;position:absloute;magin-left:105px;height:30px;"></div>
-	</div>
-	
-</div>
-
+    </div>
+    <div id="areas_layout"></div>
 </div>
-<div id="areas_layout"></div>
-<div id="schedule_layout"></div>
-
-<script type="text/javascript">
-                
-            	var areasgeoPopup = $("#areas_popup")[0];
-            	var GEO_list;
-                $('#btn-areas').click(function () {
-                    if (!areasgeoPopup) {
-                        areasgeoPopup = new areasPopup({
-                            width: '746px',
-                            height: '435px',
-                            title: '地域定向设定'
-                 		});
-                        var defaultValue = "不限";
-                        var input = $('#areas').trigger('change');
-                        var selectedIds = input.val() ? input.val().split(',') : null;
-                        $('#areasconfirm').click(function(){
-                            var pop= areasgeoPopup;
-                            areasgeoPopup.hide();
-                            input.val(Area.save());
-                            var id = 'areas',selected = Area.save();
-                            parent.$('#'+id).val(selected);
-                            if (selected && $('input[type=checkbox]:not(:checked)').length) {
-                                //有选择 且 非全选的
-                                parent.$('#count-'+id)[0].innerHTML = selected.split(',').length;
-                                parent.$('#geo-all-'+id).hide();
-                                parent.$('#geo-selected-'+id).show();
-                            }else{
-                                if(!$('input[type=checkbox]:not(:checked)').length){
-                                    parent.$('#geo-all-'+id).find('.default_text')[0].innerHTML=defaultValue;
-                                }else{
-                                    var val = defaultValue;
-                                    parent.$('#geo-all-'+id).find('.default_text')[0].innerHTML=decodeURIComponent(val);
-                                }
-                                parent.$('#geo-all-'+id).show();
-                                parent.$('#geo-selected-'+id).hide();
-                            }
-                            parent.$(parent.document).trigger('setData');
-							
-                        });
-                        //Area.init(GEO_LIST,selectedIds);
-            			$.ajax({
-            				url: '${ctx}/advertiser/main/ad/target/ad-group/getLocations',
-            				dataType:'json',
-            				success:function(GEO_LIST){
-            					Area.init(GEO_LIST,selectedIds);
-            					areasgeoPopup.show();
-            					GEO_list = GEO_LIST;
-            				},
-            				error:function(){
-            					alert('数据拉取失败，请检查您的网络连接是否可用');
-            				}
-            			});
-		                
-                		}else{
-		                areasgeoPopup.show();
-		                }
-		            });
-		            
-	                $('#count-areas').click(function () {
-	                    $('#btn-areas').trigger('click');
-	                });
-	                
-	                if ($('#areas').val()) {
-	                    $('#geo-selected-areas').show();
-	                    $('#geo-all-areas').hide();
-	                    $('#count-areas')[0].innerHTML = $('#areas').val().split(',').length;
-	                } else {
-	                    $('#geo-selected-areas').hide();
-	                    $('#geo-all-areas').show();
-	                }
-
-        </script>
-<script type="text/javascript">
-//Alex add for wifi LBS
-
-	jspagesize = 15	;
-
-/*get wifi from cachedata*/
-function initMarker(obj){
-			
-		try{
-			if(obj.value.length>4){
-				allwifi=jQuery.parseJSON(obj.value)
-				markers = [];
-				for (var i = 0; length= allwifi.length,i<length ;i ++) {
-					var markerPosition = new AMap.LngLat(allwifi[i]['lat'],allwifi[i]['lng']);
-					var marker = new AMap.Marker({
-					position: markerPosition,
-					icon: "http://developer.amap.com/wp-content/uploads/2014/06/marker.png"
-				});
-				markers.push(marker);
-			}
-			return markers;
-			}
-		}
-	catch(e){return false;}
-	}
-
-
-function savewifi(){
-	try{
-		wifiids=''
-		selectedwificount=0
-		if($("#cacheSelected").val().length>2){
-				allwifi=$.parseJSON($("#cacheSelected").val())
-						for (var i = 0; length= allwifi.length,i<length ;i ++) {
-						wifiids += allwifi[i]['id']+',';
-						selectedwificount+=1;
-					}
-				wifiids=wifiids.substring(0,wifiids.length-1)
-		}
-	$("#selectedwifi").val(wifiids);
-	$("#spanselectedhint").html("共选择了" + selectedwificount + " 个 wifi")
-	$("#spanselectedhint").show();
-	
-	}
-	catch(e){alert(e)}
-}
-
-function tabshow(e,id){
-	var mnu=['mnusearchedwifi','mnuselectedwifi']
-	try{
-		for(i=0;i<mnu.length;i++){
-			mnuid=mnu[i];divid="#div" + mnuid.substr(3)
-			if(mnu[i]==id){
-				$('#'+mnuid).addClass('current');
-				$(divid)[0].style.display='block';
-			}
-			else{
-				$('#'+mnuid).removeClass('current');
-				$(divid)[0].style.display='none';
-			}
-		}
-	}catch(e){alert(e)}
-}
-
-function wificlick(e){
-		var nval="",v=$(e).attr("dataj"),oldval,strcache=$('#cacheSelected').val()
-				if(strcache.length>2){
-					oldval=$.parseJSON(strcache);
-				}
-	
-		try{
-			if(e.checked == true){//add string to cache
-				if(strcache.length>2){
-					if(strcache.indexOf(v)<1){
-						strcache= strcache.substr(0,strcache.length-1) +',' + v + ']'
-					}
-				}
-				else{
-					strcache='['+ v +']';
-				}
-				
-				}
-			if(e.checked== false){
-				if(strcache.indexOf(v)>1){
-					strcache='['+strcache.substring(1,strcache.indexOf(v)) + strcache.substring(strcache.indexOf(v)+v.length,strcache.length-1)+ ']'
-					strcache=strcache.replace(",,",",");
-					strcache=strcache.replace("[,","[");
-					strcache=strcache.replace(",]","]");			
-				}
-				else{strcache='[]'}
-			}
-			//alert(strcache);
-			$('#cacheSelected').val(strcache);
-			loadselectwifi($('#selectedPage').val())
-			loadsearchwifi($('#searchedPage').val())
-			//alert($('#cacheSelected').val())
-		}catch(e){alert(e)}
-		
-	}
-
-
-
-
-function loadsearchwifi(p){
-	var totalcount,pageno,swifi
-
-	try{
-	if($('#cacheSearched').val().length>2){
-		swifi=$.parseJSON($('#cacheSearched').val())
-		totalcount = swifi.length
-		pagecount=Math.ceil(totalcount/jspagesize)
-		$("#searchedPage").val(p)
-		if(isNaN(p)|| typeof(p)!=='number' || parseInt(p)!==p || parseInt(p)>pagecount){pageno=1;}
-		else{pageno=p;}
-		$("#searchPage").val(p)
-		wifihtm = '<div class="wifilist">';
-		//select item in wifisections
-		for(i=jspagesize*(pageno-1);i<jspagesize*(pageno-1)+jspagesize;i++){
-			if(swifi[i]){
-				wifihtm +="<div class=\"wifiitem\"><input type=\"checkbox\" name=\"swifi["+swifi[i]['id'] +"]\" id=\"swifi"+swifi[i]['id'] +"\" value=\""+swifi[i]['id'] +"\" onclick=\"wificlick(this)\"   dataj='" + JSON.stringify(swifi[i]) +"'";
-				if($("#cacheSelected")[0].value.indexOf(JSON.stringify(swifi[i]))>-1){wifihtm +=' checked ';}
-				wifihtm+= ">&nbsp;<lable class=\"wifilab\" for=\"swifi" +swifi[i]['id'] +"\">"  +swifi[i]['address'] + "</lable></div>";
-			}
-		}
-		wifihtm += '</div>';
-		resulthtm= wifihtm+genwifinav(pagecount,pageno,'loadsearchwifi');
-	   $("#divsearchedwifi").html(resulthtm);
-	}	
-	else{$("#divsearchedwifi").html('没有搜索到wifif信息')}
-	}
-	catch(e){$("#divsearchedwifi").html('加载wifi信息出错');}
-}
-
-function loadselectwifi(p){
-	var totalcount,pageno,allwifi
-	try{
-		if($('#cacheSelected').val().length>2){
-			var allwifi=$.parseJSON($('#cacheSelected').val())
-			totalcount = allwifi.length
-			pagecount=Math.ceil(totalcount/jspagesize)
-			if(isNaN(p)|| typeof(p)!=='number' || parseInt(p)!==p || parseInt(p)>pagecount){pageno=1;}
-			else{pageno=p;}
-			$("#selectedPage").val(p)
-			wifihtm = '<div class="wifilist">';
-			//show select item in wifisections
-			for(i=jspagesize*(pageno-1);i<jspagesize*(pageno-1)+jspagesize;i++){
-				if((allwifi[i])){
-				wifihtm +="<div class=\"\"><input type=\"checkbox\" name=\"swifi[]\" id=\"swifi"+allwifi[i]['id'] +"\" value=\""+allwifi[i]['id'] +"\" onclick=\"wificlick(this) \" dataj='" + JSON.stringify(allwifi[i]) + "'  checked>&nbsp;<lable class=\"\" for=\"swifi" +allwifi[i]['id'] +"\">"  +allwifi[i]['address'] + "</lable></div>"
-				}
-				else{break;}
-			}
-			wifihtm += '</div>';
-			resulthtml= wifihtm+genwifinav(pagecount,pageno,'loadselectwifi');
-		   $("#divselectedwifi").html(resulthtml);
-	   }
-	   else{$("#divselectedwifi").html("没有选择wifi");}
-	}
-	catch(e){$("#divselectedwifi").html("加载wifi时出错");}
-}
-
-function genwifinav(pcount,pno,fun){
-		//pageinvbar
-	wifinavhtm='<div class="pagination-wifi"><ul class="pagination-mini-wifi">';
-	if(pcount<=7){pagebegin=1;pageend=pagecount;}
-	else{
-		if(pno<=4){pagebegin=1;pageend=pagecount;}
-		else{
-			if(pagecount-pno<4){pagebegin=pcount-6;pageend=pcount;}
-			else{pagebegin=pno-3;pageend=pno+3}
-			}
-	}
-	for(i=pagebegin;i<=pageend;i++){
-		wifinavhtm +="<li ><a href=\"javascript:\" onclick=\""+ fun + "("+ i +")\""
-		if(i==pno){wifinavhtm+=" class=\"disabled\""}
-	
-		wifinavhtm+= ">"+ i +"</li>"
-	}
-	wifinavhtm +='</ul></div>';
-	return wifinavhtm;
-}
-
-
-(function(){
-		var map ;
-			 $('#btnmapSearch').click(function(e){
-			 	try{
-					var sdata = $(document.forms["frmwifisearch"]).serializeArray(); 
-
-					$.ajax({
-						url: document.forms['frmwifisearch'].action,
-						type: "POST",
-						// formate "name=codeplayer&age=18&uid=1&uid=2&uid=3"
-						data: sdata,
-						datatype: 'json',
-						// sucess
-						success: function( rdata, textStatus, jqXHR ){
-								try{
-									if(rdata.length>4){
-										$('#cacheSearched').val(rdata);
-										map=window.map;
-										map.plugin(['AMap.MarkerClusterer'], function(){
-											var cl = new AMap.MarkerClusterer(map, initMarker($("#cacheSearched")[0]));
-										});
-										loadsearchwifi(1);
-										tabshow($("#mnusearchedwifi")[0],'mnusearchedwifi')									
-									}
-								else{$("#cacheSearched").val("");$("#divsearchedwifi").html("没有搜索到wifi");}
-															
-								}
-								catch(e){alert(e);}
-
-						},
-					// onfaile
-					 error: function(jqXHR, textStatus, errorMsg){
-					// jqXHR  object of XMLHttpRequest
-					// textStatus value: null、"timeout"、"error"、"abort"或"parsererror"
-					// errorMsg value: "Not Found"、"Internal Server Error"
-					alert("请求失败：" + errorMsg);
-				}
-			});
-			 	}
-			 	catch(e){alert(e.error);}			 	
-			 });
-		})();
-
-
-
-
-
-	</script>
-<script>
-	
-	 
-	$(function(){
-    	 $('#setting_list').unbind("mousedown").bind("mousedown",function(){
-    	 	var date = $("#id-date-picker-1").val().split('to');
-			var s_date = date[0];
-			var e_date = date[1];
-			var len_box = $(".time_box").find(".time_item").length;
-			if(len_box > 6){
-				alert("最多只能添加6个时段");
-			}else{
-				if(s_date!=""&&e_date!=""){
-					var datePickerOptions = {
-						"startDate":s_date,
-						"endDate":e_date
-					}
-					$("#quantum_list1").find("p").removeClass("pitchon");
-					$('#setting_list').unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-						var date = $("#id-date-picker-1").val().split('to');
-					    var s_date = date[0];
-						var e_date = date[1];
-						var checked_date = new Array();
-						var len = $(".setting .time_item").length;
-						for(var i=0;i<len;i++){
-							var json_check = {"startDate":$(".time_item").eq(i).find(".start_date").val(),"endDate":$(".time_item").eq(i).find(".end_date").val()};
-							checked_date.push(json_check);
-						}
-						var startDate = obj.value.split('to')[0];
-				   		var endDate = obj.value.split('to')[1];
-						var flag = true;
-				   		for(var j=0;j<checked_date.length;j++){
-				   			if(startDate < checked_date[j].startDate && endDate < checked_date[j].startDate){
-				   				console.log(startDate+":"+endDate)
-				   				console.log(flag+":1");
-				   			}else if(startDate > checked_date[j].endDate && endDate > checked_date[j].endDate){
-				   				console.log(flag+":2");
-				   			}else{
-				   				flag=false;
-				   			}
-				   		}
-				   		if(flag){
-					   		var obj = $("#quantum_list1");
-					   		if(obj.find(".pitchon").length){
-					           	var timeData = obj.find(".pitchon").map(function(i,span){
-					        		return $(span).attr("title");
-					        	}).toArray().join(',');
-					        }else{
-					           	var timeData = -1;
-					        }
-					   		var html = '<div class="time_item"><p class="tr_data"><span class="inp"><input type="" class="start_date edit_time" readonly="readonly" value="'+startDate+'"></span><span class="inp"><input type="" class="end_date edit_time" readonly="readonly" value = "'+endDate+'"></span></p><button class="btn_del">删除</button><input class="json_date" type="hidden" value = "'+timeData+'"></div>';
-					   		$(".setting .time_box").append(html);
-					   		$(".time_box .time_item .btn_del").bind("click",function(e){
-					   			$(this).parents(".time_item").remove();
-					   		});
-					   		$(".setting .tr_data").unbind("mousedown").bind("mousedown",function(){
-					   				var obj_tr = $(this);
-					   				var datePickerOptions_td = {
-										"startDate":s_date,
-										"endDate":e_date,
-										getValue: function(){
-											if (obj_tr.find(".start_date").val() && obj_tr.find(".end_date").val() )
-												return obj_tr.find(".start_date").val() + ' to ' + obj_tr.find(".end_date").val();
-											else
-												return '';
-										},
-										setValue: function(s,s1,s2){
-											obj_tr.find(".start_date").val(s1);
-											obj_tr.find(".end_date").val(s2);
-										}
-									}
-									obj_tr.unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-											var date = $("#id-date-picker-1").val().split('to');
-										    var s_date = date[0];
-											var e_date = date[1];
-											var checked_date = new Array();
-											var other_box =obj_tr.parent().siblings();
-											var len = other_box.length;
-											for(var i=0;i<len;i++){
-												var json_check = {"startDate":other_box.eq(i).find(".start_date").val(),"endDate":other_box.eq(i).find(".end_date").val()};
-												checked_date.push(json_check);
-											}
-											console.log(checked_date);									
-											var startDate = obj.value.split('to')[0];
-				   							var endDate = obj.value.split('to')[1];
-				   							var flag = true;
-								   			console.log(checked_date);
-								   			
-								   			if(flag){
-								   				var obj = $("#quantum_list1");
-									   			if(obj.find(".pitchon")){
-									            	var timeData = obj.find(".pitchon").map(function(i,span){
-									        			return $(span).attr("title");
-									        		}).toArray().join(',');
-									            }else{
-									            	var timeData = -1;
-									            }
-									   			obj_tr.find(".start_date").val(startDate);
-										   		obj_tr.find(".end_date").val(endDate);
-										   		console.log(timeData);
-										   		console.log(obj_tr);
-										   		obj_tr.parent().find(".json_date").val(timeData);
-								   			}else{alert("请选择正确时间！");}
-							        });
-							        obj_tr.dateRangePicker1(datePickerOptions_td);
-							        $("#quantum_list1").find("p").removeClass("pitchon");
-							        var chose_time = obj_tr.parent().find(".json_date").val();
-						        	console.log(chose_time);
-						        	if(chose_time!=-1&&chose_time!=""){
-						        		var chose_arr = chose_time.split(",");
-						        		for(var n=0;n<chose_arr.length;n++){
-						        			$("#quantum_list1 p").eq(chose_arr[n]).addClass("pitchon");
-						        		}
-						        	}
-				   				})
-				   		}else{
-				   			alert("请选择正确时间！");
-				    	}
-					});
-					$('#setting_list').dateRangePicker1(datePickerOptions);
-				}else{
-					alert("请选择活动周期，在进行操作！");
-				}
-			}
-    	});
-    	
-    	$("#btnsave").click(function(){
-    		var checked_date = new Array();
-    		var len = $(".setting .time_item").length;
-    		var jsondata = "[";
-			for(var i=0;i<len;i++){
-				if(i == 0){
-					jsondata += '{"startDate":\"'+$(".time_item").eq(i).find(".start_date").val()+'\","endDate":\"'+$(".time_item").eq(i).find(".end_date").val()+'\","dehours":\"'+$(".time_item").eq(i).find(".json_date").val()+'\"}';
-				}else{
-					jsondata += ',{"startDate":\"'+$(".time_item").eq(i).find(".start_date").val()+'\","endDate":\"'+$(".time_item").eq(i).find(".end_date").val()+'\","dehours":\"'+$(".time_item").eq(i).find(".json_date").val()+'\"}';
-				}
-			}
-			jsondata += "]";
-			$("#sdayParting").val(jsondata);
-			var falg = validateMoney();
-			if(falg == false){
-				return false;
-			}
-			//提示场景选择
-			var placelist = $("#placediv input[type='checkbox']:checked");
-			if(placelist.length == 0){
-				alert("场景为必填项，请选择！");
-				return false;
-			}
-			
-    	});
-    	
-    	$("#validation-form input[name='totalBudget']").focus(function(){
-    		$("#totalBudget_span").html("");
-		});
-		
-    	$("#validation-form input[name='totalBudget']").blur(function(){
-			validateMoney();
-		});
-		
-		$("#btncancel").click(function(){
-			location.href = $(this).attr("href");
-			return false;
-		});
-		
-    });
-    
-    function validateMoney(){
-		var reg=/^\d{1,8}\.?\d{0,2}$/;
-		var $this = $("#validation-form input[name='totalBudget']");
-		if($this.val().match(reg)!=null){
-			if(($this.val().indexOf('.') == -1 && $this.val().length > 8) || $this.val() <= 0){
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算金额必须大于0且整数位最多8位');
-				$("#totalBudget_span").html("总预算金额必须大于0且整数位最多8位").css("color","red");
-				return false;
-			}if($this.val() > parseInt($("#budget").val())){
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算不能大于订单总预算');
-				$("#totalBudget_span").html("总预算不能大于订单总预算").css("color","red");
-				return false;
-			}else{
-				$this.css("box-shadow","none").attr('title','');
-				$("#totalBudget_span").html("");
-			}
-		}else{
-			$this.css("box-shadow","0 0 6px red").attr('title','总预算金额必须大于0整数位最多8位且最多有2位小数');
-			$("#totalBudget_span").html("总预算金额必须大于0整数位最多8位且最多有2位小数").css("color","red");
-			return false;
-		}
-	}
-
-</script>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/createbyoperator.ftl

@@ -1,1183 +1,283 @@
-<@override name="head">	
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/create.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/style.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/geo.css">
-    <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker1.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.validate.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.common.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.geo.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/areas_popup.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-ui-1.10.4.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.cxselect.js"></script>
-	<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:560%;;}
-		.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-		.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-		.modal-foot{text-algin:center;width:560px;height:40px;}
-		.modal-head{height:25px; }
-		.modal-content{height:380px;}
-		label{font-size:14px;}
-		modal-dialog{backgroud:#ffffff 100% 100% repeat;}
-		#wifitab{float:left;margin-left:10px;}
-		/**搜索和已选wifi列表**/ 
-		.wifilist{
-		 height: 320px; 
-		 width:320px; 
-		 display:block;
-		}
-		#wifitabul { margin:0; padding:0; list-style:none; overflow:hidden; float:left;margin-left:0 20px 0 0; width:320px;border-bottom:1px solid #E9E9E9;}
-        #wifitabul li {float:left;line-height:30px;color:#3469E2;border-radius: 5px 5px 0px 0px;display:block;cursor:pointer;width:85px;text-align:center;border:1px solid #E9E9E9;}
-        #wifitabul li a { color:#3469E2; text-decoration:none; }
-        #wifitabul li.current { background-color:#eeeeee;}
-        #wifipage{height:320px;width:360px;}
-		#divLBS{width:900px;height:540px;background-color:#ffffff;}
-		#mapdistance{width:35px;}
-		#divmapsearch{height:35px;}
-		#mapview{width:520px;height:360px;margin-top:10px;}
-		#wifimap{width:520px;height:360px;float:left;}
-		#address{width:180px;}
-		#divselectedwifi{width:320px;margin-top:15px;font-size:14px;}
-		#divsearchedwifi{width:320px;margin-top:15px;font-size:14px;}
-		#prov{width:91px;}
-		#city{width:91px;}
-		#wifitab{height:380px;}
-		#distance{width:80px;}
-		#content{position:absolut;}
-		.pagination-wifi{float:left;margin-left:10px;width:320px;padding-top:10px;}
-		.pagination-mini-wifi{margin:0; padding:0; list-style:none; overflow:hidden; float:left;  border:solid 1px #E9E9E9;border-radius: 5px;}
-		.pagination-mini-wifi li{margin:0px; padding:3px; list-style:none; overflow:hidden; float:left; width:20px;height:20px;border:solid 1px #E9E9E9;text-align:center; }
-		#third{
-		margin-left:-60px;
-		margin-top:-16px;
-		}
-		.control-group{
-			margin-left:-25px;
-		}
-		.time_tit{
-  	height:30px;
-  	line-height:30px;
-  }
-  .time_tit p{
-  	float: left;
-	width: 150px;
-	text-align: center;
-	border: 1px solid #d5d5d5;
-	height:30px;
-	line-height:30px;
-  }
-  .time_add{
-  	width: 302px;
-	border: 1px solid;
-	text-align: center;
-	height: 30px;
-	line-height: 30px;
-	border: 1px solid #d5d5d5;
-  }
-  .time_item{
-  	height:32px;
-  	clear:both;
-  }
-  .tr_data{
-  	height:32px;
-  	float:left;
-  }
- .time_box .inp{
- 	display:block;
-  	float: left;
-  	height:30px;
-  	line-height:30px;
-	width: 150px;
-	overflow:hidden;
-	text-align: center;
-	border: 1px solid #d5d5d5;
-  }
-  .time_box .inp input{
-  	width:150px;
-  	height:30px;
-  	line-height:30px;
-  	text-align:center;
-  	border:none;
-  	padding:0;
-  	overflow:hidden;
-  }
-  
-  .time_quantum{
-    width:300px;
-    float:left;
-    margin-top:3px;
-    -moz-border-radius:4px; 
-    -webkit-border-radius:4px;
-    border-radius:4px; 
-    background-color:#e7eaee;
-    border: solid #d5d5d5 1px; 
-    margin-left: 20px;
-  } 
-  .time_quantum div p a{
-    color:#4da8e1;
-    font-size:12px;
-  } 
-  .time_quantum p{
-     float:right;
-     margin:0 5px 0 0;
-  }
-  .quantum_title{
-    height:26px;
-    line-height:26px;
-    color:#4da8e1;
-  }
-	.quantum_list{
-		overflow:hidden;
-	}
-  .quantum_list p{
-    float:left;
-    width:98px;
-    font-size:12px;
-    color:#4da8e1;
-    border: solid #d5d5d5 1px; 
-    text-align:center;
-    padding:0px;
-    margin:0px;
-    height:26px;
-    cursor:pointer;
-    line-height:26px;
-  }
-  .pitchon{
-    background-color:red;
-    background:url(/ssp_web/assets/images/duihao.png) no-repeat right bottom;
-    background-size:16%;
-  }
-  
-  .btn_del{
-  	width:90px;
-  	height:30px;
-  	line-height:30px;
-  	border: 1px solid #36aeea;
-    border-radius: 5px;
-    color: #36aeea;
-    background-color: white;
-    margin-left:20px;
-  }
-  
-  .btn_del:hover{
-  	color: white;
-    background-color: #36aeea;
-  }
-  .i1{
-  cursor:text !important;
-  }
-  .btn2:hover{
-		background-color: #4c637b;
-	}
-</style>
-
-<script type="text/javascript">
-
-     $(document).ready(function(){
-	 			
-	 	$('#id-date-picker-1').dateRangePicker({
-	 		separator : ' to ',
-	 		inline:true,
-			container: '#divdaterangepick', 
-			alwaysOpen:false
- 		});	
- 		
-		$('#city_custom').cxSelect({
-			selects: ['prov', 'city'],
-			required: true,
-			url:'${ctx}/advertiser/main/ad/target/ad-group/getLocations'
-		});
-
-		$( "#btn-toggle" ).click(function( event ) {
-			$( "#divLBS" ).dialog( "open" );
-				try{
-					map = new AMap.Map('mapview',{level:12});
-					if($('#cacheSelected').val().length>2){
-						loadselectwifi(1);
-					}
-				}
-				catch(e){alert('加载已选wifi时出错')}
-				map.plugin(['AMap.MarkerClusterer'], function(){
-				var cl = new AMap.MarkerClusterer(map, initMarker($("#cacheSelected")[0]));
-			});
-		});
-		
-		$( "#divLBS" ).dialog({
-			autoOpen: false,
-			width: 900,
-			modal: true,
-			open: function (event, ui) {
-			    $(".ui-dialog-titlebar-close", $(this).parent()).hide();
-             }
-		
-		});	
-		
-	$('#validation-form').validate({
-	    errorElement: 'span',
-	    errorClass: 'help-inline',
-	    focusInvalid: false,
-	    onfocusout: function(element) {
-	                    $(element).valid();
-	                },
-		ignore:".ignore",
-	    rules: {
-	        adGroupName: {
-	            required: true,
-	            maxlength:50
-	        },
-	        price:{
-	         number:true,
-	         required:true
-	        },
-	        dailyBudget:{
-	            number:true
-	        },
-	        maxImpression:{
-	            number:true
-	        },
-	        maxClick:{
-	            number:true
-	        },
-	        dailyMaxImpression:{
-	            digits:true
-	        },
-	        dailyMaxclick:{
-	            digits:true
-	        },
-	        dailyMaxConversion:{
-	            digits:true
-	        },
-	        maxSessionImpression:{
-	            digits:true
-	        },
-	        maxUserImpression:{
-	            digits:true
-	        },
-	        
-	    },
-	    messages: {
-	        adGroupName:{
-	            required:"请输入内容！",
-	            maxlength:"输入的长度大于50超出范围！"
-	        },
-	         price:{
-	          required:"请输入内容！",
-	         number:"请输入数字！"
-	        },
-	        dailyBudget:{
-	            number:"请输入正确格式"
-	        },
-	        maxImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        maxClick:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxclick:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxConversion:{
-	            digits:"请输入正确格式"
-	        },
-	        maxSessionImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        maxUserImpression:{
-	            digits:"请输入正确格式"
-	        } 
-	    },
-	   invalidHandler: function (event, validator) { //display error alert on form submit
-	        $('.alert-error', $('.login-form')).show();
-	    },
-	    highlight: function (e) {
-	        $(e).closest('.control-group').removeClass('info').addClass('error');
-	        $(e).closest('.control-group').find("span.note").addClass('hidden');
-	    },
-	    success: function (e) {
-	        $(e).closest('.control-group').removeClass('error').addClass('info');
-	        $(e).closest('.control-group').find("span.note").removeClass('hidden');
-	        $(e).remove();
-	    },
-	    errorPlacement: function (error, element) {
-	        if(element.is(':checkbox') || element.is(':radio')) {
-	            var controls = element.closest('.controls');
-	            if(controls.find(':checkbox,:radio').length > 1) controls.append(error);
-	            else error.insertAfter(element.nextAll('.lbl').eq(0));
-	        }
-	        else if(element.is('.chzn-select')) {
-	            error.insertAfter(element.nextAll('[class*="chzn-container"]').eq(0));
-	        }
-	        else error.insertAfter(element);
-	    },
-	     submitHandler:function(form){form.submit();}
-	    /*
-
-	    submitHandler: function (form) {
-	    	var startDate = $('input[name=startDate]').val();
-	        var endDate = $('input[name=endDate]').val();
-	        if(startDate!==""&&endDate!==""){
-	        	if(datefalg){
-					// 防止表单二次提交
-					$('button:submit').attr('disabled', 'disabled');
-					var _url = $('form').attr('action');
-					var _param = $('form').serialize();
-					$.post(_url,_param,function(data) {
-						$('#main-content').html(data);
-					});
-				}
-	        }else{
-	            $('input[name=startDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-	            $('input[name=endDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-	        }
-	    },
-	    */
-	    
-	});
-
-var datefalg = true;
-
-
-});
-</script> 
-</@override>	
-	
-<@override name="body">
-<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">  	
-<div id= "pagecontent">
-	<div id="content" style="width:97%;height:94%;">
-		<div id="third">
-			<ul style="">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<#if role == "agent">
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">投放管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a>
-					<span class="divider3"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span></li>
-					<li class="size3">创建投放</li>
-					<#elseif role == "advertiser">
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span></li>
-					<li class="size3">媒体自投</li>
-					</#if>
-				</ul> 
-			</div> 
-		<form id="validation-form" action="${ctx}/advertiser/main/ad/target/ad-group/save" method="post">   
-		<div class="control-group">
-				<label class="clname" for="form-field-1"><sup style="color:red">*</sup>投放名称：</label>
-				<div class="inputtext">
-					<input class="i1" autocomplete="off"   type="text" name="adGroupName" id="form-field-1" placeholder="">
-	                <span class="help-inline" for="form-field-1">支持输入1～50个字符</span>
-				</div>
-				
-		</div>
-
-         <div class="control-group">
-            <label class="clname" for="id-date-picker-1"><sup style="color:red">*</sup>活动周期：</label>
-			<div class="inputtext">
-             <div class="row-fluid input-append date row-fluid-revise">
-			<input   class="input1" autocomplete="off"   name="activeTime"  id="id-date-picker-1" type="text" value="" />    
-             <div id="divdaterangepick" style="width:456px; position: absolute;margin: -17px 0 0 115px;"></div>
-             </div>
-            </div>
-        </div>
-        
-       
-
-		<div class="control-group">
-			<label class="clname" style="margin-top:-14px" for="form-field-2"><sup style="color:red">*</sup>总预算：&nbsp;</label>
-			<div class="inputtext">
-				<input class="i1"  autocomplete="off"   name="totalBudget" type="text" id="form-field-2" placeholder="">
-				<input name="budget" type="hidden" id="budget" value="${budget!}"/>
-                 <span class="help-inline1" style="margin-top:-30px" >元</span>
-                <span id="totalBudget_span" style="position:absolute;margin:-9px 0 0 5px;color:#595959;" for="form-field-2">总预算不能大于订单总预算</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-3"><sup style="color:red">*</sup>投放模式：</label>
-			<label style="float:left;margin:-27px 0 0 115px;"><input id="input-radio-cpm" autocomplete="off" name="mode" type="radio" value="1" checked="checked"><span style="position:absolute;margin:3px 0 0 5px;">CPM</span></label> 
-			<label style="float:left;margin:-27px 0 0 200px;"><input id="input-radio-cpc" autocomplete="off" name="mode" type="radio" value="2"><span style="position:absolute;margin:3px 0 0 5px;">CPC</span></label>
-		</div>
-
-		<div class="control-group" style="clear:both;">
-			<label class="control-label" style="margin-top:28px" for="form-field-3"><sup style="color:red">*</sup>单价(CPM)：</label>
-			<div class="inputtext">
-				<input class="i1" autocomplete="off"   name="price" type="text" id="form-field-3" placeholder="">
-                <span class="help-inline1" style="margin-top:-46px"  >元</span>
-                <span  style="margin-top:-46px"  class="help-inline" for="form-field-3">单价</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-5">曝光总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxImpression" type="text" id="form-field-5" placeholder="">
-				 <span class="help-inline1" style="margin-top:-46px" >千次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-5">整个投放期，广告最多被曝光多少千次</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-6">点击总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxClick" type="text" id="form-field-6" placeholder="">
-				 <span class="help-inline1" style="margin-top:-46px" >次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-6">整个投放期，广告最多被点击多少次</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-7">转化总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxConversion" type="text" id="form-field-7" placeholder="">
-				 <span class="help-inline1" style="margin-top:-46px" >次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-7">整个投放期，广告最多被转化多少次</span>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label" for="form-field-8">每日曝光上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxImpression" id="form-field-8" placeholder="">
-                <span class="help-inline1" style="margin-top:-46px" >千次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-8">每天，广告最多被曝光多少千次</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-9">每日点击上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxClick" id="form-field-9" placeholder="">
-               <span class="help-inline1" style="margin-top:-46px" >次</span>
-                <span class="help-inline" style="margin-top:-46px" for="form-field-9">每天，广告最多被点击多少次</span>
-                
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-10">每日转换上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxConversion" id="form-field-10" placeholder="">
-                <span class="help-inline1" style="margin-top:-46px" >次</span>
-                <span class="help-inline" style="margin-top:-46px"  for="form-field-10">每天，广告最多被转换多少次</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-11">单人曝光频次：</label>
-			<div class="controls-reset">
-                <select id="form-field-11" name="perImpressionType">
-                    <option value="0">请选择曝光类型</option>
-                    <option value="1">每天</option>
-                    <option value="2">投放周期</option>
-                </select>
-	         </div>
-	         <div class="controls">
-				<input class="i1" autocomplete="off"   type="text" name="perImpression" id="form-field-11" placeholder="">
-	            <span class="help-inline" style="margin-top:-48px" for="form-field-11">单人曝光频次</span>
-			</div>
-			
-		</div>
-			<div class="control-group">
-			<label class="control-label" for="form-field-12">单人点击频次：</label>
-			<div class="controls-reset">
-                <select id="form-field-12" name="perClickType">
-                    <option value="0">请选择曝光类型</option>
-                    <option value="1">每天</option>
-                    <option value="2">投放周期</option>
-                </select>
-	         </div>
-	         <div class="controls">
-				<input class="i1" autocomplete="off"   type="text" name="perClick" id="form-field-12" placeholder="">
-	            <span class="help-inline" style="margin-top:-48px" for="form-field-12">单人点击频次</span>
-			</div>
-		</div>
-		
-		<!-- 前端需要传输给后端的地域定向的数据值放在value里面 -->
-		<div class="control-group" style="margin-top:-15px;">
-		    <label style="margin-top:37px;margin-left:0px;"  class="control-label">地域定向：</label>
-		
-		    <div class="inputtext">
-		         <div class="dashed">
-		            <input class="ignore" type="hidden" id="areas" name="areas" value="">
-		            <input type="button" style="width:150px;margin-top:-45px;margin-left:116px;"  class="btn-Directed btn1" id="btn-areas" value="地域设定">
-		            <div class="geo">
-		                <div class="geo-selected"  id="geo-selected-areas" style="display: none;margin:-63px 0 0 300px;position: absolute;">
-		                    <span class="area-direct"></span><span >您已经设定了<strong id="count-areas">0</strong>个地域条件</span>
-		                </div>
-		                <div class="geo-all" id="geo-all-areas" style="display: block;margin:-63px 0 0 300px;position: absolute;">
-		                    <span class="area-direct"></span><span class="default_text">不限</span>
-		                </div>
-		            </div>
-		
-		        </div>
-		          
-		    </div>
-		           
-		</div>
-		<br>
-	<div id="timediv" class="control-group" style="margin-top:-60px;">
-		<label style="margin-top:-48px;margin-left:2px;"  class="control-label">时段定向：</label>
-		<div class="controls">
-		    <div class="setting" style="float:left;margin:-25px 0 20px 115px;">
-		       	<div class="time_tit">
-		       		<p>开始时间</p>
-		            <p>结束时间</p>
-		       	</div>
-		        <input type="hidden" name="sdayParting" id="sdayParting" value=""/>
-		        <div class="clear"></div>
-		        <div class="time_box"></div>
-		      	<div class="time_add"><p id="setting_list"  class="dateRangePicker" href="">新增时间段</p></div>
-	     	</div>
-     	</div>
-  	</div><br/>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-3"><sup style="color:red">*</sup>操作系统：</label>
-			<label style="float:left;margin:-27px 0 0 115px;"><input id="input-radio-cpm" autocomplete="off" name="mode" type="radio" value="1" checked="checked"><span style="position:absolute;margin:3px 0 0 5px;">Windows</span></label> 
-			<label style="float:left;margin:-27px 0 0 230px;"><input id="input-radio-cpc" autocomplete="off" name="mode" type="radio" value="2"><span style="position:absolute;margin:3px 0 0 5px;">Mac</span></label>
-			<label style="float:left;margin:-27px 0 0 305px;"><input id="input-radio-cpc" autocomplete="off" name="mode" type="radio" value="3"><span style="position:absolute;margin:3px 0 0 5px;">IOS</span></label>
-			<label style="float:left;margin:-27px 0 0 360px;"><input id="input-radio-cpc" autocomplete="off" name="mode" type="radio" value="4"><span style="position:absolute;margin:3px 0 0 5px;">Android</span></label>
-			<label style="float:left;margin:-27px 0 0 450px;"><input id="input-radio-cpc" autocomplete="off" name="mode" type="radio" value="5"><span style="position:absolute;margin:3px 0 0 5px;">MP</span></label>
-			<label style="float:left;margin:-27px 0 0 500px;"><input id="input-radio-cpc" autocomplete="off" name="mode" type="radio" value="6"><span style="position:absolute;margin:3px 0 0 5px;">其他</span></label>
-		</div>
-
-		<div class="control-group">
-			<label  style="position:relative;" class="control-label"><sup></sup>广告位：</label>
-			<div class="controls" style="position:absolute; margin:-30px 0 0 98px;width:auto;">
-				<div class="form-align-radio1" style="margin-right:100px;">
-					<input  autocomplete="off"  style="line-height:30px;margin:0px 5px 0 0;border:none;" name="position" type="checkbox" id= "1position" value="1"><span class="lb2"> 全部</span>
-				</div>
-				<div class="form-align-radio1" style="margin-right:85px;">
-					<input  autocomplete="off" style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "2position" value="2"><span class="lb2"> 认证页</span>
-				</div>
-				<div class="form-align-radio1" style="margin-right:70px;">
-					<input  autocomplete="off"   style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "3position" value="3"><span class="lb2"> 认证页后</span>
-				</div>
-				<div class="form-align-radio1">
-					<input  autocomplete="off"  style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "4position" value="4"><span class="lb2"> 上网过程</span>
-				</div>				
-			</div>
-		</div><br/>
-		
-		<div class="control-group">
-			<label  style="position:relative;" class="control-label"><sup></sup>定向：</label>
-			<div class="controls" style="position:absolute; margin:-30px 0 0 98px;width:auto;">
-				<div class="form-align-radio1" style="margin-right:100px;">
-					<input  autocomplete="off"  style="line-height:30px;margin:0px 5px 0 0;border:none;" name="position" type="checkbox" id= "1position" value="1"><span class="lb2">数聚场景</span>
-				</div>
-				<div class="form-align-radio1" style="margin-right:85px;">
-					<input  autocomplete="off" style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "2position" value="2"><span class="lb2">分组</span>
-				</div>			
-			</div>
-		</div>
-		<br>
-		<div class="control-group" id="placediv">
-			<sup style="color:red">*</sup>场景：
-			<div class="controls6" style="margin-left: 25px;margin-top: -18px;width:auto;">
-				<#if placeList ??>
-				<#list placeList as place>
-				<div style="display:inline-block; margin-left:180px;margin-bottom:20px;">
-					<input  autocomplete="off" style="float:left;display:inline-block;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">
-					<li style="float:left;width:120px;position: relative;top:-3px;left:10px;" >${place.name}</li>
-					</div>
-				</#list>
-				</#if>
-			</div>
-		</div>
-		<div class="control-group">
-			  <lable style="margin-top:107px;margin-left:-660px;" class="control-label">
-			       <span style="color:red;">*</span>代表必填项
-			   </lable>
-		</div>
-		
-<div class="control-group">
-    <lable style="margin-top:107px;" class="control-label">
-        <input type="button" class="btn1"  style="width:150px;" id="btn-toggle" value="LBS定向"> <span id="spanselectedhint" style="display:none;margin-left:7px;"></span>
-    </lable>
-</div>
-
-	
-<div class="control-group">
-			<input style="width:150px;margin-right:15px;" type="submit" value="保存" class="btn2" id="btnsave"/>
-			<button class="btn2"  href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" style="background-color:#36aeea;" id="btncancel"><i class="icon-undo"></i> 取消</button>
-		</div>
-		
-		
-		<input  autocomplete="off"   type="hidden" name="campaignId" value="${campaignId}">
-		<input  autocomplete="off"   type="hidden" name="orderId" value="${orderId}">
-		<input  autocomplete="off"   type="hidden" name="advertiserId" value="${advertiserId}">
-		<input  autocomplete="off"   type="hidden" name="agentId" value="${agentId}">
-		<input  autocomplete="off"   type="hidden" name="zoneIdString" value="1,12">
-		<input type="hidden" name="selectedwifi" id="selectedwifi" value="">
-</form>
-<div  id="divLBS" >
-	<div class="modal-dialog">
-		<div class="modal-head"> LBS 设定</div>
-		<div class="modal-content">
-			<div class="modal-body" style="height:400px;">
-							<div id="wifimap">
-								<div id="divmapsearch">
-									<form name="frmwifisearch" id="frmWifiSearch" action="${ctx}/advertiser/main/ad/target/ad-group/wifiList">
-										<fieldset id="city_custom">
-											<input type="text" class="form-control" name="address" id="address" onkeydown="if(event.keyCode==13){return false;}">
-											<select name="prov" id="prov" class="prov" ></select>&nbsp;&nbsp;
-											<select name="city" id="city" class="city"></select>
-											<#--&nbsp;&nbsp;距离
-											<select name="distance" id="mapdistance" >
-												<option value="1">1Km</option>
-												<option value="2">2Km</option><option value="3">3Km</option>
-												<option value="4">4Km</option><option value="5" selected>5Km</option>
-												<option value="6">6Km</option><option value="10">10Km</option>
-												<option value="20">20Km</option>
-											</select>-->&nbsp;<input type="button" name="mapSearch" id="btnmapSearch" style="margin-top:-10px;background:#36aeea;" class="btn btn-primary" value="搜索"></fieldset>
-									</form>
-									<input type="hidden" name="cacheSearched" id="cacheSearched" >	<input type="hidden" name="cacheSelected" id="cacheSelected" value=''><!--[{"id":1,"address":"上海体育馆","lat":121.535816,"lng":31.24231},{"id":2,"address":"上海市八万人体育场","lat":121.526224,"lng":31.238806},{"id":3,"address":"上海市卢湾区体育馆","lat":121.523198,"lng":31.235045},{"id":9,"address":"智造局一期国际服务外包产业","lat":121.478716, "lng":31.206612},{"id":10,"address":"上海市红房子妇产科医院","lat":121.483587, "lng":31.213861},{"id":11,"address":"上海东仁商贸中","lat":121.499101, "lng":31.220265}]-->
-									<input type="hidden" id="searchedPage"><input type="hidden" id="selectedPage">
-								</div>
-								<div id="mapview"  >
-									
-								</div>
-							</div>
-							<div id="wifitab" >
-								<ul class="nav navtab" id="wifitabul" >
-							        <li  id="mnusearchedwifi"  ><a href="javascript:" onclick="tabshow(this,'mnusearchedwifi')">搜索wifii</a></li>
-							        <li  id="mnuselectedwifi" class="current"><a href="javascript:"  onclick="tabshow(this,'mnuselectedwifi')">已选wifi</a></li>
-							    </ul><br class="clearfix">
-            						<div id="divselectedwifi" class="in fade">没有选中wifi</div>
-									<div id="divsearchedwifi" class="in fade" style="display:none;">没有相关数据</div>
-							</div>
-			</div>
-
-		</div>
-		<br class="clearfix"><br class="clearfix">
-		<div class="modal-foot" style="width:300px;height:34px;position:absloute;margin-left:300px;"><input type="button" value="确定" class="btn122" onclick='savewifi();$("#divLBS").dialog("close");'style="width:100px;position:absloute;height:30px;">&nbsp;<input type="button" class="btn2" value="取消" onclick='$("#divLBS").dialog("close");' style="width:100px;position:absloute;magin-left:105px;height:30px;"></div>
-	</div>
-	
-</div>
-
-</div>
-<div id="areas_layout"></div>
-<div id="schedule_layout"></div>
-<script type="text/javascript">
-                
-            	var areasgeoPopup = $("#areas_popup")[0];
-            	var GEO_list;
-                $('#btn-areas').click(function () {
-                    if (!areasgeoPopup) {
-                        areasgeoPopup = new areasPopup({
-                            width: '746px',
-                            height: '435px',
-                            title: '地域定向设定'
-                 		});
-                        var defaultValue = "不限";
-                        var input = $('#areas').trigger('change');
-                        var selectedIds = input.val() ? input.val().split(',') : null;
-                        $('#areasconfirm').click(function(){
-                            var pop= areasgeoPopup;
-                            areasgeoPopup.hide();
-                            input.val(Area.save());
-                            var id = 'areas',selected = Area.save();
-                            parent.$('#'+id).val(selected);
-                            if (selected && $('input[type=checkbox]:not(:checked)').length) {
-                                //有选择 且 非全选的
-                                parent.$('#count-'+id)[0].innerHTML = selected.split(',').length;
-                                parent.$('#geo-all-'+id).hide();
-                                parent.$('#geo-selected-'+id).show();
-                            }else{
-                                if(!$('input[type=checkbox]:not(:checked)').length){
-                                    parent.$('#geo-all-'+id).find('.default_text')[0].innerHTML=defaultValue;
-                                }else{
-                                    var val = defaultValue;
-                                    parent.$('#geo-all-'+id).find('.default_text')[0].innerHTML=decodeURIComponent(val);
-                                }
-                                parent.$('#geo-all-'+id).show();
-                                parent.$('#geo-selected-'+id).hide();
-                            }
-                            parent.$(parent.document).trigger('setData');
-							
-                        });
-                        //Area.init(GEO_LIST,selectedIds);
-            			$.ajax({
-            				url: '${ctx}/advertiser/main/ad/target/ad-group/getLocations',
-            				dataType:'json',
-            				success:function(GEO_LIST){
-            					Area.init(GEO_LIST,selectedIds);
-            					areasgeoPopup.show();
-            					GEO_list = GEO_LIST;
-            				},
-            				error:function(){
-            					alert('数据拉取失败，请检查您的网络连接是否可用');
-            				}
-            			});
-		                
-                		}else{
-		                areasgeoPopup.show();
-		                }
-		            });
-		            
-	                $('#count-areas').click(function () {
-	                    $('#btn-areas').trigger('click');
-	                });
-	                
-	                if ($('#areas').val()) {
-	                    $('#geo-selected-areas').show();
-	                    $('#geo-all-areas').hide();
-	                    $('#count-areas')[0].innerHTML = $('#areas').val().split(',').length;
-	                } else {
-	                    $('#geo-selected-areas').hide();
-	                    $('#geo-all-areas').show();
-	                }
-
-        </script>
-<script type="text/javascript">
-//Alex add for wifi LBS
-
-	jspagesize = 15	;
-
-/*get wifi from cachedata*/
-function initMarker(obj){
-			
-		try{
-			if(obj.value.length>4){
-				allwifi=jQuery.parseJSON(obj.value)
-				markers = [];
-				for (var i = 0; length= allwifi.length,i<length ;i ++) {
-					var markerPosition = new AMap.LngLat(allwifi[i]['lat'],allwifi[i]['lng']);
-					var marker = new AMap.Marker({
-					position: markerPosition,
-					icon: "http://developer.amap.com/wp-content/uploads/2014/06/marker.png"
-				});
-				markers.push(marker);
-			}
-			return markers;
-			}
-		}
-	catch(e){return false;}
-	}
-
-
-function savewifi(){
-	try{
-		wifiids=''
-		selectedwificount=0
-		if($("#cacheSelected").val().length>2){
-				allwifi=$.parseJSON($("#cacheSelected").val())
-						for (var i = 0; length= allwifi.length,i<length ;i ++) {
-						wifiids += allwifi[i]['id']+',';
-						selectedwificount+=1;
-					}
-				wifiids=wifiids.substring(0,wifiids.length-1)
-		}
-	$("#selectedwifi").val(wifiids);
-	$("#spanselectedhint").html("共选择了" + selectedwificount + " 个 wifi")
-	$("#spanselectedhint").show();
-	
-	}
-	catch(e){alert(e)}
-}
-
-function tabshow(e,id){
-	var mnu=['mnusearchedwifi','mnuselectedwifi']
-	try{
-		for(i=0;i<mnu.length;i++){
-			mnuid=mnu[i];divid="#div" + mnuid.substr(3)
-			if(mnu[i]==id){
-				$('#'+mnuid).addClass('current');
-				$(divid)[0].style.display='block';
-			}
-			else{
-				$('#'+mnuid).removeClass('current');
-				$(divid)[0].style.display='none';
-			}
-		}
-	}catch(e){alert(e)}
-}
-
-function wificlick(e){
-		var nval="",v=$(e).attr("dataj"),oldval,strcache=$('#cacheSelected').val()
-				if(strcache.length>2){
-					oldval=$.parseJSON(strcache);
-				}
-	
-		try{
-			if(e.checked == true){//add string to cache
-				if(strcache.length>2){
-					if(strcache.indexOf(v)<1){
-						strcache= strcache.substr(0,strcache.length-1) +',' + v + ']'
-					}
-				}
-				else{
-					strcache='['+ v +']';
-				}
-				
-				}
-			if(e.checked== false){
-				if(strcache.indexOf(v)>1){
-					strcache='['+strcache.substring(1,strcache.indexOf(v)) + strcache.substring(strcache.indexOf(v)+v.length,strcache.length-1)+ ']'
-					strcache=strcache.replace(",,",",");
-					strcache=strcache.replace("[,","[");
-					strcache=strcache.replace(",]","]");			
-				}
-				else{strcache='[]'}
-			}
-			//alert(strcache);
-			$('#cacheSelected').val(strcache);
-			loadselectwifi($('#selectedPage').val())
-			loadsearchwifi($('#searchedPage').val())
-			//alert($('#cacheSelected').val())
-		}catch(e){alert(e)}
-		
-	}
-
-
-
-
-function loadsearchwifi(p){
-	var totalcount,pageno,swifi
-
-	try{
-	if($('#cacheSearched').val().length>2){
-		swifi=$.parseJSON($('#cacheSearched').val())
-		totalcount = swifi.length
-		pagecount=Math.ceil(totalcount/jspagesize)
-		$("#searchedPage").val(p)
-		if(isNaN(p)|| typeof(p)!=='number' || parseInt(p)!==p || parseInt(p)>pagecount){pageno=1;}
-		else{pageno=p;}
-		$("#searchPage").val(p)
-		wifihtm = '<div class="wifilist">';
-		//select item in wifisections
-		for(i=jspagesize*(pageno-1);i<jspagesize*(pageno-1)+jspagesize;i++){
-			if(swifi[i]){
-				wifihtm +="<div class=\"wifiitem\"><input type=\"checkbox\" name=\"swifi["+swifi[i]['id'] +"]\" id=\"swifi"+swifi[i]['id'] +"\" value=\""+swifi[i]['id'] +"\" onclick=\"wificlick(this)\"   dataj='" + JSON.stringify(swifi[i]) +"'";
-				if($("#cacheSelected")[0].value.indexOf(JSON.stringify(swifi[i]))>-1){wifihtm +=' checked ';}
-				wifihtm+= ">&nbsp;<lable class=\"wifilab\" for=\"swifi" +swifi[i]['id'] +"\">"  +swifi[i]['address'] + "</lable></div>";
-			}
-		}
-		wifihtm += '</div>';
-		resulthtm= wifihtm+genwifinav(pagecount,pageno,'loadsearchwifi');
-	   $("#divsearchedwifi").html(resulthtm);
-	}	
-	else{$("#divsearchedwifi").html('没有搜索到wifif信息')}
-	}
-	catch(e){$("#divsearchedwifi").html('加载wifi信息出错');}
-}
-
-function loadselectwifi(p){
-	var totalcount,pageno,allwifi
-	try{
-		if($('#cacheSelected').val().length>2){
-			var allwifi=$.parseJSON($('#cacheSelected').val())
-			totalcount = allwifi.length
-			pagecount=Math.ceil(totalcount/jspagesize)
-			if(isNaN(p)|| typeof(p)!=='number' || parseInt(p)!==p || parseInt(p)>pagecount){pageno=1;}
-			else{pageno=p;}
-			$("#selectedPage").val(p)
-			wifihtm = '<div class="wifilist">';
-			//show select item in wifisections
-			for(i=jspagesize*(pageno-1);i<jspagesize*(pageno-1)+jspagesize;i++){
-				if((allwifi[i])){
-				wifihtm +="<div class=\"\"><input type=\"checkbox\" name=\"swifi[]\" id=\"swifi"+allwifi[i]['id'] +"\" value=\""+allwifi[i]['id'] +"\" onclick=\"wificlick(this) \" dataj='" + JSON.stringify(allwifi[i]) + "'  checked>&nbsp;<lable class=\"\" for=\"swifi" +allwifi[i]['id'] +"\">"  +allwifi[i]['address'] + "</lable></div>"
-				}
-				else{break;}
-			}
-			wifihtm += '</div>';
-			resulthtml= wifihtm+genwifinav(pagecount,pageno,'loadselectwifi');
-		   $("#divselectedwifi").html(resulthtml);
-	   }
-	   else{$("#divselectedwifi").html("没有选择wifi");}
-	}
-	catch(e){$("#divselectedwifi").html("加载wifi时出错");}
-}
-
-function genwifinav(pcount,pno,fun){
-		//pageinvbar
-	wifinavhtm='<div class="pagination-wifi"><ul class="pagination-mini-wifi">';
-	if(pcount<=7){pagebegin=1;pageend=pagecount;}
-	else{
-		if(pno<=4){pagebegin=1;pageend=pagecount;}
-		else{
-			if(pagecount-pno<4){pagebegin=pcount-6;pageend=pcount;}
-			else{pagebegin=pno-3;pageend=pno+3}
-			}
-	}
-	for(i=pagebegin;i<=pageend;i++){
-		wifinavhtm +="<li ><a href=\"javascript:\" onclick=\""+ fun + "("+ i +")\""
-		if(i==pno){wifinavhtm+=" class=\"disabled\""}
-	
-		wifinavhtm+= ">"+ i +"</li>"
-	}
-	wifinavhtm +='</ul></div>';
-	return wifinavhtm;
-}
-
-
-(function(){
-		var map ;
-			 $('#btnmapSearch').click(function(e){
-			 	try{
-					var sdata = $(document.forms["frmwifisearch"]).serializeArray(); 
-
-					$.ajax({
-						url: document.forms['frmwifisearch'].action,
-						type: "POST",
-						// formate "name=codeplayer&age=18&uid=1&uid=2&uid=3"
-						data: sdata,
-						datatype: 'json',
-						// sucess
-						success: function( rdata, textStatus, jqXHR ){
-								try{
-									if(rdata.length>4){
-										$('#cacheSearched').val(rdata);
-										map=window.map;
-										map.plugin(['AMap.MarkerClusterer'], function(){
-											var cl = new AMap.MarkerClusterer(map, initMarker($("#cacheSearched")[0]));
-										});
-										loadsearchwifi(1);
-										tabshow($("#mnusearchedwifi")[0],'mnusearchedwifi')									
-									}
-								else{$("#cacheSearched").val("");$("#divsearchedwifi").html("没有搜索到wifi");}
-															
-								}
-								catch(e){alert(e);}
-
-						},
-					// onfaile
-					 error: function(jqXHR, textStatus, errorMsg){
-					// jqXHR  object of XMLHttpRequest
-					// textStatus value: null、"timeout"、"error"、"abort"或"parsererror"
-					// errorMsg value: "Not Found"、"Internal Server Error"
-					alert("请求失败：" + errorMsg);
-				}
-			});
-			 	}
-			 	catch(e){alert(e.error);}			 	
-			 });
-		})();
-
-
-
-
-
-	</script>
-<script>
-	
-	 
-	$(function(){
-    	 $('#setting_list').unbind("mousedown").bind("mousedown",function(){
-    	 	var date = $("#id-date-picker-1").val().split('to');
-			var s_date = date[0];
-			var e_date = date[1];
-			var len_box = $(".time_box").find(".time_item").length;
-			if(len_box > 6){
-				alert("最多只能添加6个时段");
-			}else{
-				if(s_date!=""&&e_date!=""){
-					var datePickerOptions = {
-						"startDate":s_date,
-						"endDate":e_date
-					}
-					$("#quantum_list1").find("p").removeClass("pitchon");
-					$('#setting_list').unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-						var date = $("#id-date-picker-1").val().split('to');
-					    var s_date = date[0];
-						var e_date = date[1];
-						var checked_date = new Array();
-						var len = $(".setting .time_item").length;
-						for(var i=0;i<len;i++){
-							var json_check = {"startDate":$(".time_item").eq(i).find(".start_date").val(),"endDate":$(".time_item").eq(i).find(".end_date").val()};
-							checked_date.push(json_check);
-						}
-						var startDate = obj.value.split('to')[0];
-				   		var endDate = obj.value.split('to')[1];
-						var flag = true;
-				   		for(var j=0;j<checked_date.length;j++){
-				   			if(startDate < checked_date[j].startDate && endDate < checked_date[j].startDate){
-				   				console.log(startDate+":"+endDate)
-				   				console.log(flag+":1");
-				   			}else if(startDate > checked_date[j].endDate && endDate > checked_date[j].endDate){
-				   				console.log(flag+":2");
-				   			}else{
-				   				flag=false;
-				   			}
-				   		}
-				   		if(flag){
-					   		var obj = $("#quantum_list1");
-					   		if(obj.find(".pitchon").length){
-					           	var timeData = obj.find(".pitchon").map(function(i,span){
-					        		return $(span).attr("title");
-					        	}).toArray().join(',');
-					        }else{
-					           	var timeData = -1;
-					        }
-					   		var html = '<div class="time_item"><p class="tr_data"><span class="inp"><input type="text" class="start_date edit_time" readonly="readonly" value="'+startDate+'"></span><span class="inp"><input type="text" class="end_date edit_time" readonly="readonly" value = "'+endDate+'"></span></p><button class="btn_del">删除</button><input class="json_date" type="hidden" value = "'+timeData+'"></div>';
-					   		$(".setting .time_box").append(html);
-					   		$(".time_box .time_item .btn_del").bind("click",function(e){
-					   			$(this).parents(".time_item").remove();
-					   		});
-					   		$(".setting .tr_data").unbind("mousedown").bind("mousedown",function(){
-					   				var obj_tr = $(this);
-					   				var datePickerOptions_td = {
-										"startDate":s_date,
-										"endDate":e_date,
-										getValue: function(){
-											if (obj_tr.find(".start_date").val() && obj_tr.find(".end_date").val() )
-												return obj_tr.find(".start_date").val() + ' to ' + obj_tr.find(".end_date").val();
-											else
-												return '';
-										},
-										setValue: function(s,s1,s2){
-											obj_tr.find(".start_date").val(s1);
-											obj_tr.find(".end_date").val(s2);
-										}
-									}
-									obj_tr.unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-											var date = $("#id-date-picker-1").val().split('to');
-										    var s_date = date[0];
-											var e_date = date[1];
-											var checked_date = new Array();
-											var other_box =obj_tr.parent().siblings();
-											var len = other_box.length;
-											for(var i=0;i<len;i++){
-												var json_check = {"startDate":other_box.eq(i).find(".start_date").val(),"endDate":other_box.eq(i).find(".end_date").val()};
-												checked_date.push(json_check);
-											}
-											console.log(checked_date);									
-											var startDate = obj.value.split('to')[0];
-				   							var endDate = obj.value.split('to')[1];
-				   							var flag = true;
-								   			console.log(checked_date);
-								   			
-								   			if(flag){
-								   				var obj = $("#quantum_list1");
-									   			if(obj.find(".pitchon")){
-									            	var timeData = obj.find(".pitchon").map(function(i,span){
-									        			return $(span).attr("title");
-									        		}).toArray().join(',');
-									            }else{
-									            	var timeData = -1;
-									            }
-									   			obj_tr.find(".start_date").val(startDate);
-										   		obj_tr.find(".end_date").val(endDate);
-										   		console.log(timeData);
-										   		console.log(obj_tr);
-										   		obj_tr.parent().find(".json_date").val(timeData);
-								   			}else{alert("请选择正确时间！");}
-							        });
-							        obj_tr.dateRangePicker1(datePickerOptions_td);
-							        $("#quantum_list1").find("p").removeClass("pitchon");
-							        var chose_time = obj_tr.parent().find(".json_date").val();
-						        	console.log(chose_time);
-						        	if(chose_time!=-1&&chose_time!=""){
-						        		var chose_arr = chose_time.split(",");
-						        		for(var n=0;n<chose_arr.length;n++){
-						        			$("#quantum_list1 p").eq(chose_arr[n]).addClass("pitchon");
-						        		}
-						        	}
-				   				})
-				   		}else{
-				   			alert("请选择正确时间！");
-				    	}
-					});
-					$('#setting_list').dateRangePicker1(datePickerOptions);
-				}else{
-					alert("请选择活动周期，在进行操作！");
-				}
-			}
-    	});
-    	
-    	$("#btnsave").click(function(){
-    		var checked_date = new Array();
-    		var len = $(".setting .time_item").length;
-    		var jsondata = "[";
-			for(var i=0;i<len;i++){
-				if(i == 0){
-					jsondata += '{"startDate":\"'+$(".time_item").eq(i).find(".start_date").val()+'\","endDate":\"'+$(".time_item").eq(i).find(".end_date").val()+'\","dehours":\"'+$(".time_item").eq(i).find(".json_date").val()+'\"}';
-				}else{
-					jsondata += ',{"startDate":\"'+$(".time_item").eq(i).find(".start_date").val()+'\","endDate":\"'+$(".time_item").eq(i).find(".end_date").val()+'\","dehours":\"'+$(".time_item").eq(i).find(".json_date").val()+'\"}';
-				}
-			}
-			jsondata += "]";
-			$("#sdayParting").val(jsondata);
-			var falg = validateMoney();
-			if(falg == false){
-				return false;
-			}
-			//提示场景选择
-			var placelist = $("#placediv input[type='checkbox']:checked");
-			if(placelist.length == 0){
-				alert("场景为必填项，请选择！");
-				return false;
-			}
-			
-    	});
-    	
-    	$("#validation-form input[name='totalBudget']").focus(function(){
-    		$("#totalBudget_span").html("");
-		});
-		
-    	$("#validation-form input[name='totalBudget']").blur(function(){
-			validateMoney();
-		});
-		
-		$("#btncancel").click(function(){
-			location.href = $(this).attr("href");
-			return false;
-		});
-		
-    });
-    
-    function validateMoney(){
-		var reg=/^\d{1,8}\.?\d{0,2}$/;
-		var $this = $("#validation-form input[name='totalBudget']");
-		if($this.val().match(reg)!=null){
-			if(($this.val().indexOf('.') == -1 && $this.val().length > 8) || $this.val() <= 0){
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算金额必须大于0且整数位最多8位');
-				$("#totalBudget_span").html("总预算金额必须大于0且整数位最多8位").css("color","red");
-				return false;
-			}if($this.val() > parseInt($("#budget").val())){
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算不能大于订单总预算');
-				$("#totalBudget_span").html("总预算不能大于订单总预算").css("color","red");
-				return false;
-			}else{
-				$this.css("box-shadow","none").attr('title','');
-				$("#totalBudget_span").html("");
-			}
-		}else{
-			$this.css("box-shadow","0 0 6px red").attr('title','总预算金额必须大于0整数位最多8位且最多有2位小数');
-			$("#totalBudget_span").html("总预算金额必须大于0整数位最多8位且最多有2位小数").css("color","red");
-			return false;
-		}
-	}
-
-</script>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">	
+<title>媒体自投</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/time_adGroup.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/wifi.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/style.css">
+<link rel="stylesheet" href="${ctx}/assets/css/geo.css">
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker1.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.common.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.geo.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/areas_popup.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-ui-1.10.4.custom.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.cxselect.js"></script>
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/wifi.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/adGroup.js"></script>
+
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">媒体自投</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="" method="post">
+	 			<input type="hidden" id="adGroupId" name="id" value=""/>
+	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
+	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>
+	 			<input type="hidden" id="campaignId" name="campaignId" value="${campaignId!}"/>
+	 			<input type="hidden" name="agentId" value="${agentId!}"/>
+				<input type="hidden" name="zoneIdString" value="1,12"/>
+				<input type="hidden" name="selectedwifi" id="selectedwifi" value=""/>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>投放名称：</label>
+					<input class="input-text" tabindex="1" id="adGroupName" name="adGroupName" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>活动周期：</label>
+					<span id="input-calendar">
+						<i class="icon-calendar"></i>   
+						<input type="text" tabindex="2" name="activeTime" id="dateRangePicker" value="" verify="date-to/24/1/0"/><span class="spanVaildate"></span>
+					</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>总预算：</label>
+					<input name="budget" type="hidden" id="budget" value="${budget!}"/>
+					<input class="input-text" tabindex="3" id="totalBudget" name="totalBudget" type="text" value="" verify="float/11/1/2"/>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>投放模式：</label>
+					<input class="input-radio" name="mode" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">CPM</span>
+					<input class="input-radio" name="mode" type="radio" value="2"><span class="input-radio-span otherspan">CPC</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>单价(CPM)：</label>
+					<input class="input-text" tabindex="4" id="price" name="price" type="text" value="" verify="float/11/1/2"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>曝光总上限：</label>
+					<input class="input-text" tabindex="6" id="maxImpression" name="maxImpression" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>点击总上限：</label>
+					<input class="input-text" tabindex="7" id="maxClick" name="maxClick" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被点击多少次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>转化总上限：</label>
+					<input class="input-text" tabindex="8" id="maxConversion" name="maxConversion" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日曝光总上限：</label>
+					<input class="input-text" tabindex="9" id="dailyMaxImpression" name="dailyMaxImpression" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">每天，广告最多被曝光多少千次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日点击总上限：</label>
+					<input class="input-text" tabindex="10" id="dailyMaxClick" name="dailyMaxClick" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被点击多少次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日转化总上限：</label>
+					<input class="input-text" tabindex="11" id="dailyMaxConversion" name="dailyMaxConversion" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被转换多少次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>单人点击频次：</label>
+					<ul id="main_perClickul">
+						<li class="select_box" id="perClickul_box">
+							<span id="perClickul_span">请选择点击类型</span>
+							<ul class="son_ul" id="perClick_son_ul">
+								<li value="0">请选择点击类型</li>
+                    			<li value="1">每天</li>
+                    			<li value="2">投放周期</li>
+							</ul>
+						</li>
+					</ul>
+					<input id="perClickType" name="perClickType" type="hidden" value="" />
+					<input class="input-text-small" tabindex="12" id="perClick" name="perClick" type="text" value="" verify="number/11/0/0"/><span class="input-span">次</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>单人曝光频次：</label>
+					<ul id="main_perImpressionul">
+						<li class="select_box" id="perImpressionul_box">
+							<span id="perImpressionul_span">请选择曝光类型</span>
+							<ul class="son_ul" id="perImpression_son_ul">
+								<li value="0">请选择曝光类型</li>
+                    			<li value="1">每天</li>
+                    			<li value="2">投放周期</li>
+							</ul>
+						</li>
+					</ul>
+					<input id="perImpressionType" name="perImpressionType" type="hidden" value="" />
+					<input class="input-text-small" tabindex="13" id="perImpression" name="perImpression" type="text" value="" verify="number/11/0/0"/><span class="input-span">次</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="areasDiv">
+					<label class="input-label-other"><span class="lbl-no"></span>地域定向：</label>
+					<input class="ignore" type="hidden" id="areas" name="areas" value=""/>
+					<a id="btn-areas" class="btn2">地域设定</a>
+		            <label id="geo-selected-areas"><span class="area-direct"></span><span>您已经设定了<strong id="count-areas">0</strong>个地域条件</span></label>
+		            <label id="geo-all-areas"><span class="area-direct"></span><span class="default_text">不限</span></label>
+				</div>
+				<div id="timediv" class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>时段定向：</label>
+					<div class="setting">
+						<div class="time_tit">
+					    	<p>开始时间</p>
+					        <p>结束时间</p>
+					    </div>
+					    <input type="hidden" name="sdayParting" id="sdayParting" value=""/>
+					    <div class="clear"></div>
+					    <div class="time_box"></div>
+					    <div class="time_add"><p id="setting_list" class="dateRangePicker" href="">新增时间段</p></div>
+				    </div>
+			  	</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统：</label>
+					<input class="input-radio" name="os" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">iOS</span>
+					<input class="input-radio" name="os" type="radio" value="2"><span class="input-radio-span otherspan">Android</span>
+					<input class="input-radio" name="os" type="radio" value="3"><span class="input-radio-span otherspan">WP</span>
+					<input class="input-radio" name="os" type="radio" value="4"><span class="input-radio-span otherspan">Symbian</span>
+					<input class="input-radio" name="os" type="radio" value="5"><span class="input-radio-span otherspan">MAC OS</span>
+					<input class="input-radio" name="os" type="radio" value="6"><span class="input-radio-span otherspan">Windows</span>
+					<input class="input-radio" name="os" type="radio" value="7"><span class="input-radio-span otherspan">其他</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>广告位：</label>
+					<input class="input-checkbox" name="position" type="checkbox" value="2"><span class="input-checkbox-span otherspan">认证页</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="3"><span class="input-checkbox-span otherspan">认证页后</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="4"><span class="input-checkbox-span otherspan">上网过程</span>
+					<input type="hidden" name="pager" value="1"/>
+					<table border="1" class="uploadTable">
+						<thead>
+							<tr>
+								 <th style="width:20%;">全部app广告位</th>
+								 <th style="width:20%;">已选广告位</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>新浪体育_app_首页_banner</td>
+								<td>新浪体育_app_首页_banner<img src="${ctx}/assets/images/cross.png"/></td>
+							<tr>
+							<tr>
+								<td>
+									分页
+								</td>
+								<td>
+									
+								</td>
+							<tr>
+						</tbody>
+					</table>
+				
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>定向：</label>
+					<input class="input-radio" name="aa" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">数据场景</span>
+					<input class="input-radio" name="aa" type="radio" value="2"><span class="input-radio-span otherspan">分组</span>
+				</div>
+				<div class="input-group" id="placeDiv">
+					<label class="input-label-other"><span class="lbl-yes">*</span>场景：</label>
+					<div class="input-checkboxsDiv">
+						<#if placeList ??>
+						<#list placeList as place>
+						<div class="single_div">
+							<input class="single_div_checkbox" name="place" type="checkbox" value="${place.id!}"><span class="single_div_span">${place.name!}</span>
+						</div>
+						</#list>
+						</#if>
+					</div>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>LBS定向：</label>
+					<a id="btn-toggle" class="btn2">LBS定向</a>
+					<span id="spanselectedhint"></span>
+				</div>
+				<div id="divLBS">
+					<div class="wifi-modal-dialog">
+						<div class="wifi-modal-head">
+							<lable>LBS 设定</label>
+							<span id="wifi-headclose" class="close-tag"></span>
+						</div>
+						<div class="wifi-modal-content">
+							<div class="wifi-modal-body">
+								<div id="wifimap">
+									<div id="divmapsearch">
+										<fieldset id="city_custom">
+											<select name="prov" id="prov" class="prov" ></select>
+											<select name="city" id="city" class="city"></select>
+											<input type="text" class="input-text-small" name="address" id="address" onkeydown="if(event.keyCode==13){return false;}">
+											<#--距离
+											<select name="distance" id="mapdistance" >
+												<option value="1">1Km</option>
+												<option value="2">2Km</option><option value="3">3Km</option>
+												<option value="4">4Km</option><option value="5" selected>5Km</option>
+												<option value="6">6Km</option><option value="10">10Km</option>
+												<option value="20">20Km</option>
+											</select>-->
+											<input type="button" name="mapSearch" id="btnmapSearch" style="margin-top:-10px;background:#36aeea;" class="btn btn-primary" value="搜索">
+										</fieldset>
+										<!--[{"id":1,"address":"上海体育馆","lat":121.535816,"lng":31.24231},{"id":2,"address":"上海市八万人体育场","lat":121.526224,"lng":31.238806},{"id":3,"address":"上海市卢湾区体育馆","lat":121.523198,"lng":31.235045},{"id":9,"address":"智造局一期国际服务外包产业","lat":121.478716, "lng":31.206612},{"id":10,"address":"上海市红房子妇产科医院","lat":121.483587, "lng":31.213861},{"id":11,"address":"上海东仁商贸中","lat":121.499101, "lng":31.220265}]-->
+										<input type="hidden" name="cacheSearched" id="cacheSearched"/>	
+										<input type="hidden" name="cacheSelected" id="cacheSelected" value=''/>
+										<input type="hidden" id="searchedPage"><input type="hidden" id="selectedPage"/>
+									</div>
+									<div id="mapview"></div>
+								</div>
+								<div id="wifitab" >
+									<ul class="nav navtab" id="wifitabul" >
+							        	<li id="mnusearchedwifi"><a href="javascript:" onclick="tabshow(this,'mnusearchedwifi')">搜索wifii</a></li>
+							        	<li id="mnuselectedwifi" class="current"><a href="javascript:"  onclick="tabshow(this,'mnuselectedwifi')">已选wifi</a></li>
+							    	</ul>
+            						<div id="divselectedwifi" class="in fade">没有选中wifi</div>
+									<div id="divsearchedwifi" class="in fade" style="display:none;">没有相关数据</div>
+								</div>
+							</div>
+						</div>
+						<div class="wifi-modal-foot">
+							<button id="wifi-btn-save" class="btn-save" type="submit">确定</button>
+							<button id="wifi-btn-cancel" class="btn-cancel" type="button">取消</button>
+						</div>
+					</div>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>代表必填项</label>
+				</div>
+				<div id="footBtn">
+					<button id="create-btn-save" class="btn-save" type="submit">保存</button>
+					<button id="create-btn-cancel" class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+    <div id="areas_layout"></div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/edit.ftl

@@ -1,1408 +1,269 @@
 <@override name="head">	
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/public-head.css"/>
- <link rel="stylesheet" href="${ctx}/assets/css/create.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/style.css">
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/geo.css">
-<link rel="stylesheet" href="${ctx}/assets/js/schedule/s.css">
-<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>	
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser1.css"/>
-
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<title>编辑投放</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/time_adGroup.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/wifi.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/style.css">
+<link rel="stylesheet" href="${ctx}/assets/css/geo.css">
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker1.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.validate.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.common.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.geo.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/areas_popup.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-ui-1.10.4.custom.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.cxselect.js"></script>
 <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-
-<style>
-        /**map serch button**/ 
-		#btnmapSearch:hover {background:#344c67;}
-		/**点击找回**/
-		#line{margin-left:80px;}
-		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:560%;}
-		.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-		.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-		.modal-foot{text-algin:center;width:560px;}
-		.modal-head{height:25px; }
-		.modal-content{height:380px;}
-		label{font-size:14px;}
-		//wifi分页导航类  div为pagination 下面的类为 pagination-mini。每个页为这个ul下的一个li
-		
-		modal-dialog{backgroud:#ffffff 100% 100% repeat;}
-		#wifitab{float:left;margin-left:10px;}
-		/**搜索和已选wifi列表**/ 
-		.wifilist{
-		 height: 320px; 
-		 width:320px; 
-		 display:block;
-		}
-		#wifitabul { margin:0; padding:0; list-style:none; overflow:hidden; float:left;margin-left:0 20px 0 0; width:320px;border-bottom:1px solid #E9E9E9;}
-        #wifitabul li {float:left;line-height:30px;color:#3469E2;border-radius: 5px 5px 0px 0px;display:block;cursor:pointer;width:85px;text-align:center;border:1px solid #E9E9E9;}
-        #wifitabul li a { color:#3469E2; text-decoration:none; }
-        #wifitabul li.current { background-color:#eeeeee;}
-        #wifipage{height:320px;width:360px;}
-		#divLBS{width:900px;height:540px;background-color:#ffffff;}
-		#mapdistance{width:35px;}
-		#divmapsearch{height:35px;}
-		#mapview{width:520px;height:360px;margin-top:10px;}
-		#wifimap{width:520px;height:360px;float:left;}
-		#address{width:180px;}
-		#divselectedwifi{width:320px;margin-top:15px;font-size:14px;}
-		#divsearchedwifi{width:320px;margin-top:15px;font-size:14px;}
-		#prov{width:91px;}
-		#city{width:91px;}
-		#wifitab{height:380px;}
-		#distance{width:80px;}
-		#content{position:absolut;}
-		.pagination-wifi{float:left;margin-left:10px;width:320px;padding-top:10px;}
-		.pagination-mini-wifi{margin:0; padding:0; list-style:none; overflow:hidden; float:left;  border:solid 1px #E9E9E9;border-radius: 5px;}
-		.pagination-mini-wifi li{margin:0px; padding:3px; list-style:none; overflow:hidden; float:left; width:20px;height:20px;border:solid 1px #E9E9E9;text-align:center; }
-		#third{
-		margin-left:-60px;
-		margin-top:-10px;
-		}
-		.form-horizontal .control-label{
-		text-align:left;
-		}
-		#form-field-1{
-		margin-left:-222px;
-		}
-		#id-date-picker-1{
-		margin-left:-41px;
-		margin-top:-28px;
-		}
-		#form-field-2{
-		margin-left:-78px;
-		margin-top:-2px;
-		}
-		#form-field-3{
-		margin-left:-50px;
-		margin-top:-3px;
-		}
-		#form-field-4{
-		margin-left:-69px;
-		margin-top:-4px;
-		}
-		#form-field-5{
-		margin-left:-54px;
-		margin-top:-2px;
-		}
-		#form-field-6{
-		margin-left:-54px;
-		margin-top:-2px;
-		}
-		#form-field-7{
-		margin-left:-54px;
-		margin-top:-2px;
-		}
-		#form-field-8{
-		margin-left:-38px;
-		margin-top:-2px;
-		}
-		#form-field-9{
-		margin-left:-38px;
-		margin-top:-2px;
-		}
-		#form-field-10{
-		margin-left:-38px;
-		margin-top:-2px;
-		}
-		.controls-reset #form-field-11{
-		   border-radius:5px;
-		   width:153px;
-		   height:40px;
-		   margin-left:-37px;
-		   margin-top:-3px;
-		}
-		.controls #form-field-11{
-		   border-radius:5px;
-		   width:137px;
-		   height:30px;
-		   margin-left:-171px;
-		   margin-top:-3px;
-		}
-		.controls-reset #form-field-12{
-		   border-radius:5px;
-		   width:153px;
-		   height:40px;
-		   margin-left:-37px;
-		   margin-top:-3px;
-		}
-		.controls #form-field-12{
-		   border-radius:5px;
-		   width:137px;
-		   height:30px;
-		   margin-left:-171px;
-		   margin-top:-3px;
-		}
-		
-		.controls7 #form-field-13{
-		margin-left:-37px;
-		margin-top:-3px;
-		}
-		.time_tit{
-		  	height:30px;
-		  	line-height:30px;
-		  }
-		  .time_tit p{
-		  	float: left;
-			width: 150px;
-			text-align: center;
-			border: 1px solid #d5d5d5;
-			height:30px;
-			line-height:30px;
-		  }
-		  .time_add{
-		  	width: 302px;
-			border: 1px solid;
-			text-align: center;
-			height: 30px;
-			line-height: 30px;
-			border: 1px solid #d5d5d5;
-		  }
-		  .time_item{
-		  	height:32px;
-		  	clear:both;
-		  }
-		  .tr_data{
-		  	height:32px;
-		  	float:left;
-		  }
-		 .time_box .inp{
-		 	display:block;
-		  	float: left;
-		  	height:30px;
-		  	line-height:30px;
-			width: 150px;
-			overflow:hidden;
-			text-align: center;
-			border: 1px solid #d5d5d5;
-		  }
-		  .time_box .inp input{
-		  	width:150px;
-		  	height:30px;
-		  	line-height:30px;
-		  	text-align:center;
-		  	border:none;
-		  	padding:0;
-		  	overflow:hidden;
-		  }
-		  
-		  .time_quantum{
-		    width:300px;
-		    float:left;
-		    margin-top:3px;
-		    -moz-border-radius:4px; 
-		    -webkit-border-radius:4px;
-		    border-radius:4px; 
-		    background-color:#e7eaee;
-		    border: solid #d5d5d5 1px; 
-		    margin-left: 20px;
-		  } 
-		  .time_quantum div p a{
-		    color:#4da8e1;
-		    font-size:12px;
-		  } 
-		  .time_quantum p{
-		     float:right;
-		     margin:0 5px 0 0;
-		  }
-		  .quantum_title{
-		    height:26px;
-		    line-height:26px;
-		    color:#4da8e1;
-		  }
-			.quantum_list{
-				overflow:hidden;
-			}
-		  .quantum_list p{
-		    float:left;
-		    width:98px;
-		    font-size:12px;
-		    color:#4da8e1;
-		    border: solid #d5d5d5 1px; 
-		    text-align:center;
-		    padding:0px;
-		    margin:0px;
-		    height:26px;
-		    cursor:pointer;
-		    line-height:26px;
-		  }
-		  .pitchon{
-		    background-color:red;
-		    background:url(/ssp_web/assets/advertiser/images/duihao.png) no-repeat right bottom;
-		    background-size:16%;
-		  }
-		  
-		  .btn_del{
-		  	width:90px;
-		  	height:30px;
-		  	line-height:30px;
-		  	border: 1px solid #36aeea;
-		    border-radius: 5px;
-		    color: #36aeea;
-		    background-color: white;
-		    margin-left:20px;
-		  }
-		  
-		  .btn_del:hover{
-		  	color: white;
-		    background-color: #36aeea;
-		  }
-		  .btn2:hover{
-		  	background-color: #4c637b;
-		  }
-</style>
-<script type="text/javascript">
-
-     $(document).ready(function(){
-	 	
-	 	$('#id-date-picker-1').dateRangePicker({
-	 		separator : ' to ',
-	 		inline:true,
-			container: '#divdaterangepick', 
-			alwaysOpen:false
- 		});	
-     
-	$('#city_custom').cxSelect({
-		selects: ['prov', 'city'],
-		required: true,
-		url:'${ctx}/advertiser/main/ad/target/ad-group/getLocations'
-		});
-
-
-	
-	$( "#btn-toggle" ).click(function( event ) {
-		$( "#divLBS" ).dialog( "open" );
-			try{
-				map = new AMap.Map('mapview',{level:12});
-				if($('#cacheSelected').val().length>2){
-						loadselectwifi(1);
-					}
-	}
-	catch(e){alert('加载已选wifi时出错')}
-	map.plugin(['AMap.MarkerClusterer'], function(){
-	var cl = new AMap.MarkerClusterer(map, initMarker($("#cacheSelected")[0]));
-	});
-			
-		
-	});
-		
-	$( "#divLBS" ).dialog({
-		autoOpen: false,
-			width: 900,
-			modal: true,
-			open: function (event, ui) {
-			    $(".ui-dialog-titlebar-close", $(this).parent()).hide();
-             }
-		
-		});	
-		
-	$('#validation-form').validate({
-	    errorElement: 'span',
-	    errorClass: 'help-inline',
-	    focusInvalid: false,
-	    onfocusout: function(element) {
-	                    $(element).valid();
-	                },
-		ignore:".ignore",
-	    rules: {
-	        adGroupName: {
-	            required: true,
-	            maxlength:50
-	        },
-	        price:{
-	         number:true,
-	         required:true
-	        },
-	        dailyBudget:{
-	            number:true
-	        },
-	        maxImpression:{
-	            number:true
-	        },
-	        maxClick:{
-	            number:true
-	        },
-	        dailyMaxImpression:{
-	            digits:true
-	        },
-	        dailyMaxclick:{
-	            digits:true
-	        },
-	        dailyMaxConversion:{
-	            digits:true
-	        },
-	        maxSessionImpression:{
-	            digits:true
-	        },
-	        maxUserImpression:{
-	            digits:true
-	        },
-	        
-	    },
-	    messages: {
-	        adGroupName:{
-	            required:"请输入内容！",
-	            maxlength:"输入的长度大于50超出范围！"
-	        },
-	         price:{
-	          required:"请输入内容！",
-	         number:"请输入数字！"
-	        },
-	        dailyBudget:{
-	            number:"请输入正确格式"
-	        },
-	        maxImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        maxClick:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxclick:{
-	            digits:"请输入正确格式"
-	        },
-	        dailyMaxConversion:{
-	            digits:"请输入正确格式"
-	        },
-	        maxSessionImpression:{
-	            digits:"请输入正确格式"
-	        },
-	        maxUserImpression:{
-	            digits:"请输入正确格式"
-	        } 
-	    },
-	   invalidHandler: function (event, validator) { //display error alert on form submit
-	        $('.alert-error', $('.login-form')).show();
-	    },
-	    highlight: function (e) {
-	        $(e).closest('.control-group').removeClass('info').addClass('error');
-	        $(e).closest('.control-group').find("span.note").addClass('hidden');
-	    },
-	    success: function (e) {
-	        $(e).closest('.control-group').removeClass('error').addClass('info');
-	        $(e).closest('.control-group').find("span.note").removeClass('hidden');
-	        $(e).remove();
-	    },
-	    errorPlacement: function (error, element) {
-	        if(element.is(':checkbox') || element.is(':radio')) {
-	            var controls = element.closest('.controls');
-	            if(controls.find(':checkbox,:radio').length > 1) controls.append(error);
-	            else error.insertAfter(element.nextAll('.lbl').eq(0));
-	        }
-	        else if(element.is('.chzn-select')) {
-	            error.insertAfter(element.nextAll('[class*="chzn-container"]').eq(0));
-	        }
-	        else error.insertAfter(element);
-	    },
-	     submitHandler:function(form){form.submit();}
-	    /*
-
-	    submitHandler: function (form) {
-	    	var startDate = $('input[name=startDate]').val();
-	        var endDate = $('input[name=endDate]').val();
-	        if(startDate!==""&&endDate!==""){
-	        	if(datefalg){
-					// 防止表单二次提交
-					$('button:submit').attr('disabled', 'disabled');
-					var _url = $('form').attr('action');
-					var _param = $('form').serialize();
-					$.post(_url,_param,function(data) {
-						$('#main-content').html(data);
-					});
-				}
-	        }else{
-	            $('input[name=startDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-	            $('input[name=endDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-	        }
-	    },
-	    */
-	    
-	});
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/wifi.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/adGroup.js"></script>
 
-var datefalg = true;
-
-
-
-
-	
-});
-        </script> 
 </@override>	
-	
 <@override name="body">
-<!-- PAGE CONTENT BEGINS HERE -->
 <div id=content_bg>
-		<#include "/advertiser/main/public-head.ftl">    
-		<div id= "pagecontent">
-			<div id="content" style="width:97%;height:94%;">
-				<div id="third">
-					<ul style="">
-							<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-							<span class="divider1"><i class="icon-angle-right"></i></span></li>
-							<#if role == "agent">
-							
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a>
-							<span class="divider3"><i class="icon-angle-right"></i></span></li>
-							<li class="size2"><a style="margin-left:15px !important" href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-							<span class="divider2"><i class="icon-angle-right"></i></span></li>
-							<li class="size3">编辑投放</li>
-							<#elseif role == "advertiser">
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a></li>
-							<span class="divider2"><i class="icon-angle-right"></i></span></li>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-							<span class="divider2"><i class="icon-angle-right"></i></span></li>
-							<li class="size3">编辑投放</li>
-							</#if>
-						</ul> 
-					</div> 
-	<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/ad/target/ad-group/save" method="post" style="margin-left:-20px;">
-		<input  autocomplete="off"  type="hidden" name="id" value="${adGroup.id}">
-		<div class="control-group">
-		<label class="control-label" for="form-field-1"><sup style="color:red">*</sup>投放名称：</label>
-			<div class="controls">
-				
-				<input class="i1" autocomplete="off" type="text" name="adGroupName" value="${adGroup.adGroupName}" id="form-field-1">
-                <span class="help-inline" for="form-field-1">支持输入1～50个字符</span>
-			</div>
-		</div>
-
-         <div class="control-group">
-         <label class="control-label" for="id-date-picker-1"><sup style="color:red">*</sup>活动周期：</label>
-         	<div class="controls row-fluid">
-            
-			<input class="input1 input-append " autocomplete="off"   name="activeTime"  id="id-date-picker-1" type="text" value="${activeTime}" data-date-format="yyyy/mm/dd" /> &nbsp;&nbsp;     
-         </div>
-         <div id="divdaterangepick" style="width:456px;margin: -2px 0 0 120px;position: absolute;"></div>
-        </div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-2"><sup style="color:red">*</sup>总预算：</label>
-			<div class="controls1">
-				<input class="i1"  autocomplete="off" name="totalBudget" value="${adGroup.totalBudget}" type="text" id="form-field-2" placeholder="">
-                <input name="budget" type="hidden" id="budget" value="${budget!}"/>
-                <span>元</span>
-                <span id="totalBudget_span" style="position:absolute;margin:6px 0 0 5px;color:#595959;" for="form-field-2">总预算不能大于订单总预算</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-3"><sup style="color:red">*</sup>投放模式：</label>
-			<label style="float:left;margin-left:-39px;"><input id="input-radio-cpm" autocomplete="off" name="mode" type="radio" <#if adGroup.mode==1>checked</#if> value="1"><span style="position:absolute;margin:3px 0 0 5px;">CPM</span></label> 
-			<label style="float:left;margin-left:46px;"><input id="input-radio-cpc" autocomplete="off" name="mode" type="radio" <#if adGroup.mode==2>checked</#if> value="2"><span style="position:absolute;margin:3px 0 0 5px;">CPC</span></label>
-		</div>
-		
-		<div class="control-group" style="clear:both;">
-			<label class="control-label" for="form-field-3"><sup style="color:red">*</sup>单价(CPM)：</label>
-			<div class="controls2">
-				<input class="i1" autocomplete="off"   name="price" value="${adGroup.price}" type="text" id="form-field-3" placeholder="">
-                <span>元</span>
-                <span class="help-inline" for="form-field-3">单价</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-4">每日预算：</label>
-			<div class="controls3">
-				<input class="i1" autocomplete="off" name="dailyBudget" value="${adGroup.dailyBudget}" type="text" id="form-field-4" placeholder="">
-                <span>元</span>
-                <span class="help-inline" for="form-field-4">若不设置，系统默认将总预算在投放周期内的均值作为每日预算</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-5">曝光总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxImpression" value="${adGroup.maxImpression}" type="text" id="form-field-5" placeholder="">
-				 <span>千次</span>
-                <span class="help-inline" for="form-field-5">整个投放期，广告最多被曝光多少千次</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-6">点击总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxClick" value="${adGroup.maxClick}" type="text" id="form-field-6" placeholder="">
-				 <span>次</span>
-                <span class="help-inline" for="form-field-6">整个投放期，广告最多被点击多少次</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-7">转化总上限：</label>
-			<div class="controls4">
-				<input class="i1" autocomplete="off"   name="maxConversion" value="${adGroup.maxConversion}" type="text" id="form-field-7" placeholder="">
-				 <span>次</span>
-                <span class="help-inline" for="form-field-7">整个投放期，广告最多被转化多少次</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-8">每日曝光上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxImpression" value="${adGroup.dailyMaxImpression}" id="form-field-8" placeholder="">
-                <span>千次</span>
-                <span class="help-inline" for="form-field-8">每天，广告最多被曝光多少千次</span>
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-9">每日点击上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxClick" value="${adGroup.dailyMaxClick}" id="form-field-9" placeholder="">
-               <span>次</span>
-                <span class="help-inline" for="form-field-9">每天，广告最多被点击多少次</span>
-                
-			</div>
-		</div>
-
-		<div class="control-group">
-			<label class="control-label" for="form-field-10">每日转换上限：</label>
-			<div class="controls5">
-				<input class="i1" autocomplete="off"   type="text" name="dailyMaxConversion" value="${adGroup.dailyMaxConversion}" id="form-field-10" placeholder="">
-                <span>次</span>
-                <span class="help-inline"  for="form-field-10">每天，广告最多被转换多少次</span>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-11">单人曝光频次：</label>
-			<div class="controls-reset">
-                <select id="form-field-11" name="perImpressionType">
-                    <option value="0" <#if adGroup.perImpressionType==0>selected</#if> >请选择曝光类型</option>
-                    <option value="1" <#if adGroup.perImpressionType==1>selected</#if> >每天</option>
-                    <option value="2" <#if adGroup.perImpressionType==2>selected</#if> >投放周期</option>
-                </select>
-	         </div>
-	         <div class="controls">
-				<input  autocomplete="off"   type="text" name="perImpression" value="${adGroup.perImpression}" id="form-field-11" placeholder="">
-	            <span class="help-inline"  for="form-field-11">单人曝光频次</span>
-			</div>
-			
-		</div>
-			<div class="control-group">
-			<label class="control-label" for="form-field-12">单人点击频次：</label>
-			<div class="controls-reset">
-                <select id="form-field-12" name="perClickType">
-                    <option value="0" <#if adGroup.perClickType==0>selected</#if> >请选择曝光类型</option>
-                    <option value="1" <#if adGroup.perClickType==1>selected</#if> >每天</option>
-                    <option value="2" <#if adGroup.perClickType==2>selected</#if> >投放周期</option>
-                </select>
-	         </div>
-	         <div class="controls">
-				<input  autocomplete="off"   type="text" name="perClick" value="${adGroup.perClick}" id="form-field-12" placeholder="">
-	            <span class="help-inline"  for="form-field-12">单人点击频次</span>
-			</div>
-		</div>
-			
-		<div class="control-group">
-			<label class="control-label">点击找回：</label>
-			<div class="controls" id="line">
-				<label class="form-align-radio">
-					<input class="i" autocomplete="off"  style="margin-left:-57px;top:-4px;" name="retarget" type="radio" value="1" <#if adGroup.retarget==1>checked</#if> ><span style="margin-left:-3px;margin-top:0px;" class="lbl"> 未设置</span>
-				</label>
-				<label class="form-align-radio">
-					<input class="i" autocomplete="off"  style="margin-left:80px;top:-3px;" name="retarget" type="radio" value="2" <#if adGroup.retarget==2>checked</#if> ><span style="margin-left:0px;margin-top:-3px;" class="lbl"> 点击过本广告主广告</span>
-				</label>
-				<label class="form-align-radio">
-					<input class="i" autocomplete="off"  style="margin-left:80px;top:-3px;" name="retarget" type="radio" value="3" <#if adGroup.retarget==3>checked</#if> ><span style="margin-left:0px;top:0px;" class="lbl"> 点击过广告</span>
-				</label>
-				<label class="form-align-radio">
-					<input class="i" autocomplete="off"  style="margin-left:80px;top:-3px;" name="retarget" type="radio" value="4" <#if adGroup.retarget==4>checked</#if> ><span style="margin-left:0px;margin-top:0px;"  class="lbl"> 点击过本订单广告</span>
-				</label>
-				<label class="form-align-radio">
-					<input class="i" autocomplete="off" style="margin-left:80px;top:-3px;"  name="retarget" type="radio" value="5" <#if adGroup.retarget==5>checked</#if> ><span style="margin-left:0px;margin-top:0px;"  class="lbl"> 点击过本活动广告</span>
-				</label>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label" for="form-field-13">访客投放期：</label>
-			<div class="controls7">
-				<input class="i1" autocomplete="off"   type="text" name="period" value="${adGroup.period!}" id="form-field-13" placeholder="">
-                <span class="help-inline"  for="form-field-13">1-90天</span>
-			</div>
-		</div>
-				
-		<div class="control-group">
-			<label class="control-label"><sup></sup>访客分类：</label>
-			<div class="controls">
-				<label class="form-align-radio">
-					<input id="i" autocomplete="off" name="site" style="margin-left:-249px;top:-2px;" type="checkbox" value="1" <#if adGroup.site==1>checked</#if> ><span style="margin-left:-88px;top:1px;"  class="lbl">全站访客</span>
-				</label>				
-			</div>
-		</div>
-		
-		<div class="hr hr32"></div>
-		
-		<!-- 前端需要传输给后端的地域定向的数据值放在value里面 -->
-		<div class="control-group">
-    <label class="control-label">地域定向：</label>
-
-    <div class="controls2">
-       <div class="dashed">
-            <input class="ignore" type="hidden" id="areas" name="areas" value="${areas}">
-            <input type="button" style="width:150px;margin-top:-3px;margin-left:-48px;"  class="btn-Directed btn1" id="btn-areas" value="地域设定">
-            <div class="geo">
-		       <div class="geo-selected"  id="geo-selected-areas" style="display: none;margin:-50px 0 0 300px;position: absolute;">
-		          <span class="area-direct"></span><span >您已经设定了<strong id="count-areas">0</strong>个地域条件</span>
-		       </div>
-		       <div class="geo-all" id="geo-all-areas" style="display: block;margin:-50px 0 0 300px;position: absolute;">
-		          <span class="area-direct"></span><span class="default_text">不限</span>
-		       </div>
-		    </div>
-        </div>         
-     </div>           
-</div>
-		<div id="timediv" class="control-group" style="margin-top:-40px;">
-			<label style="margin-left:2px;width:auto;"  class="control-label">时段定向：</label>
-			<div class="controls">
-				<div class="setting" style="margin:-60px 0 0px 120px;">
-			       	<div class="time_tit">
-			       		<p>开始时间</p>
-			            <p>结束时间</p>
-			       	</div>
-			       	<input type="hidden" name="sdayParting" id="sdayParting" value='${time!}'/>
-			        <div class="clear"></div>
-			        <div class="time_box"></div>
-			      	<div class="time_add"><p id="setting_list"  class="dateRangePicker" href="">新增时间段</p></div>
-		     	</div>
-		    </div>
-		</div>
-
-		<div class="control-group" id="placediv" style="clear:both;">
-			<sup style="color:red">*</sup>场景：
-			<div class="controls6" style="margin-bottom: 37px;margin-left: 25px;margin-top: -18px;width:auto;">
-				<#if placeList ??>
-				<#list placeList as place>
-				<div style="display:inline-block; margin-left:180px;margin-bottom:20px;">
-					<input  autocomplete="off" style="float:left;display:inline-block;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">
-					<li style="float:left;width:120px;position: relative;top:-3px;left:10px;" >${place.name}</li>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">编辑投放</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/ad-group/save" method="post">
+	 			<input type="hidden" id="adGroupId" name="id" value="${adGroup.id!}"/>
+	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${adGroup.advertiserId!}"/>
+	 			<input type="hidden" id="orderId" name="orderId" value="${adGroup.orderId!}"/>
+	 			<input type="hidden" id="campaignId" name="campaignId" value="${adGroup.campaignId!}"/>
+	 			<input type="hidden" name="agentId" value="${adGroup.agentId!}"/>
+				<input type="hidden" name="zoneIdString" value="1,12"/>
+				<input type="hidden" name="selectedwifi" id="selectedwifi" value="${selectedwifi!}"/>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>投放名称：</label>
+					<input class="input-text" tabindex="1" id="adGroupName" name="adGroupName" type="text" value="${adGroup.adGroupName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>活动周期：</label>
+					<span id="input-calendar">
+						<i class="icon-calendar"></i>   
+						<input type="text" tabindex="2" name="activeTime" id="dateRangePicker" value="${activeTime!}" verify="date-to/24/1/0"/><span class="spanVaildate"></span>
+					</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>总预算：</label>
+					<input name="budget" type="hidden" id="budget" value="${budget!}"/>
+					<input class="input-text" tabindex="3" id="totalBudget" name="totalBudget" type="text" value="${adGroup.totalBudget!}" verify="float/11/1/2"/>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>投放模式：</label>
+					<input class="input-radio" name="mode" type="radio" value="1" <#if adGroup.mode==1>checked</#if> ><span class="input-radio-span otherspan">CPM</span>
+					<input class="input-radio" name="mode" type="radio" value="2" <#if adGroup.mode==2>checked</#if> ><span class="input-radio-span otherspan">CPC</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>单价(CPM)：</label>
+					<input class="input-text" tabindex="4" id="price" name="price" type="text" value="${adGroup.price!}" verify="float/11/1/2"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日预算：</label>
+					<input class="input-text" tabindex="5" id="dailyBudget" name="dailyBudget" type="text" value="${adGroup.dailyBudget!}" verify="float/11/0/2"/>
+					<span class="input-span">元</span><span class="help-inline">若不设置，系统默认将总预算在投放周期内的均值作为每日预算</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>曝光总上限：</label>
+					<input class="input-text" tabindex="6" id="maxImpression" name="maxImpression" type="text" value="${adGroup.maxImpression!}" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>点击总上限：</label>
+					<input class="input-text" tabindex="7" id="maxClick" name="maxClick" type="text" value="${adGroup.maxClick!}" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被点击多少次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>转化总上限：</label>
+					<input class="input-text" tabindex="8" id="maxConversion" name="maxConversion" type="text" value="${adGroup.maxConversion!}" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日曝光总上限：</label>
+					<input class="input-text" tabindex="9" id="dailyMaxImpression" name="dailyMaxImpression" type="text" value="${adGroup.dailyMaxImpression!}" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">每天，广告最多被曝光多少千次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日点击总上限：</label>
+					<input class="input-text" tabindex="10" id="dailyMaxClick" name="dailyMaxClick" type="text" value="${adGroup.dailyMaxClick!}" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被点击多少次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日转化总上限：</label>
+					<input class="input-text" tabindex="11" id="dailyMaxConversion" name="dailyMaxConversion" type="text" value="${adGroup.dailyMaxConversion!}" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被转换多少次</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>单人点击频次：</label>
+					<ul id="main_perClickul">
+						<li class="select_box" id="perClickul_box">
+							<span id="perClickul_span">请选择点击类型</span>
+							<ul class="son_ul" id="perClick_son_ul">
+								<li value="0">请选择点击类型</li>
+                    			<li value="1">每天</li>
+                    			<li value="2">投放周期</li>
+							</ul>
+						</li>
+					</ul>
+					<input id="perClickType" name="perClickType" type="hidden" value="${adGroup.perClickType!}"/>
+					<input class="input-text-small" tabindex="12" id="perClick" name="perClick" type="text" value="${adGroup.perClick!}" verify="number/11/0/0"/><span class="input-span">次</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>单人曝光频次：</label>
+					<ul id="main_perImpressionul">
+						<li class="select_box" id="perImpressionul_box">
+							<span id="perImpressionul_span">请选择曝光类型</span>
+							<ul class="son_ul" id="perImpression_son_ul">
+								<li value="0">请选择曝光类型</li>
+                    			<li value="1">每天</li>
+                    			<li value="2">投放周期</li>
+							</ul>
+						</li>
+					</ul>
+					<input id="perImpressionType" name="perImpressionType" type="hidden" value="${adGroup.perImpressionType!}"/>
+					<input class="input-text-small" tabindex="13" id="perImpression" name="perImpression" type="text" value="${adGroup.perImpression!}" verify="number/11/0/0"/><span class="input-span">次</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>点击找回：</label>
+					<input class="input-radio" name="retarget" type="radio" value="1" <#if adGroup.retarget==1>checked</#if> ><span class="input-radio-span otherspan">未设置</span>
+					<input class="input-radio" name="retarget" type="radio" value="2" <#if adGroup.retarget==2>checked</#if> ><span class="input-radio-span otherspan">点击过本广告主广告</span>
+					<input class="input-radio" name="retarget" type="radio" value="3" <#if adGroup.retarget==3>checked</#if> ><span class="input-radio-span otherspan">点击过广告</span>
+					<input class="input-radio" name="retarget" type="radio" value="4" <#if adGroup.retarget==4>checked</#if> ><span class="input-radio-span otherspan">点击过本订单广告</span>
+					<input class="input-radio" name="retarget" type="radio" value="5" <#if adGroup.retarget==5>checked</#if> ><span class="input-radio-span otherspan">点击过本活动广告</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>访客投放期：</label>
+					<input class="input-text" tabindex="14" id="period" name="period" type="text" value="${adGroup.period!}" verify="number/2/0/0"/>
+					<span class="input-span">1-90天</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>访客分类：</label>
+					<input class="input-checkbox" name="site" type="checkbox" value="1" <#if adGroup.site==1>checked</#if> ><span class="input-checkbox-span otherspan">全站访客</span>
+				</div>
+				<div class="input-group" id="areasDiv">
+					<label class="input-label-other"><span class="lbl-no"></span>地域定向：</label>
+					<input class="ignore" type="hidden" id="areas" name="areas" value="${areas!}"/>
+					<a id="btn-areas" class="btn2">地域设定</a>
+		            <label id="geo-selected-areas"><span class="area-direct"></span><span>您已经设定了<strong id="count-areas">0</strong>个地域条件</span></label>
+		            <label id="geo-all-areas"><span class="area-direct"></span><span class="default_text">不限</span></label>
+				</div>
+				<div id="timediv" class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>时段定向：</label>
+					<div class="setting">
+						<div class="time_tit">
+					    	<p>开始时间</p>
+					        <p>结束时间</p>
+					    </div>
+					    <input type="hidden" name="sdayParting" id="sdayParting" value='${time!}'/>
+					    <div class="clear"></div>
+					    <div class="time_box"></div>
+					    <div class="time_add"><p id="setting_list" class="dateRangePicker" href="">新增时间段</p></div>
+				    </div>
+			  	</div>
+			  	<div class="input-group place-edit" id="placeDiv">
+			  		<input type="hidden" id="edit-place" value="${place!}"/>
+					<label class="input-label-other"><span class="lbl-yes">*</span>场景：</label>
+					<div class="input-checkboxsDiv">
+						<#if placeList ??>
+						<#list placeList as place>
+						<div class="single_div">
+							<input class="single_div_checkbox" name="place" type="checkbox" value="${place.id!}"><span class="single_div_span">${place.name!}</span>
+						</div>
+						</#list>
+						</#if>
 					</div>
-				</#list>
-				</#if>
-			</div>
-		</div>
-		<script type="text/javascript">
-		   var a="${place}";
-		   var c=a.split(",");
-		   for(var i=1;i<=17;i++)
-		   {
-		   		var placeaaa = i + 'place' ; 
-		   		var flag=document.getElementById(placeaaa).value;   
-			    for(var j=0;j<c.length;j++)
-			    {
-				     if(c[j]==flag)
-				     {
-				      document.getElementById(placeaaa).checked=true;
-				     }
-			    }
-		   }
-		 </script>		 
-		
-		<div class="control-group">
-			<label  style="position:relative;margin-top:-30px;" class="control-label"><sup></sup>位置：</label>
-			<div class="controls" style="position:absolute; margin:-30px 0 0 98px;width:auto;">
-				<div class="form-align-radio1" style="margin-right:100px;">
-					<input  autocomplete="off"  style="line-height:30px;margin:0px 5px 0 0;border:none;" name="position" type="checkbox" id= "1position" value="1"><span class="lb2"> 全部</span>
 				</div>
-				<div class="form-align-radio1" style="margin-right:84px;">
-					<input  autocomplete="off" style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "2position" value="2"><span class="lb2"> 认证页</span>
+				<div class="input-group position-edit" id="positionDiv">
+					<label class="input-label-other"><span class="lbl-no"></span>访客分类：</label>
+					<input type="hidden" id="edit-position" value="${adGroup.position!}"/>
+					<input class="input-checkbox" name="position" type="checkbox" value="1"><span class="input-checkbox-span otherspan">全部</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="2"><span class="input-checkbox-span otherspan">认证页</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="3"><span class="input-checkbox-span otherspan">认证页后</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="4"><span class="input-checkbox-span otherspan">上网过程</span>
 				</div>
-				<div class="form-align-radio1" style="margin-right:72px;">
-					<input  autocomplete="off"   style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "3position" value="3"><span class="lb2"> 认证页后</span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>LBS定向：</label>
+					<a id="btn-toggle" class="btn2">LBS定向</a>
+					<span id="spanselectedhint"></span>
 				</div>
-				<div class="form-align-radio1">
-					<input  autocomplete="off"  style="line-height:30px;margin:0px 5px 0 0;" name="position" type="checkbox" id= "4position" value="4"><span class="lb2"> 上网过程</span>
-				</div>				
-			</div>
-		</div>
-		
-		<script type="text/javascript">
-		   var a="${adGroup.position}";
-		   var c=a.split(",");
-		   for(var i=1;i<=4;i++)
-		   {
-		   		var positionaaa = i + 'position' ; 
-		   		var flag=document.getElementById(positionaaa).value;   
-			    for(var j=0;j<c.length;j++)
-			    {
-				     if(c[j]==flag)
-				     {
-				      document.getElementById(positionaaa).checked=true;
-				     }
-			    }
-		   }
-		 </script>
-		
-		
-		
-<div class="control-group">
-    <lable class="control-label">
-        <span style="color:red">*</span>代表必填项
-    </lable>
-</div>
-		
-<div class="control-group">
-    <lable style="margin-top:-17px;" class="control-label">
-        <input type="button" id="btn-toggle" class="btn1" style="width:150px;margin-top:10px;" value="LBS定向"> <span id="spanselectedhint" style="display:none;position:absolute;margin:15px 0 0 10px;"></span>
-    </lable>
-</div>
-
-	
-<div class="control-group">
-			<input type="submit" style="width:150px;margin-right:15px;" value="保存" class="btn2" id="btnsave">
-			<button class="btn2" href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" style="background-color:#36aeea;" id="btncancel"><i class="icon-undo"></i> 取消</button>
-		</div>
-		
-		
-		<input  autocomplete="off"   type="hidden" name="campaignId" value="${adGroup.campaignId}">
-		<input  autocomplete="off"   type="hidden" name="orderId" value="${adGroup.orderId}">
-		<input  autocomplete="off"   type="hidden" name="advertiserId" value="${adGroup.advertiserId}">
-		<input  autocomplete="off"   type="hidden" name="agentId" value="${adGroup.agentId}">
-		<input  autocomplete="off"   type="hidden" name="zoneIdString" value="1,12">
-		<input type="hidden" name="selectedwifi" id="selectedwifi" value="${selectedwifi!}">
-</form>
-<div  id="divLBS" >
-	<div class="modal-dialog">
-		<div class="modal-head"> LBS 设定</div>
-		<div class="modal-content">
-			<div class="modal-body" style="height:400px;">
-							<div id="wifimap">
-								<div id="divmapsearch">
-									<form name="frmwifisearch" id="frmWifiSearch" action="${ctx}/advertiser/main/ad/target/ad-group/wifiList">
+				<div id="divLBS">
+					<div class="wifi-modal-dialog">
+						<div class="wifi-modal-head">
+							<label>LBS 设定</label>
+							<span id="wifi-headclose" class="close-tag"></span>
+						</div>
+						<div class="wifi-modal-content">
+							<div class="wifi-modal-body">
+								<div id="wifimap">
+									<div id="divmapsearch">
 										<fieldset id="city_custom">
-											<input type="text" class="form-control" name="address" id="address" onkeydown="if(event.keyCode==13){return false;}"/>
-											<select name="prov" id="prov" class="prov" ></select>&nbsp;&nbsp;
+											<select name="prov" id="prov" class="prov" ></select>
 											<select name="city" id="city" class="city"></select>
-											<#--&nbsp;&nbsp;距离
+											<input type="text" class="input-text-small" name="address" id="address" onkeydown="if(event.keyCode==13){return false;}">
+											<#--距离
 											<select name="distance" id="mapdistance" >
 												<option value="1">1Km</option>
 												<option value="2">2Km</option><option value="3">3Km</option>
 												<option value="4">4Km</option><option value="5" selected>5Km</option>
 												<option value="6">6Km</option><option value="10">10Km</option>
 												<option value="20">20Km</option>
-											</select>-->&nbsp;<input type="button" name="mapSearch" id="btnmapSearch" class="btn btn-primary" value="搜索" style="background:#36aeea"></fieldset>
-									</form>
-									<input type="hidden" name="cacheSearched" id="cacheSearched" >	
-									<input type="hidden" name="cacheSelected" id="cacheSelected" value='${cacheSelected}'><!--[{"id":1,"address":"上海体育馆","lat":121.535816,"lng":31.24231},{"id":2,"address":"上海市八万人体育场","lat":121.526224,"lng":31.238806},{"id":3,"address":"上海市卢湾区体育馆","lat":121.523198,"lng":31.235045},{"id":9,"address":"智造局一期国际服务外包产业","lat":121.478716, "lng":31.206612},{"id":10,"address":"上海市红房子妇产科医院","lat":121.483587, "lng":31.213861},{"id":11,"address":"上海东仁商贸中","lat":121.499101, "lng":31.220265}]-->
-									<input type="hidden" id="searchedPage"><input type="hidden" id="selectedPage">
-								</div>
-								<div id="mapview"  >
-									
+											</select>-->
+											<input type="button" name="mapSearch" id="btnmapSearch" style="margin-top:-10px;background:#36aeea;" class="btn btn-primary" value="搜索">
+										</fieldset>
+										<!--[{"id":1,"address":"上海体育馆","lat":121.535816,"lng":31.24231},{"id":2,"address":"上海市八万人体育场","lat":121.526224,"lng":31.238806},{"id":3,"address":"上海市卢湾区体育馆","lat":121.523198,"lng":31.235045},{"id":9,"address":"智造局一期国际服务外包产业","lat":121.478716, "lng":31.206612},{"id":10,"address":"上海市红房子妇产科医院","lat":121.483587, "lng":31.213861},{"id":11,"address":"上海东仁商贸中","lat":121.499101, "lng":31.220265}]-->
+										<input type="hidden" name="cacheSearched" id="cacheSearched"/>	
+										<input type="hidden" name="cacheSelected" id="cacheSelected" value='${cacheSelected!}'/>
+										<input type="hidden" id="searchedPage"><input type="hidden" id="selectedPage"/>
+									</div>
+									<div id="mapview"></div>
 								</div>
-							</div>
-							<div id="wifitab" >
-								<ul class="nav navtab" id="wifitabul" >
-							        <li  id="mnusearchedwifi"  ><a href="javascript:" onclick="tabshow(this,'mnusearchedwifi')">搜索wifii</a></li>
-							        <li  id="mnuselectedwifi" class="current"><a href="javascript:"  onclick="tabshow(this,'mnuselectedwifi')">已选wifi</a></li>
-							    </ul><br class="clearfix">
+								<div id="wifitab" >
+									<ul class="nav navtab" id="wifitabul" >
+							        	<li id="mnusearchedwifi"><a href="javascript:" onclick="tabshow(this,'mnusearchedwifi')">搜索wifii</a></li>
+							        	<li id="mnuselectedwifi" class="current"><a href="javascript:"  onclick="tabshow(this,'mnuselectedwifi')">已选wifi</a></li>
+							    	</ul>
             						<div id="divselectedwifi" class="in fade">没有选中wifi</div>
 									<div id="divsearchedwifi" class="in fade" style="display:none;">没有相关数据</div>
+								</div>
 							</div>
-			</div>
-
+						</div>
+						<div class="wifi-modal-foot">
+							<button id="wifi-btn-save" class="btn-save" type="submit">确定</button>
+							<button id="wifi-btn-cancel" class="btn-cancel" type="button">取消</button>
+						</div>
+					</div>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>代表必填项</label>
+				</div>
+				<div id="footBtn">
+					<button id="create-btn-save" class="btn-save" type="submit">保存</button>
+					<button id="create-btn-cancel" class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+			<div id="areas_layout"></div>
 		</div>
-		<br class="clearfix"><br class="clearfix">
-		<div class="modal-foot" style="width:300px;height:34px;position:absloute;margin-left:300px;"><input type="button" value="确定" class="btn122" onclick='savewifi();$("#divLBS").dialog("close");'style="width:100px;position:absloute;height:30px;">&nbsp;<input type="button" class="btn2" value="取消" onclick='$("#divLBS").dialog("close");' style="width:100px;position:absloute;magin-left:105px;height:30px;"></div>
-	</div>
-	
+    </div>
 </div>
-<div class="space-24ger"></div>
-</div><!--/row-->
-<div id="areas_layout"></div>
-<div id="schedule_layout"></div>
-
-<script type="text/javascript">
-                    
-            	var areasgeoPopup = $("#areas_popup")[0];
-            	var GEO_list;
-                $('#btn-areas').click(function () {
-                    if (!areasgeoPopup) {
-                        areasgeoPopup = new areasPopup({
-                            width: '746px',
-                            height: '435px',
-                            title: '地域定向设定'
-                 		});
-                        var defaultValue = "不限";
-                        var input = $('#areas').trigger('change');
-                        var selectedIds = input.val() ? input.val().split(',') : null;
-                        $('#areasconfirm').click(function(){
-                            var pop= areasgeoPopup;
-                            areasgeoPopup.hide();
-                            input.val(Area.save());
-                            var id = 'areas',selected = Area.save();
-                            parent.$('#'+id).val(selected);
-                            if (selected && $('input[type=checkbox]:not(:checked)').length) {
-                                //有选择 且 非全选的
-                                parent.$('#count-'+id)[0].innerHTML = selected.split(',').length;
-                                parent.$('#geo-all-'+id).hide();
-                                parent.$('#geo-selected-'+id).show();
-                            }else{
-                                if(!$('input[type=checkbox]:not(:checked)').length){
-                                    parent.$('#geo-all-'+id).find('.default_text')[0].innerHTML=defaultValue;
-                                }else{
-                                    var val = defaultValue;
-                                    parent.$('#geo-all-'+id).find('.default_text')[0].innerHTML=decodeURIComponent(val);
-                                }
-                                parent.$('#geo-all-'+id).show();
-                                parent.$('#geo-selected-'+id).hide();
-                            }
-                            parent.$(parent.document).trigger('setData');
-
-                        });
-                        //Area.init(GEO_LIST,selectedIds);
-            			$.ajax({
-            				url: '${ctx}/advertiser/main/ad/target/ad-group/getLocations',
-            				dataType:'json',
-            				success:function(GEO_LIST){
-            					Area.init(GEO_LIST,selectedIds);
-            					areasgeoPopup.show();
-            					GEO_list = GEO_LIST;
-            				},
-            				error:function(){
-            					alert('数据拉取失败，请检查您的网络连接是否可用');
-            				}
-            			});
-		                
-                		}else{
-		                areasgeoPopup.show();
-		                }
-		            });
-		            
-	                $('#count-areas').click(function () {
-	                    $('#btn-areas').trigger('click');
-	                });
-	                if ($('#areas').val()) {
-
-	                    $('#geo-selected-areas').show();
-	                    $('#geo-all-areas').hide();
-	                    $('#count-areas')[0].innerHTML = $('#areas').val().split(',').length;
-	                } else {
-	                    $('#geo-selected-areas').hide();
-	                    $('#geo-all-areas').show();
-	                }
-
-          
-            
-        </script>
-<script type="text/javascript">
-//Alex add for wifi LBS
-
-	jspagesize = 2	;
-
-/*get wifi from cachedata*/
-function initMarker(obj){
-			
-		try{
-			if(obj.value.length>4){
-				allwifi=jQuery.parseJSON(obj.value)
-				markers = [];
-				for (var i = 0; length= allwifi.length,i<length ;i ++) {
-					var markerPosition = new AMap.LngLat(allwifi[i]['lat'],allwifi[i]['lng']);
-					var marker = new AMap.Marker({
-					position: markerPosition,
-					icon: "http://developer.amap.com/wp-content/uploads/2014/06/marker.png"
-				});
-				markers.push(marker);
-			}
-			return markers;
-			}
-		}
-	catch(e){return false;}
-	}
-
-
-function savewifi(){
-	try{
-		wifiids=''
-		selectedwificount=0
-		if($("#cacheSelected").val().length>2){
-				allwifi=$.parseJSON($("#cacheSelected").val())
-						for (var i = 0; length= allwifi.length,i<length ;i ++) {
-						wifiids += allwifi[i]['id']+',';
-						selectedwificount+=1;
-					}
-				wifiids=wifiids.substring(0,wifiids.length-1)
-		}
-	$("#selectedwifi").val(wifiids);
-	$("#spanselectedhint").html("共选择了" + selectedwificount + " 个 wifi")
-	$("#spanselectedhint").show();
-	
-	}
-	catch(e){alert(e)}
-}
-
-function tabshow(e,id){
-	var mnu=['mnusearchedwifi','mnuselectedwifi']
-	try{
-		for(i=0;i<mnu.length;i++){
-			mnuid=mnu[i];divid="#div" + mnuid.substr(3)
-			if(mnu[i]==id){
-				$('#'+mnuid).addClass('current');
-				$(divid)[0].style.display='block';
-			}
-			else{
-				$('#'+mnuid).removeClass('current');
-				$(divid)[0].style.display='none';
-			}
-		}
-	}catch(e){alert(e)}
-}
-
-function wificlick(e){
-		var nval="",v=$(e).attr("dataj"),oldval,strcache=$('#cacheSelected').val()
-				if(strcache.length>2){
-					oldval=$.parseJSON(strcache);
-				}
-	
-		try{
-			if(e.checked == true){//add string to cache
-				if(strcache.length>2){
-					if(strcache.indexOf(v)<1){
-						strcache= strcache.substr(0,strcache.length-1) +',' + v + ']'
-					}
-				}
-				else{
-					strcache='['+ v +']';
-				}
-				
-				}
-				
-			if(e.checked== false){
-				if(strcache.indexOf(v)>0){
-					
-					strcache='['+strcache.substring(1,strcache.indexOf(v)) + strcache.substring(strcache.indexOf(v)+v.length,strcache.length-1)+ ']'
-					strcache=strcache.replace(",,",",");
-					strcache=strcache.replace("[,","[");
-					strcache=strcache.replace(",]","]");			
-				}
-				else{alert(strcache +"\n" + v +"\n"+strcache.indexOf(v))
-				strcache='[]'
-				}
-			}
-			//alert(strcache);
-			$('#cacheSelected').val(strcache);
-			loadselectwifi($('#selectedPage').val())
-			loadsearchwifi($('#searchedPage').val())
-			//alert($('#cacheSelected').val())
-		}catch(e){alert(e)}
-		
-	}
-
-
-
-
-function loadsearchwifi(p){
-	var totalcount,pageno,swifi
-
-	try{
-	if($('#cacheSearched').val().length>2){
-		swifi=$.parseJSON($('#cacheSearched').val())
-		totalcount = swifi.length
-		pagecount=Math.ceil(totalcount/jspagesize)
-		$("#searchedPage").val(p)
-		if(isNaN(p)|| typeof(p)!=='number' || parseInt(p)!==p || parseInt(p)>pagecount){pageno=1;}
-		else{pageno=p;}
-		$("#searchPage").val(p)
-		wifihtm='';
-		//select item in wifisections
-		for(i=jspagesize*(pageno-1);i<jspagesize*(pageno-1)+jspagesize;i++){
-			if(swifi[i]){
-				wifihtm +="<div class=\"wifiitem\"><input type=\"checkbox\" name=\"swifi["+swifi[i]['id'] +"]\" id=\"swifi"+swifi[i]['id'] +"\" value=\""+swifi[i]['id'] +"\" onclick=\"wificlick(this)\"   dataj='" + JSON.stringify(swifi[i]) +"'";
-				//alert($("#cacheSelected")[0].value+"\n"+JSON.stringify(swifi[i]).toString().substring(0,20) +"\n"+$("#cacheSelected")[0].value.indexOf(JSON.stringify(swifi[i]).toString().substring(0,20)))
-				if($("#cacheSelected")[0].value.indexOf(JSON.stringify(swifi[i]).toString().substring(0,20))>-1){wifihtm +=' checked ';}
-				wifihtm+= ">&nbsp;<lable class=\"wifilab\" for=\"swifi" +swifi[i]['id'] +"\">"  +swifi[i]['address'] + "</lable></div>";
-			}
-		}
-		resulthtm= wifihtm+genwifinav(pagecount,pageno,'loadsearchwifi');
-	   $("#divsearchedwifi").html(resulthtm);
-	}	
-	else{$("#divsearchedwifi").html('没有搜索到wifif信息')}
-	}
-	catch(e){$("#divsearchedwifi").html('加载wifi信息出错');}
-}
-
-function loadselectwifi(p){
-	var totalcount,pageno,allwifi
-	try{
-		if($('#cacheSelected').val().length>2){
-			var allwifi=$.parseJSON($('#cacheSelected').val())
-			totalcount = allwifi.length
-			pagecount=Math.ceil(totalcount/jspagesize)
-			if(isNaN(p)|| typeof(p)!=='number' || parseInt(p)!==p || parseInt(p)>pagecount){pageno=1;}
-			else{pageno=p;}
-			$("#selectedPage").val(p)
-			wifihtm = '<div class="wifilist">';
-			//show select item in wifisections
-			for(i=jspagesize*(pageno-1);i<jspagesize*(pageno-1)+jspagesize;i++){
-				if((allwifi[i])){
-				wifihtm +="<div class=\"wifiitem\"><input type=\"checkbox\" name=\"swifi[]\" id=\"swifi"+allwifi[i]['id'] +"\" value=\""+allwifi[i]['id'] +"\" onclick=\"wificlick(this) \" dataj='" + JSON.stringify(allwifi[i]) + "'  checked>&nbsp;<lable class=\"\" for=\"swifi" +allwifi[i]['id'] +"\">"  +allwifi[i]['address'] + "</lable></div>"
-				}
-				else{break;}
-			}
-			wifihtm += '</div>'
-			resulthtml= wifihtm+genwifinav(pagecount,pageno,'loadselectwifi');
-		   $("#divselectedwifi").html(resulthtml);
-	   }
-	   else{$("#divselectedwifi").html("没有选择wifi");}
-	}
-	catch(e){$("#divselectedwifi").html("加载wifi时出错");}
-}
-
-function genwifinav(pcount,pno,fun){
-		//pageinvbar
-	wifinavhtm='<div class="pagination-wifi"><ul class="pagination-mini-wifi">';
-	if(pcount<=7){pagebegin=1;pageend=pagecount;}
-	else{
-		if(pno<=4){pagebegin=1;pageend=pagecount;}
-		else{
-			if(pagecount-pno<4){pagebegin=pcount-6;pageend=pcount;}
-			else{pagebegin=pno-3;pageend=pno+3}
-			}
-	}
-	for(i=pagebegin;i<=pageend;i++){
-		wifinavhtm +="<li ><a href=\"javascript:\" onclick=\""+ fun + "("+ i +")\""
-		if(i==pno){wifinavhtm+=" class=\"disabled\""}
-	
-		wifinavhtm+= ">"+ i +"</li>"
-	}
-	wifinavhtm +='</ul></div>';
-	return wifinavhtm;
-}
-
-
-(function(){
-		var map ;
-			 $('#btnmapSearch').click(function(e){
-			 	try{
-					var sdata = $(document.forms["frmwifisearch"]).serializeArray(); 
-
-					$.ajax({
-						url: document.forms['frmwifisearch'].action,
-						type: "POST",
-						// formate "name=codeplayer&age=18&uid=1&uid=2&uid=3"
-						data: sdata,
-						datatype: 'json',
-						// sucess
-						success: function( rdata, textStatus, jqXHR ){
-								try{
-									if(rdata.length>4){
-										$('#cacheSearched').val(rdata);
-										map=window.map;
-										map.plugin(['AMap.MarkerClusterer'], function(){
-											var cl = new AMap.MarkerClusterer(map, initMarker($("#cacheSearched")[0]));
-										});
-										loadsearchwifi(1);
-										tabshow($("#mnusearchedwifi")[0],'mnusearchedwifi')									
-									}
-								else{$("#cacheSearched").val("");$("#divsearchedwifi").html("没有搜索到wifi");}
-															
-								}
-								catch(e){alert(e);}
-
-						},
-					// onfaile
-					 error: function(jqXHR, textStatus, errorMsg){
-					// jqXHR  object of XMLHttpRequest
-					// textStatus value: null、"timeout"、"error"、"abort"或"parsererror"
-					// errorMsg value: "Not Found"、"Internal Server Error"
-					alert("请求失败：" + errorMsg);
-				}
-			});
-			 	}
-			 	catch(e){alert(e.error);}			 	
-			 });
-		})();	
-
-
-
-
-
-	</script>
-<script>
-	
-	 function setting_date(){
-    	var str_date = $("#sdayParting").val();
-    	console.log(str_date);  
-    	if(str_date!=""){
-    		var js_date = $.parseJSON(str_date);
-    		var html="";
-    		for(var i=0;i<js_date.length;i++){
-    			console.log(js_date[i].dehours);
-    			html += '<div class="time_item"><p class="tr_data"><span class="inp"><input type="text" class="start_date edit_time" readonly="readonly" value="'+js_date[i].startDate+'"></span><span class="inp"><input type="text" class="end_date edit_time" readonly="readonly" value = "'+js_date[i].endDate+'"></span></p><button class="btn_del">删除</button><input class="json_date" type="hidden" value = "'+js_date[i].dehours+'"></div>'; 
-    		}
-    		$(".setting .time_box").append(html);
-    		$(".time_box .time_item .btn_del").bind("click",function(e){
-   				$(this).parents(".time_item").remove();
-   			});
-    		var date = $("#id-date-picker-1").val().split('to');
-			var s_date = date[0];
-			var e_date = date[1];
-    		$(".setting .tr_data").unbind("mousedown").bind("mousedown",function(){
-   				var obj_tr = $(this);
-   				var th_date_s = $(this).find(".start_date").val();
-   				var th_date_e = $(this).find(".end_date").val();
-   				var datePickerOptions_td = {
-					"startDate":th_date_s,
-					"endDate":th_date_e,
-					getValue: function(){
-						if (obj_tr.find(".start_date").val() && obj_tr.find(".end_date").val() )
-							return obj_tr.find(".start_date").val() + ' to ' + obj_tr.find(".end_date").val();
-						else
-							return '';
-					},
-					setValue: function(s,s1,s2){
-						obj_tr.find(".start_date").val(s1);
-						obj_tr.find(".end_date").val(s2);
-					}
-				}
-				obj_tr.unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-					var date = $("#id-date-picker-1").val().split('to');
-					var s_date = date[0];
-					var e_date = date[1];
-					var checked_date = new Array();
-					var other_box =obj_tr.parent().siblings();
-					var len = other_box.length;
-					for(var i=0;i<len;i++){
-						var json_check = {"startDate":other_box.eq(i).find(".start_date").val(),"endDate":other_box.eq(i).find(".end_date").val()};
-						checked_date.push(json_check);
-					}
-					console.log(checked_date);									
-					var startDate = obj.value.split('to')[0];
-				   	var endDate = obj.value.split('to')[1];
-			   		var flag = true;
-			   		if(flag){
-						var obj = $("#quantum_list1");
-						if(obj.find(".pitchon")){
-							var timeData = obj.find(".pitchon").map(function(i,span){
-								return $(span).attr("title");
-							}).toArray().join(',');
-						}else{
-							var timeData = -1;
-						}
-						obj_tr.find(".start_date").val(startDate);
-						obj_tr.find(".end_date").val(endDate);
-						obj_tr.parent().find(".json_date").val(timeData);
-					}else{alert("请选择正确时间！");}
-				});
-				obj_tr.dateRangePicker1(datePickerOptions_td);
-				$("#quantum_list1").find("p").removeClass("pitchon");
-				var chose_time = obj_tr.parent().find(".json_date").val();
-				console.log(chose_time);
-				if(chose_time!=-1&&chose_time!=""){
-					var chose_arr = chose_time.split(",");
-					for(var n=0;n<chose_arr.length;n++){
-						$("#quantum_list1 p").eq(chose_arr[n]).addClass("pitchon");
-					}
-				}
-			});
-    	}
-    }
-	$(function(){
-		savewifi();
-		//获取排期时间
-		setting_date();
-    	$('#setting_list').unbind("mousedown").bind("mousedown",function(){
-    	 	var date = $("#id-date-picker-1").val().split('to');
-			var s_date = date[0];
-			var e_date = date[1];
-			var len_box = $(".time_box").find(".time_item").length;
-			if(len_box > 6){
-				alert("最多只能添加6个时段");
-			}else{
-				if(s_date!=""&&e_date!=""){
-					var datePickerOptions = {
-						"startDate":s_date,
-						"endDate":e_date
-					}
-					$("#quantum_list1").find("p").removeClass("pitchon");
-					$('#setting_list').unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-						var date = $("#id-date-picker-1").val().split('to');
-					    var s_date = date[0];
-						var e_date = date[1];
-						var checked_date = new Array();
-						var len = $(".setting .time_item").length;
-						for(var i=0;i<len;i++){
-							var json_check = {"startDate":$(".time_item").eq(i).find(".start_date").val(),"endDate":$(".time_item").eq(i).find(".end_date").val()};
-							checked_date.push(json_check);
-						}
-						var startDate = obj.value.split('to')[0];
-				   		var endDate = obj.value.split('to')[1];
-						var flag = true;
-				   		for(var j=0;j<checked_date.length;j++){
-				   			if(startDate < checked_date[j].startDate && endDate < checked_date[j].startDate){
-				   				console.log(startDate+":"+endDate)
-				   				console.log(flag+":1");
-				   			}else if(startDate > checked_date[j].endDate && endDate > checked_date[j].endDate){
-				   				console.log(flag+":2");
-				   			}else{
-				   				flag=false;
-				   			}
-				   		}
-				   		if(flag){
-					   		var obj = $("#quantum_list1");
-					   		if(obj.find(".pitchon").length){
-					           	var timeData = obj.find(".pitchon").map(function(i,span){
-					        		return $(span).attr("title");
-					        	}).toArray().join(',');
-					        }else{
-					           	var timeData = -1;
-					        }
-					   		var html = '<div class="time_item"><p class="tr_data"><span class="inp"><input type="text" class="start_date edit_time" readonly="readonly" value="'+startDate+'"></span><span class="inp"><input type="text" class="end_date edit_time" readonly="readonly" value = "'+endDate+'"></span></p><button class="btn_del">删除</button><input class="json_date" type="hidden" value = "'+timeData+'"></div>';
-					   		$(".setting .time_box").append(html);
-					   		$(".time_box .time_item .btn_del").bind("click",function(e){
-					   			$(this).parents(".time_item").remove();
-					   		});
-					   		$(".setting .tr_data").unbind("mousedown").bind("mousedown",function(){
-					   				var obj_tr = $(this);
-					   				var datePickerOptions_td = {
-										"startDate":s_date,
-										"endDate":e_date,
-										getValue: function(){
-											if (obj_tr.find(".start_date").val() && obj_tr.find(".end_date").val() )
-												return obj_tr.find(".start_date").val() + ' to ' + obj_tr.find(".end_date").val();
-											else
-												return '';
-										},
-										setValue: function(s,s1,s2){
-											obj_tr.find(".start_date").val(s1);
-											obj_tr.find(".end_date").val(s2);
-										}
-									}
-									obj_tr.unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-											var date = $("#id-date-picker-1").val().split('to');
-										    var s_date = date[0];
-											var e_date = date[1];
-											var checked_date = new Array();
-											var other_box =obj_tr.parent().siblings();
-											var len = other_box.length;
-											for(var i=0;i<len;i++){
-												var json_check = {"startDate":other_box.eq(i).find(".start_date").val(),"endDate":other_box.eq(i).find(".end_date").val()};
-												checked_date.push(json_check);
-											}
-											console.log(checked_date);									
-											var startDate = obj.value.split('to')[0];
-				   							var endDate = obj.value.split('to')[1];
-				   							var flag = true;
-								   			console.log(checked_date);
-								   			if(flag){
-								   				var obj = $("#quantum_list1");
-									   			if(obj.find(".pitchon")){
-									            	var timeData = obj.find(".pitchon").map(function(i,span){
-									        			return $(span).attr("title");
-									        		}).toArray().join(',');
-									            }else{
-									            	var timeData = -1;
-									            }
-									   			obj_tr.find(".start_date").val(startDate);
-										   		obj_tr.find(".end_date").val(endDate);
-										   		console.log(timeData);
-										   		console.log(obj_tr);
-										   		obj_tr.parent().find(".json_date").val(timeData);
-								   			}else{alert("请选择正确时间！");}
-							        });
-							        obj_tr.dateRangePicker1(datePickerOptions_td);
-							        $("#quantum_list1").find("p").removeClass("pitchon");
-							        var chose_time = obj_tr.parent().find(".json_date").val();
-						        	console.log(chose_time);
-						        	if(chose_time!=-1&&chose_time!=""){
-						        		var chose_arr = chose_time.split(",");
-						        		for(var n=0;n<chose_arr.length;n++){
-						        			$("#quantum_list1 p").eq(chose_arr[n]).addClass("pitchon");
-						        		}
-						        	}
-				   				})
-				   		}else{
-				   			alert("请选择正确时间！");
-				    	}
-					});
-					$('#setting_list').dateRangePicker1(datePickerOptions);
-				}else{
-					alert("请选择活动周期，在进行操作！");
-				}
-			}
-    	});
-    	
-    	$("#btnsave").click(function(){
-    		var checked_date = new Array();
-    		var len = $(".setting .time_item").length;
-    		var jsondata = "[";
-			for(var i=0;i<len;i++){
-				if(i == 0){
-					jsondata += '{"startDate":\"'+$(".time_item").eq(i).find(".start_date").val()+'\","endDate":\"'+$(".time_item").eq(i).find(".end_date").val()+'\","dehours":\"'+$(".time_item").eq(i).find(".json_date").val()+'\"}';
-				}else{
-					jsondata += ',{"startDate":\"'+$(".time_item").eq(i).find(".start_date").val()+'\","endDate":\"'+$(".time_item").eq(i).find(".end_date").val()+'\","dehours":\"'+$(".time_item").eq(i).find(".json_date").val()+'\"}';
-				}
-			}
-			jsondata += "]";
-			$("#sdayParting").val(jsondata);
-			
-			//提示场景选择
-			var placelist = $("#placediv input[type='checkbox']:checked");
-			if(placelist.length == 0){
-				alert("场景为必填项，请选择！");
-				return false;
-			}
-		});
-		
-    	$("#validation-form input[name='totalBudget']").focus(function(){
-    		$("#totalBudget_span").html("");
-		});
-		
-    	$("#validation-form input[name='totalBudget']").blur(function(){
-			validateMoney();
-		});
-		
-		$("#btncancel").click(function(){
-			location.href = $(this).attr("href");
-			return false;
-		});
-    });
-    
-    function validateMoney(){
-		var reg=/^\d{1,8}\.?\d{0,2}$/;
-		var $this = $("#validation-form input[name='totalBudget']");
-		if($this.val().match(reg)!=null){
-			if(($this.val().indexOf('.') == -1 && $this.val().length > 8) || $this.val() <= 0){
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算金额必须大于0且整数位最多8位');
-				$("#totalBudget_span").html("总预算金额必须大于0且整数位最多8位").css("color","red");
-				return false;
-			}if($this.val() > parseInt($("#budget").val())){
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算不能大于订单总预算');
-				$("#totalBudget_span").html("总预算不能大于订单总预算").css("color","red");
-				return false;
-			}else{
-				$this.css("box-shadow","none").attr('title','');
-				$("#totalBudget_span").html("");
-			}
-		}else{
-			$this.css("box-shadow","0 0 6px red").attr('title','总预算金额必须大于0整数位最多8位且最多有2位小数');
-			$("#totalBudget_span").html("总预算金额必须大于0整数位最多8位且最多有2位小数").css("color","red");
-			return false;
-		}
-	}
-  
-</script>
 </@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/list.ftl

@@ -1,249 +1,132 @@
 <@override name="head">
-	<title>投放管理-投放管理</title>
-    <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-
-	<script type="text/javascript">
-
-		 $(document).ready(function(){
-		 
-			//搜索按钮的实现
-			$("#search_img").click(function(){
-				var $searchValue = $(".search-form input[name=searchValue]");
-				if($searchValue.val() == "请输入关键字"){
-					$searchValue.val(null);
-				};
-				var advertiserId=$(".search-form input[name=advertiserId]").val();
-				var orderId=$(".search-form input[name=orderId]").val();
-				var campaignId=$(".search-form input[name=campaignId]").val();
-				var adGroupStatus=$(".search-form input[name=adGroupStatus]").val();
-				var page=$(".search-form input[name=page]").val();
-	            url = "${ctx}/advertiser/main/ad/target/ad-group/list?campaignId="+campaignId;  
-	            param=$("#search1").val();
-	            location.href=url+"&searchValue="+param+"&selectedStatus="+adGroupStatus+"&page="+page+"&orderId="+orderId+"&advertiserId="+advertiserId;
-	 		});
-	 		
-		 	//状态全部、
-			var p=${adGroupStatus};
-			if (p==0){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtqb").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==1){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".tfyes").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==2){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".tfno").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==3){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".tfend").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==4){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhting").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}	
-		
-			//开启,暂停,删除
-			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/advertiser/main/ad/target/ad-group/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/advertiser/main/ad/target/ad-group/disable";
-				}else if($(this).attr("id") == "btn-delete"){
-					url = "${ctx}/advertiser/main/ad/target/ad-group/delete";
-				}
-				singleOper($(this),url,"${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&advertiserId=${advertiserId!}&orderId=${orderId!}");
-			});
-			//批量开启,批量暂停,批量删除
-			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/advertiser/main/ad/target/ad-group/enable";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/advertiser/main/ad/target/ad-group/disable";
-				}else if($(this).attr("id") == "all-btn-delete"){
-					url = "${ctx}/advertiser/main/ad/target/ad-group/delete";
-				}
-				batchOpear($(this),url,"${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&advertiserId=${advertiserId!}&orderId=${orderId!}");
-			});
-			
-			/*
-			 * 实现分页跳转
-			 */
-			$("#pageDiv .pagination ul li a[href]").click(function(){
-				var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-				var _form = $('.search-form');
-				_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-				_form.find('img').click();//触发搜索
-				//return false;
-			});	
-			
-			$(".btn1").click(function(){
-				if($("#campaignId").val() == "" || $("#campaignId").val() == -1){
-					$("#btnCreatelink").attr("href","javascript:void(0);");
-					bootbox.alert("请选择活动！");
-					$("#btnCreatelink").attr("title","请选择活动");
-					return false;
-				}
-			});
-			
-			$('ul#activeul_son_ul li').live("click",function(){
-				window.location.href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId="+$("#activeId").val()+"&selectedStatus=${adGroupStatus!}";
-	 		});
-		});
-
-</script>	
-</@override>
+<title>投放管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/adGroup.js"></script>
+</@override> 
 <@override name="body">
 <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent" style="padding-bottom:80px;">
-	    <div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a>
-				<span class="divider3"><i class="icon-angle-right"></i></span></li>
-				<li class="size3">广告主管理</li>
-				<#elseif role == "advertiser">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span></li>
-				<li class="size3">投放管理</li>
-				</#if>
-			</ul>  
-		</div>
-		<div id="selectuls" style=" margin: 0 0 0 10px;">
-			<ul id="main_advertiserul">
-				<li class="select_box" id="advertiserul_box">
-					<span id="advertiserul_span">${selectedadvertiserName!}</span>
-					<ul class="son_ul" id="advertiser_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-			<ul id="main_orderul">
-				<li class="select_box" id="orderul_box">
-					<span id="orderul_span">${selectedorderName!}</span>
-					<ul class="son_ul" id="orderul_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-			<ul id="main_campaignul">
-				<li class="select_box" id="campaignul_box">
-					<span id="campaignul_span">${selectedcampaignName!}</span>
-					<ul class="son_ul" id="campaignul_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-		</div>
-		<div id="class23">	 
-			<div id="class3" style="border-bottom:none;">
-				<ul id="zhuangtai" style="margin-left:5px;">
-					<li class="zhuangtaichoose" style="border-bottom:none;margin-left:0px;margin-bottom:15px;">状态：</li>
-					<a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&selectedStatus=0"><li class="zhuangtaiall zhtqb">全部</li></a>
-					<a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&selectedStatus=1"><li class="zhuangtai1 tfyes" style="width:60px;">投放中</li></a>
-					<a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&selectedStatus=2"><li class="zhuangtai1 tfno" style="width:60px;">未投放</li></a>
-					<a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&selectedStatus=3"><li class="zhuangtai1 tfend" style="width:80px;">投放结束</li></a>
-					<a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&selectedStatus=4"><li class="zhuangtai1 zhting">暂停</li></a>
-				</ul>
-			</div> 
-		</div>     
- 		<div id="class4" style="height:34px;clear:both;">
-			<div id="button">	
-				<a id="btnCreatelink" style="margin:0px 5px 0 10px;" href="${ctx}/advertiser/main/ad/target/ad-group/create?campaignId=${campaignId}"><button class="btn1">创建投放</button></a>
-				<a id="btnCreatelink" style="margin:0px 5px 0 10px;" href="${ctx}/advertiser/main/ad/target/ad-group/createbyoperator?campaignId=${campaignId}"><button class="btn1">媒体自投</button></a>
-				<button style="margin-right:5px;" class="btn1" id="all-btn-enable" >批量开启</button>
-				<button style="margin-right:5px;" class="btn1" id="all-btn-disable" >批量停用</button>
-				<button style="margin:0px;" class="btn1" id="all-btn-delete">批量删除</button>
-			</div>
-		<div class="class41"> 
-			<form  method="post" class="search-form">
-				<input type="hidden" id="role" value="${role}">
-				<input type="hidden" id="agentId" value="${userSession.agentId}">
-				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-				<div  id="search" style="float:right;margin-right:30px;">
-					<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}">
-					<input type="hidden" id="orderId" name="orderId" value="${orderId!}">
-					<input type="hidden" id="activeId" name="campaignId" value="${campaignId!}">
-					<input type="hidden" name="adGroupStatus" value="${adGroupStatus!}">
-					<input  id="page" autocomplete="off"   type="hidden" name="page" value="${pager.page}"> 
-					<input id="searchKey"   autocomplete="off"   type="hidden" name="searchKey" value="${searchKey!'contactName'}">
-					<input id="search1" type="text" name="searchValue" value="${searchValue!}" >
-					<img id="search_img" src="${ctx}/assets/advertiser/images/fangdajing.png"/>
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">投放管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" method="post">
+ 				<input type="hidden" id="status" name="selectedStatus" value="${selectedStatus!}"/>
+ 				<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="advertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="orderId" id="orderId" value="${orderId!}"/>
+					<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="campaignId" id="campaignId" value="${campaignId!}"/>
+					<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
 				</div>
-			</form>
-	 	</div>           
-  		<div id="class5" style="width:100%;margin:20px 0px 0 10px;">
-  		    	<table border="1" style="width:98%;float:left;margin-top: 15px;text-align:center;" id="table1">
-               		<thead>
-                    	<tr class="tr1"  id ='tr11'>
-		                	<th class="th11" style="width:7%;"> <div class="fxk"></div></th>
-		                    <th class="td1" style="width:5%;">ID</th>
-		                    <th class="td1" style="width:10%;">投放名称</th>
-							<th class="td1" style="width:9%;">创意</th>
-							<th class="td1" style="width:15%;">投放周期</th>
-							<th class="td1" style="width:13%;">最后更新日期</th>
-							<th class="td1" style="width:9%;">状态</th>
-							<th class="td1" style="width:36%;">操作</th>
-                    	</tr>
-                    </thead>
-                    <tbody id="tbody1">
-                    	<#if adGroupList ??>
-                    	<#list adGroupList as adGroup>
-							<tr id="nuh" class="">
-			                    <td class="td22"><div class="fxk1" id="#{adGroup.id}"></div></td>
-								<td class="td2">${adGroup.id!}</td>
-								<td class="td2">${adGroup.adGroupName!}</td>
-								<td class="td2"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroup.id}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" style="color:#36aeea; text-decoration: underline;">${adGroup.bannerNumber!}个创意</a></td>
-								<td class="td2">${adGroup.startDate?date}~${adGroup.endDate?date}</td>
-								<td class="td2"><a href="${ctx}/advertiser/main/ad/target/ad-group/update?adGroupId=${adGroup.id}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" style="color:#36aeea; text-decoration: underline;">${adGroup.updated?datetime}</a></td>
-								<td class="td2"><#if adGroup.status==0>开启<#else>暂停</#if></td>
-								<td class="td3" >
-									<div class="zabtn">
-										<a href="${ctx}/advertiser/main/ad/target/ad-group/edit?advertiserId=${advertiserId}&orderId=${orderId}&campaignId=${campaignId}&id=${adGroup.id!}"><button style="margin-right:5px;" class="btn122">编辑</button></a>
-										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId!}&selectedadvertiserName=${selectedadvertiserName!}&selectedorderId=${orderId!}&selectedorderName=${selectedorderName!}&selectedcampaignId=${campaignId!}&selectedcampaignName=${selectedcampaignName!}&selectedadGroupId=${adGroup.id!}&selectedadGroupName=${adGroup.adGroupName!}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
+			    <div id="selectBar_status" class="selectBar">
+	 				<span>状态：</span>
+					<a value="0">全部</a>
+					<a value="1">投放中</a>
+					<a value="2">未投放</a>
+					<a value="3">投放结束</a>
+					<a value="4">暂停</a>
+			    </div>
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/ad/target/ad-group/create?campaignId=${campaignId!}" class="btn2" id="btn-create">创建投放</a>
+						<a href="${ctx}/advertiser/main/ad/target/ad-group/createbyoperator?campaignId=${campaignId!}" class="btn2" id="btn-sinceVote">媒体自投</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量停用</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+			            	<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			                <th class="theadTh" style="width:5%;">ID</th>
+			                <th class="theadTh" style="width:13%;">投放名称</th>
+			                <th class="theadTh" style="width:9%;">创意</th>
+			                <th class="theadTh" style="width:15%;">投放周期</th>
+			                <th class="theadTh" style="width:12%;">最后更新日期</th>
+			                <th class="theadTh" style="width:9%;">状态</th>
+			                <th class="theadTh" style="width:35%;">操作</th>
+			            </tr> 
+					</thead>
+					<tbody>
+						<#if adGroupList ??>
+						<#list adGroupList as adGroup>
+							<tr id="tbodyTr">
+								<td class="tbodyTd"><div class="checkboxStyleTd" id="${adGroup.id!}"></div></td>
+								<td class="tbodyTd">${adGroup.id!}</td>
+								<td class="tbodyTd">${adGroup.adGroupName!}</td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroup.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${adGroup.bannerNumber!}个创意</a></td>
+								<td class="tbodyTd">${adGroup.startDate!?date}~${adGroup.endDate!?date}</td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/ad-group/update?adGroupId=${adGroup.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${adGroup.updated!?datetime}</a></td>
+								<td class="tbodyTd"><#if adGroup.status==0>正常<#else>停用</#if></td>
+								<td class="tbodyTd">
+									<div id="listButtons">
+										<a href="${ctx}/advertiser/main/ad/target/ad-group/edit?id=${adGroup.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="btn3">编辑</a>
+										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId!}&selectedorderId=${orderId!}&selectedcampaignId=${campaignId!}&selectedadGroupId=${adGroup.id!}" class="btn3">查看报表</a>
 										<#if adGroup.status==0>
-										<button style="margin:0px;" id="btn-disable" value=${adGroup.id} class="btn122">停用</button>
-										<#elseif adGroup.status==1>
-										<button style="margin:0px;" id="btn-enable" value=${adGroup.id} class="btn122">开启</button>
+										<a id="btn-disable" value="${adGroup.id!}" class="btn3">停用</a>
+										<#elseif adGroup.status=1>
+										<a id="btn-enable" value="${adGroup.id!}" class="btn3">开启</a>
 										</#if>
-										<button id="btn-delete" value=${adGroup.id} class="btn122">删除</button>
-									<div>
+										<a id="btn-delete" value="${adGroup.id!}" class="btn3">删除</a>
+									</div>
 								</td>
-		                    </tr>
-	                    </#list>
-                    	</#if>
-                    </tbody>
-              	</table>
-              	
-              	<div id="daochu">
-					<a style="text-decoration: none;" href="${ctx}/advertiser/main/ad/target/ad-group/exportAdGroupExcel?advertiserId=${advertiserId}&orderId=${orderId}&campaignId=${campaignId}&selectedStatus=${adGroupStatus}"><div class="btn2">导出Excel</div></a>
+							</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_list()">导出Excel</a>
 				</div>
-				
-				<div id="pageDiv" style="margin:0px 30px 20px 0px;">
+				<div id="pageDiv">
 					<#include "/common/pagination/simple.ftl"/>
 				</div>
+			</form>
 		</div>
 	</div>
-<div>
+</div>
 </@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/update.ftl

@@ -1,98 +1,66 @@
 <@override name="head">
-	<title>投放信息修改记录</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/target/ad-group/exportAmendmentLogExcel?adGroupId=${adGroupId}");
-		};
-		
-	</script>
-	
-</@override>
-
+<title>投放信息修改记录</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+</@override> 
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul style="padding-top:20px;margin-left:9px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?advertiserId=${advertiserId}&orderId=${orderId}&campaignId=${campaignId}">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">投放信息修改记录</li>
-			</ul>  
-		</div>
-		<form id="formPage" action="${ctx}/advertiser/main/ad/target/ad-group/update?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" method="post">
-			<input  id="page" type="hidden" name="page" value="${pager.page}">
-			<div id="account-table" style="margin-top:10px;">
-				<table border="1" class="tablefig" id="tablefig">
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">投放信息修改记录</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/target/ad-group/update?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" method="post">
+ 				<input id="page" type="hidden" name="page" value="${pager.page}"/>
+				<table border="1" class="tableFig tableUpdate">
 					<thead>
-						<tr>
-							<th class="th1" style="width:15%;">变更时间</th>
-				   	   	 	<th class="th2" style="width:10%;">操作人</th>
-				   	   	 	<th class="th3" style="width:15%;">登录IP</th>
-				   	   	 	<th class="th4" style="width:10%;">操作类型</th>
-				   	   	 	<th style="width:30%;">变更详情</th>
-						</tr>
+						<tr class="theadTr">
+			                <th class="theadTh" style="width:15%;">变更时间</th>
+			                <th class="theadTh" style="width:10%;">操作人</th>
+			                <th class="theadTh" style="width:15%;">登录IP</th>
+			                <th class="theadTh" style="width:10%;">操作类型</th>
+			                <th class="theadTh" style="width:30%;">变更详情</th>
+			            </tr> 
 					</thead>
 					<tbody>
 						<#if logList ??>
 						<#list logList as log>
-				   	        <tr class="odd">
-							<td >${log.operTime?datetime!}</td>
-				   	   	 	<td >${log.accountName!}</td>
-				   	   	 	<td >${log.userIp!}</td>
-				   	   	 	<td >${log.actionType!}</td>
-				   	   	 	<td >${log.action!}</td>
-				   	   	 	</tr>
+							<tr id="tbodyTr">
+								<td class="tbodyTd">${log.operTime?datetime!}</td>
+								<td class="tbodyTd">${log.userRealName!}</td>
+								<td class="tbodyTd">${log.userIp!}</td>
+								<td class="tbodyTd">${log.actionType!}</td>
+								<td class="tbodyTd">${log.action!}</td>
+							</tr>
 						</#list>
 						</#if>
 					</tbody>
 				</table>
-			
-				<div id="daochu" style="margin-left:20px;">
-					<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-					<a style="margin:-34px 0 0 180px;" class="ljbtn2 backbtn" href="${ctx}/advertiser/main/ad/target/ad-group/list?advertiserId=${advertiserId}&orderId=${orderId}&campaignId=${campaignId}">返回</a>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="${ctx}/advertiser/main/ad/target/ad-group/exportAmendmentLogExcel?adGroupId=${adGroupId!}">导出Excel</a>
+					<a class="btn-back" href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">返回</a>
 				</div>
-							
 				<div id="pageDiv">
-	               	<#include "/common/pagination/simple.ftl"/>
-	            </div>	
-            
-            </div>
-		</form>
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
 	</div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/edit.ftl

@@ -1,148 +1,72 @@
-<@override name="head">
-	<title>编辑订单</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.iframe-transport.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.fileupload.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-
-	<style>
-		#upload-click{
-		width:320px;
-		height:40px;
-		display:block;
-		margin-left:130px;
-		border: 1px solid #d5dadf;
-	    border-radius: 5px !important;
-	    font-size: 14px;
-	    line-height: 40px;
-	    text-align:center;
-	    text-dcoration:none;
-		}
-	</style>
-	<script type="text/javascript">
-		$(function(){
-			$('#input-file').fileupload({
-				autoUpload: true,
-				url: '${ctx}/advertiser/main/ad/target/ad/upload?bannerId=${banner.id}',		
-				formData:{bannerId:$('form input[name="id"]').val()},
-				done:function(e,data){
-					var path = data.result;
-					if(path.indexOf("~") < 0){
-					var file_name = path.split("\\")[path.split("\\").length-1];
-					$("#bannerTemplateName").val(file_name);
-		              $("#bannerTemplateName1").val(file_name); 
-					 $("#upload-path").val(data.result);
-			     }else{
-			    	 alert(data.result);
-			     }
-				}
-			})
-			
-		
-			$("#validation-form").autovalidate();
-			$(".btn3").click(function(){
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-			});
-			$(".btn4").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}";
-			});
-			
-			$("#upload-click").click(function(){
-				$("#input-file").click();
-			})
-			
-		});
-	</script>
-</@override>
-
+<@override name="head">	
+<title>编辑创意</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.ui.widget.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.iframe-transport.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.fileupload.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/adBanner.js"></script>
+</@override>	
 <@override name="body">
 <div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-    	<div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">创意管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">编辑创意</li>
-				<#elseif role == "advertiser">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">创意管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">编辑创意</li>
-				</#if>
-			</ul>  
-		</div>
-	 	
-	 	<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/ad/target/ad/save" method="post">
-	 		<input  autocomplete="off"   type="hidden" name="adGroupId" value="${banner.adGroupId}">
-   			<input  autocomplete="off"   type="hidden" name="id" value="${banner.id}">
-			<div class="all">
-				<div class="line1">
-					<label class="label1"><span style="color:dodgerblue;">*</span>创意名称：</label>
-					<div class="xianzhi">
-						<input class="shuru1" id="bannerTemplateName" autocomplete="off"  name="bannerTemplate.name" type="text" value="${banner.bannerTemplate.name}" verify="text/255/1/0" disabled="true"><span class="spanVaildate"></span>
-						<input id="bannerTemplateName1" name="bannerTemplate.name" type="hidden" value="${banner.bannerTemplate.name}"/>
-					</div>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">创意管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">编辑创意</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/ad/save" method="post">
+	 			<input type="hidden" id="adGroupId" name="adGroupId" value="${banner.adGroupId!}"/>
+   				<input type="hidden" id="bannerId" name="id" value="${banner.id!}"/>
+   				<input type="hidden" id="campaignId" value="${campaignId!}"/>
+   				<input type="hidden" id="orderId" value="${orderId!}"/>
+   				<input type="hidden" id="advertiserId" value="${advertiserId!}"/>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>创意名称：</label>
+					<input class="input-text" tabindex="1" id="bannerTemplateName" name="bannerTemplate.name" type="text" value="${banner.bannerTemplate.name!}" disabled="true"/>
+					<input id="bannerTemplateName1" name="bannerTemplate.name" type="hidden" value="${banner.bannerTemplate.name!}"/>
 				</div>
-				<div class="line2">
-					<label class="label2">上传创意：</label>
-					<a id="upload-click" href="#">&nbsp&nbsp点&nbsp&nbsp击&nbsp&nbsp上&nbsp&nbsp传</a>
-					<input  type="file" id="input-file" style="display:none"/>
+				<div class="input-group" id="input-file-div">
+					<label class="input-label-other"><span class="lbl-yes">*</span>上传创意：</label>
+					<a id="upload-click" href="#">点&nbsp;&nbsp;击&nbsp;&nbsp;上&nbsp;&nbsp;传</a>
+					<input type="file" id="input-file"/>
 					<input type="hidden" id="upload-path" name="uploadPath" value=""/>
 				</div>
-				<div class="line2">
-					<label class="label2" style="clear:both;margin-top:10px;"><span style="color:dodgerblue;">*</span>到达地址：</label>
-					<div class="xianzhi">
-						<input class="shuru2" autocomplete="off" id="visitAddress" name="visitAddress" type="text" value="${banner.visitAddress!}" verify="text/255/1/0" style="margin-top:10px;"><span class="spanVaildate"></span>
-					</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>到达地址：</label>
+					<input class="input-text" tabindex="2" id="visitAddress" name="visitAddress" type="text" value="${banner.visitAddress!}" verify="text/255/1/0"/><span class="spanVaildate"></span>
 				</div>
-				<div class="line2">
-					<label class="label2"  style="clear:both;margin-top:20px;">点击监测地址：</label>
-					<div class="xianzhi">
-						<input class="shuru2" autocomplete="off" id="clickAddress" name="clickAddress" type="text" value="${banner.clickAddress!}" verify="text/255/0/0" style="margin-top:20px;"><span class="spanVaildate"></span>
-					</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>点击监测地址：</label>
+					<input class="input-text" tabindex="3" id="clickAddress" name="clickAddress" type="text" value="${banner.clickAddress!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
-				<div class="line2">
-					<label class="label2" style="clear:both;margin-top:20px;">曝光监测地址：</label>
-					<div class="xianzhi" style="margin-top:20px;">
-						<input class="shuru2" autocomplete="off" id="impressionAddress" name="impressionAddress" type="text" value="${banner.impressionAddress!}" verify="text/255/0/0" style="margin-top:20px;"><span class="spanVaildate"></span>
-					</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>曝光监测地址：</label>
+					<input class="input-text" tabindex="4" id="impressionAddress" name="impressionAddress" type="text" value="${banner.impressionAddress!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
-			</div>	
-			<div class="btnall" style="margin-top:215px;">
-				<button  class="btn3" type="submit">保存</button>
-				<button  class="btn4" type="reset">取消</button>
-			</div>
-		</form>
-	</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
 </div>
-
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/list.ftl

@@ -1,257 +1,141 @@
 <@override name="head">
-	<title>投放管理-创意管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-    <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-
-	<script type="text/javascript">
-
-		 $(document).ready(function(){
-		 
-			//搜索按钮的实现
-			$("#search_img").click(function(){
-				var $searchValue = $(".search-form input[name=searchValue]");
-				if($searchValue.val() == "请输入关键字"){
-					$searchValue.val(null);
-				};
-				var advertiserId=$(".search-form input[name=advertiserId]").val();
-				var orderId=$(".search-form input[name=orderId]").val();
-				var campaignId=$(".search-form input[name=campaignId]").val();
-				var adGroupId=$(".search-form input[name=adGroupId]").val();
-				var status=$(".search-form input[name=selectedStatus]").val();
-				var page=$(".search-form input[name=page]").val();
-	            url = "${ctx}/advertiser/main/ad/target/ad/list?adGroupId="+adGroupId;  
-	            param=$("#search1").val();
-	            location.href=url+"&searchValue="+param+"&selectedStatus="+status+"&page="+page+"&campaignId="+campaignId+"&orderId="+orderId+"&advertiserId="+advertiserId;
-	 		});
-	 		
-		 	//状态全部、
-			var p=$(".search-form input[name=selectedStatus]").val();
-			if(p==2){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtqb").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==0){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtzhch").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==1){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtty").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			} 
-				
-			//开启,暂停,删除
-			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/advertiser/main/ad/target/ad/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/advertiser/main/ad/target/ad/disable";
-				}else if($(this).attr("id") == "btn-delete"){
-					url = "${ctx}/advertiser/main/ad/target/ad/delete";
-				}
-				singleOper($(this),url,"${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}");
-			});
-			//批量开启,批量暂停
-			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/advertiser/main/ad/target/ad/enable";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/advertiser/main/ad/target/ad/disable";
-				}else if($(this).attr("id") == "all-btn-delete"){
-					url = "${ctx}/advertiser/main/ad/target/ad/delete";
-				}
-				batchOpear($(this),url,"${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}");
-			});
-			
-			/*
-			 * 实现分页跳转
-			 */
-			$("#pageDiv .pagination ul li a[href]").click(function(){
-				var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-				var _form = $('.search-form');
-				_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-				_form.find('img').click();//触发搜索
-				//return false;
-			});	
-			
-			$(".btn1").click(function(){
-				if($("#adGroupId").val() == "" || $("#adGroupId").val() == -1){
-					$("#btnCreatelink").attr("href","javascript:void(0);");
-					bootbox.alert("请选择投放！");
-					$("#btnCreatelink").attr("title","请选择投放");
-					return false;
-				}
-			});
-			
-			$('ul#putul_son_ul li').live("click",function(){
-				$('.search-form').find('img').click();
-		 	});
-		});
-
-</script>	
-
-</@override>
+<title>创意管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/adBanner.js"></script>
+</@override> 
 <@override name="body">
 <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent" style="padding-bottom:80px;">
-	    <div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">创意管理</li>
-				<#elseif role == "advertiser">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">创意管理</li>
-				</#if>
-			</ul>  
-		</div>
-		<div id="selectuls" style=" margin: 0 0 0 10px;">
-			<ul id="main_advertiserul">
-				<li class="select_box" id="advertiserul_box">
-					<span id="advertiserul_span">${selectedadvertiserName!}</span>
-					<ul class="son_ul" id="advertiser_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-			<ul id="main_orderul">
-				<li class="select_box" id="orderul_box">
-					<span id="orderul_span">${selectedorderName!}</span>
-					<ul class="son_ul" id="orderul_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-			<ul id="main_campaignul">
-				<li class="select_box" id="campaignul_box">
-					<span id="campaignul_span">${selectedcampaignName!}</span>
-					<ul class="son_ul" id="campaignul_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-			<ul id="main_adGroupul">
-				<li class="select_box" id="adGroupul_box">
-					<span id="adGroupul_span">${selectedadGroupName!}</span>
-					<ul class="son_ul" id="adGroupul_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-		</div>
-		<div id="class23">	 
-			<div id="class3" style="border-bottom:none;">
-				<ul id="zhuangtai" style="margin-left:5px;">
-					<li class="zhuangtaichoose" style="border-bottom:none;margin-left:0px;margin-bottom:15px;">状态：</li>
-					<a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&selectedStatus=2"><li class="zhuangtaiall zhtqb">全部</li></a>
-					<a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&selectedStatus=0"><li class="zhuangtai1 zhtzhch">开启</li></a>
-					<a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&selectedStatus=1"><li class="zhuangtai1 zhtty">停用</li></a>
-				</ul>
-			</div> 
-		</div>     
- 		<div id="class4" style="height:34px;clear:both;">
-			<div id="button">	
-				<a id="btnCreatelink" style="margin:0px 5px 0 10px;" href="${ctx}/advertiser/main/ad/target/create-banner/list?adGroupId=${adGroupId}"><button class="btn1">创建创意</button></a>
-				<button style="margin-right:5px;" class="btn1" id="all-btn-enable" >批量开启</button>
-				<button style="margin-right:5px;" class="btn1" id="all-btn-disable" >批量停用</button>
-				<button style="margin:0px;" class="btn1" id="all-btn-delete">批量删除</button>
-			</div>
-			<div class="class41"> 
-				<form  method="post" class="search-form">
-					<input type="hidden" id="role" value="${role}">
-					<input type="hidden" id="agentId" value="${userSession.agentId}">
-					<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-					<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-					<div  id="search" style="float:right;margin-right:30px;">
-						<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}">
-						<input type="hidden" id="orderId" name="orderId" value="${orderId!}">
-						<input type="hidden" id="activeId" name="campaignId" value="${campaignId!}">
-						<input type="hidden" id="putId" name="adGroupId" value="${adGroupId!}">
-						<input type="hidden" name="selectedStatus" value="${selectedStatus!}">
-						<input  id="page" autocomplete="off"   type="hidden" name="page" value="${pager.page}"> 
-						<input id="searchKey"   autocomplete="off"   type="hidden" name="searchKey" value="${searchKey!'contactName'}">
-						<input id="search1" type="text" name="searchValue" value="${searchValue!}" >
-						<img id="search_img" src="${ctx}/assets/advertiser/images/fangdajing.png"/>
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">创意管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" method="post">
+ 				<input type="hidden" id="status" name="selectedStatus" value="${selectedStatus!}"/>
+ 				<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="advertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="orderId" id="orderId" value="${orderId!}"/>
+					<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="campaignId" id="campaignId" value="${campaignId!}"/>
+					<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="adGroupId" id="adGroupId" value="${adGroupId!}"/>
+					<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}"/>
+				</div>
+			    <div id="selectBar_status" class="selectBar">
+	 				<span>状态：</span>
+					<a value="2">全部</a>
+					<a value="0">正常</a>
+					<a value="1">停用</a>
+			    </div>
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/ad/target/create-banner/list?adGroupId=${adGroupId!}" class="btn2" id="btn-create">创建创意</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量停用</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
 					</div>
-				</form>
-		 	</div>  
-  			<div id="class5" style="width:100%;margin:20px 0px 0 10px;">
-  		    	<table border="1" style="width:97.7%;float:left;margin-top: 15px;" id="table1">
-               		<thead>
-                    	<tr class="tr1"  id ='tr11'>
-		                	<th class="th11" style="width:7%;"> <div class="fxk"></div></th>
-		                    <th class="td1" style="width:5%;">ID</th>
-		                    <th class="td1" style="width:9%;">创意</th>
-							<th class="td1" style="width:8%;">创意名称</th>
-							<th class="td1" style="width:15%;">创意链接</th>
-							<th class="td1" style="width:6%;">尺寸</th>
-							<th class="td1" style="width:12%;">最后更新日期</th>
-							<th class="td1" style="width:6%;">状态</th>
-							<th class="td1" style="width:35%;">操作</th>
-                    	</tr>
-                    </thead>
-                    <tbody id="tbody1">
-                    	<#if bannerList ??>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+			            	<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			                <th class="theadTh" style="width:5%;">ID</th>
+			                <th class="theadTh" style="width:9%;">创意</th>
+			                <th class="theadTh" style="width:8%;">创意名称</th>
+			                <th class="theadTh" style="width:15%;">创意链接</th>
+			                <th class="theadTh" style="width:6%;">尺寸</th>
+			                <th class="theadTh" style="width:12%;">最后更新日期</th>
+			                <th class="theadTh" style="width:6%;">状态</th>
+			                <th class="theadTh" style="width:35%;">操作</th>
+			            </tr> 
+					</thead>
+					<tbody>
+						<#if bannerList ??>
 						<#list bannerList as banner>
-							<tr id="nuh" class="">
-			                    <td class="td22"><div class="fxk1" id="#{banner.id!}"></div></td>
-								<td class="td2">${banner.id!}</td>
-								<td class="td2"><img src="${banner.bannerTemplate.pathSmall!}"/></td>
-								<td class="td2">${banner.bannerTemplate.name!}</td>
-								<td class="td2"><a href="#" style="color:#36aeea; text-decoration: underline;">${banner.visitAddress!}</a></td>
-								<td class="td2">${banner.bannerTemplate.width!}x${banner.bannerTemplate.height!}</td>
-								<td class="td2"><a href="${ctx}/advertiser/main/ad/target/ad/update?bannerId=${banner.id}&adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" style="color:#36aeea; text-decoration: underline;">${banner.updated?datetime}</a></td>
-								<td class="td2"><#if banner.status==0 && banner.bannerTemplate.status == 0>开启<#else>停用</#if></td>
-								<td class="td3" >
-									<div class="zabtn">
-										<a href="${ctx}/advertiser/main/ad/target/ad/edit?bannerId=${banner.id!}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}"><button style="margin-right:5px;" class="btn122">编辑</button></a>
-										<a data-toggle="dropdown" href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId!}&selectedadvertiserName=${selectedadvertiserName!}&selectedorderId=${orderId!}&selectedorderName=${selectedorderName!}&selectedcampaignId=${campaignId!}&selectedcampaignName=${selectedcampaignName!}&selectedadGroupId=${adGroupId!}&selectedadGroupName=${selectedadGroupName!}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
+							<tr id="tbodyTr">
+								<td class="tbodyTd"><div class="checkboxStyleTd" id="${banner.id!}"></div></td>
+								<td class="tbodyTd">${banner.id!}</td>
+								<td class="tbodyTd"><img src="${banner.bannerTemplate.pathSmall!}"/></td>
+								<td class="tbodyTd">${banner.bannerTemplate.name!}</td>
+								<td class="tbodyTd"><a href="javascript:void(0);" class="tableTdStyle">${banner.visitAddress!}</a></td>
+								<td class="tbodyTd">${banner.bannerTemplate.width!}x${banner.bannerTemplate.height!}</td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/ad/update?bannerId=${banner.id}&adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${banner.updated!?datetime}</a></td>
+								<td class="tbodyTd"><#if banner.status==0 && banner.bannerTemplate.status == 0>开启<#else>停用</#if></td>
+								<td class="tbodyTd">
+									<div id="listButtons">
+										<a href="${ctx}/advertiser/main/ad/target/ad/edit?bannerId=${banner.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="btn3">编辑</a>
+										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId!}&selectedorderId=${orderId!}&selectedcampaignId=${campaignId!}&selectedadGroupId=${adGroupId!}" class="btn3">查看报表</a>
 										<#if banner.status==0 && banner.bannerTemplate.status == 0>
-										<button style="margin:0px;" id="btn-disable" value=${banner.id} class="btn122">停用</button>
+										<a id="btn-disable" value="${banner.id!}" class="btn3">停用</a>
 										<#else>
-										<button style="margin:0px;" id="btn-enable" value=${banner.id} class="btn122">开启</button>
+										<a id="btn-enable" value="${banner.id!}" class="btn3">开启</a>
 										</#if>
-										<button id="btn-delete" value=${banner.id} class="btn122">删除</button>
-									<div>
+										<a id="btn-delete" value="${banner.id!}" class="btn3">删除</a>
+									</div>
 								</td>
-		                    </tr>
-	                    </#list>
-                    	</#if>
-                    </tbody>
-              	</table>
-              	
-              	<div id="daochu">
-					<a style="text-decoration: none;" href="${ctx}/advertiser/main/ad/target/ad/exportAdExcel?advertiserId=${advertiserId}&orderId=${orderId}&campaignId=${campaignId}&adGroupId=${adGroupId}&selectedStatus=${selectedStatus}"><div class="btn2">导出Excel</div></a>
+							</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_list()">导出Excel</a>
 				</div>
-				
-				<div id="pageDiv" style="margin:0px 30px 20px 0px;">
+				<div id="pageDiv">
 					<#include "/common/pagination/simple.ftl"/>
 				</div>
-			</div>
+			</form>
 		</div>
 	</div>
-<div>
+</div>
 </@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/update.ftl

@@ -1,100 +1,68 @@
 <@override name="head">
-	<title>创意信息修改记录</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/target/ad/exportAmendmentLogExcel?bannerId=${bannerId}&adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}");
-		};
-		
-	</script>
-	
-</@override>
-
+<title>活动信息修改记录</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+</@override> 
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul style="padding-top:20px;margin-left:9px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?advertiserId=${advertiserId}&orderId=${orderId}&campaignId=${campaignId}">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">创意管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">创意信息修改记录</li>
-			</ul>  
-		</div>
-		<form id="formPage" action="${ctx}/advertiser/main/ad/target/ad/update?bannerId=${bannerId}&adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" method="post">
-			<input  id="page" type="hidden" name="page" value="${pager.page}">
-			<div id="account-table" style="margin-top:10px;">
-				<table border="1" class="tablefig" id="tablefig">
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">创意管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">创意信息修改记录</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/target/ad/update?bannerId=${bannerId!}&adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" method="post">
+ 				<input id="page" type="hidden" name="page" value="${pager.page}"/>
+				<table border="1" class="tableFig tableUpdate">
 					<thead>
-						<tr>
-							<th class="th1" style="width:15%;">变更时间</th>
-				   	   	 	<th class="th2" style="width:10%;">操作人</th>
-				   	   	 	<th class="th3" style="width:15%;">登录IP</th>
-				   	   	 	<th class="th4" style="width:10%;">操作类型</th>
-				   	   	 	<th style="width:30%;">变更详情</th>
-						</tr>
+						<tr class="theadTr">
+			                <th class="theadTh" style="width:15%;">变更时间</th>
+			                <th class="theadTh" style="width:10%;">操作人</th>
+			                <th class="theadTh" style="width:15%;">登录IP</th>
+			                <th class="theadTh" style="width:10%;">操作类型</th>
+			                <th class="theadTh" style="width:30%;">变更详情</th>
+			            </tr> 
 					</thead>
 					<tbody>
 						<#if logList ??>
 						<#list logList as log>
-				   	        <tr class="odd">
-							<td >${log.operTime?datetime!}</td>
-				   	   	 	<td >${log.accountName!}</td>
-				   	   	 	<td >${log.userIp!}</td>
-				   	   	 	<td >${log.actionType!}</td>
-				   	   	 	<td >${log.action!}</td>
-				   	   	 	</tr>
+							<tr id="tbodyTr">
+								<td class="tbodyTd">${log.operTime?datetime!}</td>
+								<td class="tbodyTd">${log.userRealName!}</td>
+								<td class="tbodyTd">${log.userIp!}</td>
+								<td class="tbodyTd">${log.actionType!}</td>
+								<td class="tbodyTd">${log.action!}</td>
+							</tr>
 						</#list>
 						</#if>
 					</tbody>
 				</table>
-			
-				<div id="daochu" style="margin-left:20px;">
-					<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-					<a style="margin:-34px 0 0 180px;" class="ljbtn2 backbtn" href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">返回</a>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="${ctx}/advertiser/main/ad/target/ad/exportAmendmentLogExcel?bannerId=${bannerId!}&adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">导出Excel</a>
+					<a class="btn-back" href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">返回</a>
 				</div>
-							
 				<div id="pageDiv">
-	               	<#include "/common/pagination/simple.ftl"/>
-	            </div>	
-            
-            </div>
-		</form>
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
 	</div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/create.ftl

@@ -1,164 +1,100 @@
-<@override name="head">
-	<title>创建活动</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript">
-		$(function(){
-			$('#pickTime').dateRangePicker();
-			$("#validation-form").autovalidate();
-			$(".btn3").click(function(){
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				var falg = validateMoney();
-				if(falg == false){
-					return false;
-				}
-			});
-			$(".btn4").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}";
-			});
-			
-	    	$("#validation-form input[name='totalBudget']").blur(function(){
-				validateMoney();
-			});
-			
-	    });
-	    
-	    function validateMoney(){
-			var reg=/^\d{1,8}\.?\d{0,2}$/;
-			var $this = $("#validation-form input[name='totalBudget']");
-			if($this.val().match(reg)!=null){
-				if(($this.val().indexOf('.') == -1 && $this.val().length > 8) || $this.val() <= 0){
-					$this.css("box-shadow","0 0 6px red").attr('title','总预算金额整数位最多8位');
-					$this.parent("div").find("span.spanVaildate").html("总预算金额整数位最多8位").css("color","red");
-					return false;
-				}else if($this.val() > parseInt($("#orderTotalBudget").val())){
-					$this.css("box-shadow","0 0 6px red").attr('title','总预算不能大于订单总预算');
-					$this.parent("div").find("span.spanVaildate").html("总预算不能大于订单总预算").css("color","red");
-					return false;
-				}else{
-					$this.css("box-shadow","none").attr('title','');
-					$this.parent("div").find("span.spanVaildate").html("");
-				}
-			}else{
-				$this.css("box-shadow","0 0 6px red").attr('title','总预算金额整数位最多8位且最多有2位小数');
-				$this.parent("div").find("span.spanVaildate").html("总预算金额整数位最多8位且最多有2位小数").css("color","red");
-				return false;
-			}
-		}
-	</script>
-		
-</@override>
+<@override name="head">	
+<title>创建活动</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/campaign.js"></script>
+</@override>	
 <@override name="body">
 <div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-    	<div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">创建活动</li>
-			</ul>  
-	 	</div>
-	 	<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/ad/target/campaign/save" method="post">
-			<div class="all">
-				<div class="line1">
-					<label class="label1"><span style="color:dodgerblue;">*</span>活动名称：</label>
-					<div class="xianzhi">
-						<input class="shuru1" autocomplete="off" id="name" name="name" type="text" value="" verify="unspecial/50/1/0"><span class="spanVaildate"></span>
-					</div>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">创建活动</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/campaign/save" method="post">
+	 			<input type="hidden" id="orderTotalBudget" value="${orderTotalBudget!}"/>
+	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
+	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>
+	 			<input type="hidden" name="agentId" value="${agentId!}"/>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>活动名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>活动周期：</label>
+					<span id="input-calendar">
+						<i class="icon-calendar"></i>   
+						<input type="text" tabindex="2" name="pickTime" id="dateRangePicker" value="" verify="date-to/24/1/0"/><span class="spanVaildate"></span>
+					</span>
 				</div>
-				<div class="line2" style="clear:both;">
-					<label class="label2"><span style="color:dodgerblue;">*</span>活动周期：</label>
-					<input class="shuru2" autocomplete="off" id="pickTime" name="pickTime" type="text" value="" verify="text/30/1/0" data-date-format="yyyy-mm-dd">
-					<span class="add-on"><i class="icon-calendar" style="position:absolute;margin:12px 0 0 -20px;background-image:none;"></i></span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>总预算：</label>
+					<input class="input-text" tabindex="3" id="totalBudget" name="totalBudget" type="text" value="" verify="float/11/1/2"/>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span>
 				</div>
-				<div class="line2" style="clear:both;padding-top:15px;">
-					<label class="label2"><span style="color:dodgerblue;">*</span>总预算：</label>
-						<input type="hidden" id="orderTotalBudget" value="${orderTotalBudget!}"/>
-						<input class="shuru2" autocomplete="off" id="yusuan" name="totalBudget" type="text" value="" verify="float/10/1/2" style="margin-left:13px !important;">
-						<input class="yusuanyu" value="元"><span class="help-inline">总预算不能大于订单总预算</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日预算：</label>
+					<input class="input-text" tabindex="4" id="dailyBudget" name="dailyBudget" type="text" value="" verify="float/11/0/2"/>
+					<span class="input-span">元</span><span class="help-inline">若不设置，系统默认将总预算在投放周期内的均值作为每日预算</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;每日预算：</label>
-					<input class="shuru3" autocomplete="off" id="dailyBudget" name="dailyBudget" type="text" value="" verify="float/10/0/2">
-					<input class="yusuanyu" value="元"><span class="help-inline">若不设置，系统默认将总预算在投放周期内的均值作为每日预算</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>曝光总上限：</label>
+					<input class="input-text" tabindex="5" id="impression" name="impression" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;曝光总上限：</label>
-					<input class="shuru3" autocomplete="off" id="impression" name="impression" type="text" value="" verify="number/11/0/0">
-					<input class="yusuanyu" value="千次"><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>点击总上限：</label>
+					<input class="input-text" tabindex="6" id="click" name="click" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被点击多少次，-1代表不限</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;点击总上限：</label>
-					<input class="shuru3" autocomplete="off" id="click" name="click" type="text" value="" verify="number/11/0/0">
-					<input class="yusuanyu" value="次"><span class="help-inline">整个投放期，广告最多被点击多少次，-1代表不限</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>转化总上限：</label>
+					<input class="input-text" tabindex="7" id="conversion" name="conversion" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;转化总上限：</label>
-					<input class="shuru3" autocomplete="off" id="conversion" name="conversion" type="text" value="" verify="number/11/0/0">
-					<input class="yusuanyu" value="次"><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日曝光总上限：</label>
+					<input class="input-text" tabindex="8" id="dailyImpression" name="dailyImpression" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">每天，广告最多被曝光多少千次</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;每日曝光总上限：</label>
-					<input class="shuru3" autocomplete="off" id="dailyImpression" name="dailyImpression" type="text" value="" verify="number/11/0/0">
-					<input class="yusuanyu" value="千次"><span class="help-inline">每天，广告最多被曝光多少千次</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日点击总上限：</label>
+					<input class="input-text" tabindex="9" id="dailyClick" name="dailyClick" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被点击多少次</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;每日点击总上限：</label>
-					<input class="shuru3" autocomplete="off" id="dailyClick" name="dailyClick" type="text" value="" verify="number/11/0/0">
-					<input class="yusuanyu" value="次"><span class="help-inline">每天，广告最多被点击多少次</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日转化总上限：</label>
+					<input class="input-text" tabindex="10" id="dailyConversion" name="dailyConversion" type="text" value="" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被转换多少次</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;每日转化总上限：</label>
-					<input class="shuru3" autocomplete="off" id="dailyConversion" name="dailyConversion" type="text" value="" verify="number/11/0/0">
-					<input class="yusuanyu" value="次"><span class="help-inline">每天，广告最多被转换多少次</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>备注：</label>
+					<input class="input-text" tabindex="11" id="memo" name="memo" type="text" value="" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;备注：</label>
-					<input class="shuru3" autocomplete="off" id="memo" name="memo" type="text" value="" verify="unspecial/255/0/0"><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
 				</div>
-			</div>	
-			<div class="btnall" style="margin:80px 0 0 50px;">
-				<input  class="btn3" type="submit" value="保存" style="width:120px;">
-				<button  class="btn4" type="reset">取消</button>
-			</div>
-	 		
-		<input  autocomplete="off"   type="hidden" name="orderId" value="${orderId}">
-		<input  autocomplete="off"   type="hidden" name="advertiserId" value="${advertiserId}">
-		<input  autocomplete="off"   type="hidden" name="agentId" value="${agentId}">
-	 </form>
-	</div>		
-</div>	
+			</form>
+		</div>
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/edit.ftl

@@ -1,163 +1,100 @@
-<@override name="head">
-	<title>创建活动</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript">
-		$(function(){
-			$('#pickTime').dateRangePicker();
-			$("#validation-form").autovalidate();
-			$(".btn3").click(function(){
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				var falg = validateMoney();
-				if(falg == false){
-					return false;
-				}
-			});
-			$(".btn4").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}";
-			});
-			
-			$("#validation-form input[name='totalBudget']").blur(function(){
-					validateMoney();
-				});
-				
-		    });
-		    
-		    function validateMoney(){
-				var reg=/^\d{1,8}\.?\d{0,2}$/;
-				var $this = $("#validation-form input[name='totalBudget']");
-				if($this.val().match(reg)!=null){
-					if(($this.val().indexOf('.') == -1 && $this.val().length > 8) || $this.val() <= 0){
-						$this.css("box-shadow","0 0 6px red").attr('title','总预算金额整数位最多8位');
-						$this.parent("div").find("span.spanVaildate").html("总预算金额整数位最多8位").css("color","red");
-						return false;
-					}else if($this.val() > parseInt($("#orderTotalBudget").val())){
-						$this.css("box-shadow","0 0 6px red").attr('title','总预算不能大于订单总预算');
-						$this.parent("div").find("span.spanVaildate").html("总预算不能大于订单总预算").css("color","red");
-						return false;
-					}else{
-						$this.css("box-shadow","none").attr('title','');
-						$this.parent("div").find("span.spanVaildate").html("");
-					}
-				}else{
-					$this.css("box-shadow","0 0 6px red").attr('title','总预算金额整数位最多8位且最多有2位小数');
-					$this.parent("div").find("span.spanVaildate").html("总预算金额整数位最多8位且最多有2位小数").css("color","red");
-					return false;
-				}
-			}
-	</script>
-		
-</@override>
+<@override name="head">	
+<title>编辑活动</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/campaign.js"></script>
+</@override>	
 <@override name="body">
 <div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-    	<div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">创建活动</li>
-			</ul>  
-	 	</div>
-	 	<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/ad/target/campaign/save" method="post">
-			<div class="all">
-				<div class="line1">
-					<label class="label1"><span style="color:dodgerblue;">*</span>活动名称：</label>
-					<div class="xianzhi">
-						<input class="shuru1" autocomplete="off" id="name" name="name" type="text" value="${campaign.name}" verify="unspecial/50/1/0"><span class="spanVaildate"></span>
-					</div>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">编辑活动</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/campaign/save" method="post">
+	 			<input type="hidden" id="orderTotalBudget" value="${orderTotalBudget!}"/>
+	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
+	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>
+	 			<input type="hidden" name="id" value="${campaign.id!}"/>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>活动名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="${campaign.name!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>活动周期：</label>
+					<span id="input-calendar">
+						<i class="icon-calendar"></i>   
+						<input type="text" tabindex="2" name="pickTime" id="dateRangePicker" value="${campaign.activeTime!?date} to ${campaign.expireTime!?date}" verify="date-to/24/1/0"/><span class="spanVaildate"></span>
+					</span>
 				</div>
-				<div class="line2" style="clear:both;">
-					<label class="label2"><span style="color:dodgerblue;">*</span>活动周期：</label>
-					<input class="shuru2" autocomplete="off" id="pickTime" name="pickTime" type="text" value="${campaign.activeTime?date} to ${campaign.expireTime?date}" verify="text/30/1/0" data-date-format="yyyy-mm-dd">
-					<span class="add-on"><i class="icon-calendar" style="position:absolute;margin:12px 0 0 -20px;background-image:none;"></i></span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>总预算：</label>
+					<input class="input-text" tabindex="3" id="totalBudget" name="totalBudget" type="text" value="${campaign.totalBudget!}" verify="float/11/1/2"/>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span>
 				</div>
-				<div class="line2" style="clear:both;padding-top:15px;">
-					<label class="label2"><span style="color:dodgerblue;">*</span>总预算：</label>
-					<input type="hidden" id="orderTotalBudget" value="${orderTotalBudget!}"/>
-					<input class="shuru2" autocomplete="off" id="yusuan" name="totalBudget" type="text" value="${campaign.totalBudget}" verify="float/10/1/2" style="margin-left:13px !important;">
-					<input class="yusuanyu" value="元"><span class="help-inline">总预算不能大于订单总预算</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日预算：</label>
+					<input class="input-text" tabindex="4" id="dailyBudget" name="dailyBudget" type="text" value="${campaign.dailyBudget!}" verify="float/11/0/2"/>
+					<span class="input-span">元</span><span class="help-inline">若不设置，系统默认将总预算在投放周期内的均值作为每日预算</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;每日预算：</label>
-					<input class="shuru3" autocomplete="off" id="dailyBudget" name="dailyBudget" type="text" value="${campaign.dailyBudget}" verify="float/10/0/2">
-					<input class="yusuanyu" value="元"><span class="help-inline">若不设置，系统默认将总预算在投放周期内的均值作为每日预算</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>曝光总上限：</label>
+					<input class="input-text" tabindex="5" id="impression" name="impression" type="text" value="${campaign.impression!}" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;曝光总上限：</label>
-					<input class="shuru3" autocomplete="off" id="impression" name="impression" type="text" value="${campaign.impression}" verify="number/11/0/0">
-					<input class="yusuanyu" value="千次"><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>点击总上限：</label>
+					<input class="input-text" tabindex="6" id="click" name="click" type="text" value="${campaign.click!}" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被点击多少次，-1代表不限</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;点击总上限：</label>
-					<input class="shuru3" autocomplete="off" id="click" name="click" type="text" value="${campaign.click}" verify="number/11/0/0">
-					<input class="yusuanyu" value="次"><span class="help-inline">整个投放期，广告最多被点击多少次，-1代表不限</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>转化总上限：</label>
+					<input class="input-text" tabindex="7" id="conversion" name="conversion" type="text" value="${campaign.conversion!}" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;转化总上限：</label>
-					<input class="shuru3" autocomplete="off" id="conversion" name="conversion" type="text" value="${campaign.conversion}" verify="number/11/0/0">
-					<input class="yusuanyu" value="次"><span class="help-inline">整个投放期，广告最多被曝光多少千次，-1代表不限</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日曝光总上限：</label>
+					<input class="input-text" tabindex="8" id="dailyImpression" name="dailyImpression" type="text" value="${campaign.dailyClick!}" verify="number/11/0/0"/>
+					<span class="input-span">千次</span><span class="help-inline">每天，广告最多被曝光多少千次</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;每日曝光总上限：</label>
-					<input class="shuru3" autocomplete="off" id="dailyImpression" name="dailyImpression" type="text" value="${campaign.dailyClick}" verify="number/11/0/0">
-					<input class="yusuanyu" value="千次"><span class="help-inline">每天，广告最多被曝光多少千次</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日点击总上限：</label>
+					<input class="input-text" tabindex="9" id="dailyClick" name="dailyClick" type="text" value="${campaign.impression!}" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被点击多少次</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;每日点击总上限：</label>
-					<input class="shuru3" autocomplete="off" id="dailyClick" name="dailyClick" type="text" value="${campaign.impression}" verify="number/11/0/0">
-					<input class="yusuanyu" value="次"><span class="help-inline">每天，广告最多被点击多少次</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>每日转化总上限：</label>
+					<input class="input-text" tabindex="10" id="dailyConversion" name="dailyConversion" type="text" value="${campaign.dailyConversion!}" verify="number/11/0/0"/>
+					<span class="input-span">次</span><span class="help-inline">每天，广告最多被转换多少次</span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;每日转化总上限：</label>
-					<input class="shuru3" autocomplete="off" id="dailyConversion" name="dailyConversion" type="text" value="${campaign.dailyConversion}" verify="number/11/0/0">
-					<input class="yusuanyu" value="次"><span class="help-inline">每天，广告最多被转换多少次</span><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>备注：</label>
+					<input class="input-text" tabindex="11" id="memo" name="memo" type="text" value="${campaign.memo!}" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
 				</div>
-				<div class="line3" style="width:1000px;">
-					<label class="label3" >&nbsp;&nbsp;备注：</label>
-					<input class="shuru3" autocomplete="off" id="memo" name="memo" type="text" value="${campaign.memo}" verify="unspecial/255/0/0"><span style="margin-top:8px;" class="spanVaildate"></span>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
 				</div>
-			</div>	
-			<div class="btnall" style="margin:80px 0 0 50px;">
-				<input  class="btn3" type="submit" value="保存" style="width:120px;">
-				<button  class="btn4" type="reset">取消</button>
-			</div>
-		<input  autocomplete="off"   type="hidden" name="id" value="${campaign.id}">
-		<input  autocomplete="off"   type="hidden" name="orderId" value="${orderId}">
-		<input  autocomplete="off"   type="hidden" name="advertiserId" value="${advertiserId}">
-	 </form>
-	</div>		
-</div>	
+			</form>
+		</div>
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/list.ftl

@@ -1,225 +1,121 @@
 <@override name="head">
-	<title>投放管理-活动管理</title>
-    <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	
-	<script type="text/javascript">
-   	$(document).ready(function(){
-		 //搜索按钮的实现
-		$("#search_img").click(function(){
-			var $searchValue = $(".search-form input[name=searchValue]");
-			if($searchValue.val() == "请输入关键字"){
-				$searchValue.val(null);
-			};
-			var advertiserId=$(".search-form input[name=advertiserId]").val();
-			var page=$(".search-form input[name=page]").val();
-			a=${orderId};
-            url = "${ctx}/advertiser/main/ad/target/campaign/list";  
-            param=$("#search1").val();
-            status=${status};
-            location.href=url+"?searchValue="+param+"&status="+status+"&page="+page+"&advertiserId="+advertiserId+"&orderId="+a;
- 		}); 
-		 	//状态全部、开启、停用
-			var p=${status};
-			if (p==2){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtqb").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else if(p==1){
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtty").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}else {
-				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
-				$(".zhtzhch").removeClass("zhuangtai1").addClass("zhuangtaiall");
-			}	
-			
-			//开启,暂停,删除
-			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/advertiser/main/ad/target/campaign/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/advertiser/main/ad/target/campaign/disable";
-				}else if($(this).attr("id") == "btn-delete"){
-					url = "${ctx}/advertiser/main/ad/target/campaign/delete";
-				}
-				singleOper($(this),url,"${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId!}&orderId=${orderId!}");
-			});
-			
-			//批量开启,批量暂停,批量删除
-			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/advertiser/main/ad/target/campaign/enable";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/advertiser/main/ad/target/campaign/disable";
-				}else if($(this).attr("id") == "all-btn-delete"){
-					url = "${ctx}/advertiser/main/ad/target/campaign/delete";
-				}
-				batchOpear($(this),url,"${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId!}&orderId=${orderId!}");
-			});
-			
-			/*
-			 * 实现分页跳转
-			 */
-			$("#pageDiv .pagination ul li a[href]").click(function(){
-				var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-				var _form = $('.search-form');
-				_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-				_form.find('img').click();//触发搜索
-				//return false;
-			});	
-			
-			$(".btn1").click(function(){
-				if($("#orderId").val() == "" || $("#orderId").val() == -1){
-					$("#btnCreatelink").attr("href","javascript:void(0);");
-					bootbox.alert("请选择订单！");
-					$("#btnCreatelink").attr("title","请选择订单");
-					return false;
-				}
-			});
-			
-			$('ul#orderul_son_ul li').live("click",function(){
-				window.location.href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId="+$("#advertiserId").val()+"&orderId="+$("#orderId").val()+"&status=${status}";
-	 		});
-	 		
-		});
-
-</script>	
-</@override>
+<title>活动管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/campaign.js"></script>
+</@override> 
 <@override name="body">
 <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent" style="padding-bottom:80px;">
-	    <div id="third">
-			<ul style="padding-top:20px;margin:0px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a> <span class="divider3"><i class="icon-angle-right"></i></span><li class="size3">活动管理</li></li>
-				<#elseif role == "advertiser">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a> <span class="divider3"><i class="icon-angle-right"></i></span><li class="size3">活动管理</li></li>
-				</#if>
-			</ul>  
-		</div>
-		<div id="selectuls" style=" margin: 0 0 0 10px;">
-			<ul id="main_advertiserul">
-				<li class="select_box" id="advertiserul_box">
-					<span id="advertiserul_span">${selectedadvertiserName!}</span>
-					<ul class="son_ul" id="advertiser_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-			<ul id="main_orderul">
-				<li class="select_box" id="orderul_box">
-					<span id="orderul_span">${selectedorderName!}</span>
-					<ul class="son_ul" id="orderul_son_ul"></ul>
-				</li>
-			</ul>
-			<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-		</div>
-		<div id="class23">	 
-			<div id="class3" style="border-bottom:none;">
-				<ul id="zhuangtai" style="margin-left:5px;">
-					<li class="zhuangtaichoose" style="border-bottom:none;margin-left:0px;margin-bottom:15px;">状态：</li>
-					<a href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}&status=2" ><li class="zhuangtaiall zhtqb">全部</li></a>
-					<a href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}&status=0" ><li class="zhuangtai1 zhtzhch">正常</li></a>
-					<a href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}&status=1" ><li class="zhuangtai1 zhtty">停用</li></a>
-				</ul>
-			</div> 
-		</div>     
- 		<div id="class4" style="height:34px;clear:both;">
-			<div id="button">	
-				<a id="btnCreatelink" style="margin:0px 5px 0 10px;" href="${ctx}/advertiser/main/ad/target/campaign/create?advertiserId=${advertiserId}&orderId=${orderId}" ><button  class="btn1" >创建活动</button></a>
-				<button style="margin-right:5px;" class="btn1" id="all-btn-enable" >批量开启</button>
-				<button style="margin-right:5px;" class="btn1" id="all-btn-disable" >批量停用</button>
-				<button style="margin:0px;" class="btn1" id="all-btn-delete">批量删除</button>
-			</div>
-		<div class="class41"> 
-		<input type="hidden" id="orderId" name="orderId" value="${orderId!}">
-			<form  method="post" class="search-form">
-				<input type="hidden" id="role" value="${role}">
-				<input type="hidden" id="agentId" value="${userSession.agentId}">
-				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-				<div  id="search" style="float:right;margin-right:30px;"> 
-					<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}">
-					<input  id="page" autocomplete="off"   type="hidden" name="page" value="${pager.page}"> 
-					<input id="searchKey"   autocomplete="off"   type="hidden" name="searchKey" value="${searchKey!'contactName'}">
-					<input id="search1" type="text" name="searchValue" value="${searchValue!}" >
-					<img id="search_img" src="${ctx}/assets/advertiser/images/fangdajing.png"/>
-					
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">活动管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}" method="post">
+ 				<input type="hidden" id="status" name="status" value="${status!}"/>
+ 				<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="advertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="orderId" id="orderId" value="${orderId!}"/>
+					<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
 				</div>
-			</form>
-	 	</div>           
-  		<div id="class5" style="width:100%;margin:20px 0px 0 10px;">
-  		    	<table border="1" style="width:98%;float:left;margin-top: 15px;" id="table1">
-               		<thead>
-                    	<tr class="tr1"  id ='tr11'>
-		                	<th class="th11" style="width:7%;"> <div class="fxk"></div></th>
-		                    <th class="td1" style="width:5%;">ID</th>
-		                    <th class="td1" style="width:9%;">活动名称</th>
-							<th class="td1" style="width:8%;">总预算</th>
-							<th class="td1" style="width:6%;">投放</th>
-							<th class="td1" style="width:15%;">投放周期</th>
-							<th class="td1" style="width:12%;">最后更新日期</th>
-							<th class="td1" style="width:7%;">状态</th>
-							<th class="td1" style="width:35%;" >操作</th>
-                    	</tr>
-                    </thead>
-                    <tbody id="tbody1">
-                    	<#if campaignList ??>
-                    	<#list campaignList as campaign>
-							<tr id="nuh" class="">
-			                    <td class="td2" ><div class="fxk1" id="#{campaign.id}"></div></td>
-		                        <td class="td2" >${campaign.id!}</td>
-		                        <td class="td2" >${campaign.name!}</td>
-		                        <td class="td2" >${campaign.totalBudget!}</td>
-		                        <td class="td2" ><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaign.id}&orderId=${orderId}&advertiserId=${advertiserId}"  style="color:#36aeea; text-decoration: underline;">${campaign.groupNumber!}个投放</a></td>		                                 
-		                        <td class="td2" >${campaign.activeTime?date}~${campaign.expireTime?date}</td>		            
-		                        <td class="td2" ><a href="${ctx}/advertiser/main/ad/target/campaign/update?campaignId=${campaign.id}&advertiserId=${advertiserId}" style="color:#36aeea; text-decoration: underline;">${campaign.upDated?datetime}</a></td>
-		                        <td class="td2" ><#if campaign.status==0>正常<#else>停用</#if></td>		                                     
-		                        <td class="td2" >
-		                           	<a href="${ctx}/advertiser/main/ad/target/campaign/edit?advertiserId=${advertiserId}&id=${campaign.id}" ><button style="margin:0px 5px 0 0;" class="btn122">编辑</button></a>		                      
-                                	<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId}&selectedadvertiserName=${selectedadvertiserName}&selectedorderId=${orderId}&selectedorderName=${selectedorderName}&selectedcampaignId=${campaign.id}&selectedcampaignName=${campaign.name}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
-		                           	<#if campaign.status==0>
-									<button style="margin:0px;" id="btn-disable" value=${campaign.id} class="btn122">停用</button>
-									<#elseif campaign.status=1>
-									<button style="margin:0px;" id="btn-enable" value=${campaign.id} class="btn122">开启</button>
-									</#if>
-									<button id="btn-delete"  value=${campaign.id} class="btn122">删除</button>
-		                        </td>
-		                    </tr>
-	                    </#list>
-                    	</#if>
-                    </tbody>
-              	</table>
-              	
-              	<div id="daochu">
-					<a style="text-decoration: none;" href="${ctx}/advertiser/main/ad/target/campaign/exportDataReportExcel?advertiserId=${advertiserId}&orderId=${orderId}&status=${status}"><div class="btn2">导出Excel</div></a>
+			    <div id="selectBar_status" class="selectBar">
+	 				<span>状态：</span>
+					<a value="2">全部</a>
+					<a value="0">正常</a>
+					<a value="1">停用</a>
+			    </div>
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/ad/target/campaign/create?orderId=${orderId!}&advertiserId=${advertiserId!}" class="btn2" id="btn-create">创建活动</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量停用</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+			            	<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			                <th class="theadTh" style="width:5%;">ID</th>
+			                <th class="theadTh" style="width:9%;">活动名称</th>
+			                <th class="theadTh" style="width:8%;">总预算</th>
+			                <th class="theadTh" style="width:6%;">投放</th>
+			                <th class="theadTh" style="width:15%;">投放周期</th>
+			                <th class="theadTh" style="width:12%;">最后更新日期</th>
+			                <th class="theadTh" style="width:7%;">状态</th>
+			                <th class="theadTh" style="width:35%;">操作</th>
+			            </tr> 
+					</thead>
+					<tbody>
+						<#if campaignList ??>
+						<#list campaignList as campaign>
+							<tr id="tbodyTr">
+								<td class="tbodyTd"><div class="checkboxStyleTd" id="${campaign.id!}"></div></td>
+								<td class="tbodyTd">${campaign.id!}</td>
+								<td class="tbodyTd">${campaign.name!}</td>
+								<td class="tbodyTd">${campaign.totalBudget!}</td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaign.id!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${campaign.groupNumber!}个投放</a></td>
+								<td class="tbodyTd">${campaign.activeTime?date}~${campaign.expireTime?date}</td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/campaign/update?campaignId=${campaign.id!}&advertiserId=${advertiserId!}" class="tableTdStyle">${campaign.upDated?datetime}</a></td>
+								<td class="tbodyTd"><#if campaign.status==0>正常<#else>停用</#if></td>
+								<td class="tbodyTd">
+									<div id="listButtons">
+										<a href="${ctx}/advertiser/main/ad/target/campaign/edit?id=${campaign.id!}&advertiserId=${advertiserId!}" class="btn3">编辑</a>
+										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId!}&selectedorderId=${orderId!}&selectedcampaignId=${campaign.id!}" class="btn3">查看报表</a>
+										<#if campaign.status==0>
+										<a id="btn-disable" value="${campaign.id!}" class="btn3">停用</a>
+										<#elseif campaign.status=1>
+										<a id="btn-enable" value="${campaign.id!}" class="btn3">开启</a>
+										</#if>
+										<a id="btn-delete" value="${campaign.id!}" class="btn3">删除</a>
+									</div>
+								</td>
+							</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_list()">导出Excel</a>
 				</div>
-				
-				<div id="pageDiv" style="margin:0px 30px 20px 0px;">
+				<div id="pageDiv">
 					<#include "/common/pagination/simple.ftl"/>
 				</div>
+			</form>
 		</div>
 	</div>
-<div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
-
-
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/update.ftl

@@ -1,97 +1,65 @@
 <@override name="head">
-	<title>活动信息修改记录</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/target/campaign/exportLogExcel?campaignId=${campaignId}");
-		};
-		
-	</script>
-	
-</@override>
-
+<title>活动信息修改记录</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+</@override> 
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul style="padding-top:20px;margin-left:9px;">
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<#if role == "agent">
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">投放管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				</#if>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}">活动管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">活动信息修改记录</li>
-			</ul>  
-		</div>
-		<form id="formPage" action="${ctx}/advertiser/main/ad/target/campaign/update?campaignId=${campaignId}&advertiserId=${advertiserId}" method="post">
-			<input  id="page" type="hidden" name="page" value="${pager.page}">
-			<input  id="orderId" type="hidden" name="orderId" value="${orderId}">
-			<div id="account-table" style="margin-top:10px;">
-				<table border="1" class="tablefig" id="tablefig">
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">活动信息修改记录</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/target/campaign/update?campaignId=${campaignId!}&advertiserId=${advertiserId!}" method="post">
+ 				<input id="page" type="hidden" name="page" value="${pager.page}"/>
+ 				<input id="orderId" type="hidden" name="orderId" value="${orderId!}"/>
+				<table border="1" class="tableFig tableUpdate">
 					<thead>
-						<tr>
-							<th class="th1" style="width:15%;">变更时间</th>
-				   	   	 	<th class="th2" style="width:10%;">操作人</th>
-				   	   	 	<th class="th3" style="width:15%;">登录IP</th>
-				   	   	 	<th class="th4" style="width:10%;">操作类型</th>
-				   	   	 	<th style="width:30%;">变更详情</th>
-						</tr>
+						<tr class="theadTr">
+			                <th class="theadTh" style="width:15%;">变更时间</th>
+			                <th class="theadTh" style="width:10%;">操作人</th>
+			                <th class="theadTh" style="width:15%;">登录IP</th>
+			                <th class="theadTh" style="width:10%;">操作类型</th>
+			                <th class="theadTh" style="width:30%;">变更详情</th>
+			            </tr> 
 					</thead>
 					<tbody>
 						<#if logList ??>
 						<#list logList as log>
-				   	        <tr class="odd">
-							<td >${log.operTime?datetime!}</td>
-				   	   	 	<td >${log.accountName!}</td>
-				   	   	 	<td >${log.userIp!}</td>
-				   	   	 	<td >${log.actionType!}</td>
-				   	   	 	<td >${log.action!}</td>
-				   	   	 	</tr>
+							<tr id="tbodyTr">
+								<td class="tbodyTd">${log.operTime?datetime!}</td>
+								<td class="tbodyTd">${log.userRealName!}</td>
+								<td class="tbodyTd">${log.userIp!}</td>
+								<td class="tbodyTd">${log.actionType!}</td>
+								<td class="tbodyTd">${log.action!}</td>
+							</tr>
 						</#list>
 						</#if>
 					</tbody>
 				</table>
-			
-				<div id="daochu" style="margin-left:20px;">
-					<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-					<a style="margin:-34px 0 0 180px;" class="ljbtn2 backbtn" href="${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}">返回</a>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="${ctx}/advertiser/main/ad/target/campaign/exportLogExcel?campaignId=${campaignId!}">导出Excel</a>
+					<a class="btn-back" href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">返回</a>
 				</div>
-							
 				<div id="pageDiv">
-	               	<#include "/common/pagination/simple.ftl"/>
-	            </div>	
-            
-            </div>
-		</form>
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
 	</div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/clone-banner/index.ftl

@@ -1,199 +1,47 @@
 <@override name="head">
-	<title>广告投放系统</title>
-	<!--css-->
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/clonebanner.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	<!--公共头的样式-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<!--这个页面的样式-->
-	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	
-
-</@override>
+<title>从创意中心选择</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/adBanner.js"></script>
+</@override> 
 <@override name="body">
-
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-
-<div id= "pagecontent">
-	<div id="shortcutBar">
-			<span style="font-size:20px;padding-top:20px;">从创意中心选择</span>		         
-	</div>
-
-	<div id="selectCondition">
-        <div >
-			<label>创意尺寸：</label>
-			<a name="size" value="0">全部</a>
-			<#if sizeList ??>
-			<#list sizeList as size>	
-                	<a name="size" value="${size.width}X${size.height}">
-                		${size.width}X${size.height}
-                	</a>
-			</#list>
-			</#if>           
-		</div>
-		
-        <div>
-            <label>创意类型：</label>
-               <a name="type" value="0">全部</a>
-               <a name="type" value="1">Flash</a>   
-               <a name="type" value="2">图片</a>      
-               <a name="type" value="3">视频</a>
-		</div>
-		
-		</div>
-     
-
-       <div id="searchBar" >
-		      	
-			<form action="${ctx}/advertiser/main/ad/target/clone-banner/list" class="search-form" method="post">
-				<input type="hidden" name="page" value="${pager.page!}">
-				<input type="hidden" name="searchKey" value="name">
-				<input type="hidden" name="adGroupId" value="${adGroupId!}">
-				<input type="text" name="searchValue" value="请输入需要搜索的内容" onkeydown="if(event.keyCode==13){return false;}">
-				<img id="serachData_img" src="${ctx}/assets/advertiser/images/fangdajing1.png"/>
+    <div id="pagecontent">
+   		<div id="content">
+   			<p id="cloneListP">从创意中心选择</p>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/target/clone-banner?adGroupId=${adGroupId!}" method="post">
+ 				<input type="hidden" id="width" name="width" value="${width!}"/>
+				<input type="hidden" id="height" name="height" value="${height!}"/>
+				<input type="hidden" id="type" name="type" value="${type!}"/>
+				<input type="hidden" id="size" name="size" value="${size!}"/>
+				<input type="hidden" id="adGroupId" name="adGroupId" value="${adGroupId!}"/>
+   				<div id="selectBar_size" class="selectBar">
+	 				<span>创意尺寸：</span>
+					<a value="">全部</a>
+					<#if sizeList ??>
+					<#list sizeList as size>	
+                	<a value="${size.width!}X${size.height!}">${size.width!}X${size.height!}</a>
+					</#list>
+					</#if>
+			    </div>
+			    <div id="selectBar_type" class="selectBar">
+	 				<span>创意类型：</span>
+					<a value="">全部</a>
+		            <a value="1">Flash</a>   
+		            <a value="2">图片</a>      
+		            <a value="3">视频</a>
+			    </div>
+			    <div id="navButtons">
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<#include "list.ftl">
 			</form>
 		</div>
-
-	<div id="tableList">
-        <#include "list.ftl">
 	</div>
 </div>
-
 </@override>
-<@extends name="/common/simple.ftl"/>
-
-
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-<script type="text/javascript">
-	
-	$(document).ready(function(){
-		
-	  //个人信息栏的js控制
-		$("#divselect").click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-		
-		//搜索输入框的样式改变
-		$("#searchBar input[name='searchValue']").focus(function(){
-			$(this).val("");
-		});
-		$("#searchBar input[name='searchValue']").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入需要搜索的内容");
-			}
-		});
-		
-		
-		$("#all").click(function(){
-			/*alert("复选框进来了没有？");*/
-			 var obj=document.getElementsByName("id");
-			/* console.log(obj);*/
-			    if(document.getElementById("all").checked==true){
-			        for(var i=0;i<obj.length;i++){
-			            obj[i].checked=true;
-			        }
-			    }else{
-			        for(var i=0;i<obj.length;i++){ obj[i].checked=false;}
-			         }
-		 });
-		
-		//搜索按钮
-		$('#searchBar img').click(function(){
-			var _form = $('#searchBar .search-form');
-			var $searchValue = $("#searchBar .search-form input[name=searchValue]")
-			if($searchValue.val() == "请输入需要搜索的内容"){
-				$searchValue.val(null);
-			};
-			var _url = _form.attr('action');
-			var _param = $('#tableList form').serialize();
-			_param = _form.serialize() + "&" + _param;
-			console.log("search url:"+_url+", param:"+_param);
-			//window.location.assign(_url + "?" + _param);
-			$.post(_url, _param, function(data) {
-				$('#tableList').html(data);
-			});
-			if($searchValue.val() == ''){
-				$searchValue.val("请输入需要搜索的内容");
-			};
-			return false;
-		});
-		
-		// 以下是实现创意尺寸，创意类型的筛选。
-		$('#selectCondition a').click(function() {	
-			console.log('aaa');
-			var _href = $(this).attr('href');
-			var _name = $(this).attr('name');
-			var _value = $(this).attr('value');
-			if(_name == 'size') {
-				var _width = null;
-				var _height = null;
-				if(_value != 0) {
-					var _size = _value.split('X',2);
-					console.info('_size:'+_size);
-					_width = _size[0];
-					_height = _size[1];
-				}
-				$("#tableList form input[name=width]").val(_width);
-				$("#tableList form input[name=height]").val(_height);
-			}
-			if(_name == 'type'){
-				if(_value != 0) {
-					$("#tableList form input[name=type]").val(_value);
-				} else {
-					$("#tableList form input[name=type]").val(null);
-				}
-			}
-			$(this).siblings().css('border-bottom','2px solid #f4f5f7');	
-			$(this).css('border-bottom','2px solid #36aeea');
-			$('#searchBar img').click();
-		});
-		
-		// 绑定表格中编辑/取代码/查看报表/开启停用得按钮点击事件
-		$(document).on('click','#tableList button',function() {
-			var _href = $(this).attr('href');
-			var btn = $(this);
-			
-			// 防止二次点击
-			$(this).attr('disabled', 'disabled');		
-			// 停用开启时需要提醒
-			if (btn.text() && (btn.text().indexOf("取消")>-1)) {
-				if (_href&&_href!='#') {
-					window.location.href=_href;
-				}
-			} else {
-				if(btn.text() && (btn.text().indexOf("保存")>-1)){
-			
-				var _checkboxes = $('table tbody input:checkbox:checked');
-				if (_checkboxes.size()>0) {	
-					//防止二次提交
-					$(this).attr('disabled', 'disabled');
-					var _url = $(this).attr("href");
-					var _param = _checkboxes.serialize();
-					//window.location.href=_url;
-					$.post(_url, _param, function(data) {
-						window.location.href=_url;
-						$('#box').html(data);
-					});
-				}		
-			}
-		}		
-			return false;
-		});
-
-		// 分页中超链接跳转
-		
-		 $(document).on('click','#paged .pagination ul li a[href]',function(){
-		     	var _page = $(this).attr('href').substr(1);
-		     	var _form = $('#pagecontent .search-form');
-		     	_form.find('input:hidden[name=\'page\']').val(_page);
-		     	_form.find('img').click();
-		     	return false;
-		     });
-		
-	});
-	
-</script>
-
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/clone-banner/list.ftl

@@ -1,65 +1,44 @@
-<table class="table">
-    <thead>
-        <tr>
-            <th class="center" style="width:5%;">
-				<label class="fxk-label"><input id="all" class="fxk-check-box"  autocomplete="off"   type="checkbox" />
-				<span class="fxk-span"></span>
-				</label>		
-			</th>
-            <th >ID</th>
-            <th >创意</th>
-            <th class="dataToggle hide-piece">创意名称</th>
-            <th>创意尺寸</th>
-            <th>创意类型</th>
-            <th class="hidden-480">上传时间</th>
-            <th>创意状态</th>
-        </tr>
+<table border="1" class="tableFig">
+	<thead>
+		<tr class="theadTr">
+			<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			<th class="theadTh" style="width:5%;">ID</th>
+			<th class="theadTh" style="width:15%;">创意</th>
+			<th class="theadTh" style="width:10%;">创意名称</th>
+			<th class="theadTh" style="width:10%;">创意尺寸</th>
+			<th class="theadTh" style="width:10%;">创意类型</th>
+			<th class="theadTh" style="width:15%;">上传时间</th>
+			<th class="theadTh" style="width:8%;">创意状态</th>
+		</tr>
     </thead>
     <tbody>
 		<#if bannerTemplateList ??>
         <#list bannerTemplateList as bannerTemplate>
-        <tr class="">
-            <td class="center" style="width:5%">
-				<label class="fxk-label"><input class="fxk-check-box" autocomplete="off"   type="checkbox" name="id" value="#{bannerTemplate.id}" />
-				<span class="fxk-span"></span>
-				</label>
-			</td>
-            <td >${bannerTemplate.id!}</td>
-            <td class="hidden-480"><img src='${bannerTemplate.pathSmall!}'></td>
-            <td class='bannerName'>
-            	<input readonly="readonly" value='${bannerTemplate.name!}'/>
-            </td>
-            <td>${bannerTemplate.width!}x${bannerTemplate.height!}</td>
-            <td>
-            	<#if bannerTemplate.type == 1>Flash<#elseif bannerTemplate.type == 2>图片<#else>视频</#if>
-            </td>
-            <td class="hidden-480">${bannerTemplate.updated?datetime}</td>
-            <td><#if bannerTemplate.status==0>开启<#else>停用</#if></td>
-        </tr>
+        <tr id="tbodyTr">
+			<td class="tbodyTd"><div class="checkboxStyleTd" id="${bannerTemplate.id!}"></div></td>
+			<td class="tbodyTd">${bannerTemplate.id!}</td>
+			<td class="tbodyTd"><img src='${bannerTemplate.pathSmall!}'></td>
+			<td class="tbodyTd">${bannerTemplate.name!}</td>
+			<td class="tbodyTd">${bannerTemplate.width!}x${bannerTemplate.height!}</td>
+			<td class="tbodyTd"><#if bannerTemplate.type == 1>Flash<#elseif bannerTemplate.type == 2>图片<#else>视频</#if></td>
+			<td class="tbodyTd">${bannerTemplate.updated!?datetime}</td>
+			<td class="tbodyTd"><#if bannerTemplate.status==0>开启<#else>停用</#if></td>
+		</tr>
         </#list>
         <#if bannerTemplateList?size==0>
-	                   <tr class="">
-	                   		<td class="center" colspan="9">
-	                            <label><span class="lbl" >创意中心没有创意，请先去创意中心创建创意</span></label>
-	                        </td>
-	                   </tr>
-	       </#if>
+	    	<tr id="tbodyTr">
+	        	<td class="tbodyTd" colspan="9">
+	            	<label><span>创意中心没有创意，请先去创意中心创建创意</span></label>
+	            </td>
+	        </tr>
+	    </#if>
 		</#if>           
     </tbody>
 </table>
-
-<form class="selectParam">
-	<input type="hidden" name="width" value="${width!}">
-	<input type="hidden" name="height" value="${height!}">
-	<input type="hidden" name="type" value="${type!}">
-</form>
-
-<div id="footBar">
-	<div class="btn2">
-            <button id="save"  href="${ctx}/advertiser/main/ad/target/clone-banner/save?adGroupId=${adGroupId!}">保存</button>
-			<button id="cancel" href="${ctx}/advertiser/main/ad/target/create-banner/list?adGroupId=${adGroupId!}">取消</button>
-	</div>
-	<div id="paged">
-       <#include "/common/pagination/simple.ftl"/>
-    </div>
+<div id="exportReport">
+	<a id="btn-save" class="btn_export" onClick="cloneSaveBanner()">保存</a>
+	<a id="btn-cancel" class="btn-back" href="${ctx}/advertiser/main/ad/target/create-banner/list?adGroupId=${adGroupId!}">取消</a>
 </div>
+<div id="pageDiv">
+	<#include "/common/pagination/simple.ftl"/>
+</div>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/create-banner/list.ftl

@@ -1,317 +1,110 @@
 <@override name="head">
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/createbanner.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-		
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<title>创建创意</title>
 <script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.ui.widget.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.iframe-transport.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.fileupload.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-		
-<style>
-	#third{height:50px}
-	#third li{float:left;}
-	#up{ border: 1px solid #36aeea;
-    	border-radius: 5px;
-		color: #36aeea;
-		cursor: pointer;
-		height: 34px;
-		margin-top: 10px;
-		width: 120px;
-		line-height:34px;
-		text-align:center}
-</style>
-</@override>
-
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/adBanner.js"></script>
+</@override> 
 <@override name="body">
-	
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
-		<div id="page-content">
-			<div id="box">
-				<div id="boxlist">
-					<div id="third">
-						<ul style="padding-top:20px;margin-left:9px;">
-							<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-							<span class="divider1"><i class="icon-angle-right"></i></span>
-							<#if role == "agent">
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a>
-							<span class="divider3"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">创意管理</a>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size3">创建创意
-							<#elseif role == "advertiser">
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId}">订单管理</a>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId}&advertiserId=${advertiserId}">活动管理</a>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">创意管理</a>
-							<span class="divider2"><i class="icon-angle-right"></i></span>
-							<li class="size3">创建创意</li>
-							</#if>
-						</ul>  
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<#if role == "agent">
+					<li><a href="${ctx}/advertiser/main/ad/advertiser/list">广告主管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					</#if>
+					<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}">订单管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">创意管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">创建创意</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/ad/target/create-banner/list?adGroupId=${adGroupId!}" method="post">
+			   	<input type="hidden" id="adGroupId" value="${adGroupId!}"/>
+   				<input type="hidden" id="campaignId" value="${campaignId!}"/>
+   				<input type="hidden" id="orderId" value="${orderId!}"/>
+   				<input type="hidden" id="advertiserId" value="${advertiserId!}"/>
+   				<input id="bannerObjs" type=hidden name="bannerObjs" value=""/>
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/ad/target/clone-banner?adGroupId=${adGroupId!}" class="btn2">从创意中心选择</a>
+						<a class="btn2" id="all-btn-upload">批量上传创意</a>
+						<input type="file" id="all-input-file" multiple="mltiple"/>
+						<a class="btn2" id="btn-delete-create">批量删除</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
 					</div>
-					<div class="btns">
-					
-						<div>
-							<div class="btn-content">
-								<button class="banner-select" href="${ctx}/advertiser/main/ad/target/clone-banner?adGroupId=${adGroupId}" onMouseOver="this.style.cssText='background-color:#36aeea;color:#fff;'" onMouseOut="this.style.cssText='background-color:#ffffff;color:#36aeea;'">从创意中心选择</button>
-							</div>
-							<div class="btn-content" id="up" onMouseOver="this.style.cssText='background-color:#36aeea;color:#fff;'" onMouseOut="this.style.cssText='background-color:#ffffff;color:#36aeea;'">
-							<p id="loadse" >批量上传创意</p>
-							<input type="file"  id="input-files" style="display:none" multiple="mltiple"/>
-							</div>
-							<div class="btn-content">
-								<button href="${ctx}/advertiser/main/ad/target/create-banner/delete" title="bootbox-confirm" id="delete" onMouseOver="this.style.cssText='background-color:#36aeea;color:#fff;'" onMouseOut="this.style.cssText='background-color:#ffffff;color:#36aeea;'">删除</button>
-							</div>
-						</div>
-						<form action="${ctx}/advertiser/main/ad/target/create-banner/list?adGroupId=${adGroupId!}" class="search-form" method="post">
-							<input type="hidden" name="page" value="${pager.page!}">
-							<input type="hidden" name="searchKey" value="name">
-							<input id="search-input" type="text" name="searchValue" value="请输入需要搜索的内容" onkeydown="if(event.keyCode==13){return false;}">
-							<img id="serachData_img" src="${ctx}/assets/advertiser/images/fangdajing1.png"/>
-						</form>		
-					</div>	
-			
-				<div id="list-content">
-					<table  rules="rows">
+				</div>
+				<table border="1" class="tableFig">
 					<thead>
-						<tr id="list-head">
-						<th class="center" style="width:5%;">
-						<label class="fxk-label"><input id="all" class="fxk-check-box"  autocomplete="off"   type="checkbox" />
-						<span class="fxk-span"></span>
-						</label>		
-						</th>
-							<th>ID</th>
-							<th>创意</th>
-							<th>创意名称</th>
-							<th>尺寸</th>
-							<th>类型</th>
-							<th>上传时间</th>
-							<th>地址代码</th>
-						</tr>
-						</thead>
-						<form  id='form1' >
-						<tbody>
+						<tr class="theadTr">
+			            	<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			                <th class="theadTh" style="width:5%;">ID</th>
+			                <th class="theadTh" style="width:12%;">创意</th>
+			                <th class="theadTh" style="width:10%;">创意名称</th>
+			                <th class="theadTh" style="width:6%;">尺寸</th>
+			                <th class="theadTh" style="width:6%;">类型</th>
+			                <th class="theadTh" style="width:12%;">上传时间</th>
+			                <th class="theadTh" style="width:30%;">地址代码</th>
+			            </tr> 
+					</thead>
+					<tbody>
 						<#if createBannerList ??>
-                    	<#list createBannerList as crb>             
-                <!--   <form name='frm${crb.id!}' id='frm${crb.id!}' action='${ctx}/advertiser/main/ad/target/create-banner/save' method='post'>-->
-						<tr>
-							<td class="center" style="width:5%">
-							<label class="fxk-label"><input  class="fxk-check-box" autocomplete="off"   type="checkbox" name="id" value="#{crb.id}" />
-							<span class="fxk-span"></span>
-							</label>
-						</td>
-							<td class="content-id">${crb.id!}</td>
-							<td class="content-banner"><img src="${crb.bannerTemplate.pathSmall!}"></td>
-							<td class="content-banner"><input type="text" name="name" id="cont" value="${crb.bannerTemplate.name!}" /></td>
-							<td calss="content-style" >${crb.bannerTemplate.height}x${crb.bannerTemplate.width}</td>
-							<td class="content-style"><#if crb.bannerTemplate.type==1>视频<#else>非视频</#if></td>
-							<td class="content-banner">${crb.supdated?datetime}</td>
-							<td class="content-address">
-								<p><span>到达地址：&nbsp;</span><input type="text" name="visitAddress" value="${crb.visitAddress!}" /></p>
-								<p><span>点击地址：&nbsp;</span><input type="text" name="clickAddress" value="${crb.clickAddress!}" /></p>
-								<p><span>曝光地址：&nbsp;</span><input type="text"  name="impressionAddress" value="${crb.impressionAddress!}"/></p>
-							</td>
-						</tr>
-						
-						  </#list>
-						  <#if createBannerList?size==0>
-	                   <tr class="">
-	                   		<td class="center" colspan="9">
-	                            <label><span class="lbl" >创意中心没有创意，请先去创意中心创建创意</span></label>
-	                        </td>
-	                   </tr>
-	                			</#if>
-							</#if>  
-						</tbody> 
-					</form>
+						<#list createBannerList as crb>
+							<tr id="tbodyTr">
+								<td class="tbodyTd"><div class="checkboxStyleTd" id="${crb.id!}"></div></td>
+								<td class="tbodyTd">${crb.id!}</td>
+								<td class="tbodyTd"><img src="${crb.bannerTemplate.pathSmall!}"/></td>
+								<td class="tbodyTd">${crb.bannerTemplate.name!}</td>
+								<td class="tbodyTd">${crb.bannerTemplate.width!}x${crb.bannerTemplate.height!}</td>
+								<td class="tbodyTd"><#if crb.bannerTemplate.type==1>视频<#else>非视频</#if></td>
+								<td class="tbodyTd">${crb.supdated!?datetime}</td>
+								<td class="tbodyTd">
+									<input type=hidden name="id" value="${crb.id!}"/>
+									<input type=hidden name="name" value="${crb.bannerTemplate.name!}"/>
+									<div class="input-group-td" id="input-group-td-first"><span>到达地址：</span><input type="text" class="input-text" name="visitAddress" value="${crb.visitAddress!}"/></div>
+									<div class="input-group-td"><span>点击地址：</span><input type="text" class="input-text" name="clickAddress" value="${crb.clickAddress!}"/></div>
+									<div class="input-group-td"><span>曝光地址：</span><input type="text" class="input-text" name="impressionAddress" value="${crb.impressionAddress!}"/></div>
+								</td>
+							</tr>
+						</#list>
+						<#if createBannerList?size==0>
+	                   	<tr id="tbodyTr">
+	                   		<td class="tbodyTd" colspan="9">
+	                            <label><span>创意中心没有创意，请先去创意中心创建创意</span></label>
+	                       	</td>
+	                  	</tr>
+	                	</#if>
+						</#if>
+					</tbody>
 				</table>
-			</div>
-				
-				<div>			
-						<form id="form2" class="search-form"  action="${ctx}/advertiser/main/ad/target/create-banner/save?adGroupId=${adGroupId}" method='post'>
-							<input  id="hidjson" autocomplete="off"  type=hidden name="bannerObjs" value="" />
-							<div class="btn2">
-								<input id="save" type="submit"  value="保存" onclick='return mysubt();' />
-								<!--  <button  id="save" type="submit"  onclick='return mysubt();' >保存</button> -->
-								<button id="cancel"  href="${ctx}/advertiser/main/ad/target/ad?adGroupId=${adGroupId!}">取消</button>
-							</div>
-						</form>
-							
-						<div id="page-list">
-			                <#include "/common/pagination/simple.ftl"/>
-			            </div>
-		         </div>         
-              
-			</div>
-	
+				<div id="exportReport">
+					<a id="btn-save" class="btn_export" onclick="createSaveBanner()">保存</a>
+					<a id="btn-cancel" class="btn-back" href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">取消</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-			
 	</div>
-
-  
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
-<script>
-$(function(){
-	
-	$('#input-files').fileupload({
-		autoUpload: true,
-		url: '${ctx}/advertiser/main/ad/target/create-banner/upload?adGroupId=${adGroupId}',		
-		done:function(e,data){
-			alert(data.result);
-			window.location.reload();
-		}				
-	});
-	
-	$('#loadse').click(function(){
-		$('#input-files').click();
-	});
-	
-	// 分页中超链接跳转
-     $('#page-list .pagination ul li a[href]').click(function(){
-     	var _page = $(this).attr('href').substr(1);
-     	var _form = $('.btns .search-form');
-     	_form.find('input:hidden[name=\'page\']').val(_page);
-     	_form.find('img').click();
-     	return false;
-     });
-  
-  	//搜索事件
-    $('.btns img').click(function(){
-		var _form = $('.btns .search-form');
-		var $searchValue = $(".btns .search-form input[name=searchValue]")
-		if($searchValue.val() == "请输入需要搜索的内容"){
-			$searchValue.val(null);
-		};
-		var _url = _form.attr('action');
-		var _param =_form.serialize();
-		$.post(_url, _param, function(data) {
-			$('#page-content').html(data);
-		});
-		if($searchValue.val() == ''){
-			$searchValue.val("请输入需要搜索的内容");
-		};
-		return false;
-	});
-     
-   	//搜索输入框的样式改变
-	$(".btns input[name='searchValue']").focus(function(){
-		$(this).val("");
-	});
-	$(".btns input[name='searchValue']").blur(function(){
-		if($(this).val()== ""){
-			$(this).val("请输入需要搜索的内容");
-		}
-	});
-		
-	//复选框选择
-	$("#all").click(function(){
-		var obj=document.getElementsByName("id");
-		if(document.getElementById("all").checked==true){
-			for(var i=0;i<obj.length;i++){
-			   obj[i].checked=true;
-			}
-		}else{
-			for(var i=0;i<obj.length;i++){ obj[i].checked=false;}
-		}
-	});
-	
-	//批量删除
-	$('.btn-content #delete').click(function(){
-		var _checkboxes = $('table tbody input:checkbox:checked');
-		if (_checkboxes.size()>0) {		
-			var _url = $(this).attr("href");
-			var _param = _checkboxes.serializeArray();
-			// 删除时需要提醒
-			if ($(this).text() && ($(this).text().indexOf("删除")>-1
-				||$(this).text().indexOf("关闭")>-1)) {
-				bootbox.confirm("确定删除吗?删除后无法再找回", function(ensure) {
-					if (ensure) {
-						$.post(_url, _param, function(data) {
-							window.location.reload();
-						});
-					}
-				});
-			} else {
-				$.post(_url, _param, function(data) {
-					window.location.reload();
-				});			
-			}
-		}
-	});
-		
-	 // 页面中按钮的超链接跳转
-	$('.btn-content .banner-select').click(function(){
-		var _href = $(this).attr("href");
-		if (_href&&_href!='#') {
-			window.location.href=_href;
-			return false;
-		}
-	});
-});
-
-	function mysubt(){
-		try{
-			var boxs = document.getElementsByName("id");		
-			for(var i=0;i<boxs.length;i++){
-				boxs[i].checked=true;
-			}
-			var jsonuserinfo = $("#form1").serializeObject();
-			var didjson =document.getElementById("hidjson").value 
-			document.getElementById("hidjson").value=jsonuserinfo;
-		}catch(e){
-			return false;
-		}
-	}
-     
-    //序列化对象
-    $.fn.serializeObject = function(){    
- 		var o = {};    
- 	   	var a = this.serializeArray();    
- 	   	$.each(a, function() {    
- 	       	if (o[this.name]) {    
- 	           	if (!o[this.name].push) {    
- 	               	o[this.name] = [o[this.name]];    
- 	           	}    
- 	           	o[this.name].push(this.value || '');    
- 	       	} else {    
- 	           o[this.name] = this.value || '';    
- 	       	} 
- 	   	});  
- 	  	var vCount = 0;
-        // 计算json内部的数组最大长度
-        for(var item in o){
-            var tmp = $.isArray(o[item]) ? o[item].length : 1;
-            vCount = (tmp > vCount) ? tmp : vCount;
-        }
-
-        if(vCount > 1) {
-            var jsonData2 = new Array();
-            for(var i = 0; i < vCount; i++){
-                var jsonObj = {};
-                for(var item in o) {
-                    jsonObj[item] = o[item][i];
-                }
-                jsonData2.push(jsonObj);
-            }
-            return JSON.stringify(jsonData2);
-        }else{
-            return "[" + JSON.stringify(o) + "]";
-        } 
- 	} 
-</script>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/authority/create.ftl

@@ -1,261 +1,78 @@
-<@override name="head">
-	<title>创建账号</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			var role = '${role}';
-			var agentId = '${userSession.agentId}';
-			
-			if(role == "agent"){
-				$("#selectedAdvertiserId").val(0);
-				$('#advertiser_son_ul').hide(); //初始ul隐藏
-			 	$("#advertiser_son_ul").append("<li value='0'>请选择广告主</li>");
-			 	var url = "${ctx}/widget/selector/provide/advertiser?parentId="+agentId;
-			 	$.getJSON( url, function(data) {
-					var data_1 = data.advertiserList;
-					$.each( data_1, function( key, val ) {
-						$("#advertiser_son_ul").append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
-					});
-				});
-			}else if(role == "advertiser"){
-				var advertiserId = '${userSession.advertiserId}';
-				var advertiserName = '${advertiserName}';
-				$("#advertiserul_span").html(advertiserName);
-				$("#selectedAdvertiserId").val(advertiserId);
-				$("#selectedAdvertiserName").val(advertiserName);
-			}
-		 	$("ul#main_advertiserul #advertiserul_select_box span").click(function(){
-		 		if(role == "agent"){
-		 			$('#advertiser_son_ul').slideDown(); //ul显示
-		 		}
-		 	});
-		 	$('ul#advertiser_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#selectedAdvertiserId").val($(this).attr("value"));
-				$('#advertiser_son_ul').slideUp(); //ul隐藏
-			});
-			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').slideUp(); //ul隐藏
-		 	});
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				//var addParam = $("#validation-form").serialize();
-				var Account = new Object();//账号对象
-				Account['agentId'] = agentId;
-				Account['advertiserId'] = $("#selectedAdvertiserId").val();
-				Account['accountName'] = $("#accountName").val();
-				Account['password'] = $("#password").val();
-				Account['realName'] = $("#realName").val();
-				Account['tel'] = $("#tel").val();
-				Account['state'] = $('input[name="state"]:checked').val();
-				var authority = "";
-				$("#checkboxs input[type=checkbox]:checked").each(function(){
-				    	authority+=$(this).val()+",";
-				});
-				authority = authority.substring(0,authority.length-1);
-				var flag = isExistName();//判断账号名称是否重复
-				if(flag){
-					return false;
-				}
-				if($("#ensurePassword").val() !="" && $("#ensurePassword").val() !=$("#password").val()){
-					$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-					return false;
-				}
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				$.ajax({
-					type: "POST",
-				    url: "${ctx}/advertiser/main/authority/save?authority="+authority+"&ensurePassword="+$("#ensurePassword").val(),
-				    data: Account,
-				    success: function(data){
-						location.href = "${ctx}/advertiser/main/authority/list.ftl";
-				    }
-				});
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/authority/list";
-			});
-				
-			//显示密码点击事件
-			$("#input-password").click(function(){
-				if($(this).attr("checked")){
-					$("#password-span").html('<input class="input-text" autocomplete="off" id="password" name="password" type="text" value="'+$("#password").val()+'" verify="unspecial/100/1/0">');
-					$("#ensurePassword-span").html('<input class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="text" value="'+$("#ensurePassword").val()+'" verify="unspecial/100/1/0">');
-				}else{
-					$("#password-span").html('<input class="input-text" autocomplete="off" id="password" name="password" type="password" value="'+$("#password").val()+'" verify="unspecial/100/1/0">');
-					$("#ensurePassword-span").html('<input class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="'+$("#ensurePassword").val()+'" verify="unspecial/100/1/0">');
-				}
-				//改变密码框样式时触发
-				$("#ensurePassword").blur(function(){
-					validPassword();
-				});
-			});
-				
-			//确认密码与密码一致
-			$("#ensurePassword").blur(function(){
-				validPassword();
-			});
-				
-			function validPassword(){
-				var password = $("#password").val();
-				var ensurePassword = $("#ensurePassword").val();
-				if(ensurePassword != ""){
-					if(ensurePassword != password){
-						$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-						return false;
-					}else{
-						$("#ensurePassword").css("box-shadow","none").attr('title','');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-					}
-				}
-			}
-			
-			$("#accountName").blur(function(){
-				if($(this).val() != ""){
-					var reg=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-					if($(this).val().match(reg)!=null){
-						$(this).css("box-shadow","none").attr('title','');
-						$(this).parent("div").find("span.spanVaildate").html("");
-						isExistName();
-					}else{
-						$(this).css("box-shadow","0 0 6px red").attr('title','格式必须为邮箱类型， 如: example@email.com');
-						$(this).parent("div").find("span.spanVaildate").html("格式必须为邮箱类型， 如: example@email.com");
-						return false;
-					}
-				}
-			});
-			
-			function isExistName(){
-				var flag = false;
-				var accountName = $("#accountName").val();
-				$.ajax({
-		           	type: "POST",
-		            url: "${ctx}/advertiser/main/authority/isExist",
-		            async: false,
-		            data: {accountName:accountName},
-		             success: function(data){
-				 		if(data == "YES"){
-				 			$("#accountName").css("box-shadow","0 0 6px red").attr('title','你输入的账号已存在！');
-				 			$("#accountName").parent("div").find("span.spanVaildate").html("你输入的账号已存在！");
-				 			flag = true;
-				 		}else{
-				 			$("#accountName").css("box-shadow","none").attr('title','');
-				 			$("#accountName").parent("div").find("span.spanVaildate").html("");
-				 			flag = false;
-				 		}
-		             }
-				});
-				return flag;
-			}
-			
-		});
-	</script>
-	
-</@override>
-
+<@override name="head">	
+<title>创建账号</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/authority.js"></script>
+</@override>	
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-    	<div id="handler" style="padding-top:20px;margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/authority/list">权限管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">创建账号</li>
-			</ul>  
-		</div>
+<div id=content_bg>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
 		<div id="content">
-			<div id="createForm">
-				<form id="validation-form" class="form-horizontal">
-					<input type="hidden" name="advertiserId" id="selectedAdvertiserId" value="${userSession.advertiserId}">
-					<input type="hidden" name="advertiserName" id="selectedAdvertiserName" value="${advertiserName}">
-					<div class="control-group" id="advertiserul_selectuldiv">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>关联广告主：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_advertiserul">
-						  <li class="select_box" id="advertiserul_select_box">
-						    <span id="advertiserul_span">请选择广告主</span>
-						    <ul class="son_ul" id="advertiser_son_ul" style="margin-left: 0;"></ul>
-						  </li>
-						</ul>
-					</div>
-					
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号：</label>
-						<input tabindex="1" class="input-text" autocomplete="off" id="accountName" name="accountName" type="text" value="" verify="email/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="password-div">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>密码：</label>
-						<span id="password-span"><input tabindex="2" class="input-text" autocomplete="off" id="password" name="password" type="password" value="" verify="unspecial/100/1/0"></span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="ensurePassword-div">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码：</label>
-						<span id="ensurePassword-span"><input tabindex="3" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"></span>
-						<input id="input-password" autocomplete="off" type="checkbox" style="margin-top:9px;"><span id="input-password-span">显示密码</span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>姓名：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="realName" name="realName" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系电话：</label>
-						<input tabindex="5" class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="" verify="tel-mobile/12/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span>开启</span></label> 
-						<label class="form-align-radio" style="margin:-40px 0 0 140px;"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span>暂停</span></label>
-					</div>
-					
-					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="201"/><span class="input-checkbox-span">投放管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="202" /><span class="input-checkbox-span">数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="203" /><span class="input-checkbox-span">创意中心</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="204" /><span class="input-checkbox-span">代码中心</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="205" /><span class="input-checkbox-span">财务管理</span>
-					</div>
-					
-					<div id="btn-class" class="form-actions1">
-						<div id="create-btn-save">保存</div>
-					    <div id="create-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/authority/list">权限管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">创建账号</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/authority/save" method="post">
+	 			<input type="hidden" name="id" id="accountId" value="0"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>关联广告主：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">请选择广告主</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="advertiserId" id="advertiserId" value="${advertiserId!}"/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号：</label>
+					<input class="input-text" tabindex="1" id="accountName" name="accountName" type="text" value="" verify="email/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="password-div">
+					<label class="input-label"><span class="lbl-yes">*</span>密码：</label>
+					<span id="password-span"><input class="input-text" tabindex="2" id="password" name="password" type="password" value="" verify="unspecial/100/1/0"/></span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="ensurePassword-div">
+					<label class="input-label"><span class="lbl-yes">*</span>确认密码：</label>
+					<span id="ensurePassword-span"><input class="input-text" tabindex="3" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"/></span>
+					<input id="input-password-create" type="checkbox" class="input-password"><span class="input-password-span">显示密码</span>
+					<span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>姓名：</label>
+					<input class="input-text" tabindex="4" id="realName" name="realName" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系电话：</label>
+					<input class="input-text" tabindex="5" id="tel" name="tel" type="text" value="" verify="tel-mobile/12/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号状态：</label>
+					<input class="input-radio" name="state" type="radio" value="1" checked="checked"/><span class="input-radio-span">开启</span>
+					<input class="input-radio" name="state" type="radio" value="0"/><span class="input-radio-span">暂停</span>
+				</div>
+				<div class="input-group" id="checkboxs">
+					<input id="authority" name="authority" type="hidden" value=""/>
+					<label class="input-label"><span class="lbl-no"></span>权限：</label>
+					<input class="input-checkbox" type="checkbox" value="201"/><span class="input-checkbox-span">投放管理</span>
+					<input class="input-checkbox" type="checkbox" value="202"/><span class="input-checkbox-span">数据报表</span>
+					<input class="input-checkbox" type="checkbox" value="203"/><span class="input-checkbox-span">创意中心</span>
+					<input class="input-checkbox" type="checkbox" value="205"/><span class="input-checkbox-span">财务管理</span>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" id="btn-cancel-authority" type="button">取消</button>
+				</div>
+			</form>
 		</div>
-	</div>
+    </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/authority/edit.ftl

@@ -1,255 +1,78 @@
-<@override name="head">
-	<title>编辑账号</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	
-	<script type="text/javascript" >
-		$(function(){
-			var role = '${role}';
-			var agentId = '${userSession.agentId}';
-			
-			if(role == "agent"){
-				$('#advertiser_son_ul').hide(); //初始ul隐藏
-			 	$("#advertiser_son_ul").append("<li value='0'>请选择广告主</li>");
-			 	var url = "${ctx}/widget/selector/provide/advertiser?parentId="+agentId;
-			 	$.getJSON( url, function(data) {
-					var data_1 = data.advertiserList;
-					$.each( data_1, function( key, val ) {
-						$("#advertiser_son_ul").append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
-						if($("#selectedAdvertiserId").val() == val.value){
-							$("#advertiserul_span").html(val.label);
-						}
-					});
-				});
-			}else if(role == "advertiser"){
-				var advertiserId = '${userSession.advertiserId}';
-				var advertiserName = '${advertiserName}';
-				$("#advertiserul_span").html(advertiserName);
-				$("#selectedAdvertiserId").val(advertiserId);
-				$("#selectedAdvertiserName").val(advertiserName);
-			}
-		 	$("ul#main_advertiserul #advertiserul_select_box span").click(function(){
-		 		if(role == "agent"){
-		 			$('#advertiser_son_ul').slideDown(); //ul显示
-		 		}
-		 	});
-		 	
-		 	$('ul#advertiser_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#selectedAdvertiserId").val($(this).attr("value"));
-				$('#advertiser_son_ul').slideUp(); //ul隐藏
-			});
-			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').slideUp(); //ul隐藏
-		 	});
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#edit-btn-save").unbind('click').click(function(){
-				//var editParam = $("#validation-form").serialize();
-				var Account = new Object();//账号对象
-				Account['id'] = $("#accountId").val();
-				Account['agentId'] = agentId;
-				Account['advertiserId'] = $("#selectedAdvertiserId").val();
-				Account['accountName'] = $("#accountName").val();
-				Account['password'] = $("#password").val();
-				Account['realName'] = $("#realName").val();
-				Account['tel'] = $("#tel").val();
-				Account['state'] = $('input[name="state"]:checked').val();
-				var authority = "";
-				$("#checkboxs input[type=checkbox]:checked").each(function(){
-				    	authority+=$(this).val()+",";
-				});
-				authority = authority.substring(0,authority.length-1);
-				if($("#ensurePassword").val() !="" && $("#ensurePassword").val() !=$("#password").val()){
-					$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-					return false;
-				}
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				$.ajax({
-		            type: "POST",
-		             url: "${ctx}/advertiser/main/authority/save?authority="+authority+"&ensurePassword="+$("#ensurePassword").val(),
-		             data: Account,
-		            success: function(data){
-				 		location.href = "${ctx}/advertiser/main/authority/list";
-		            }
-				});
-			});
-				
-			//取消按钮
-			$("#edit-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/authority/list";
-			});
-				
-			//修改密码点击事件
-			$("#input-password").click(function(){
-				if($(this).attr("checked")){
-					$("#password").attr("disabled",false);
-					$("#ensurePassword").attr("disabled",false);
-					$("#password").attr("verify","unspecial/100/1/0");
-					$("#ensurePassword").attr("verify","unspecial/100/1/0");
-				}else{
-					$("#password").val("");
-					$("#ensurePassword").val("");
-					$("#password").attr("disabled",true);
-					$("#ensurePassword").attr("disabled",true);
-					$("#password").attr("verify","unspecial/100/0/0");
-					$("#ensurePassword").attr("verify","unspecial/100/0/0");
-					$("#password").css("box-shadow","none").attr('title','');
-					$("#password").parent("span").parent("div").find("span.spanVaildate").html("");
-					$("#ensurePassword").css("box-shadow","none").attr('title','');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-				}
-			});
-				
-			//确认密码与密码一致
-			$("#ensurePassword").blur(function(){
-				validPassword();
-			});
-			
-			$("#ensurePassword, #password").focus(function(){
-				$(this).css("box-shadow","0 0 6px red");
-			});
-			
-			$("#ensurePassword, #password").blur(function(){
-				$(this).css("box-shadow","none");
-			});
-				
-			function validPassword(){
-				var password = $("#password").val();
-				var ensurePassword = $("#ensurePassword").val();
-				if(ensurePassword != ""){
-					if(ensurePassword != password){
-						$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-						return false;
-					}else{
-						$("#ensurePassword").css("box-shadow","none").attr('title','');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-					}
-				}
-			}
-				
-			//权限控制
-			function getAuthority(){
-				var authority = $("#input-authority").val();
-				var authArr = authority.split(",");
-				var checkboxs = $("#checkboxs input[type='checkbox']");
-				checkboxs.each(function(i){
-					for(var i = 0;i<authArr.length;i++){
-						if($(this).val() == authArr[i]){
-							$(this).attr("checked","true");
-						}
-					}
-				});
-			}
-			getAuthority();
-			
-		});
-	</script>
-	
-</@override>
-
+<@override name="head">	
+<title>编辑账号</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/authority.js"></script>
+</@override>	
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-    	<div id="handler" style="padding-top:20px;margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/authority/list">权限管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">编辑账号</li>
-			</ul>  
-		</div>
+<div id=content_bg>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
 		<div id="content">
-			<div id="editForm">
-				<form id="validation-form" class="form-horizontal">
-					<input  autocomplete="off"  type="hidden" name="id" id="accountId" value="${account.id}"/>
-					<input type="hidden" name="advertiserId" id="selectedAdvertiserId" value="${account.advertiserId}">
-					<input type="hidden" name="advertiserName" id="selectedAdvertiserName" value="${advertiserName}">
-					<div class="control-group" id="advertiserul_selectuldiv">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>关联广告主：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_advertiserul">
-						  <li class="select_box" id="advertiserul_select_box">
-						    <span id="advertiserul_span">请选择广告主</span>
-						    <ul class="son_ul" id="advertiser_son_ul" style="margin-left: 0;"></ul>
-						  </li>
-						</ul>
-					</div>
-					
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号：</label>
-						<input class="input-text" autocomplete="off" id="accountName" name="accountName" type="text" value="${account.accountName}" disabled="true"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>密码：</label>
-						<span id="password-span"><input tabindex="1" class="input-text" autocomplete="off" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码：</label>
-						<span id="ensurePassword-span"><input tabindex="2" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span>
-						<input id="input-password" autocomplete="off" type="checkbox" style="margin-top:9px;"><span id="input-password-span">修改密码</span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>姓名：</label>
-						<input tabindex="3" class="input-text" autocomplete="off" id="realName" name="realName" type="text" value="${account.realName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系电话：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="${account.tel}" verify="tel-mobile/12/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" <#if account.state=="1">checked</#if> value="1"><span>开启</span></label> 
-						<label class="form-align-radio" style="margin:-40px 0 0 140px;"><input id="input-radio-down" autocomplete="off" name="state" type="radio" <#if account.state=="0">checked</#if> value="0"><span>暂停</span></label>
-					</div>
-					
-					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
-						<input id="input-authority" type="hidden" name="authority" value="${authority}" />
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="201"/><span class="input-checkbox-span">投放管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="202" /><span class="input-checkbox-span">数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="203" /><span class="input-checkbox-span">创意中心</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="204" /><span class="input-checkbox-span">代码中心</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="205" /><span class="input-checkbox-span">财务管理</span>
-					</div>
-					
-					<div id="btn-class" class="form-actions1">
-						<div id="edit-btn-save">保存</div>
-					    <div id="edit-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/authority/list">权限管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">编辑账号</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/authority/save" method="post">
+	 			<input type="hidden" name="id" id="accountId" value="${account.id!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>关联广告主：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">请选择广告主</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="advertiserId" id="advertiserId" value="${account.advertiserId!}"/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号：</label>
+					<input class="input-text" tabindex="1" id="accountName" name="accountName" type="text" value="${account.accountName!}" disabled="true"/>
+				</div>
+				<div class="input-group" id="password-div">
+					<label class="input-label"><span class="lbl-yes">*</span>密码：</label>
+					<span id="password-span"><input class="input-text" tabindex="2" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"/></span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="ensurePassword-div">
+					<label class="input-label"><span class="lbl-yes">*</span>确认密码：</label>
+					<span id="ensurePassword-span"><input class="input-text" tabindex="3" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"/></span>
+					<input id="input-password-edit" type="checkbox" class="input-password"><span class="input-password-span">修改密码</span>
+					<span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>姓名：</label>
+					<input class="input-text" tabindex="4" id="realName" name="realName" type="text" value="${account.realName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系电话：</label>
+					<input class="input-text" tabindex="5" id="tel" name="tel" type="text" value="${account.tel!}" verify="tel-mobile/12/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号状态：</label>
+					<input class="input-radio" name="state" type="radio" value="1" <#if account.state=="1">checked</#if> /><span class="input-radio-span">开启</span>
+					<input class="input-radio" name="state" type="radio" value="0" <#if account.state=="0">checked</#if> /><span class="input-radio-span">暂停</span>
+				</div>
+				<div class="input-group authority-edit" id="checkboxs">
+					<input id="authority" name="authority" type="hidden" value="${authority!}"/>
+					<label class="input-label"><span class="lbl-no"></span>权限：</label>
+					<input class="input-checkbox" type="checkbox" value="201"/><span class="input-checkbox-span">投放管理</span>
+					<input class="input-checkbox" type="checkbox" value="202"/><span class="input-checkbox-span">数据报表</span>
+					<input class="input-checkbox" type="checkbox" value="203"/><span class="input-checkbox-span">创意中心</span>
+					<input class="input-checkbox" type="checkbox" value="205"/><span class="input-checkbox-span">财务管理</span>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" id="btn-cancel-authority" type="button">取消</button>
+				</div>
+			</form>
 		</div>
-	</div>
+    </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/authority/list.ftl

@@ -1,183 +1,84 @@
 <@override name="head">
-	<title>账号管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-	
-		$(function(){
-		
-			//创建账号
-			$("#btn-create").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/authority/create.ftl";
-			});
-			
-			//编辑
-			$("#btn-edit").live("click", function() {
-				var accountId = parseInt($(this).attr("value"));
-				location.href = "${ctx}/advertiser/main/authority/edit?accountId="+accountId;
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-
-			//批量开启,批量暂停
-			$("#all-btn-enable,#all-btn-disable").click(function(){
-				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
-				var _param = checkboxs.serialize();
-				var url = ""; var type = "";
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/advertiser/main/authority/enable";
-					type = "开启";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/advertiser/main/authority/disable";
-					type = "暂停";
-				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							$.post(url, _param, function(data) {
-								$('#formPage').submit();
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的用户！");
-				}
-			});
-			
-			//开启,暂停
-			$('#btn-enable,#btn-disable').live('click' ,function(){
-				var url = "";
-				var accountId = parseInt($(this).attr("value"));
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/advertiser/main/authority/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/advertiser/main/authority/disable";
-				}
-				$.post(url, {id:accountId}, function(data) {
-					$('#formPage').submit();
-				});
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			if($("#searchValue").val()!=""){
-				$("#exportExcel").attr("href","${ctx}/advertiser/main/authority/exportDataReportExcel?value="+$("#searchValue").val());
-			}else{
-				$("#exportExcel").attr("href","${ctx}/advertiser/main/authority/exportDataReportExcel");
-			}
-		};
-		
-	</script>
-	
+<title>账号管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/authority.js"></script>
 </@override>
-
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
 <div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id= "pagecontent">
-		<div id="handler" style="padding:20px 0px; margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">权限管理</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/advertiser/main/authority/list" method="post">
-			  	<div id="buttons">
-			  		<div id="btn-create" class="btn1">创建账号</div>      
-			        <div id="all-btn-enable" class="btn1">批量开启</div>  
-			        <div id="all-btn-disable" class="btn1">批量暂停</div> 
-			        <div id="serachData">
-			        	<input type="hidden" id="page" name="page" value="${pager.page}">
-						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}"/>
-						<input id="serachData_img" type="submit" value="" />
+    	<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">权限管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/authority/list" method="post">
+ 				<div id="navButtons">
+					<div id="button">		
+						<a href="${ctx}/advertiser/main/authority/create" class="btn2">创建账号</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量暂停</a>
 					</div>
-			    </div>
-				<div id="account-table" style="margin-left:-20px;">
-					<table border="1" class="tablefig" id="tablefig">
-						<thead>
-							<tr>
-								<th width="5%">
-									<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-								</th>
-								<th width="5%">ID</th>
-								<th width="20%">账号</th>
-								<th width="10%">姓名</th>
-								<th width="15%">联系电话</th>
-								<th width="5%">状态</th>
-								<th width="15%">最后登录时间</th>
-								<th width="25%">操作</th>
-							</tr>
-						</thead>
-						<tbody>
-						<#if accountList ??>
-						<#list accountList as account>
-							<tr class="">
-								<td class="center">
-									<label><input  autocomplete="off" type="checkbox" name="id" value="#{account.id}"><span class="lbl"></span></label>
-								</td>
-								<td class="breakword">${account.id!}</td>
-								<td class="breakword">${account.accountName!}</td>
-								<td class="breakword">${account.realName!}</td>
-								<td class="hide-piece">${account.tel!}</td>
-								<td><#if account.state=="1">正常<#else>暂停</#if></td>
-								<td>${account.createTime?datetime}</td>
-								<td>
-									<div id="btndiv">
-										<div id="btn-edit" class="btn11" value="${account.id}">编辑</div>
-										<#if account.state=="1">
-										<div id="btn-disable" class="btn11" value="${account.id}">暂停</div>
-										<#elseif account.state=="0">
-										<div id="btn-enable" class="btn11" value="${account.id}">开启</div>
-										</#if>
-									</div>
-								</td>
-							</tr>
-						</#list>
-						</#if>
-					</tbody>
-					</table>
-					
-					<div id="daochu" style="margin-left:20px;">
-						<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
 					</div>
-								
-					<div id="pageDiv" style="margin-top: 0;">
-		               	<#include "/common/pagination/simple.ftl"/>
-		            </div>	
-            	</div>
-			</form>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:5%;">ID</th>
+							<th class="theadTh" style="width:20%;">账号</th>
+							<th class="theadTh" style="width:10%;">姓名</th>
+							<th class="theadTh" style="width:15%;">联系电话</th>
+							<th class="theadTh" style="width:5%;">状态</th>
+							<th class="theadTh" style="width:15%;">最后登录时间</th>
+							<th class="theadTh" style="width:25%;">操作</th>
+						</tr>
+				    </thead>
+				    <tbody>
+						<#if accountList ??>
+				        <#list accountList as account>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${account.id!}"></div></td>
+							<td class="tbodyTd">${account.id!}</td>
+							<td class="tbodyTd">${account.accountName!}</td>
+							<td class="tbodyTd">${account.realName!}</td>
+							<td class="tbodyTd">${account.tel!}</td>
+							<td class="tbodyTd"><#if account.state=="1">正常<#else>暂停</#if></td>
+							<td class="tbodyTd">${account.createTime!?datetime}</td>
+							<td class="tbodyTd">
+								<div id="listButtons">
+									<a href="${ctx}/advertiser/main/authority/edit?accountId=${account.id!}" class="btn3">编辑</a>
+									<#if account.state=="0">
+									<a id="btn-enable" value="${account.id!}" class="btn3">开启</a>
+									<#elseif account.state=="1">
+									<a id="btn-disable" value="${account.id!}" class="btn3">暂停</a>
+									</#if>
+								</div>
+							</td>
+						</tr>
+				        </#list>
+						</#if>           
+				    </tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
 		</div>
 	</div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/authority/loginperson.ftl

@@ -1,182 +1,74 @@
-<@override name="head">
-	<title>个人信息</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#edit-btn-save").unbind('click').click(function(){
-				//var editParam = $("#validation-form").serialize();
-				var Account = new Object();//账号对象
-				Account['id'] = $("#accountId").val();
-				Account['accountName'] = $("#accountName").val();
-				Account['password'] = $("#password").val();
-				Account['realName'] = $("#realName").val();
-				Account['tel'] = $("#tel").val();
-				Account['state'] = $('input[name="state"]:checked').val();
-				if (!$("#validation-form").validate()) {
-					return false;
-				} 
-				if($("#ensurePassword").val() !="" && $("#ensurePassword").val() !=$("#password").val()){
-					$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-					return false;
-				}
-				$.ajax({
-		            type: "POST",
-		             url: "${ctx}/advertiser/main/authority/saveloginperson?operator_Id="+$("#operatorId").val()+"&operatoraccount="+$("#operatoraccount").val()+"&operatoraccountName="+$("#operatoraccountName").val()+"&operatorbank="+$("#operatorbank").val()+"&ensurePassword="+$("#ensurePassword").val(),
-		             data: Account,
-		            success: function(data){
-				 		location.href = "${ctx}/advertiser/main/dashboard";
-		            }
-				});
-			});
-				
-			//取消按钮
-			$("#edit-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/dashboard";
-			});
-				
-			//修改密码点击事件
-			$("#input-password").click(function(){
-				if($(this).attr("checked")){
-					$("#password").attr("disabled",false);
-					$("#ensurePassword").attr("disabled",false);
-					$("#password").attr("verify","unspecial/100/1/0");
-					$("#ensurePassword").attr("verify","unspecial/100/1/0");
-				}else{
-					$("#password").val("");
-					$("#ensurePassword").val("");
-					$("#password").attr("disabled",true);
-					$("#ensurePassword").attr("disabled",true);
-					$("#password").attr("verify","unspecial/100/0/0");
-					$("#ensurePassword").attr("verify","unspecial/100/0/0");
-					$("#password").css("box-shadow","none").attr('title','');
-					$("#password").parent("span").parent("div").find("span.spanVaildate").html("");
-					$("#ensurePassword").css("box-shadow","none").attr('title','');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-				}
-			});
-				
-			//确认密码与密码一致
-			$("#ensurePassword").blur(function(){
-				validPassword();
-			});
-				
-			function validPassword(){
-				var password = $("#password").val();
-				var ensurePassword = $("#ensurePassword").val();
-				if(ensurePassword != ""){
-					if(ensurePassword != password){
-						$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-						return false;
-					}else{
-						$("#ensurePassword").css("box-shadow","none").attr('title','');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-					}
-				}
-			}
-				
-		});
-	</script>
-	
-</@override>
-
+<@override name="head">	
+<title>个人信息</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/authority.js"></script>
+</@override>	
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-    	<div id="handler" style="padding-top:20px; margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">个人信息</li>
-			</ul>  
-		</div>
+<div id=content_bg>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
 		<div id="content">
-			<div id="editForm">
-				<form id="validation-form" class="form-horizontal">
-					<input  autocomplete="off"  type="hidden" name="id" id="accountId" value="${account.id}"/>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号：</label>
-						<input class="input-text" autocomplete="off" id="accountName" name="accountName" type="text" value="${account.accountName}" disabled="true"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>密码：</label>
-						<span id="password-span"><input tabindex="1" class="input-text" autocomplete="off" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码：</label>
-						<span id="ensurePassword-span"><input tabindex="2" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span>
-						<input id="input-password" autocomplete="off" type="checkbox" style="margin-top:9px;"><span id="input-password-span">修改密码</span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>姓名：</label>
-						<input tabindex="3" class="input-text" autocomplete="off" id="realName" name="realName" type="text" value="${account.realName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系电话：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="${account.tel}" verify="tel-mobile/12/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" <#if account.state=="1">checked</#if> value="1" disabled><span style="top:3px;position:relative;">开启</span></label> 
-						<label class="form-align-radio" style="position:absolute;margin:-40px 0 0 140px;"><input id="input-radio-down" autocomplete="off" name="state" type="radio" <#if account.state=="0">checked</#if> value="0" disabled><span style="top:3px;position:relative;">暂停</span></label>
-					</div>
-					
-					<#if operator ??>
-					<input type="hidden" name="operator_Id" id="operatorId" value="${operator.id}"/>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>银行账号：</label>
-						<input tabindex="5" class="input-text" autocomplete="off" id="operatoraccount" name="operatoraccount" type="text" value="${operator.account}" verify="number/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>开户人姓名：</label>
-						<input tabindex="6" class="input-text" autocomplete="off" id="operatoraccountName" name="operatoraccountName" type="text" value="${operator.accountName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>开户行：</label>
-						<input tabindex="7" class="input-text" autocomplete="off" id="operatorbank" name="operatorbank" type="text" value="${operator.bank}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<#else>
-						<input type="hidden" name="operator_Id" id="operatorId" value="0"/>
-					</#if>
-					<div id="btn-class" class="form-actions1" style="margin-top:50px;">
-						<div id="edit-btn-save">保存</div>
-					    <div id="edit-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">个人信息</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/authority/save" method="post">
+	 			<input type="hidden" name="id" id="accountId" value="${account.id!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号：</label>
+					<input class="input-text" tabindex="1" id="accountName" name="accountName" type="text" value="${account.accountName!}" disabled="true"/>
+				</div>
+				<div class="input-group" id="password-div">
+					<label class="input-label"><span class="lbl-yes">*</span>密码：</label>
+					<span id="password-span"><input class="input-text" tabindex="2" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"/></span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="ensurePassword-div">
+					<label class="input-label"><span class="lbl-yes">*</span>确认密码：</label>
+					<span id="ensurePassword-span"><input class="input-text" tabindex="3" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"/></span>
+					<input id="input-password-edit" type="checkbox" class="input-password"><span class="input-password-span">修改密码</span>
+					<span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>姓名：</label>
+					<input class="input-text" tabindex="4" id="realName" name="realName" type="text" value="${account.realName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系电话：</label>
+					<input class="input-text" tabindex="5" id="tel" name="tel" type="text" value="${account.tel!}" verify="tel-mobile/12/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号状态：</label>
+					<input class="input-radio" name="state" type="radio" value="1" <#if account.state=="1">checked</#if> /><span class="input-radio-span">开启</span>
+					<input class="input-radio" name="state" type="radio" value="0" <#if account.state=="0">checked</#if> /><span class="input-radio-span">暂停</span>
+				</div>
+				<#if operator ??>
+				<input type="hidden" name="operator_Id" id="operatorId" value="${operator.id}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>银行账号：</label>
+					<input class="input-text" tabindex="6" id="operatoraccount" name="operatoraccount" type="text" value="${operator.account!}" verify="number/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>开户人姓名：</label>
+					<input class="input-text" tabindex="7" id="operatoraccountName" name="operatoraccountName" type="text" value="${operator.accountName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>开户行：</label>
+					<input class="input-text" tabindex="8" id="operatorbank" name="operatorbank" type="text" value="${operator.bank!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<#else>
+					<input type="hidden" name="operator_Id" id="operatorId" value="0"/>
+				</#if>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" id="btn-cancel-account" type="button">取消</button>
+				</div>
+			</form>
 		</div>
-	</div>
+    </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/code-class/create.ftl

@@ -1,105 +0,0 @@
-<@override name="head">
-	<title>创建分类</title>
-	<!--Include Required css file-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:17px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	
-	<script type="text/javascript">
-		$(document).ready(function(){
-		 	//获取地址栏参数
-		 	function GetRequest() {
-			   var url = location.search; //获取url中"?"符后的字串
-			   var theRequest = new Object();
-			   if (url.indexOf("?") != -1) {
-			      var str = url.substr(1);
-			      strs = str.split("&");
-			      for(var i = 0; i < strs.length; i ++) {
-			         theRequest[strs[i].split("=")[0]]=unescape(strs[i].split("=")[1]);
-			      }
-			   }
-			   return theRequest;
-			}
-		 	
-		 	$("#validation-form").autovalidate();
-		 	//保存按钮
-			$("#btn-save").unbind('click').click(function(){
-			    var requestData = GetRequest();//获取地址栏参数
-				var CodeClass = new Object();//分类代码对象
-				CodeClass['codeName'] = $("#codeName").val();
-				CodeClass['codePara'] = $("#codePara").val();
-				CodeClass['advertiserId'] = requestData['advertiserId'];
-				if (!$("#validation-form").validate()) {
-					return false;
-				} 
-				$.ajax({
-	            	type: "POST",
-	             	url: "${ctx}/advertiser/main/code-class/save",
-	             	data: CodeClass,
-	             	success: function(data){
-						location.href = "${ctx}/advertiser/main/code-class/list";
-	             	}
-				});
-			});
-			
-			//取消按钮
-			$("#btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/code-class/list";
-			});
-		});
-	</script>
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent">
-			<div id="handler">
-				<ul style="margin-left:10px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2" style="margin-left: -10px;"><a href="${ctx}/advertiser/main/code-site/list">代码中心</a></li>
-					<span class="divider2" style="margin:0px;"><i class="icon-angle-right"></i></span>
-					<li class="size2" style="margin:0px;"><a href="${ctx}/advertiser/main/code-class/list">分类访客找回</a></li>
-					<span class="divider2" style="margin: 0 0 0px 10px;"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">创建分类</li>
-				</ul>  
-			</div>
-		    <div id="content"> 	
-		     	<div id="createForm" style="margin:30px 20px 100px 20px;">
-					<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/code-class/save" method="post">
-						<div class="control-group">
-							<label for="form-field-4"><span>*</span>请输入您要创建的访客找回分类名称：</label>
-							<div><input class="input-text" autocomplete="off" name="codeName" type="text" id="codeName" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span></div>
-						</div>
-						
-						<div class="control-group">
-							<label for="form-field-4"><span>*</span>请输入您要创建的访客找回分类参数值：</label>
-							<div><input class="input-text" autocomplete="off" name="codePara" type="text" id="codePara" value="" verify="number/11/1/0"><span class="spanVaildate"></span></div>
-						</div>
-						
-						<div id="btn-class" class="button-code">
-							<div id="btn-save">保存</div>      
-						    <div id="btn-cancel">取消</div>
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/code-class/edit.ftl

@@ -1,91 +0,0 @@
-<@override name="head">
-	<title>编辑分类</title>
-	<!--Include Required css file-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:17px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	
-	<script type="text/javascript">
-		$(document).ready(function(){
-		 	$("#validation-form").autovalidate();
-		 	//保存按钮
-			$("#btn-save").unbind('click').click(function(){
-				var CodeClass = new Object();//分类代码对象
-				CodeClass['id'] = $("#codeClassId").val();
-				CodeClass['codeName'] = $("#codeName").val();
-				CodeClass['codePara'] = $("#codePara").val();
-				if (!$("#validation-form").validate()) {
-					return false;
-				} 
-				$.ajax({
-	            	type: "POST",
-	             	url: "${ctx}/advertiser/main/code-class/save",
-	             	data: CodeClass,
-	             	success: function(data){
-						location.href = "${ctx}/advertiser/main/code-class/list";
-	             	}
-				});
-			});
-			
-			//取消按钮
-			$("#btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/code-class/list";
-			});
-		});
-	</script>
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent">
-			<div id="handler">
-				<ul style="margin-left:10px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2" style="margin-left: -10px;"><a href="${ctx}/advertiser/main/code-site/list">代码中心</a></li>
-					<span class="divider2" style="margin:0px;"><i class="icon-angle-right"></i></span>
-					<li class="size2" style="margin:0px;"><a href="${ctx}/advertiser/main/code-class/list">分类访客找回</a></li>
-					<span class="divider2" style="margin: 0 0 0px 10px;"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">编辑分类</li>
-				</ul>  
-			</div>
-		    <div id="content">	
-		     	<div id="editForm" style="margin:30px 20px 100px 20px;">
-					<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/code-class/save" method="post">
-						<input  autocomplete="off" type="hidden" name="id" id="codeClassId" value="${codeClass.id}"/>
-						<div class="control-group">
-							<label for="form-field-4"><span>*</span>请输入您要创建的访客找回分类名称：</label>
-							<div><input class="input-text" autocomplete="off" name="codeName" type="text" id="codeName" value="${codeClass.codeName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span></div>
-						</div>
-						
-						<div class="control-group">
-							<label for="form-field-4"><span>*</span>请输入您要创建的访客找回分类参数值：</label>
-							<div><input class="input-text" autocomplete="off" name="codePara" type="text" id="codePara" value="${codeClass.codePara}" verify="number/11/1/0"><span class="spanVaildate"></span></div>
-						</div>
-						
-						<div id="btn-class" class="button-code">
-							<div id="btn-save">保存</div>      
-						    <div id="btn-cancel">取消</div>
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/code-class/list.ftl

@@ -1,328 +0,0 @@
-<@override name="head">
-	<title>分类访客找回</title>
-	<!--Include Required css file-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ad-code.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/jquery-ui.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/ZeroClipboard.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery-1.8.2.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.core.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.mouse.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.button.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.draggable.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.dialog.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.position.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.resizable.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.effect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript">
-		$(document).ready(function(){
-			var role = '${role}';
-			var agentId = '${userSession.agentId}';
-			//当选择广告主后，显示创建分类按钮
-			if($("#selectedAdvertiserId").val() != -1){
-				$("#createType").css("display","block");
-			}else{
-				$("#createType").css("display","none");
-			}
-			if(role == "agent"){
-				$('#advertiser_son_ul').hide(); //初始ul隐藏
-			 	$("#advertiser_son_ul").append("<li value='-1'>请选择广告主</li>");
-			 	var url = "${ctx}/widget/selector/provide/advertiser?parentId="+agentId;
-			 	$.getJSON( url, function(data) {
-					var data_1 = data.advertiserList;
-					$.each( data_1, function( key, val ) {
-						$("#advertiser_son_ul").append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
-					});
-				});
-			}else if(role == "advertiser"){
-				var advertiserId = '${userSession.advertiserId}';
-				var advertiserName = '${advertiserName}';
-				$("#advertiserul_span").html(advertiserName);
-				$("#createType").css("display","block");
-				$("#selectedAdvertiserId").val(advertiserId);
-				$("#selectedAdvertiserName").val(advertiserName);
-			}
-		 	$("ul#main_advertiserul #advertiserul_select_box span").click(function(){
-				if(role == "agent"){
-					if($('#advertiser_son_ul').height()>210){
-		 				$('#advertiser_son_ul').css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-		 			};
-		 			$('#advertiser_son_ul').slideDown(); //ul显示
-		 		}
-		 	});
-		 	$('ul#advertiser_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#selectedAdvertiserId").val($(this).attr("value"));
-				$("#selectedAdvertiserName").val($(this).html());
-				//当选择广告主后，显示创建分类按钮
-				if($("#selectedAdvertiserId").val() != -1){
-					$("#createType").css("display","block");
-				}else{
-					$("#createType").css("display","none");
-				}
-				$('#advertiser_son_ul').slideUp(); //ul隐藏
-				$('#formPage').submit();
-			});
-			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').slideUp(); //ul隐藏
-		 	});
-		 	
-		 	$("#code-type div.btn-codeclick1").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-site/list";
-			});
-		
-		 	$("#code-type div.btn-codeclick2").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-class/list";
-		 	});
-		
-		 	$("#code-type div.btn-codeclick3").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-convert/list";
-		 	});
-		 	
-			//复选框按钮
-			$('#table_code_type th input:checkbox').click(function(){
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-		
-			//点击创建分类代码
-			$("#createType").click(function(){
-				location.href = "${ctx}/advertiser/main/code-class/create?advertiserId="+$("#selectedAdvertiserId").val();
-			});
-			
-			//点击编辑分类代码
-			$("#btndiv .btn-update").click(function(){
-				var updateId = $(this).attr("value");
-				location.href = "${ctx}/advertiser/main/code-class/edit?id="+updateId;
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-		});	
-	</script>
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent">
-			<div id="handler">
-				<ul style="margin-left:10px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2" style="margin-left: -10px;"><a href="${ctx}/advertiser/main/code-site/list">代码中心</a></li>
-					<span class="divider2" style="margin:0px;"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">分类访客找回</li>
-				</ul>  
-			</div>
-			<form id="formPage" action="${ctx}/advertiser/main/code-class/list" method="post">	
-			<input type="hidden" name="advertiserId" id="selectedAdvertiserId" value="${advertiserId}">
-			<input type="hidden" name="selectedAdvertiserName" id="selectedAdvertiserName" value="${selectedAdvertiserName}">
-			<div id="content">
-				<div class="controls-reset" id="controls-main">
-					<span style="font-size:12px;">选择广告主：</span>
-					<ul id="main_advertiserul">
-					  <li class="select_box" id="advertiserul_select_box">
-					    <span id="advertiserul_span">${selectedAdvertiserName}</span>
-					    <ul class="son_ul" id="advertiser_son_ul" style="margin-left: 0;"></ul>
-					  </li>
-					</ul>
-				</div>
-				
-				
-		       	<div id="code-type">
-		       		<div class="btn-code btn-codeclick1 selected">全站访客找回</div>      
-		        	<div class="btn-code btn-codeclick2">分类访客找回</div>  
-		        	<div class="btn-code btn-codeclick3">转化代码</div>      
-		       	</div>
-		     
-		     	<div style="background-color:#EBF1F5; height:2px;"></div>
-		    	
-		     	<div id="typeVisitors">
-					<div id="typeHead">
-						<span id="createType">创建分类</span>
-						<div id="serachData">
-							<input type="hidden" id="page" name="page" value="${pager.page}">
-							<input type="text" name="searchValue" id="searchValue" value="${searchValue!}">
-							<input id="serachData_img" type="submit" value="" />
-						</div>
-					</div>
-					
-					<div style="margin-top:20px;">
-						<input type="hidden" id="codeClassId" value="">
-						<table id="table_code_type" border="1">
-							<thead>
-								<tr>
-									<th class="center" width="10%">
-										<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-									</th>
-									<th class="dataToggle hide-piece"  width="15%">代码名称</th>
-									<th class="dataToggle hide-piece"  width="15%">参数值</th>
-									<th class="dataToggle hide-piece"  width="25%">编辑时间</th>
-									<th  width="45%">操作</th>
-								</tr>
-							</thead>
-							<tbody>
-							<#if codeClassList ??>
-							<#list codeClassList as codeClass>
-								<tr class="">
-									<td class="center">
-										<label><input autocomplete="off" type="checkbox" name="id" value="${codeClass.id}" class="input_checkbox"><span class="lbl"></span></label>
-									</td>
-									<td class="breakword">${codeClass.codeName!}</td>
-									<td class="breakword">${codeClass.codePara!}</td>
-									<td class="hidden-480">${codeClass.updated?datetime}</td>		          			       
-									<td class="center">
-										<div id="btndiv">
-											<div class="btn1 btn-update" value="${codeClass.id}">编辑</div>
-											<div class="btn1 btn-getcode" value="${codeClass.id}">获取代码</div>
-											<div class="btn1 btn-validcode" value="${codeClass.id}">验证代码</div>
-										</div>
-									</td>
-								</tr>
-							</#list>
-							</#if>
-							</tbody>
-						</table>
-					</div>
-					<div id="pageDiv">
-               			<#include "/common/pagination/simple.ftl"/>
-            		</div>
-				</div>
-			</div>
-			</form>
-			<div id="getCodeDialog" style="display:none;width:500px;">
-				<#include "/advertiser/main/code-site/scriptOrPic.ftl"/>
-			</div>
-			
-			<div id="validateCodeDialog" style="display:none;">
-				<#include "/advertiser/main/code-site/validateCode.ftl"/>
-			</div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
-
-<script type="text/javascript">
-	$(function(){
-
-		$('#selectul_son_ul').hide(); //初始ul隐藏
-		$('#selectul_box span').click(function(){ //鼠标移动函数
-			$(this).parent().find('ul#selectul_son_ul').slideDown();  //找到ul.selectul_son_ul显示
-		});
-		$('ul#selectul_son_ul li').click(function(){
-			$(this).parents('li').find('span').html($(this).html());
-			$("#type").val($(this).attr("value"));
-			$(this).parents('li').find('ul').slideUp();
-			getResult($("#codeClassId").val(),$("#type").val());
-		});
-		$("#selectul_box").mouseleave(function(){
-			$('#selectul_son_ul').slideUp(); //ul隐藏
-		});
-			
-		$("#btndiv .btn-getcode").click(function(){
-			$("#codeClassId").val($(this).attr("value"));
-			$("#getCodeDialog").dialog({
-				autoOpen: true,
-				title: '访客找回代码安装',
-				height: 405,
-				width: 470,
-				modal: true,
-				buttons: [ 
-					{ 
-						text: "复制", 
-						id: "btn-copy",
-						click: function() { 
-							$(this).dialog("close");
-        				}
-					},
-					{ 
-						text: "取消", 
-						click: function() { 
-							$(this).dialog("close");
-						}
-					} 
-				],
-				close: function() {
-					//关闭之后重置ul的值
-					$('#selectul_box').find('span').html('<li vaule="0">Javascript</li>');
-					$("#type").val(0);
-				}
-			});
-			//默认类型为Javascript，获取相应的值
-			getResult($(this).attr("value"),$("#type").val());
-			//以下代码实现复制功能，利用ZeroClipboard插件实现
-			var client = new ZeroClipboard($('button#btn-copy'));
-	  		client.on('ready', function(event) {
-				client.on('copy', function(event) {
-					event.clipboardData.setData('text/plain', $("#mytextarea").val());
-				});
-				client.on('aftercopy', function(event) {
-					console.log('Copied text to clipboard: ' + event.data['text/plain']);
-				});
-			});
-			client.on('error', function(event) {
-				ZeroClipboard.destroy();
-			});
-		});
-		
-		//获取对应的代码值
-		function getResult(id,type){
-			$.ajax({
-				type:"POST",
-				url:"${ctx}/advertiser/main/code-class/getcode",
-				data:{id:id,type:type},
-				success:function(data){
-					$("#mytextarea").html(data);           
-				}     
-			});
-		}
-		
-		//校验代码点击事件
-		$("#btndiv .btn-validcode").click(function(){
-			$("#validateCodeDialog").dialog({
-				autoOpen: true,
-				title: '访客找回代码验证',
-				height: 260,
-				width: 435,
-				modal: true,
-				buttons: [ 
-					{ 
-						text: "验证", 
-						click: function() { 
-        				}
-					},
-					{ 
-						text: "取消", 
-						click: function() { 
-							$(this).dialog("close");
-						}
-					} 
-				],
-				close: function() {
-					//关闭之后重置url的值
-					$('。code-content-ways3-url').val("");
-				}
-			});
-		});
-	
-	});
-
-</script>

src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/create.ftl

@@ -1,166 +0,0 @@
-<@override name="head">
-	<title>创建转化代码</title>
-	<!--Include Required css file-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:17px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-		.scrollHeight{
-			height:210px;
-			overflow-y:scroll;
-			overflow-x:hidden;
-			z-index:9999;
-		}
-	</style>
-	
-	<script type="text/javascript">
-		$(document).ready(function(){
-		 	//下拉框
-			$('#convertType_selectull_son_ul').hide(); //初始ul隐藏
-			$('#convertType_selectul_box span').click(function(){ //鼠标移动函数
-				$(this).parent().find('ul#convertType_selectull_son_ul').show();  //找到ul.selectul_son_ul显示
-				if($('#convertType_selectull_son_ul').height()>210){
-	 				$('#convertType_selectull_son_ul').addClass("scrollHeight");
-	 			};
-				$(this).parent().click(function(){},
-		 			function(){
-			 			$(this).parent().find("ul#convertType_selectull_son_ul").hide(); 
-			 		});
-			},function(){});
-			$('ul#convertType_selectull_son_ul li').click(function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$(this).parents('li').find('ul').hide();
-			});
-			$("#convertType_selectul_box").mouseleave(function(){
-			 	$('#convertType_selectull_son_ul').hide(); //ul隐藏
-			 	if($("#convertType").val() == 0){
-					$("#convertType_selectul").css("box-shadow","0 0 6px red").attr("title","请选择转化代码类型");
-					$("#convertType_selectdiv").find('span.spanVaildate').html("请选择转化代码类型");
-				}else{
-					$("#convertType_selectul").css("box-shadow","none").attr("title","");
-					$("#convertType_selectdiv").find('span.spanVaildate').html("");
-				}
-			});
-		 	
-		 	//获取地址栏参数
-		 	function GetRequest() {
-			   var url = location.search; //获取url中"?"符后的字串
-			   var theRequest = new Object();
-			   if (url.indexOf("?") != -1) {
-			      var str = url.substr(1);
-			      strs = str.split("&");
-			      for(var i = 0; i < strs.length; i ++) {
-			         theRequest[strs[i].split("=")[0]]=unescape(strs[i].split("=")[1]);
-			      }
-			   }
-			   return theRequest;
-			}
-		 	
-		 	$("#convertType_selectull_son_ul li").click(function(){
-		 		$("#convertType").val($(this).attr("value"));
-		 	});
-		 	
-		 	$("#validation-form").autovalidate();
-		 	//保存按钮
-			$("#btn-save").unbind('click').click(function(){
-			    var requestData = GetRequest();//获取地址栏参数
-				var CodeConvert = new Object();//转化代码对象
-				CodeConvert['convertName'] = $("#convertName").val();
-				CodeConvert['convertType'] = $("#convertType").val();
-				CodeConvert['advertiserId'] = requestData['advertiserId'];
-				if (!$("#validation-form").validate()) {
-					return false;
-				} 
-				if($("#convertType").val() == 0){
-					$("#convertType_selectul").css("box-shadow","0 0 6px red").attr("title","请选择转化代码类型");
-					$("#convertType_selectdiv").find('span.spanVaildate').html("请选择转化代码类型");
-					return false;
-				}
-				$.ajax({
-	            	type: "POST",
-	             	url: "${ctx}/advertiser/main/code-convert/save",
-	             	data: CodeConvert,
-	             	success: function(data){
-						location.href = "${ctx}/advertiser/main/code-convert/list";
-	             	}
-				});
-			});
-			
-			//取消按钮
-			$("#btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/code-convert/list";
-			});
-			
-		});
-	</script>
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent">
-			<div id="handler">
-				<ul style="margin-left:10px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2" style="margin-left: -10px;"><a href="${ctx}/advertiser/main/code-site/list">代码中心</a></li>
-					<span class="divider2" style="margin:0px;"><i class="icon-angle-right"></i></span>
-					<li class="size2" style="margin:0px;"><a href="${ctx}/advertiser/main/code-convert/list">转化代码</a></li>
-					<span class="divider2" style="margin: 0 0 0px 10px;"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">创建转化代码</li>
-				</ul>  
-			</div>
-		    <div id="content"> 	
-		     	<div id="createForm" style="margin:20px 20px 150px 20px;">
-					<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/code-convert/save" method="post">
-						<div class="control-group">
-							<label for="form-field-4"><span>*</span>请输入您要创建的转化代码名称：</label>
-							<div><input class="input-text" autocomplete="off" name="convertName" type="text" id="convertName" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span></div>
-						</div>
-						
-						<div class="control-group" id="convertType_selectdiv">
-							<input name="convertType" type="hidden" id="convertType" value="0">
-							<label for="form-field-4"><span>*</span>转化目标类型：</label>
-							<span class="spanVaildate" style="margin:15px 0 0 170px"></span>
-							<ul id="convertType_selectul">
-								<li class="select_box" id="convertType_selectul_box">
-									<span>请选择转化代码类型</span>
-								    <ul class="son_ul" id="convertType_selectull_son_ul">
-								    	<li vaule="0">请选择转化代码类型</li>
-								    	<li value="1">注册</li>
-								    	<li value="2">订单</li>
-								    	<li value="3">购物车</li>
-								    	<li value="4">参加互动</li>
-								    	<li value="5">第一次激活</li>
-								    	<li value="6">下载</li>
-								    	<li value="7">咨询</li>
-								    	<li value="8">在线留言</li>
-								    	<li value="9">其他</li>
-								    </ul>
-								</li>
-							</ul>
-						</div>
-						
-						<div id="btn-convert" class="button-code" style="margin-top:100px;">
-							<div id="btn-save">保存</div>      
-						    <div id="btn-cancel">取消</div>
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/edit.ftl

@@ -1,180 +0,0 @@
-<@override name="head">
-	<title>编辑转化代码</title>
-	<!--Include Required css file-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:17px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-		.scrollHeight{
-			height:210px;
-			overflow-y:scroll;
-			overflow-x:hidden;
-			z-index:9999;
-		}
-	</style>
-	
-	<script type="text/javascript">
-		$(document).ready(function(){
-		 	//下拉框
-			$('#convertType_selectull_son_ul').hide(); //初始ul隐藏
-			$('#convertType_selectul_box span').click(function(){ //鼠标移动函数
-				$(this).parent().find('ul#convertType_selectull_son_ul').show();  //找到ul.selectul_son_ul显示
-				if($('#convertType_selectull_son_ul').height()>210){
-	 				$('#convertType_selectull_son_ul').addClass("scrollHeight");
-	 			};
-				$(this).parent().click(function(){},
-		 			function(){
-			 			$(this).parent().find("ul#convertType_selectull_son_ul").hide(); 
-			 		});
-			},function(){});
-			$('ul#convertType_selectull_son_ul li').click(function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$(this).parents('li').find('ul').hide();
-			});
-			$("#convertType_selectul_box").mouseleave(function(){
-			 	$('#convertType_selectull_son_ul').hide(); //ul隐藏
-			 	if($("#convertType").val() == 0){
-					$("#convertType_selectul").css("box-shadow","0 0 6px red").attr("title","请选择转化代码类型");
-					$("#convertType_selectdiv").find('span.spanVaildate').html("请选择转化代码类型");
-				}else{
-					$("#convertType_selectul").css("box-shadow","none").attr("title","");
-					$("#convertType_selectdiv").find('span.spanVaildate').html("");
-				}
-			});
-			
-		 	$("#convertType_selectull_son_ul li").click(function(){
-		 		$("#convertType").val($(this).attr("value"));
-		 	});
-		 	
-		 	$("#validation-form").autovalidate();
-		 	//保存按钮
-			$("#btn-save").unbind('click').click(function(){
-				var CodeConvert = new Object();//分类代码对象
-				CodeConvert['id'] = $("#codeConvertId").val();
-				CodeConvert['convertName'] = $("#convertName").val();
-				CodeConvert['convertType'] = $("#convertType").val();
-				if (!$("#validation-form").validate()) {
-					return false;
-				} 
-				if($("#convertType").val() == 0){
-					$("#convertType_selectul").css("box-shadow","0 0 6px red").attr("title","请选择转化代码类型");
-					$("#convertType_selectdiv").find('span.spanVaildate').html("请选择转化代码类型");
-					return false;
-				}
-				$.ajax({
-	            	type: "POST",
-	             	url: "${ctx}/advertiser/main/code-convert/save",
-	             	data: CodeConvert,
-	             	success: function(data){
-						location.href = "${ctx}/advertiser/main/code-convert/list";
-	             	}
-				});
-			});
-			
-			//取消按钮
-			$("#btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/advertiser/main/code-convert/list";
-			});
-		});
-	</script>
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent">
-			<div id="handler">
-				<ul style="margin-left:10px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2" style="margin-left: -10px;"><a href="${ctx}/advertiser/main/code-site/list">代码中心</a></li>
-					<span class="divider2" style="margin:0px;"><i class="icon-angle-right"></i></span>
-					<li class="size2" style="margin:0px;"><a href="${ctx}/advertiser/main/code-convert/list">转化代码</a></li>
-					<span class="divider2" style="margin: 0 0 0px 10px;"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">编辑转化代码</li>
-				</ul>  
-			</div>
-		    <div id="content">
-		     	<div id="editForm" style="margin:30px 20px 150px 20px;">
-					<form id="validation-form" class="form-horizontal" action="${ctx}/advertiser/main/code-convert/save" method="post">
-						<input  autocomplete="off"  type="hidden" name="id" id="codeConvertId" value="${codeConvert.id}"/>
-						<input id="convertType" autocomplete="off"  type="hidden" name="convertType" value="${codeConvert.convertType}"/>
-						<div class="control-group">
-							<label for="form-field-4"><span>*</span>请输入您要创建的转化代码名称：</label>
-							<div><input class="input-text" autocomplete="off" name="convertName" type="text" id="convertName" value="${codeConvert.convertName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span></div>
-						</div>
-						
-						<div class="control-group" id="convertType_selectdiv">
-							<label for="form-field-4"><span>*</span>转化目标类型：</label>
-							<span class="spanVaildate" style="margin:15px 0 0 170px"></span>
-							<ul id="convertType_selectul">
-								<li class="select_box" id="convertType_selectul_box">
-									<#if codeConvert.convertType==0>
-										<span>请选择转化代码类型</span>
-									</#if> 
-									<#if codeConvert.convertType==1>
-										<span>注册</span>
-									</#if>
-									<#if codeConvert.convertType==2>
-										<span>订单</span>
-									</#if> 
-									<#if codeConvert.convertType==3>
-										<span>购物车</span>
-									</#if> 
-									<#if codeConvert.convertType==4>
-										<span>参加互动</span>
-									</#if> 
-									<#if codeConvert.convertType==5>
-										<span>第一次激活</span>
-									</#if>
-									<#if codeConvert.convertType==6>
-										<span>下载</span>
-									</#if> 
-									<#if codeConvert.convertType==7>
-										<span>咨询</span>
-									</#if> 
-									<#if codeConvert.convertType==8>
-										<span>在线留言</span>
-									</#if> 
-									<#if codeConvert.convertType==9>
-										<span>其他</span>
-									</#if> 
-								    <ul class="son_ul" id="convertType_selectull_son_ul">
-								    	<li vaule="0">请选择转化代码类型</li>
-								    	<li value="1">注册</li>
-								    	<li value="2">订单</li>
-								    	<li value="3">购物车</li>
-								    	<li value="4">参加互动</li>
-								    	<li value="5">第一次激活</li>
-								    	<li value="6">下载</li>
-								    	<li value="7">咨询</li>
-								    	<li value="8">在线留言</li>
-								    	<li value="9">其他</li>
-								    </ul>
-								</li>
-							</ul>
-						</div>
-						
-						<div id="btn-convert" class="button-code" style="margin-top:100px;">
-							<div id="btn-save">保存</div>      
-						    <div id="btn-cancel">取消</div>
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/list.ftl

@@ -1,357 +0,0 @@
-<@override name="head">
-	<title>分类访客找回</title>
-	<!--Include Required css file-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ad-code.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/jquery-ui.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/ZeroClipboard.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery-1.8.2.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.core.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.mouse.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.button.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.draggable.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.dialog.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.position.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.resizable.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.effect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript">
-		$(document).ready(function(){
-		
-		 	var role = '${role}';
-			var agentId = '${userSession.agentId}';
-			//当选择广告主后，显示创建分类按钮
-			if($("#selectedAdvertiserId").val() != -1){
-				$("#createType").css("display","block");
-			}else{
-				$("#createType").css("display","none");
-			}
-			if(role == "agent"){
-				$('#advertiser_son_ul').hide(); //初始ul隐藏
-			 	$("#advertiser_son_ul").append("<li value='-1'>请选择广告主</li>");
-			 	var url = "${ctx}/widget/selector/provide/advertiser?parentId="+agentId;
-			 	$.getJSON( url, function(data) {
-					var data_1 = data.advertiserList;
-					$.each( data_1, function( key, val ) {
-						$("#advertiser_son_ul").append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
-					});
-				});
-			}else if(role == "advertiser"){
-				var advertiserId = '${userSession.advertiserId}';
-				var advertiserName = '${advertiserName}';
-				$("#advertiserul_span").html(advertiserName);
-				$("#createType").css("display","block");
-				$("#selectedAdvertiserId").val(advertiserId);
-				$("#selectedAdvertiserName").val(advertiserName);
-			}
-		 	$("ul#main_advertiserul #advertiserul_select_box span").click(function(){
-				if(role == "agent"){
-					if($('#advertiser_son_ul').height()>210){
-		 				$('#advertiser_son_ul').css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-		 			};
-		 			$('#advertiser_son_ul').slideDown(); //ul显示
-		 		}
-		 	});
-		 	$('ul#advertiser_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#selectedAdvertiserId").val($(this).attr("value"));
-				$("#selectedAdvertiserName").val($(this).html());
-				//当选择广告主后，显示创建分类按钮
-				if($("#selectedAdvertiserId").val() != -1){
-					$("#createType").css("display","block");
-				}else{
-					$("#createType").css("display","none");
-				}
-				$('#advertiser_son_ul').slideUp(); //ul隐藏
-				$('#formPage').submit();
-			});
-			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').slideUp(); //ul隐藏
-		 	});
-		 	
-		 	$("#code-type div.btn-codeclick1").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-site/list";
-			});
-		
-		 	$("#code-type div.btn-codeclick2").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-class/list";
-		 	});
-		
-		 	$("#code-type div.btn-codeclick3").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-convert/list";
-		 	});
-		 	
-			//复选框按钮
-			$('#table_code_type th input:checkbox').click(function(){
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-		
-			//点击创建转化代码
-			$("#createType").click(function(){
-				location.href = "${ctx}/advertiser/main/code-convert/create?advertiserId="+$("#selectedAdvertiserId").val();
-			});
-			
-			//点击编辑转化代码
-			$("#btndiv div.btn-update").click(function(){
-				var updateId = $(this).attr("value");
-				location.href = "${ctx}/advertiser/main/code-convert/edit?id="+updateId;
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-		});	
-	</script>
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent">
-			<div id="handler">
-				<ul style="margin-left:10px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2" style="margin-left: -10px;"><a href="${ctx}/advertiser/main/code-site/list">代码中心</a></li>
-					<span class="divider2" style="margin:0px;"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">转化代码</li>
-				</ul>  
-			</div>
-			<form id="formPage" action="${ctx}/advertiser/main/code-convert/list" method="post">
-			<input type="hidden" name="advertiserId" id="selectedAdvertiserId" value="${advertiserId}">
-			<input type="hidden" name="selectedAdvertiserName" id="selectedAdvertiserName" value="${selectedAdvertiserName}">
-			<div id="content">
-				<div class="controls-reset" id="controls-main">
-					<span style="font-size:12px;">选择广告主：</span>
-					<ul id="main_advertiserul">
-					  <li class="select_box" id="advertiserul_select_box">
-					    <span id="advertiserul_span">${selectedAdvertiserName}</span>
-					    <ul class="son_ul" id="advertiser_son_ul" style="margin-left:0;"></ul>
-					  </li>
-					</ul>
-				</div>
-				
-		       	<div id="code-type">
-		       		<div class="btn-code btn-codeclick1 selected">全站访客找回</div>      
-		        	<div class="btn-code btn-codeclick2">分类访客找回</div>  
-		        	<div class="btn-code btn-codeclick3">转化代码</div>      
-		       	</div>
-		     
-		     	<div style="background-color:#EBF1F5; height:2px;"></div>
-		     	
-		     	<div id="convertVisitors">
-					<div id="typeHead">
-						<span id="createType">创建转化代码</span>
-						<div id="serachData">
-							<input type="hidden" id="page" name="page" value="${pager.page}">
-							<input type="text" name="searchValue" id="searchValue" value="${searchValue!}">
-							<input id="serachData_img" type="submit" value="" />
-						</div>
-					</div>
-					
-					<div style="margin-top:20px;">
-						<input type="hidden" id="codeConvertId" value="">
-						<table id="table_code_type" border="1">
-							<thead>
-								<tr>
-									<th class="center" width="10%">
-										<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-									</th>
-									<th class="dataToggle hide-piece"  width="15%">代码名称</th>
-									<th class="dataToggle hide-piece"  width="15%">类型</th>
-									<th class="dataToggle hide-piece"  width="25%">编辑时间</th>
-									<th  width="45%">操作</th>
-								</tr>
-							</thead>
-							<tbody>
-							<#if codeConvertList ??>
-							<#list codeConvertList as codeConvert>
-								<tr class="">
-									<td class="center">
-										<label><input autocomplete="off" type="checkbox" name="id" value="${codeConvert.id}" class="input_checkbox"><span class="lbl"></span></label>
-									</td>
-									<td class="breakword">${codeConvert.convertName!}</td>
-									<td class="breakword">
-										<#if codeConvert.convertType==1>
-											注册
-										</#if>
-										<#if codeConvert.convertType==2>
-											订单
-										</#if> 
-										<#if codeConvert.convertType==3>
-											购物车
-										</#if> 
-										<#if codeConvert.convertType==4>
-											参加互动
-										</#if> 
-										<#if codeConvert.convertType==5>
-											第一次激活
-										</#if>
-										<#if codeConvert.convertType==6>
-											下载
-										</#if> 
-										<#if codeConvert.convertType==7>
-											咨询
-										</#if> 
-										<#if codeConvert.convertType==8>
-											在线留言
-										</#if> 
-										<#if codeConvert.convertType==9>
-											其他
-										</#if> 
-									</td>
-									<td class="hidden-480">${codeConvert.updated?datetime}</td>		          			       
-									<td class="center">
-										<div id="btndiv">
-											<div class="btn1 btn-update" value="${codeConvert.id}">编辑</div>
-											<div class="btn1 btn-getcode" value="${codeConvert.id}">获取代码</div>
-											<div class="btn1 btn-validcode" value="${codeConvert.id}">验证代码</div>
-										</div>
-									</td>
-								</tr>
-							</#list>
-							</#if>
-							</tbody>
-						</table>
-					</div>
-					<div id="pageDiv">
-               			<#include "/common/pagination/simple.ftl"/>
-            		</div>
-					</form>
-				</div>
-			</div>
-			
-			<div id="getCodeDialog" style="display:none;width:500px;">
-				<#include "/advertiser/main/code-site/scriptOrPic.ftl"/>
-			</div>
-			
-			<div id="validateCodeDialog" style="display:none;">
-				<#include "/advertiser/main/code-site/validateCode.ftl"/>
-			</div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
-
-<script type="text/javascript">
-	$(function(){
-
-		$('#selectul_son_ul').hide(); //初始ul隐藏
-		$('#selectul_box span').click(function(){ //鼠标移动函数
-			$(this).parent().find('ul#selectul_son_ul').slideDown();  //找到ul.selectul_son_ul显示
-		});
-		$('ul#selectul_son_ul li').click(function(){
-			$(this).parents('li').find('span').html($(this).html());
-			$("#type").val($(this).attr("value"));
-			$(this).parents('li').find('ul').slideUp();
-			getResult($("#codeConvertId").val(),$("#type").val());
-		});
-		$("#selectul_box").mouseleave(function(){
-			$('#selectul_son_ul').slideUp(); //ul隐藏
-		});
-			
-		$("#btndiv .btn-getcode").click(function(){
-			$("#codeConvertId").val($(this).attr("value"));
-			$("#getCodeDialog").dialog({
-				autoOpen: true,
-				title: '转化代码安装',
-				height: 405,
-				width: 470,
-				modal: true,
-				buttons: [ 
-					{ 
-						text: "复制", 
-						id: "btn-copy",
-						click: function() { 
-							$(this).dialog("close");
-        				}
-					},
-					{ 
-						text: "取消", 
-						click: function() { 
-							$(this).dialog("close");
-						}
-					} 
-				],
-				close: function() {
-					//关闭之后重置ul的值
-					$('#selectul_box').find('span').html('<li vaule="0">Javascript</li>');
-					$("#type").val(0);
-				}
-			});
-			//默认类型为Javascript，获取相应的值
-			getResult($(this).attr("value"),$("#type").val());
-			//以下代码实现复制功能，利用ZeroClipboard插件实现
-			var client = new ZeroClipboard($('button#btn-copy'));
-	  		client.on('ready', function(event) {
-				client.on('copy', function(event) {
-					event.clipboardData.setData('text/plain', $("#mytextarea").val());
-				});
-				client.on('aftercopy', function(event) {
-					console.log('Copied text to clipboard: ' + event.data['text/plain']);
-				});
-			});
-			client.on('error', function(event) {
-				ZeroClipboard.destroy();
-			});
-		});
-		
-		//获取对应的代码值
-		function getResult(id,type){
-			$.ajax({
-				type:"POST",
-				url:"${ctx}/advertiser/main/code-convert/getcode",
-				data:{id:id,type:type},
-				success:function(data){
-					$("#mytextarea").html(data);           
-				}     
-			});
-		}
-		
-		//校验代码点击事件
-		$("#btndiv .btn-validcode").click(function(){
-			$("#validateCodeDialog").dialog({
-				autoOpen: true,
-				title: '转化代码验证',
-				height: 260,
-				width: 435,
-				modal: true,
-				buttons: [ 
-					{ 
-						text: "验证", 
-						click: function() { 
-        				}
-					},
-					{ 
-						text: "取消", 
-						click: function() { 
-							$(this).dialog("close");
-						}
-					} 
-				],
-				close: function() {
-					//关闭之后重置url的值
-					$('。code-content-ways3-url').val("");
-				}
-			});
-		});
-	
-	});
-
-</script>

src/main/webapp/WEB-INF/pages/advertiser/main/code-site/list.ftl

@@ -1,211 +0,0 @@
-<@override name="head">
-	<title>广告投放系统</title>
-	<!--Include Required css file-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/ZeroClipboard.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript">
-	
-		$(document).ready(function(){
-			var role = '${role}';
-			var agentId = '${userSession.agentId}';
-			
-			if(role == "agent"){
-				$('#advertiser_son_ul').hide(); //初始ul隐藏
-			 	$("#advertiser_son_ul").append("<li value='0'>请选择广告主</li>");
-			 	var url = "${ctx}/widget/selector/provide/advertiser?parentId="+agentId;
-			 	$.getJSON( url, function(data) {
-					var data_1 = data.advertiserList;
-					$.each( data_1, function( key, val ) {
-						$("#advertiser_son_ul").append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
-					});
-				});
-			}else if(role == "advertiser"){
-				var advertiserName = '${advertiserName}';
-				$("#advertiserul_span").html(advertiserName);
-				getMytextarea($("#selectedAdvertiserId").val(),$("#type").val());
-			}
-		 	
-		 	$("ul#main_advertiserul #advertiserul_select_box span").click(function(){
-		 		if(role == "agent"){
-			 		if($('#advertiser_son_ul').height()>210){
-		 				$('#advertiser_son_ul').css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-		 			};
-		 			$('#advertiser_son_ul').slideDown(); //ul显示
-		 		}
-		 	});
-		 	$('ul#advertiser_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#selectedAdvertiserId").val($(this).attr("value"));
-				$('#advertiser_son_ul').slideUp(); //ul隐藏
-				//默认请求Script代码
-				getMytextarea($("#selectedAdvertiserId").val(),$("#type").val());
-			});
-			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').slideUp(); //ul隐藏
-		 	});
-		 	
-		 	$("#code-type div.btn-codeclick1").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-site/list";
-			});
-		
-		 	$("#code-type div.btn-codeclick2").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-class/list";
-		 	});
-		
-		 	$("#code-type div.btn-codeclick3").click(function(){
-		 		location.href = "${ctx}/advertiser/main/code-convert/list";
-		 	});
-		 	
-		 	$('#selectul_son_ul').hide(); //初始ul隐藏
-			$('#selectul_box span').click(function(){ //鼠标移动函数
-				$(this).parent().find('ul#selectul_son_ul').slideDown();  //找到ul.selectul_son_ul显示
-				$(this).parent().click(function(){},
-		 			function(){
-			 			$(this).parent().find("ul#selectul_son_ul").slideUp(); 
-			 		});
-			},function(){});
-			$('ul#selectul_son_ul li').click(function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#type").val($(this).attr("value"));
-				$(this).parents('li').find('ul').slideUp();
-				//点击 li  请求Script代码或图片
-				getMytextarea($("#selectedAdvertiserId").val(),$("#type").val());
-			});
-			$("#selectul_box").mouseleave(function(){
-			 	$('#selectul_son_ul').slideUp(); //ul隐藏
-			});
-			
-			function getMytextarea(advertiserId,type){
-				$.ajax({
-				    //提交数据的类型 POST GET
-				    type:"POST",
-				    //提交的网址
-				    url:"${ctx}/advertiser/main/code-site/getcode",
-				    //提交的数据
-				    data:{advertiserId:advertiserId,type:type},
-				    //成功返回之后调用的函数            
-				    success:function(data){
-				       $("#mytextarea").html(data);           
-				    }     
-				});
-			}
-		 	
-			//复制按钮事件,利用ZeroClipboard插件实现
-		 	function copyData(){
-			 	var client = new ZeroClipboard($('.code-content-ways1 #btnCopy'));
-				client.on('ready', function(event) {
-					client.on('copy', function(event) {
-						event.clipboardData.setData('text/plain', $("#mytextarea").val());
-					});
-					client.on('aftercopy', function(event) {
-					$(".code-content-ways1 #btnCopy").addClass("zeroclipboard-is-hover");
-						console.log('Copied text to clipboard: ' + event.data['text/plain']);
-					});
-				});
-				client.on('error', function(event) {
-					ZeroClipboard.destroy();
-				});
-			}
-			copyData();
-		});
-	</script>
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-		<#include "/advertiser/main/public-head.ftl">
-		<div id= "pagecontent">
-			<div id="handler">
-				<ul style="margin-left:10px;">
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2" style="margin-left: -10px;"><a href="${ctx}/advertiser/main/code-site/list">代码中心</a></li>
-					<span class="divider2" style="margin:0px;"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">全站访客找回</li>
-				</ul>  
-			</div>
-			<div id="content">
-				<div class="controls-reset" id="controls-main">
-					<span style="font-size:12px;">选择广告主：</span>
-					<ul id="main_advertiserul">
-					  <li class="select_box" id="advertiserul_select_box">
-					    <span id="advertiserul_span">请选择广告主</span>
-					    <ul class="son_ul" id="advertiser_son_ul"></ul>
-					  </li>
-					</ul>
-				</div>
-				<input type="hidden" name="selectedAdvertiserId" id="selectedAdvertiserId" value="${userSession.advertiserId}">
-				
-		       	<div id="code-type">
-		       		<div class="btn-code btn-codeclick1 selected">全站访客找回</div>      
-		        	<div class="btn-code btn-codeclick2">分类访客找回</div>  
-		        	<div class="btn-code btn-codeclick3">转化代码</div>      
-		       	</div>
-		     
-		     	<div style="background-color:#EBF1F5; height:2px;"></div>
-		     	
-		     	<div id="allVisitor">
-				 	<div id="code-content">
-						<p style="font-size:16px;margin-top:20px;">如何安装访客找回代码？</p>
-					    <p class="pclass">1.从列表中找到要安装的代码，点击“获取代码”。</p>
-					    <p class="pclass">2.在弹出窗口中选择代码类型，JavaScript或者图片类型。</p>
-					    <p class="pclass">3.在代码处点击鼠标右键，选择复制。</p>
-					    <p class="pclass">4.将复制的代码，粘贴到适当的网页中（</body> 之前）。</p>
-					    <p class="pclass">注：全站找回代码，要放到全站的所有页面中。</p>
-					</div>
-					     
-					<div class="code-content-ways1">
-						<input type="hidden" id="type" name="type" value="0">
-					    <p style="font-size:16px;margin:15px 0 5px 0;">1.提取代码</p>
-					    <div class="controls-reset" id="controls-site">
-					    	<span style="font-size:12px;">选择全站访客找回代码类型：</span>
-							<ul id="main_selectul">
-								<li class="select_box" id="selectul_box">
-									<span>Javascript</span>
-								    <ul class="son_ul" id="selectul_son_ul">
-								    	<li vaule="0">Javascript</li>
-								    	<li value="1">图片</li>
-								    </ul>
-								</li>
-							</ul>
-					    </div>
-						<div><textarea name="code-contentByWays" id="mytextarea" disabled="disabled"></textarea></div>
-						<div id="btnCopy" class="btn-code btn-copy">复制</div>
-					</div>
-					     
-					<div class="code-content-ways2">
-						<p style="font-size:16px;margin-top:20px;">2.安装</p>
-					    <p class="pclass">将复制的全站访客找回代码，粘贴到适当的网页中&lt;/body&gt;之前；</p>
-					    <p class="pclass">若携带扩展参数信息，请将代码中红色字体替换为实际参数值或留空。</p>
-					</div>
-					       	
-					<div class="code-content-ways3">
-					    <p style="font-size:16px;margin-top:20px;">3.验证</p>
-					    <div>
-					        <p style="margin:10px 0;">请输入您已安装代码页面的URL进行验证：</p>
-					   		<input class="code-content-ways3-url" type="text" name="urlpath" value=""/>
-					   	</div>
-					    <div id="btnValidate" class="btn-code btn-copy">验证</div>
-					    <p class="pclass">请输入一个您已安装代码的页面URL，点击验证后系统将自动访问这个页面，30秒以内我们将在下方显示代码的安放状态。</p>
-					</div>
-					       	
-					<div class="code-content-ways4">
-					    <p style="font-size:16px;margin-top:20px;">4.完成！</p>
-					    <p class="pclass">如通过验证提示正确，表示代码安装成功；如出现错误请重新检查代码安放，并并重新进行验证。</p>
-					</div>
-					
-				</div>
-			</div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/code-site/scriptOrPic.ftl

@@ -1,17 +0,0 @@
-<div class="code-content-ways1">
-	<input type="hidden" id="type" name="type" value="0">
-	<div class="controls-reset" id="controls-site">
-		<span style="font-size:12px;margin-top: 10px;position: absolute;">选择代码类型：</span>
-		<ul id="popup_selectul">
-			<li class="select_box" id="selectul_box">
-				<span id="select_box_span">Javascript</span>
-				<ul class="son_ul" id="selectul_son_ul" style="margin-left:0px;">
-					<li vaule="0">Javascript</li>
-					<li value="1">图片</li>
-				</ul>
-			</li>
-		</ul>
-	</div>
-	<div style="margin-top:10px;"><textarea name="code-contentByWays" id="mytextarea" disabled="disabled" style="width:400px;height:200px;"></textarea></div>
-</div>
-

src/main/webapp/WEB-INF/pages/advertiser/main/code-site/validateCode.ftl

@@ -1,14 +0,0 @@
-<script>
-$(function(){
-
-	$("#btnValidate").click(function(){
-		alert(1);
-	});
-});
-</script>
-
-<div class="code-content-ways3">
-	<p style="margin:10px 0;">请输入您已安装代码页面的URL进行验证：</p>
-	<input class="code-content-ways3-url" type="text" name="urlpath" value=""/>
-	<p class="pclass">请输入一个您已安装代码的页面URL，点击验证后系统将自动访问这个页面，30秒以内我们将在下方显示代码的安放状态。</p>
-</div>

src/main/webapp/WEB-INF/pages/advertiser/main/dashboard.ftl

@@ -1,573 +1,132 @@
 <@override name="head">
 <#assign sec=JspTaglibs["http://www.springframework.org/security/tags"]>
 <title>广告投放系统</title>
-<!--Include Required css file-->
+<link rel="stylesheet" href="${ctx}/assets/css/dashboard_advertiser.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 
-<!--Include Required Prerequisites js-->
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<!--图表生成 js-->
 <script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<!-- 弹出框插件,bootbox.min.js 依赖bootstrap.min.js -->
 <script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-
-<script type="text/javascript">
-$(document).ready(function(){
-	//定时器每秒调用一次当前时间()
-	setInterval(function(){
-		var date = new Date();
-		$("#today").text(formatDate(date));
-	},1000);
-	
-	function formatDate(now)   {   
-		var year = now.getFullYear();   
-		var month = now.getMonth()+1;   
-		var date = now.getDate();   
-		var hour = now.getHours();   
-		var minute = now.getMinutes();   
-		var second = now.getSeconds(); 
-		if(hour < 12)  
-			return  year+"年"+month+"月"+date+"日      上午"+hour+":"+minute+":"+second;
-		else 
-			return  year+"年"+month+"月"+date+"日      下午"+hour+":"+minute+":"+second;
-	}
-	
-	/*
-	*根据时间选择,类型选择,广告主id,查询得到图表
-	*	初始化一些数值
-	*	
-	*/
-	var role = $("#role").val();//获取角色
-	var advertiserId = $("#sessionadvertiserId").val();//广告主id
-	var flow=[];flow[0] = [];flow[1] = [];flow[2] = [];flow[3] = [];//图表的纵坐标数据
-	var labels = [];//图表的横坐标数据
-	var tipLabel=new Array("Consume","Impression","Click","Rate");//折线的名字
-	var consume=tipLabel[0];
-	for (var i = 0; i < 24; i++) {  //默认的X轴的标签labels显示的是昨天的24个小时
-		flow[0].push(0);//初始值设置为0;
-		flow[1].push(0);//初始值设置为0;
-		flow[2].push(0);//初始值设置为0;
-		flow[3].push(0);//初始值设置为0;
-		if(i<10){
-			labels.push("0" + i);
-		} else {
-			labels.push(i);
-		}
-	}
-	
-	/*
-	*更改日期的函数，所有更改日期的事件都是调用此函数
-	*/
-	function cb(start, end) { 
-		$('#dateRangePicker').val(start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));//将日期显示在input标签里面
-		searchAndDraw(start, end);
-	}
-	/*
-	*查询数据和绘制折线图函数, 只要advertiserId和date改变,就调用此函数重新绘制图形
-	*	@param 开始日期,结束日期
-	*	操作:		更改日期,
-	*			调用searchData函数查询数据
-	*			调用drawDiagram函数绘制折线图
-	*/
-	function searchAndDraw(start, end){
-		if(role == 'agent'){
-			advertiserId = $('#selectedAdvertiserId3').val();
-		}
-		if(advertiserId != null){
-			searchData(advertiserId,start, end);//调用searchData函数查询数据
-		}
-		var data = flow[0];	
-		drawDiagram(labels,data,consume);//调用绘制图表函数，绘制图表
-	}
-	/*
-	*	默认显示昨天,moment.js是时间日期处理插件,基于jquery
-	*/
-	cb(moment().subtract(1, 'days'),moment().subtract(1, 'days'));
-	
-	/*
-	*	显示日历插件,jquery.dateRangePicker.js是双日期选择插件,基于jquery
-	*		仅仅设置语言为cn, 最大选择日期问今天
-	*		绑定一个确定按钮点击事件,回调函数,执行cb函数,更改日期,其实不用改,只不过是为了查询数据和绘制图表
-	*/
-	$('#dateRangePicker').dateRangePicker({  
-		language:'cn',
-		endDate:new Date()
-	}).bind('datepicker-apply', function(evt, obj) {
-		cb(moment(obj.date1), moment(obj.date2));
-	});
-	
-	/*
-    *发送ajax请求，查询数据
-    * @param 广告主id,开始日期,结束日期 格式为YYYY-MM-DD
-    * 将横坐标日期存储在labels数组中
-    * 将纵坐标数据存储在flow数组中
-    */
-	function searchData(advertiserId,start,end){    
-		//ajax请求的参数：param{advertiserId,startDate,endDate}
-		var param = {
-			"advertiserId" : advertiserId,
-			"startDate" : start.format('YYYY-MM-DD'),
-			"endDate" : end.format('YYYY-MM-DD'),
-		}
-		//发送ajax请求
-		$.ajax({
-			type : 'post',	//请求方式，post
-			data : param,	//请求参数，param
-			url : '${ctx}/advertiser/main/dashboard/chart',	//请求url
-			async : false,	//是否设置为异步请求
-			cache : false,	//是否缓存
-			dataType : 'json',	//数据类型为json
-			success : function(data){ //请求成功回调函数处理，参数为返回回来的json数组
-				//创建消费数，曝光数，点击数，点击率的数组，用于存储返回回来的数据，然后将这些数据存储在flow数组中，用于图表显示
-				var consume = [];
-				var impression = [];
-				var click = [];
-				var clickRate = [];
-				//判断是数据按小时还是天显示
-				if(start.format('YYYY-MM-DD') == end.format('YYYY-MM-DD')){
-					labels = [];//清空labels数组
-					console.log('按小时显示');
-					//如果不是今天
-					if(moment().format('YYYY-MM-DD') != start.format('YYYY-MM-DD')){
-						for(var i=0;i<24;i++){ //循环给消费数，曝光数，点击数，点击率赋值，循环24次
-							if(i<10){
-								labels.push("0" + i);
-							} else {
-								labels.push(i);
-							}
-							$.each(data,function(key,value){//循环遍历返回的数据data,如果data.hour和当前时间点相等，将相应的值付给数组
-								if(value.hour == i){
-									consume[i] = value.totalConsume;
-									impression[i] = value.totalImpression;
-									click[i] = value.totalClick;
-									clickRate[i] = value.clickRate;
-								}
-							});
-							//未赋值，将相应的数组值赋0.
-							if(consume[i] == null){ consume[i] = 0; }
-							if(impression[i] == null){ impression[i] = 0; }
-							if(click[i] == null){ click[i] = 0;	}
-							if(clickRate[i] == null){ clickRate[i] = 0;	}
-						}
-					} else { //如果是今天
-						var now_hour = new Date().getHours();
-						for(var i=0;i<now_hour;i++){ //循环给消费数，曝光数，点击数，点击率赋值，循环24次
-							if(i<10){
-								labels.push("0" + i);
-							} else {
-								labels.push(i);
-							}
-							$.each(data,function(key,value){//循环遍历返回的数据data,如果data.hour和当前时间点相等，将相应的值付给数组
-								if(value.hour == i){
-									consume[i] = value.totalConsume;
-									impression[i] = value.totalImpression;
-									click[i] = value.totalClick;
-									clickRate[i] = value.clickRate;
-								}
-							});
-							//未赋值，将相应的数组值赋0.
-							if(consume[i] == null){ consume[i] = 0; }
-							if(impression[i] == null){ impression[i] = 0; }
-							if(click[i] == null){ click[i] = 0;	}
-							if(clickRate[i] == null){ clickRate[i] = 0;	}
-						}
-					}
-					//如果是昨天或者今天,图表按小时显示数据，后端暂时没有写
-					
-				} else {
-					console.log('按日期显示');
-					labels = []; //清空labels数组
-					var days = moment.duration(end.diff(start,'days'), 'days').asDays(); //计算选择了几天,利用moment.js相关函数
-					for(var i=0;days>=0;i++,days--){ //循环给labels,消费数，曝光数，点击数，点击率赋值，循环days次
-						labels[i] = moment(end).subtract(days, 'days').format('MM-DD');//将选择的日期赋值给label，格式为MM-DD，例如选择过去三天：labels=[09-21,09-22,09-23]						
-						$.each(data,function(key,value){//循环遍历返回的数据data,如果data.reportDate和当前日期相等，将相应的值付给数组
-							if(value.reportDate == moment(end).subtract(days, 'days').format('YYYY-MM-DD')){
-								consume[i] = value.totalConsume;
-								impression[i] = value.totalImpression;
-								click[i] = value.totalClick;
-								clickRate[i] = value.clickRate;
-							}
-						});
-						//未赋值，将相应的数组值赋0.
-						if(consume[i] == null){ consume[i] = 0; }
-						if(impression[i] == null){ impression[i] = 0; }
-						if(click[i] == null){ click[i] = 0;	}
-						if(clickRate[i] == null){ clickRate[i] = 0;	}
-					}
-				}
-				//将消费数，曝光数，点击数，点击率的数组赋值给flow数组的元素
-				flow[0] = consume;
-				flow[1] = impression;
-				flow[2] = click;
-				flow[3] = clickRate;
-			},
-			error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
-			    // 通常 textStatus 和 errorThrown 之中
-			    // 只有一个会包含信息
-				console.info('error');
-			    this; // 调用本次AJAX请求时传递的options参数
-			}
-		});
-	}
-	/*
-	*快速设置为(今天 昨天 过去7天 过去30天)
-	*/
-	$('#dashboard_chartContent .chart-up .right span.time').click(function(e){ //今天 昨天 过去七天 过去三十天触发函数
-        e.preventDefault;
-		$('#dashboard_chartContent .chart-up .right span').css('color','#344c67');
-		$(this).css('color','#36aeea');
-        var ind = $(this).index();
-        switch (ind){
-            case 0:
-                cb(moment(),moment());
-                break;
-            case 1:
-                cb(moment().subtract(1, 'days'),moment().subtract(1, 'days'));
-                break;
-            case 2:
-                cb(moment().subtract(7, 'days'),moment().subtract(1, 'days'));
-                break;
-            case 3:
-                cb(moment().subtract(30, 'days'),moment().subtract(1, 'days'));
-                break;
-        }
-    });
-	
-	/*
-	*四条折线(消费,曝光数,点击数,点击率),点击切换
-	*/
-	$('#dashboard_chartContent #right_radio input[type="radio"]').click(function(){
-		var n = $(this).val();
-		var data = flow[n];
-		consume = tipLabel[n];
-		var txt = '';
-		if(n == 0){	txt = '消费（元）';	 }	
-		if(n == 1){	txt = '曝光数（次）'; }
-		if(n == 2){	txt = '点击数（次）'; }
-		if(n == 3){	txt = '点击率（%）'; }
-		$('#dashboard_chartContent .chart-down .chart-down-right').html(txt);
-		drawDiagram(labels,data,consume);
-	});
-	
-	/*
-	*绘制折线图函数
-	*	@param 横坐标数值，纵坐标数值，和折线的名字
-	*/
-	function drawDiagram(labels,data,consume){		
-		$('#chart').highcharts({ 
-			chart: { type: 'line' },
-			title: { text: '' }, //标题
-			//subtitle: { text: 'Source: WorldClimate.com' }, //副标题
-			xAxis: { categories: labels }, 
-			yAxis: { 
-				title: { text: '' }, 
-				plotLines: [{ value: 0, width: 1, color: '#808080' }]
-			}, 
-			tooltip: { crosshairs: true, shared: true }, 
-			legend: { 
-				enabled:false,
-			},
-			credits:{
-				enabled:false,
-			},
-		
-			series: [{ 
-				name: consume, 
-				data: data,
-				color:'#36aeea',
-				marker:{
-					symbol: 'circle',
-					fillColor:'#ffffff',
-					lineColor:'#36aeea',
-					lineWidth: 2,
-					radius: 5,
-				}
-			}]
-		}); 
-	}
-	
-	/*
-	*切换折线图和图表
-	*/
-	$("#diagramHead span:first-child").click(function(){
-		$("#sheetContent").css("display","none");
-		$("#diagramHead span:first-child").css("border-bottom","1px solid #ffffff");
-		$("#dashboard_chartContent").css("display","block");
-		$("#diagramHead span:last-child").css("border-bottom","1px solid #d5dee8");
-	});
-	$("#diagramHead span:last-child").click(function(){
-		$("#dashboard_chartContent").css("display","none");
-		$("#diagramHead span:first-child").css("border-bottom","1px solid #d5dee8");
-		$("#sheetContent").css("display","block");
-		$("#diagramHead span:last-child").css("border-bottom","1px solid #ffffff");
-		var chooseDate = $('#dateRangePicker').val().split(' to ',2);
-		var start = chooseDate[0];//转换为moment格式
-		var end = chooseDate[1];//转换为moment格式
-		var advertiserId = $('#selectedAdvertiserId3').val();
-		var param = {
-			'advertiserId':advertiserId,
-			'startDate':start,
-			'endDate':end,
-		};
-		var _url = '${ctx}/advertiser/main/dashboard/list';
-		console.log(param);
-		$.post(_url,param,function(data){
-			$('#sheetContent').html(data);
-		});
-	});
-		
-	/*
-	*根据广告主id创建订单
-	*/
-	$('#right button.btn1').click(function(){
-		if($("#isShowRight").val() == "0"){
-			var advertiserId = null;
-			//判断是广告主还是代理商
-			if(role == "advertiser"){
-				advertiserId = $("#sessionadvertiserId").val();
-			} else {
-				advertiserId = $('#selectedAdvertiserId2').val();
-			}
-			//如果没有选择广告主,弹出提示
-			if((advertiserId == -1) || (advertiserId == null) || (advertiserId == "")){
-				bootbox.alert('请选择广告主');
-			} else {
-				var _href = $(this).attr('href') + '?advertiserId=' + advertiserId;
-				window.location.assign(_href);
-			}
-		}else{
-			bootbox.alert('您没有创建订单的权限！');
-		}
-	});
-	
-	$("ul#advertiser_son_ul2 li").live("click",function(){
-	 	$(this).parents('li').find('span').html($(this).html());
-		$("#selectedAdvertiserId2").val($(this).attr("value"));
-		$('#advertiser_son_ul2').hide(); //ul隐藏
-	});
-	
-	//获取广告主的值
-	if($("#role").val() == "agent"){
-		$("#advertiser_son_ul").hide();
-		$("#advertiser_son_ul2").hide();
-		$("#advertiser_son_ul3").hide();
-		var _url = "${ctx}/widget/selector/provide/advertiser?parentId="+$("#sessionagentId").val(); //请求地址
-		getSelectData("advertiserul_span","advertiser_son_ul","advertiserul_box","全部广告主",_url);
-		getSelectData("advertiserul_span2","advertiser_son_ul2","advertiserul_box2","请选择广告主",_url);
-		getSelectData("advertiserul_span3","advertiser_son_ul3","advertiserul_box3","请选择广告主",_url);
-	}else if($("#role").val() == "advertiser"){
-		$("#advertiserul_span").html($("#sessionadvertiserName").val());
-		$("#selectedAdvertiserId").val($("#sessionadvertiserId").val());
-		$("#advertiserul_span2").html($("#sessionadvertiserName").val());
-		$("#selectedAdvertiserId2").val($("#sessionadvertiserId").val());
-		$("#advertiserul_span3").html($("#sessionadvertiserName").val());
-		$("#selectedAdvertiserId3").val($("#sessionadvertiserId").val());
-	}
-	
-	$("ul#advertiser_son_ul li").live("click",function(){
-	 	$(this).parents('li').find('span').html($(this).html());
-		$("#selectedAdvertiserId").val($(this).attr("value"));
-		$('#advertiser_son_ul').hide(); //ul隐藏
-		var agentId = $("#agentId").val(); //获取代理商id
-		var advertiserId = $('#selectedAdvertiserId').val();
-		var param = {};
-		if(advertiserId == -1) {
-			param = {
-				'agentId':agentId
-			};
-		} else {
-			param = {
-				'advertiserId':advertiserId
-			};
-		}
-		//发送ajax请求
-		$.ajax({
-			type : 'post',	//请求方式，post
-			data : param,	//请求参数，param
-			url : '${ctx}/advertiser/main/dashboard/findCompareAjax',	//请求url
-			async : false,	//是否设置为异步请求
-			cache : false,	//是否缓存
-			dataType : 'json',	//数据类型为json
-			success : function(data){ //请求成功回调函数处理，参数为返回回来的json数组
-				$('#accountBalance .dataFrame_data').text(data.balance);
-				$('#exposure .dataFrame_data').text(data.totalImpression);
-				$('#click .dataFrame_data').text(data.totalClick);
-			},
-			error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
-				console.info('error');
-			}
-		});
-	});
-	
-	$("ul#advertiser_son_ul3 li").live("click",function(){
-	 	$(this).parents('li').find('span').html($(this).html());
-		$("#selectedAdvertiserId3").val($(this).attr("value"));
-		$('#advertiser_son_ul3').hide(); //ul隐藏
-		$('#dashboard_chartContent .chart-down .chart-down-left').html("趋势图："+$(this).html());
-		var chooseDate = $('#dateRangePicker').val().split(' to ',2);
-		var start = moment(chooseDate[0]);//转换为moment格式
-		var end = moment(chooseDate[1]);//转换为moment格式
-		searchAndDraw(start, end);
-	});
-	
-	function getSelectData(target_spanId,target_sonulId,target_boxId,defaultName,url){
-		$("#"+target_sonulId).append("<li value='-1' style='width:130px;'>"+defaultName+"</li>");
-		$.getJSON( url, function(data) {
-			var data_1 = data.advertiserList;
-			$.each( data_1, function( key, val ) {
-				$("#"+target_sonulId).append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
-			});
-		});
-		if($("#isShowRight").val() == "0"){
-			$("#"+target_spanId).on("click",function(){
-		 		if($("#role").val() == "agent"){
-		 			if($('#'+target_sonulId).height()>210){
-		 				$('#'+target_sonulId).css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-		 			};
-		 			$('#'+target_sonulId).show(); //ul显示
-		 		}
-		 	});
-		}else{
-			if(target_spanId != "advertiserul_span2"){
-				$("#"+target_spanId).on("click",function(){
-			 		if($("#role").val() == "agent"){
-			 			if($('#'+target_sonulId).height()>210){
-			 				$('#'+target_sonulId).css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-			 			};
-			 			$('#'+target_sonulId).show(); //ul显示
-			 		}
-			 	});
-			}
-		}
-		$("#"+target_boxId).mouseleave(function(){
-	 		$('#'+target_sonulId).hide(); //ul隐藏
-	 	});
-	}
-});
-</script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/dashboard.js"></script>
 </@override>
-
 <@override name="body">
-<#include "public-head.ftl">
-<div id="pagecontent">
-	<div id="content">
-		<div id="navDiv">
-			<ul id="navDiv_ul">
-				<li><i class="icon-home"></i>首页</li>
-			</ul>  
- 		</div>
- 		<div id="dashboard_top_advertiser">
- 			<div id="left">
- 				<div class="up">
-					<span id="today"></span>
-					<ul id="main_advertiserul">
-						<li class="select_box" id="advertiserul_box">
-							<span id="advertiserul_span">全部广告主</span>
-							<ul class="son_ul" id="advertiser_son_ul"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedAdvertiserId" id="selectedAdvertiserId" value="${advertiserId!}">
-				</div>
-				<div class="down">
-					<div id="exposure" class="dataFrame">
-					   	<div class="dataFrame_name">
-					   		<span>曝光数</span>
-					   		<#if compareMap.impressionStatus == 'up'>
-							<i class="icon-arrow-up"></i>
-							<#else>
-							<i class="icon-arrow-down"></i>
-							</#if>
-					   	</div>
-					   	<div class="dataFrame_data">${compareMap.totalImpression!}</div>
-					</div>
-					<div id="click" class="dataFrame">
-					   	<div class="dataFrame_name">
-					   		<span>点击数</span>
-					   		<#if compareMap.impressionStatus == 'up'>
-							<i class="icon-arrow-up"></i>
-							<#else>
-							<i class="icon-arrow-down"></i>
-							</#if>
-					   	</div>
-					   	<div class="dataFrame_data">${compareMap.totalClick!}</div>
+<div id=content_bg>
+	<#include "public-head.ftl">
+	<div id="pagecontent">
+		<div id="content">
+			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li class="navDiv_currentLi">首页</li>
+				</ul>  
+	 		</div>
+	 		<div id="dashboard_top_advertiser">
+	 			<div id="left">
+	 				<div class="up">
+						<span id="today"></span>
+						<ul id="main_advertiserul">
+							<li class="select_box" id="advertiserul_box">
+								<span id="advertiserul_span">全部广告主</span>
+								<ul class="son_ul" id="advertiser_son_ul"></ul>
+							</li>
+						</ul>
+						<input type="hidden" name="selectedAdvertiserId" id="selectedAdvertiserId" value="${advertiserId!}">
 					</div>
-					<div id="accountBalance" class="dataFrame">
-					   	<div class="dataFrame_name"><span>账户余额</span></div>
-					   	<div class="dataFrame_data">${compareMap.balance!}</div>
+					<div class="down">
+						<div id="exposure" class="dataFrame">
+						   	<div class="dataFrame_name">
+						   		<span>曝光数</span>
+						   		<#if compareMap.impressionStatus == 'up'>
+								<i class="icon-arrow-up"></i>
+								<#else>
+								<i class="icon-arrow-down"></i>
+								</#if>
+						   	</div>
+						   	<div class="dataFrame_data">${compareMap.totalImpression!}</div>
+						</div>
+						<div id="click" class="dataFrame">
+						   	<div class="dataFrame_name">
+						   		<span>点击数</span>
+						   		<#if compareMap.impressionStatus == 'up'>
+								<i class="icon-arrow-up"></i>
+								<#else>
+								<i class="icon-arrow-down"></i>
+								</#if>
+						   	</div>
+						   	<div class="dataFrame_data">${compareMap.totalClick!}</div>
+						</div>
+						<div id="accountBalance" class="dataFrame">
+						   	<div class="dataFrame_name"><span>账户余额</span></div>
+						   	<div class="dataFrame_data">${compareMap.balance!}</div>
+						</div>
 					</div>
-				</div>
- 			</div>
- 			<@sec.authorize access="hasAnyRole('ROLE_agent_adgroup,ROLE_MANAGER')">
- 				<input type="hidden" id="isShowRight" value="0"/>
- 			</@sec.authorize>
- 			<div id="right">
- 				<div class="up"><span>创建新的订单</span></div>
-				<div class="down">
-					<ul id="main_advertiserul2">
-						<li class="select_box" id="advertiserul_box2">
-							<span id="advertiserul_span2">请选择广告主</span>
-							<ul class="son_ul" id="advertiser_son_ul2"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedAdvertiserId2" id="selectedAdvertiserId2" value="${advertiserId2!}">
-					<button class="btn1" href='${ctx}/advertiser/main/ad/order/create'>创建新的订单</button>
-				</div>
- 			</div>
- 		</div>
- 		<div id="dashboard_diagram">
-			<div id="diagramHead">
-				<span>图像模式</span>
-				<span>列表模式</span>
-			</div>
-			<div id="dashboard_chartContent">
-				<div class="chart-up">
-					<div class="pull-down">
-						<span class="span">选择广告主</span>
-						<ul id="main_advertiserul3">
-							<li class="select_box" id="advertiserul_box3">
-								<span id="advertiserul_span3">请选择广告主</span>
-								<ul class="son_ul" id="advertiser_son_ul3"></ul>
+	 			</div>
+	 			<@sec.authorize access="hasAnyRole('ROLE_agent_adgroup,ROLE_MANAGER')">
+	 				<input type="hidden" id="isShowRight" value="0"/>
+	 			</@sec.authorize>
+	 			<div id="right">
+	 				<div class="up"><span>创建新的订单</span></div>
+					<div class="down">
+						<ul id="main_advertiserul2">
+							<li class="select_box" id="advertiserul_box2">
+								<span id="advertiserul_span2">请选择广告主</span>
+								<ul class="son_ul" id="advertiser_son_ul2"></ul>
 							</li>
 						</ul>
-						<input type="hidden" name="selectedAdvertiserId3" id="selectedAdvertiserId3" value="${advertiserId3!}">
-					</div>
-					<div class="time-period">
-						<span class="span">时间周期选择</span>
-						<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-							<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-						</span>
+						<input type="hidden" name="selectedAdvertiserId2" id="selectedAdvertiserId2" value="${advertiserId2!}">
+						<button class="btn1" href='${ctx}/advertiser/main/ad/order/create'>创建新的订单</button>
 					</div>
-					<div class="right">
-							<span class='time'>今天</span>
-							<span class='time'>昨天</span>
-							<span class='time'>最近7天</span>
-							<span class='time'>最近30天</span>
-						<div id="right_radio">
-							<span><input type="radio" name="item" checked="checked" value="0"/>消费数</span>
-							<span><input type="radio" name="item" value="1"/>曝光数</span>
-							<span><input type="radio" name="item" value="2"/>点击数</span>
-							<span><input type="radio" name="item" value="3"/>点击率</span>
+	 			</div>
+	 		</div>
+	 		<div id="dashboard_diagram">
+				<div id="diagramHead">
+					<span>图像模式</span>
+					<span>列表模式</span>
+				</div>
+				<div id="dashboard_chartContent">
+					<div class="chart-up">
+						<div class="pull-down">
+							<span class="span">选择广告主</span>
+							<ul id="main_advertiserul3">
+								<li class="select_box" id="advertiserul_box3">
+									<span id="advertiserul_span3">请选择广告主</span>
+									<ul class="son_ul" id="advertiser_son_ul3"></ul>
+								</li>
+							</ul>
+							<input type="hidden" name="selectedAdvertiserId3" id="selectedAdvertiserId3" value="${advertiserId3!}">
+						</div>
+						<div class="time-period">
+							<span class="span">时间周期选择</span>
+							<span id="calendar_span">
+								<i class="icon-calendar"></i>   
+								<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+							</span>
+						</div>
+						<div class="right">
+								<span class='time'>今天</span>
+								<span class='time'>昨天</span>
+								<span class='time'>最近7天</span>
+								<span class='time'>最近30天</span>
+							<div id="right_radio">
+								<span><input type="radio" name="item" checked="checked" value="0"/>消费数</span>
+								<span><input type="radio" name="item" value="1"/>曝光数</span>
+								<span><input type="radio" name="item" value="2"/>点击数</span>
+								<span><input type="radio" name="item" value="3"/>点击率</span>
+							</div>
 						</div>
 					</div>
+					<div class="chart-down">
+						<div class="chart-down-left">趋势图：请选择广告主</div>
+						<div class="chart-down-right">消费 (元)</div>
+						<div id="chart"></div>
+					</div>
 				</div>
-				<div class="chart-down">
-					<div class="chart-down-left">趋势图：请选择广告主</div>
-					<div class="chart-down-right">消费 (元)</div>
-					<div id="chart" style="width:99.8%;"></div>
-				</div>
-			</div>
-			<div id="sheetContent">
-	
+				<div id="sheetContent"></div>
 			</div>
 		</div>
 	</div>
 </div>
-
 </@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/finance/adv-balance/distribution.ftl

@@ -1,157 +1,93 @@
-<@override name="head">
-	<title>财务管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	
-	<script type="text/javascript" >
-	
-		$(function(){
-		
-			$('#dateRangePicker').dateRangePicker();
-			if($('#dateRangePicker').val() == ""){
-				$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-			}
-			
-			//广告主消费记录
-			$("#btn-advBalance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/adv-balance/list";
-			});
-			
-			//资金管理
-			$("#btn-finance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
-			});
-			
-			//批广告主分配记录
-			$("#btn-distribution").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/adv-balance/distribution";
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/finance/adv-balance/exportAllocateReportExcel?selectedAdvertiserId="+$("#advertiserId").val()+"&dateRangePicker="+$("#dateRangePicker").val());
-		};
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler" style="padding:20px 0px; margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/adv-balance/list">财务管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">广告主分配记录</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/advertiser/main/finance/adv-balance/distribution" method="post">
-				<input type="hidden" id="role" value="${role}">
-				<input type="hidden" id="agentId" value="${userSession.agentId}">
-				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-			    <input id="page" name="page" type="hidden" value="${pager.page}"/>
-			  	<div id="buttons">
-			  		<div id="btn-advBalance" class="btn1">广告主消费记录</div>      
-			        <div id="btn-finance" class="btn1">资金管理</div>  
-			        <div id="btn-distribution" class="btn1">广告主分配记录</div> 
-			    </div>
-			    <div id="selectuls" style="clear:both;">
-			    	<span style="float:left;">广告主：</span>
-					<ul id="main_advertiserul" style="margin-right:20px;">
-						<li class="select_box" id="advertiserul_box">
-							<span id="advertiserul_span">${selectedAdvertiserName!}</span>
-							<ul class="son_ul" id="advertiser_son_ul"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
-					<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
-					
-					<div class="controls-reset-1" style="float:left;margin-right:10px;">
-						<span id="u18" class="ax_droplist">查看周期： </span>
-						<span id="tex" ><i class="icon-calendar" style="background-image:none;position:absolute;margin:10px 0 0 5px;"></i>
-							<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" style="padding-left:20px;margin:left:-5px;width:177px;"/>
-						</span>
-					</div>
-					<input id="sign" type="submit" value="查询">
-					<a class="caiwuExport" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-				</div>
-			    </div>
-				<table border="1" class="tablefig" id="tablefig">
-					<thead>
-						<tr>
-							<th style="width:5%;">
-								<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-							</th>
-							<th class="td1" style="width:15%;">时间</th>
-							<th class="td1" style="width:15%;">广告主</th>
-							<th class="td1" style="width:20%;">分配金额（元）</th>
-							<th class="td1" style="width:20%;">消耗信用额度（元）</th>
-							<th class="td1" style="width:20%;">可用信用额度（元）</th>
-						</tr>
-					</thead>
-					<tbody>
-					<#if advBalanceList ??>
-					<#list advBalanceList as advBalance>
-						<tr style="text-align:center;">
-							<td>
-								<label><input  autocomplete="off" type="checkbox" name="id" value="${advBalance.id!}"><span class="lbl"></span></label>
-							</td>
-							<td class="breakword">${advBalance.actTime?date}</td>
-                        	<td class="breakword">${advBalance.advertiserName!}</td>
-							<td class="breakword">${advBalance.allocate!}</td>
-							<td class="breakword">${advBalance.allocate!}</td>
-							<td class="breakword">${advBalance.balance!}</td>
-						</tr>
-					</#list>
-					</#if>
-				</tbody>
-				</table>
-								
-				<div id="pageDiv">
-		            <#include "/common/pagination/simple.ftl"/>
-		        </div>	
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>广告主分配记录</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/finance.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/advertiser/main/public-head.ftl">
+    <div id= "pagecontent">
+    	<div id="contentOther">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li><a href="${ctx}/advertiser/main/finance/adv-balance/list">财务管理</a></li>
+				    <li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">广告主分配记录</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/finance/adv-balance/distribution" method="post">
+ 				<input id="page" name="page" type="hidden" value="${pager.page}"/>
+ 				<div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/finance/adv-balance/list" class="btn2">广告主消费记录</a>
+						<a href="${ctx}/advertiser/main/finance/finance-data/list" class="btn2">资金管理</a>
+						<a href="${ctx}/advertiser/main/finance/adv-balance/distribution" class="btn2">广告主分配记录</a>
+					</div>
+				</div>
+				<div id="selectuls">
+					<div class="selectuls_finance_div">
+						<span class="selectuls_finance_span">广告主：</span>
+						<ul id="main_advertiserul">
+							<li class="select_box" id="advertiserul_box">
+								<span id="advertiserul_span">${selectedAdvertiserName!}</span>
+								<ul class="son_ul" id="advertiser_son_ul"></ul>
+							</li>
+						</ul>
+						<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
+						<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
+					</div>
+					<div class="selectuls_finance_div">
+						<span class="selectuls_finance_span">查看周期：</span>
+						<span id="calendar_span">
+							<i class="icon-calendar"></i>   
+							<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						</span>
+					</div>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<a id="btn_formExport" href="javascript:void(0);" onClick="exportExcel_distribution()">导出Excel</a>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:15%;">时间</th>
+							<th class="theadTh" style="width:15%;">广告主</th>
+							<th class="theadTh" style="width:20%;">分配金额（元）</th>
+							<th class="theadTh" style="width:20%;">消耗信用额度（元）</th>
+							<th class="theadTh" style="width:20%;">可用信用额度（元）</th>
+						</tr>
+				    </thead>
+				    <tbody>
+						<#if advBalanceList ??>
+				        <#list advBalanceList as advBalance>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${advBalance.id!}"></div></td>
+							<td class="tbodyTd">${advBalance.actTime!?date}</td>
+							<td class="tbodyTd">${advBalance.advertiserName!}</td>
+							<td class="tbodyTd">${advBalance.allocate!}</td>
+							<td class="tbodyTd">${advBalance.allocate!}</td>
+							<td class="tbodyTd">${advBalance.balance!}</td>
+						</tr>
+				        </#list>
+						</#if>           
+				    </tbody>
+				</table>
+				<div id="pageDiv-other">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/finance/adv-balance/list.ftl

@@ -1,196 +1,119 @@
-<@override name="head">
-	<title>财务管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			$('#dateRangePicker').dateRangePicker();
-			if($('#dateRangePicker').val() == ""){
-				$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-			}
-			
-			//广告主消费记录
-			$("#btn-advBalance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/adv-balance/list";
-			});
-			
-			//资金管理
-			$("#btn-finance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
-			});
-			
-			//批广告主分配记录
-			$("#btn-distribution").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/adv-balance/distribution";
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-			
-			$("#type_son_ul").hide();
-			$("#typeul_span").on("click",function(){
-		 		$('#type_son_ul').show(); //ul显示
-		 	});
-		 	$("#typeId").val(0);
-			$('ul#type_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#typeId").val($(this).attr("typeValue"));
-				$("#typeName").val($(this).html());
-				$('#type_son_ul').hide(); //ul隐藏
-				if($(this).attr("typeValue") == "charge"){
-					$("#chargeTh").attr("style","display:block;line-height:80px;width:220px;");
-					$(".chargeTd").attr("style","display:block;line-height:60px;width:220px;");
-				}else{
-					$("#chargeTh").attr("style","display:none");
-					$(".chargeTd").attr("style","display:none");
-				}
-			});
-			$("ul#main_typeul #typeul_select_box").mouseleave(function(){
-		 		$('#type_son_ul').hide(); //ul隐藏
-		 	});
-
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/finance/adv-balance/exportDataReportExcel?selectedAdvertiserId="+$("#advertiserId").val()+"&dateRangePicker="+$("#dateRangePicker").val()+"&type="+$("#typeId").val());
-		};
-	
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler" style="padding:20px 0px; margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/finance/adv-balance/list">财务管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">广告主消费记录</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/advertiser/main/finance/adv-balance/list" method="post">
-				<input type="hidden" id="role" value="${role}">
-				<input type="hidden" id="agentId" value="${userSession.agentId}">
-				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-			    <input id="page" name="page" type="hidden" value="${pager.page}"/>
-			  	<div id="buttons">
-			  		<div id="btn-advBalance" class="btn1">广告主消费记录</div>      
-			        <div id="btn-finance" class="btn1">资金管理</div>  
-			        <div id="btn-distribution" class="btn1">广告主分配记录</div> 
-			    </div>
-			    <div id="selectuls" style="clear:both;">
-			    	<span style="float:left;">广告主：</span>
-					<ul id="main_advertiserul" style="margin-right:20px;">
-						<li class="select_box" id="advertiserul_box">
-							<span id="advertiserul_span">${selectedAdvertiserName!}</span>
-							<ul class="son_ul" id="advertiser_son_ul"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
-					<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
-					
-					<div class="controls-reset-1" style="float:left;margin-right:20px;">
-						<span id="u18" class="ax_droplist">查看周期： </span>
-						<span id="tex" ><i class="icon-calendar" style="background-image:none;position:absolute;margin:10px 0 0 5px;"></i>
-							<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" style="padding-left:20px;margin:left:-5px;width:177px;"/>
-						</span>
-					</div>
-					<span style="float:left;">操作类型：</span>
-					<ul id="main_typeul">
-						<li class="select_box" id="typeul_select_box">
-							<span id="typeul_span">${typeName!}</span>
-							<ul class="son_ul" id="type_son_ul">
-								<li typeValue="0">请选择操作类型</li>
-								<li typeValue="charge">充值</li>
-								<li typeValue="consume">消费</li>
-								<li typeValue="allocate">分配</li>
-							</ul>
-						</li>
-					</ul>
-					<input type="hidden" name="type" id="typeId" value="${type!}">
-					<input type="hidden" name="typeName" id="typeName" value="${typeName!}">
-					
-					<input id="sign" type="submit" value="查询">
-					<a class="caiwuExport" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-				</div>
-			    </div>
-				<table border="1" class="tablefig" id="tablefig">
-					<thead>
-						<tr>
-							<th style="width:5%;">
-								<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-							</th>
-							<th class="td1" style="width:10%;">时间</th>
-							<th class="td1" style="width:20%;">广告主</th>
-							<th id="chargeTh" class="td1" style="display:none;">交易号</th>
-							<th class="td1" style="width:16%;">费用类型</th>
-							<th class="td1" style="width:22%;">金额（元）</th>
-							<th class="td1" style="width:16%;">余额（元）</th>
-						</tr>
-					</thead>
-					<tbody>
-					<#if advBalanceList ??>
-					<#list advBalanceList as advBalance>
-						<tr style="text-align:center;">
-							<td class="center">
-								<label><input  autocomplete="off" type="checkbox" name="id" value="${advBalance.id!}"><span class="lbl"></span></label>
-							</td>
-							<td class="breakword">${advBalance.actTime?date}</td>
-                        	<td class="breakword">${advBalance.advertiserName!}</td>
-							<td class="breakword chargeTd" style="display:none;">${advBalance.num!}</td>
-				        	<td class="breakword">${advBalance.type!}</td>
-							<td class="breakword">${advBalance.cash!}</td>
-							<td class="breakword">${advBalance.balance!}</td>
-						</tr>
-					</#list>
-					</#if>
-				</tbody>
-				</table>
-								
-				<div id="pageDiv"  style="margin: 10px 36px 0 0;">
-		            <#include "/common/pagination/simple.ftl"/>
-		        </div>	
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>财务管理</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/finance.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/advertiser/main/public-head.ftl">
+    <div id= "pagecontent">
+    	<div id="contentOther">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li><a href="${ctx}/advertiser/main/finance/adv-balance/list">财务管理</a></li>
+				    <li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">广告主消费记录</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/finance/adv-balance/list" method="post">
+ 				<input id="page" name="page" type="hidden" value="${pager.page}"/>
+ 				<div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/finance/adv-balance/list" class="btn2">广告主消费记录</a>
+						<a href="${ctx}/advertiser/main/finance/finance-data/list" class="btn2">资金管理</a>
+						<a href="${ctx}/advertiser/main/finance/adv-balance/distribution" class="btn2">广告主分配记录</a>
+					</div>
+				</div>
+				<div id="selectuls">
+					<div class="selectuls_finance_div">
+						<span class="selectuls_finance_span">广告主：</span>
+						<ul id="main_advertiserul">
+							<li class="select_box" id="advertiserul_box">
+								<span id="advertiserul_span">${selectedAdvertiserName!}</span>
+								<ul class="son_ul" id="advertiser_son_ul"></ul>
+							</li>
+						</ul>
+						<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
+						<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
+					</div>
+					<div class="selectuls_finance_div">
+						<span class="selectuls_finance_span">查看周期：</span>
+						<span id="calendar_span">
+							<i class="icon-calendar"></i>   
+							<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						</span>
+					</div>
+					<div class="selectuls_finance_div">
+						<span class="selectuls_finance_span">操作类型：</span>
+						<ul id="main_typeul">
+							<li class="select_box" id="typeul_select_box">
+								<span id="typeul_span">${typeName!}</span>
+								<ul class="son_ul" id="type_son_ul">
+									<li typeValue="0">请选择操作类型</li>
+									<li typeValue="charge">充值</li>
+									<li typeValue="consume">消费</li>
+									<li typeValue="allocate">分配</li>
+								</ul>
+							</li>
+						</ul>
+						<input type="hidden" name="type" id="typeId" value="${type!}">
+						<input type="hidden" name="typeName" id="typeName" value="${typeName!}">
+					</div>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<a id="btn_formExport" href="javascript:void(0);" onClick="exportExcel_list()">导出Excel</a>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:10%;">时间</th>
+							<#if role == "agent">
+							<th class="theadTh" style="width:15%;">代理商</th>
+							<#elseif role == "advertiser">
+							<th class="theadTh" style="width:15%;">广告主</th>
+							</#if>
+							<th class="theadTh" style="width:20%;">交易号</th>
+							<th class="theadTh" style="width:10%;">费用类型</th>
+							<th class="theadTh" style="width:15%;">金额（元）</th>
+							<th class="theadTh" style="width:15%;">余额（元）</th>
+						</tr>
+				    </thead>
+				    <tbody>
+						<#if advBalanceList ??>
+				        <#list advBalanceList as advBalance>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${advBalance.id!}"></div></td>
+							<td class="tbodyTd">${advBalance.actTime!?date}</td>
+							<#if role == "agent">
+							<td class="tbodyTd">${agentName!}</td>
+							<#elseif role == "advertiser">
+							<td class="tbodyTd">${advBalance.advertiserName!}</td>
+							</#if>
+							<td class="tbodyTd">${advBalance.num!}</td>
+							<td class="tbodyTd">${advBalance.type!}</td>
+							<td class="tbodyTd">${advBalance.cash!}</td>
+							<td class="tbodyTd">${advBalance.balance!}</td>
+						</tr>
+				        </#list>
+						</#if>           
+				    </tbody>
+				</table>
+				<div id="pageDiv-other">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/allocation.ftl

@@ -1,128 +1,47 @@
-<@override name="head">
-	<title>财务管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/finance.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:3px 0 0 30px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-	
-		$(function(){
-		
-			//广告主消费记录
-			$("#btn-advBalance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/adv-balance/list";
-			});
-			
-			//资金管理
-			$("#btn-finance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
-			});
-			
-			//批广告主分配记录
-			$("#btn-distribution").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/adv-balance/distribution";
-			});
-			
-			$("#allocate").blur(function(){
-				validateMoney($("#allocate"),$("#agentBalance").val(),"分配金额","当前余额");
-			});
-			
-			$("#formPage").autovalidate();
-			//保存按钮
-			$("#create-btn-save").click(function(){
-				var addParam = $("#formPage").serialize();
-				if (!$("#formPage").validate()) {
-					return false;
-				}
-				var falg = validateMoney($("#allocate"),$("#agentBalance").val(),"分配金额","当前余额");
-				if(falg == false){
-					return false;
-				}
-				$.ajax({
-			       type: "POST",
-			       url: "${ctx}/advertiser/main/finance/finance-data/save",
-			       data: addParam,
-			       success: function(data){
-					 location.href = "${ctx}/advertiser/main/finance/finance-data/list";
-			       }
-				});	
-			});
-			
-			//取消按钮
-			$("#create-btn-cancel").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
-			});
-		});
-		
-	</script>
-	
-</@override>
-
+<@override name="head">	
+<title>资金分配</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/finance.js"></script>
+</@override>	
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler" style="padding:20px 0px; margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/adv-balance/list">财务管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size2"><a href="${ctx}/advertiser/main/finance/finance-data/list">资金管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">资金分配</li>
-			</ul>  
-		</div>
+<div id=content_bg>
+ 	<#include "/advertiser/main/public-head.ftl"/>
+	<div id= "pagecontent">
 		<div id="content">
-			<div id="createForm">
-				<form id="formPage">
-					<input  autocomplete="off"  type="hidden" name="advertiserId" value="${advertiserId}"/>
-				  	<div id="buttons">
-				  		<div id="btn-advBalance" class="btn1">广告主消费记录</div>      
-				        <div id="btn-finance" class="btn1">资金管理</div>  
-				        <div id="btn-distribution" class="btn1">广告主分配记录</div> 
-				    </div>
-				    <div class="control-group" style="margin-bottom:20px;">
-				    	<input id="agentBalance" name="agentBalance" type="hidden" value="${agentBalance!}"/>
-						<label style="width:100px;">&nbsp;&nbsp;当前余额：</label><span style="float:left;margin:-32px 0 0 80px;">${agentBalance!}元</span>
-					</div>
-					
-				    <div class="control-group" style="float:both;">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>分配金额：</label>
-						<input class="input-text" autocomplete="off" id="allocate" name="allocate" type="text" value=""><span style="position:absolute;margin:3px 0 0 5px;">元</span><span class="spanVaildate"></span>
-					</div>
-						
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;备注：</label>
-						<input class="input-text" autocomplete="off" id="memo" name="memo" type="text" value="" verify="text/255/0/0"/><span style="margin-left:10px;" class="spanVaildate"></span>
-					</div>
-						
-					<div id="btn-class" class="form-actions1">
-						<div id="create-btn-save">充值</div>
-						<div id="create-btn-cancel">取消</div>
-					</div>
-				
-				</form>
-			</div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/finance/adv-balance/list">财务管理</a></li>
+				    <li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/advertiser/main/finance/finance-data/list">资金管理</a></li>
+				    <li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">资金分配</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/advertiser/main/finance/finance-data/save" method="post">
+	 			<input type="hidden" name="advertiserId" value="${advertiserId!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>当前余额：</label>
+					<span>${agentBalance!}元</span>
+					<input id="agentBalance" name="agentBalance" type="hidden" value="${agentBalance!}"/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>分配金额：</label>
+					<input class="input-text" tabindex="1" id="allocate" name="allocate" type="text" value="" verify="float/11/1/2"/><span class="input-span">元</span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>备注：</label>
+					<input class="input-text" tabindex="2" id="memo" name="memo" type="text" value="" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">充值</button>
+					<button class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
 		</div>
-	</div>
+    </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/financelist.ftl

@@ -1,149 +1,85 @@
 <@override name="head">
-	<title>财务管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	
-	<script type="text/javascript" >
-	
-		$(function(){
-		
-			//广告主消费记录
-			$("#btn-advBalance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/adv-balance/list";
-			});
-			
-			//资金管理
-			$("#btn-finance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
-			});
-			
-			//批广告主分配记录
-			$("#btn-distribution").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/adv-balance/distribution";
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/finance/finance-data/exportDataReportExcel?selectedAdvertiserId="+$("#advertiserId").val());
-		};
-		
-	</script>
-	
+<title>资金管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/advertiser/finance.js"></script>
 </@override>
-
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
+<div id=content_bg>
 	<#include "/advertiser/main/public-head.ftl">
     <div id= "pagecontent">
-		<div id="handler" style="padding:20px 0px; margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/adv-balance/list">财务管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">资金管理</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/advertiser/main/finance/finance-data/list" method="post">
-				<input type="hidden" id="role" value="${role}">
-				<input type="hidden" id="agentId" value="${userSession.agentId}">
-				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-			    <input id="page" name="page" type="hidden" value="${pager.page}"/>
-			  	<div id="buttons">
-			  		<div id="btn-advBalance" class="btn1">广告主消费记录</div>      
-			        <div id="btn-finance" class="btn1">资金管理</div>  
-			        <div id="btn-distribution" class="btn1">广告主分配记录</div> 
-			    </div>
-			    <div id="selectuls" style="clear:both;">
-			    	<div id="credit_money" style="float:left;margin:7px 100px 0 -10px;">
-			 			<label id="label1">信用额度：<span>${agentBalance}元</span></label>
-			    	</div>
-			    	<div id="avail_money" style="float:left;margin:7px 100px 0 0px;">
-			    		<label id="label1">广告主代理商可用额度：<span>${agentBalance}元</span></label>
-			    	</div>
-			    	<span style="float:left;">广告主：</span>
-					<ul id="main_advertiserul" style="margin-right:20px;">
-						<li class="select_box" id="advertiserul_box">
-							<span id="advertiserul_span">${selectedAdvertiserName!}</span>
-							<ul class="son_ul" id="advertiser_son_ul"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
-					<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
-					
-					<input id="sign" type="submit" value="查询">
-					<a class="caiwuExport" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+    	<div id="contentOther">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/advertiser/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li><a href="${ctx}/advertiser/main/finance/adv-balance/list">财务管理</a></li>
+				    <li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">资金管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/advertiser/main/finance/finance-data/list" method="post">
+ 				<input id="page" name="page" type="hidden" value="${pager.page}"/>
+ 				<div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/advertiser/main/finance/adv-balance/list" class="btn2">广告主消费记录</a>
+						<a href="${ctx}/advertiser/main/finance/finance-data/list" class="btn2">资金管理</a>
+						<a href="${ctx}/advertiser/main/finance/adv-balance/distribution" class="btn2">广告主分配记录</a>
+					</div>
+				</div>
+				<div id="selectuls">
+					<div class="selectuls_finance_div" id="avail_money">
+						<label>广告主代理商可用额度：<span>${agentBalance!}元</span></label>
+					</div>
+					<div class="selectuls_finance_div">
+						<span class="selectuls_finance_span">广告主：</span>
+						<ul id="main_advertiserul">
+							<li class="select_box" id="advertiserul_box">
+								<span id="advertiserul_span">${selectedAdvertiserName!}</span>
+								<ul class="son_ul" id="advertiser_son_ul"></ul>
+							</li>
+						</ul>
+						<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
+						<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
+					</div>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<a id="btn_formExport" href="javascript:void(0);" onClick="exportExcel_financelist()">导出Excel</a>
 				</div>
-			    </div>
-				<table border="1" class="tablefig" id="tablefig">
+				<table border="1" class="tableFig">
 					<thead>
-						<tr>
-							<th style="width:5%;">
-								<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-							</th>
-							<th class="td1" style="width:15%;">广告主</th>
-							<th class="td1" style="width:20%;">账户余额</th>
-							<th class="td1" style="width:20%;">累计分配</th>
-							<th class="td1" style="width:20%;">最后分配时间</th>
-							<th class="td1" style="width:20%;">操作</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:15%;">广告主</th>
+							<th class="theadTh" style="width:20%;">账户余额</th>
+							<th class="theadTh" style="width:20%;">累计分配</th>
+							<th class="theadTh" style="width:20%;">最后分配时间</th>
+							<th class="theadTh" style="width:20%;">操作</th>
 						</tr>
-					</thead>
-					<tbody>
-					<#if financeList ??>
-					<#list financeList as finance>
-						<tr style="text-align:center;">
-							<td class="center">
-								<label><input  autocomplete="off" type="checkbox" name="id" value="#{finance.advertiserId}"><span class="lbl"></span></label>
+				    </thead>
+				    <tbody>
+						<#if financeList ??>
+				        <#list financeList as finance>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${finance.id!}"></div></td>
+							<td class="tbodyTd">${finance.advertiserName!}</td>
+							<td class="tbodyTd">${finance.adBalance!}</td>
+							<td class="tbodyTd">${finance.sumAllocation!}</td>
+							<td class="tbodyTd"><#if finance.upDated ??>${finance.upDated!?datetime}</#if></td>
+							<td class="tbodyTd">
+								<a href="${ctx}/advertiser/main/finance/finance-data/allocation?advertiserId=${finance.advertiserId!}">资金分配</a>
 							</td>
-							<td class="breakword">${finance.advertiserName!}</td>
-                        	<td class="breakword">${finance.adBalance!}</td>
-							<td class="breakword">${finance.sumAllocation!}</td>
-				        	<td class="breakword"><#if finance.upDated ??>${finance.upDated?datetime}</#if></td>
-							<td class="breakword"><a href="${ctx}/advertiser/main/finance/finance-data/allocation?advertiserId=${finance.advertiserId}&agentBalance=${agentBalance}" style="text-decoration:none;color:#36aeea">资金分配</a></td>
 						</tr>
-					</#list>
-					</#if>
-				</tbody>
+				        </#list>
+						</#if>           
+				    </tbody>
 				</table>
-								
-				<div id="pageDiv">
-		            <#include "/common/pagination/simple.ftl"/>
-		        </div>	
-			</form>
+				<div id="pageDiv-other">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
 		</div>
 	</div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/public-head.ftl

@@ -10,7 +10,7 @@
 		
 		<#if role == "agent">
 		<@sec.authorize access="hasAnyRole('ROLE_agent_adgroup,ROLE_MANAGER')">
-			<li><a href="${ctx}/advertiser/main/ad/advertiser/list"><span>投放管理</span></a></li>
+			<li><a href="${ctx}/advertiser/main/ad/advertiser/list"><span>广告主管理</span></a></li>
 		</@sec.authorize>
 		<#elseif role == "advertiser">
 		<@sec.authorize access="hasAnyRole('ROLE_agent_adgroup,ROLE_MANAGER')">
@@ -23,11 +23,7 @@
 		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_agent_banner,ROLE_MANAGER')">
-			<li><a href="${ctx}/advertiser/main/ad/banner-template"><span>创意中心</span></a></li>
-		</@sec.authorize>
-		
-		<@sec.authorize access="hasAnyRole('ROLE_agent_code,ROLE_MANAGER')">
-			<li><a href="${ctx}/advertiser/main/code-site/list"><span>代码中心</span></a></li>
+			<li><a href="${ctx}/advertiser/main/ad/banner-template/list"><span>创意中心</span></a></li>
 		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_agent_finance,ROLE_MANAGER')">
@@ -59,27 +55,24 @@
 	
 		var path = window.location.pathname;
 		if(path.indexOf("dashboard") != -1){
-			$("#menu a:first").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
+			$("#menu a:first").addClass("menu_change");
 		};
 		if((path.indexOf("ad/advertiser") != -1)
 				||(path.indexOf("ad/order") != -1)
 				||(path.indexOf("ad/target") != -1)){
-			$("#menu a:eq(1)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
+			$("#menu a:eq(1)").addClass("menu_change");
 		};
 		if(path.indexOf("report") != -1){
-			$("#menu a:eq(2)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
+			$("#menu a:eq(2)").addClass("menu_change");
 		};
 		if(path.indexOf("banner-template") != -1){
-			$("#menu a:eq(3)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("code-site") != -1){
-			$("#menu a:eq(4)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
+			$("#menu a:eq(3)").addClass("menu_change");
 		};
 		if(path.indexOf("adv-balance") != -1){
-			$("#menu a:eq(5)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
+			$("#menu a:eq(4)").addClass("menu_change");
 		};
 		if(path.indexOf("authority") != -1){
-			$("#menu a:eq(6)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
+			$("#menu a:eq(5)").addClass("menu_change");
 		};
 		
 	});

src/main/webapp/WEB-INF/pages/back/main/ad/message/list.ftl

@@ -1,131 +1,69 @@
-<@override name="head">
-	<title>消息提醒</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			//审核消息
-			$("#btn-audit").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/finance/finance-management";
-			});
-			
-			//提现消息
-			$("#btn-deposit").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/finance/finance-management/deposit";
-			});
-			
-			//其他消息
-			$("#btn-other").unbind('click').click(function(){
-				$("#type").val(3);
-				$('#formPage').submit();
-			});
-			
-			//标记为已读
-			$("#btn-read").live('click', function() {
-				var messageId = parseInt($(this).attr("value"));
-				var url = "${ctx}/back/main/ad/message/isRead";
-				$.post(url, {messageId:messageId}, function(data) {
-					$('#formPage').submit();
-				});
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-		});
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">消息提醒</li>
-			</ul>  
-		</div>
-		<form id="formPage" action="${ctx}/back/main/ad/message/list" method="post" style="margin:0px;">
-		<div id="content">
-		  	<div id="buttons">
-		  		<div id="btn-audit" class="btna">审核消息</div>      
-		        <div id="btn-deposit" class="btna">提现消息</div>  
-		        <div id="btn-other" class="btna">其他消息</div> 
-		        <div id="serachData">
-		        	<input type="hidden" id="page" name="page" value="${pager.page}">
-		        	<input type="hidden" id="type" name="type" value="4">
-					<input id="searchValue" type="text" name="searchValue" value="${searchValue!}"/>
-					<input id="serachData_img" type="submit" value="" />
-				</div>
-		    </div>
-		</div>
-		<div id="account-table">
-			<table border="1" class="tablefig" id="tablefig">
-				<thead>
-					<tr>
-						<th width="10%">
-							<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-						</th>
-						<th width="50%">消息内容</th>
-						<th width="20%">时间</th>
-						<th width="20%">操作</th>
-					</tr>
-				</thead>
-				<tbody>
-				<#if messageList ??>
-				<#list messageList as message>
-					<tr class="">
-						<td class="center">
-							<label><input  autocomplete="off" type="checkbox" name="id" value="#{message.id}"><span class="lbl"></span></label>
-						</td>
-						<td class="breakword">${message.content!}</td>
-						<td class="breakword">${message.sendTime?datetime}</td>
-						<td class="center">
-							<#if message.read==true>
-								已读
-							<#elseif message.read==false>
-								<div id="btn-read" class="btn11" value="${message.id}" style="float:none;margin:0 auto;">标记为已读</div>
-							</#if>
-						</td>
-					</tr>
-				</#list>
-				</#if>
-			</tbody>
-			</table>
-						
-			<div style="margin: 20px 10px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>	
-		</div>
-		</form>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>消息提醒</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/message.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+    	<div id="contentOther">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">消息提醒</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/ad/message/list" method="post">
+ 				<div id="navButtons">
+					<div id="button">		
+						<a href="${ctx}/back/main/finance/finance-management" class="btn2">审核消息</a>
+						<a href="${ctx}/back/main/finance/finance-management/deposit" class="btn2">提现消息</a>
+						<a class="btn2" id="btn-other">其他消息</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input type="hidden" id="type" name="type" value="4"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:50%;">消息内容</th>
+							<th class="theadTh" style="width:20%;">时间</th>
+							<th class="theadTh" style="width:20%;">操作</th>
+						</tr>
+				    </thead>
+				    <tbody>
+						<#if messageList ??>
+				        <#list messageList as message>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${message.id!}"></div></td>
+							<td class="tbodyTd">${message.content!}</td>
+							<td class="tbodyTd">${message.sendTime!?datetime}</td>
+							<td class="tbodyTd">
+								<#if message.read==true>
+								已读
+								<#elseif message.read==false>
+								<a id="btn-read" value="${message.id!}" class="btn3">标记为已读</a>
+								</#if>
+							</td>
+						</tr>
+				        </#list>
+						</#if>           
+				    </tbody>
+				</table>
+				<div id="pageDiv-other">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl

@@ -1,163 +1,157 @@
-<@override name="head">
-<title>总体报表</title>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
-</@override>
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-   		<div id="content">
-		    <div id="selectBar">
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
-		    </div>
- 			<div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li>数据报表</li>
-				</ul>  
- 			</div>
-        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
-        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
-		 		<div id="content_choose">	
-		 			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${selectedOperatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-					<ul id="main_zoneListUl">
-						<li class="select_box" id="zoneListUl_box">
-							<span id="zoneListUl_span">${selectedZoneName!}</span>
-							<ul class="son_ul" id="son_zoneListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedZoneId" id="selectedZoneId" value="${selectedZoneId!}">
-					<input type="hidden" name="selectedZoneName" id="selectedZoneName" value="${selectedZoneName!}">
-					<span id="dateChoose_span">
-						<a value="today">今天</a> |
-						<a id="yesterday" value="yesterday">昨天</a> |
-						<a value="lastSevenDays">前七天</a> |
-						<a value="lastWeek">上周</a> |
-						<a value="thisMonth">本月</a> |
-						<a value="lastMonth">上月</a> 
-					</span>
-					<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-					</span>
-					<input id="btn_formSubmit" type="submit" value="查询"/>
-				</div>
-				<div id="content_dataFrame">
-					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
-					<div id="dataFrame0" class="dataFrame dataFrame_style">
-					   	<div class="dataFrame_name">PV</div>
-					   	<div class="dataFrame_data">${sumReport.pv}</div>
-					</div>
-					<div id="dataFrame1" class="dataFrame dataFrame_style">
-					   	<div class="dataFrame_name">UV</div>
-					   	<div class="dataFrame_data">${sumReport.uv}</div>
-					</div>
-					<div id="dataFrame2" class="dataFrame dataFrame_style">
-						<div class="dataFrame_name">广告曝光数</div>
-					   	<div class="dataFrame_data">${sumReport.impression}</div>
-					</div>
-					<div id="dataFrame3" class="dataFrame dataFrame_style">
-					   	<div class="dataFrame_name">广告点击数</div>
-					   	<div class="dataFrame_data">${sumReport.click}</div>
-					</div>
-					<div id="dataFrame4" class="dataFrame dataFrame_last_style">
-					   	<div class="dataFrame_name">收入</div>
-					   	<div class="dataFrame_data">${sumReport.income}</div>
-					</div>
-				</div>
-				<div id="chartDivs" value="total"> 
-			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-				</div>	
-				<table border="1" class="tableFig">
-			    	<thead>
-			    		<tr class="theadTr">
-			            	<th class="theadTh" style="width:15%">日期</th>
-			                <th class="theadTh" style="width:7%">PV</th>
-			                <th class="theadTh" style="width:6%">UV</th>
-			                <th class="theadTh" style="width:8%">广告曝光数</th>
-			                <th class="theadTh" style="width:8%">广告填充率</th>
-			                <th class="theadTh" style="width:8%">广告点击数</th>
-			                <th class="theadTh" style="width:8%">广告点击率</th>
-			                <th class="theadTh" style="width:7%">eCPM</th>
-			                <th class="theadTh" style="width:8%">收入</th>
-			            </tr> 
-			        </thead>
-			        <tbody>
-			        	<#if reportList ??>
-			            <#list reportList as report>
-				        <tr id="tbodyTr">
-				        	<td class="tbodyTd">${report.reportDate!?string('yyyy/MM/dd')}</td> 
-				            <td class="tbodyTd">${report.pv!}</td>
-				            <td class="tbodyTd">${report.uv!}</td>
-				            <td class="tbodyTd">${report.impression!}</td>
-				            <td class="tbodyTd">${report.fillRate!}</td>
-				            <td class="tbodyTd">${report.click!}</td>
-				            <td class="tbodyTd">${report.clickRate!}</td>  
-				            <td class="tbodyTd">${report.eCpm!}</td>
-				            <td class="tbodyTd">${report.income!}</td>
-				        </tr>
-				        </#list>  
-			        	</#if>
-			    	</tbody>
-		     	</table>
-		     	<div id="hourrpt">
-					<#if rptZoneHourList ??>
-			        <#list rptZoneHourList as hourrpt>
-				    <div id="tr22">
-				    	<div name="hr">${hourrpt.hour!}</div>
-				        <div name="hr">${hourrpt.pv!}</div>
-				        <div name="hr">${hourrpt.uv!}</div>
-				        <div name="hr">${hourrpt.impression!}</div>
-				        <div name="hr">${hourrpt.click!}</div>
-				        <div name="hr">${hourrpt.income!}</div>
-				    </div>
-				   	</#list>  
-			        </#if>
-				</div>
-		        <div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('total','${ctx}/back/main/ad/operator/operator-report/exportDataReportExcel','back')">导出Excel</a>
-				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
-			</form>
-	  	</div>        
-    </div>
-</div>
-</@override>
+<@override name="head">
+<title>总体报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+			<div id="selectBar_report" class="selectBar">
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">数据报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					<ul id="main_zoneListUl">
+						<li class="select_box" id="zoneListUl_box">
+							<span id="zoneListUl_span">${selectedZoneName!}</span>
+							<ul class="son_ul" id="son_zoneListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedZoneId" id="selectedZoneId" value="${selectedZoneId!}">
+					<input type="hidden" name="selectedZoneName" id="selectedZoneName" value="${selectedZoneName!}">
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="content_dataFrame">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="dataFrame0" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">PV</div>
+					   	<div class="dataFrame_data">${sumReport.pv}</div>
+					</div>
+					<div id="dataFrame1" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">UV</div>
+					   	<div class="dataFrame_data">${sumReport.uv}</div>
+					</div>
+					<div id="dataFrame2" class="dataFrame dataFrame_style">
+						<div class="dataFrame_name">广告曝光数</div>
+					   	<div class="dataFrame_data">${sumReport.impression}</div>
+					</div>
+					<div id="dataFrame3" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">广告点击数</div>
+					   	<div class="dataFrame_data">${sumReport.click}</div>
+					</div>
+					<div id="dataFrame4" class="dataFrame dataFrame_last_style">
+					   	<div class="dataFrame_name">收入</div>
+					   	<div class="dataFrame_data">${sumReport.income}</div>
+					</div>
+				</div>
+				<div id="chartDivs" value="total"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>	
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:15%">日期</th>
+			                <th class="theadTh" style="width:7%">PV</th>
+			                <th class="theadTh" style="width:6%">UV</th>
+			                <th class="theadTh" style="width:8%">广告曝光数</th>
+			                <th class="theadTh" style="width:8%">广告填充率</th>
+			                <th class="theadTh" style="width:8%">广告点击数</th>
+			                <th class="theadTh" style="width:8%">广告点击率</th>
+			                <th class="theadTh" style="width:7%">eCPM</th>
+			                <th class="theadTh" style="width:8%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd">${report.reportDate!?string('yyyy/MM/dd')}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		     	<div id="hourrpt">
+					<#if rptZoneHourList ??>
+			        <#list rptZoneHourList as hourrpt>
+				    <div id="tr22">
+				    	<div name="hr">${hourrpt.hour!}</div>
+				        <div name="hr">${hourrpt.pv!}</div>
+				        <div name="hr">${hourrpt.uv!}</div>
+				        <div name="hr">${hourrpt.impression!}</div>
+				        <div name="hr">${hourrpt.click!}</div>
+				        <div name="hr">${hourrpt.income!}</div>
+				    </div>
+				   	</#list>  
+			        </#if>
+				</div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('total','${ctx}/back/main/ad/operator/operator-report/exportDataReportExcel','back_total')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/apmac.ftl

@@ -1,140 +1,134 @@
-<@override name="head">
-<title>热点报表</title>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
-</@override>
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-   		<div id="content">
-		    <div id="selectBar">
-				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
-		    </div>
- 			<div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li>热点报表</li>
-				</ul>  
- 			</div>
-        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/apmac" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
-        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
-        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
-		 		<div id="content_choose">	
-		 			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${selectedOperatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-					
-					<span id="dateChoose_span">
-						<a value="today">今天</a> |
-						<a id="yesterday" value="yesterday">昨天</a> |
-						<a value="lastSevenDays">前七天</a> |
-						<a value="lastWeek">上周</a> |
-						<a value="thisMonth">本月</a> |
-						<a value="lastMonth">上月</a> 
-					</span>
-					<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-					</span>
-					<input id="btn_formSubmit" type="submit" value="查询"/>
-				</div>
-				<div id="chartDivs"> 
-			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-				</div>
-				<div id="content_chartLender">
-					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
-					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
-					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
-					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
-					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
-					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
-					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
-					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
-					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
-					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
-				</div>
-				<table border="1" class="tableFig">
-			    	<thead>
-			    		<tr class="theadTr">
-			            	<th class="theadTh" style="width:10%">热点</th>
-			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
-			                <th class="theadTh" style="width:9%">PV</th>
-			                <th class="theadTh" style="width:9%">UV</th>
-			                <th class="theadTh" style="width:9%">广告曝光数</th>
-			                <th class="theadTh" style="width:9%">广告填充率</th>
-			                <th class="theadTh" style="width:9%">广告点击数</th>
-			                <th class="theadTh" style="width:9%">广告点击率</th>
-			                <th class="theadTh" style="width:9%">eCPM</th>
-			                <th class="theadTh" style="width:9%">收入</th>
-			            </tr> 
-			        </thead>
-			        <tbody>
-			        	<#if reportList ??>
-			            <#list reportList as report>
-				        <tr id="tbodyTr">
-				        	<td class="tbodyTd tbodyTdLender">${report.apmac!}</td> 
-				        	<td class="tbodyTd">${report.viewRate!}</td> 
-				            <td class="tbodyTd">${report.pv!}</td>
-				            <td class="tbodyTd">${report.uv!}</td>
-				            <td class="tbodyTd">${report.impression!}</td>
-				            <td class="tbodyTd">${report.fillRate!}</td>
-				            <td class="tbodyTd">${report.click!}</td>
-				            <td class="tbodyTd">${report.clickRate!}</td>  
-				            <td class="tbodyTd">${report.eCpm!}</td>
-				            <td class="tbodyTd">${report.income!}</td>
-				        </tr>
-				        </#list>  
-			        	</#if>
-			    	</tbody>
-		     	</table>
-		        <div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('apmac','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
-				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
-			</form>
-	  	</div>        
-    </div>
-</div>
-</@override>
+<@override name="head">
+<title>热点报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">热点报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/apmac" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">热点</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.apmac!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('apmac','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/areal.ftl

@@ -1,169 +1,107 @@
-<@override name="head">
-<title>地域报表</title>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
-
-<script type="text/javascript">
-		$(function(){
-			
-			$("#img-city").live("click",function(){
-				var img = $(this);
-				var cnName = img.attr("value");
-				if(img.attr("type") == "close"){
-					$.ajax({
-				    	type:"POST",
-				    	url:"${ctx}/back/main/ad/operator/operator-report/arealCtiy",
-				    	data:{cnName:cnName,page:$("#page").val(),dateRangePicker:$("#dateRangePicker").val()},
-				    	success:function(data){
-				    		var html = "";
-				    		if(data.length >0){
-				    			for(var i = 0;i<data.length;i++){
-				    				html += '<tr id='+cnName+' class="changeColor" style="background-color:#CCCCCC;">';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;margin-left:20px;"><img src="${ctx}/assets/operator/images/defaultLeaf.gif" style="position: relative;top:-2px;left:-5px;"/>'+data[i].cn_city+'</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].viewRate+'%</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].pv+'</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].uv+'</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].impression+'</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].fillRate+'%</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].click+'</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].clickRate+'%</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].eCpm+'</td>';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].income+'</td>';
-				    				html += '</tr>';
-				    			}
-				    		img.parents('tr').after(html);
-				    		}
-				    		img.attr("src","${ctx}/assets/images/folderOpen.gif");
-				    	}     
-					});	
-					img.attr("type","open");
-				}else if(img.attr("type") == "open"){
-				    $('tr').remove("#"+cnName);//删除id为cname的所有 tr
-				    img.attr("src","${ctx}/assets/images/folderClose.gif");
-				    img.attr("type","close");
-					//location.href = "${ctx}/back/main/ad/operator/operator-report/areal";
-				}
-			});
-			
-    	});
-    	
-    	//到处execl
-		function exportExcel_areal(){
-			if($("#dateRangePicker").val()!=""){
-				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1&dateRangePicker="+$("#dateRangePicker").val());
-			}else{
-				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1");
-			}
-		};
-	</script>
-
-</@override>
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-   		<div id="content">
-		    <div id="selectBar">
-				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
-		    </div>
- 			<div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li>地域报表</li>
-				</ul>  
- 			</div>
-        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/areal" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
-        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
-		 		<div id="content_choose">
-		 			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${selectedOperatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-						
-					<span id="dateChoose_span">
-						<a value="today">今天</a> |
-						<a id="yesterday" value="yesterday">昨天</a> |
-						<a value="lastSevenDays">前七天</a> |
-						<a value="lastWeek">上周</a> |
-						<a value="thisMonth">本月</a> |
-						<a value="lastMonth">上月</a> 
-					</span>
-					<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-					</span>
-					<input id="btn_formSubmit" type="submit" value="查询"/>
-				</div>
-				<table border="1" class="tableFig">
-			    	<thead>
-			    		<tr class="theadTr">
-			            	<th class="theadTh" style="width:10%">地域</th>
-			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
-			                <th class="theadTh" style="width:9%">PV</th>
-			                <th class="theadTh" style="width:9%">UV</th>
-			                <th class="theadTh" style="width:9%">广告曝光数</th>
-			                <th class="theadTh" style="width:9%">广告填充率</th>
-			                <th class="theadTh" style="width:9%">广告点击数</th>
-			                <th class="theadTh" style="width:9%">广告点击率</th>
-			                <th class="theadTh" style="width:9%">eCPM</th>
-			                <th class="theadTh" style="width:9%">收入</th>
-			            </tr> 
-			        </thead>
-			        <tbody>
-			        	<#if reportList ??>
-			            <#list reportList as report>
-				        <tr id="tbodyTr">
-				        	<td class="tbodyTd"><img id="img-city" type="close" value="${report.cn!}" src='${ctx}/assets/images/folderClose.gif' style="position: relative;top:-2px;left:-5px;cursor:pointer;"/>${report.cn!}</td> 
-				        	<td class="tbodyTd">${report.viewRate!}</td> 
-				            <td class="tbodyTd">${report.pv!}</td>
-				            <td class="tbodyTd">${report.uv!}</td>
-				            <td class="tbodyTd">${report.impression!}</td>
-				            <td class="tbodyTd">${report.fillRate!}</td>
-				            <td class="tbodyTd">${report.click!}</td>
-				            <td class="tbodyTd">${report.clickRate!}</td>  
-				            <td class="tbodyTd">${report.eCpm!}</td>
-				            <td class="tbodyTd">${report.income!}</td>
-				        </tr>
-				        </#list>  
-			        	</#if>
-			    	</tbody>
-		     	</table>
-		        <div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_areal()">导出Excel</a>
-				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
-			</form>
-	  	</div>        
-    </div>
-</div>
-</@override>
+<@override name="head">
+<title>地域报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">地域报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/areal" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+		 		<div id="content_choose">
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<table border="1" class="tableFigOther">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">地域</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd"><img id="img-city" type="close" value="${report.cn!}" src='${ctx}/assets/images/folderClose.gif'/>${report.cn!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('areal','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/place.ftl

@@ -1,140 +1,134 @@
-<@override name="head">
-<title>场景报表</title>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
-</@override>
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-   		<div id="content">
-		    <div id="selectBar">
-				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
-		    </div>
- 			<div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li>场景报表</li>
-				</ul>  
- 			</div>
-        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/place" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
-        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
-        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
-		 		<div id="content_choose">	
-		 			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${selectedOperatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-					
-					<span id="dateChoose_span">
-						<a value="today">今天</a> |
-						<a id="yesterday" value="yesterday">昨天</a> |
-						<a value="lastSevenDays">前七天</a> |
-						<a value="lastWeek">上周</a> |
-						<a value="thisMonth">本月</a> |
-						<a value="lastMonth">上月</a> 
-					</span>
-					<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-					</span>
-					<input id="btn_formSubmit" type="submit" value="查询"/>
-				</div>
-				<div id="chartDivs"> 
-			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-				</div>
-				<div id="content_chartLender">
-					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
-					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
-					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
-					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
-					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
-					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
-					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
-					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
-					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
-					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
-				</div>
-				<table border="1" class="tableFig">
-			    	<thead>
-			    		<tr class="theadTr">
-			            	<th class="theadTh" style="width:10%">场景</th>
-			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
-			                <th class="theadTh" style="width:9%">PV</th>
-			                <th class="theadTh" style="width:9%">UV</th>
-			                <th class="theadTh" style="width:9%">广告曝光数</th>
-			                <th class="theadTh" style="width:9%">广告填充率</th>
-			                <th class="theadTh" style="width:9%">广告点击数</th>
-			                <th class="theadTh" style="width:9%">广告点击率</th>
-			                <th class="theadTh" style="width:9%">eCPM</th>
-			                <th class="theadTh" style="width:9%">收入</th>
-			            </tr> 
-			        </thead>
-			        <tbody>
-			        	<#if reportList ??>
-			            <#list reportList as report>
-				        <tr id="tbodyTr">
-				        	<td class="tbodyTd tbodyTdLender">${report.place!}</td> 
-				        	<td class="tbodyTd">${report.viewRate!}</td> 
-				            <td class="tbodyTd">${report.pv!}</td>
-				            <td class="tbodyTd">${report.uv!}</td>
-				            <td class="tbodyTd">${report.impression!}</td>
-				            <td class="tbodyTd">${report.fillRate!}</td>
-				            <td class="tbodyTd">${report.click!}</td>
-				            <td class="tbodyTd">${report.clickRate!}</td>  
-				            <td class="tbodyTd">${report.eCpm!}</td>
-				            <td class="tbodyTd">${report.income!}</td>
-				        </tr>
-				        </#list>  
-			        	</#if>
-			    	</tbody>
-		     	</table>
-		        <div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('place','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
-				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
-			</form>
-	  	</div>        
-    </div>
-</div>
-</@override>
+<@override name="head">
+<title>场景报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">场景报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/place" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">场景</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.place!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('place','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/position.ftl

@@ -1,140 +1,134 @@
-<@override name="head">
-<title>位置报表</title>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
-</@override>
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-   		<div id="content">
-		    <div id="selectBar">
-				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
-		    </div>
- 			<div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li>位置报表</li>
-				</ul>  
- 			</div>
-        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/position" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
-        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
-        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
-		 		<div id="content_choose">	
-		 			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${selectedOperatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-					
-					<span id="dateChoose_span">
-						<a value="today">今天</a> |
-						<a id="yesterday" value="yesterday">昨天</a> |
-						<a value="lastSevenDays">前七天</a> |
-						<a value="lastWeek">上周</a> |
-						<a value="thisMonth">本月</a> |
-						<a value="lastMonth">上月</a> 
-					</span>
-					<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-					</span>
-					<input id="btn_formSubmit" type="submit" value="查询"/>
-				</div>
-				<div id="chartDivs"> 
-			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-				</div>
-				<div id="content_chartLender">
-					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
-					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
-					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
-					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
-					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
-					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
-					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
-					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
-					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
-					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
-				</div>
-				<table border="1" class="tableFig">
-			    	<thead>
-			    		<tr class="theadTr">
-			            	<th class="theadTh" style="width:10%">位置</th>
-			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
-			                <th class="theadTh" style="width:9%">PV</th>
-			                <th class="theadTh" style="width:9%">UV</th>
-			                <th class="theadTh" style="width:9%">广告曝光数</th>
-			                <th class="theadTh" style="width:9%">广告填充率</th>
-			                <th class="theadTh" style="width:9%">广告点击数</th>
-			                <th class="theadTh" style="width:9%">广告点击率</th>
-			                <th class="theadTh" style="width:9%">eCPM</th>
-			                <th class="theadTh" style="width:9%">收入</th>
-			            </tr> 
-			        </thead>
-			        <tbody>
-			        	<#if reportList ??>
-			            <#list reportList as report>
-				        <tr id="tbodyTr">
-				        	<td class="tbodyTd tbodyTdLender"><#if report.position==1>认证<#elseif report.position==2>跳转<#elseif report.position==3>上网过程</#if></td> 
-				        	<td class="tbodyTd">${report.viewRate!}</td> 
-				            <td class="tbodyTd">${report.pv!}</td>
-				            <td class="tbodyTd">${report.uv!}</td>
-				            <td class="tbodyTd">${report.impression!}</td>
-				            <td class="tbodyTd">${report.fillRate!}</td>
-				            <td class="tbodyTd">${report.click!}</td>
-				            <td class="tbodyTd">${report.clickRate!}</td>  
-				            <td class="tbodyTd">${report.eCpm!}</td>
-				            <td class="tbodyTd">${report.income!}</td>
-				        </tr>
-				        </#list>  
-			        	</#if>
-			    	</tbody>
-		     	</table>
-		        <div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('position','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
-				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
-			</form>
-	  	</div>        
-    </div>
-</div>
-</@override>
+<@override name="head">
+<title>位置报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">位置报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/position" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">位置</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.position==1>认证<#elseif report.position==2>跳转<#elseif report.position==3>上网过程</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('position','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/size.ftl

@@ -1,140 +1,134 @@
-<@override name="head">
-<title>尺寸报表</title>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
-</@override>
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-   		<div id="content">
-		    <div id="selectBar">
-				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
-		    </div>
- 			<div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li>尺寸报表</li>
-				</ul>  
- 			</div>
-        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/size" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
-        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
-        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
-		 		<div id="content_choose">	
-		 			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${selectedOperatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-					
-					<span id="dateChoose_span">
-						<a value="today">今天</a> |
-						<a id="yesterday" value="yesterday">昨天</a> |
-						<a value="lastSevenDays">前七天</a> |
-						<a value="lastWeek">上周</a> |
-						<a value="thisMonth">本月</a> |
-						<a value="lastMonth">上月</a> 
-					</span>
-					<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-					</span>
-					<input id="btn_formSubmit" type="submit" value="查询"/>
-				</div>
-				<div id="chartDivs"> 
-			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-				</div>
-				<div id="content_chartLender">
-					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
-					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
-					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
-					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
-					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
-					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
-					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
-					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
-					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
-					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
-				</div>
-				<table border="1" class="tableFig">
-			    	<thead>
-			    		<tr class="theadTr">
-			            	<th class="theadTh" style="width:10%">尺寸</th>
-			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
-			                <th class="theadTh" style="width:9%">PV</th>
-			                <th class="theadTh" style="width:9%">UV</th>
-			                <th class="theadTh" style="width:9%">广告曝光数</th>
-			                <th class="theadTh" style="width:9%">广告填充率</th>
-			                <th class="theadTh" style="width:9%">广告点击数</th>
-			                <th class="theadTh" style="width:9%">广告点击率</th>
-			                <th class="theadTh" style="width:9%">eCPM</th>
-			                <th class="theadTh" style="width:9%">收入</th>
-			            </tr> 
-			        </thead>
-			        <tbody>
-			        	<#if reportList ??>
-			            <#list reportList as report>
-				        <tr id="tbodyTr">
-				        	<td class="tbodyTd tbodyTdLender">${report.width!}×${report.height!}</td> 
-				        	<td class="tbodyTd">${report.viewRate!}</td> 
-				            <td class="tbodyTd">${report.pv!}</td>
-				            <td class="tbodyTd">${report.uv!}</td>
-				            <td class="tbodyTd">${report.impression!}</td>
-				            <td class="tbodyTd">${report.fillRate!}</td>
-				            <td class="tbodyTd">${report.click!}</td>
-				            <td class="tbodyTd">${report.clickRate!}</td>  
-				            <td class="tbodyTd">${report.eCpm!}</td>
-				            <td class="tbodyTd">${report.income!}</td>
-				        </tr>
-				        </#list>  
-			        	</#if>
-			    	</tbody>
-		     	</table>
-		        <div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('size','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
-				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
-			</form>
-	  	</div>        
-    </div>
-</div>
-</@override>
+<@override name="head">
+<title>尺寸报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">尺寸报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/size" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">尺寸</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.width!}×${report.height!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('size','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/system.ftl

@@ -1,140 +1,134 @@
-<@override name="head">
-<title>系统报表</title>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
-</@override>
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-   		<div id="content">
-		    <div id="selectBar">
-				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
-		    </div>
- 			<div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li>系统报表</li>
-				</ul>  
- 			</div>
-        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/system" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
-        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
-        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
-		 		<div id="content_choose">	
-		 			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${selectedOperatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-					
-					<span id="dateChoose_span">
-						<a value="today">今天</a> |
-						<a id="yesterday" value="yesterday">昨天</a> |
-						<a value="lastSevenDays">前七天</a> |
-						<a value="lastWeek">上周</a> |
-						<a value="thisMonth">本月</a> |
-						<a value="lastMonth">上月</a> 
-					</span>
-					<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-					</span>
-					<input id="btn_formSubmit" type="submit" value="查询"/>
-				</div>
-				<div id="chartDivs"> 
-			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-				</div>
-				<div id="content_chartLender">
-					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
-					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
-					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
-					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
-					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
-					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
-					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
-					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
-					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
-					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
-				</div>
-				<table border="1" class="tableFig">
-			    	<thead>
-			    		<tr class="theadTr">
-			            	<th class="theadTh" style="width:10%">系统</th>
-			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
-			                <th class="theadTh" style="width:9%">PV</th>
-			                <th class="theadTh" style="width:9%">UV</th>
-			                <th class="theadTh" style="width:9%">广告曝光数</th>
-			                <th class="theadTh" style="width:9%">广告填充率</th>
-			                <th class="theadTh" style="width:9%">广告点击数</th>
-			                <th class="theadTh" style="width:9%">广告点击率</th>
-			                <th class="theadTh" style="width:9%">eCPM</th>
-			                <th class="theadTh" style="width:9%">收入</th>
-			            </tr> 
-			        </thead>
-			        <tbody>
-			        	<#if reportList ??>
-			            <#list reportList as report>
-				        <tr id="tbodyTr">
-				        	<td class="tbodyTd tbodyTdLender"><#if report.system==1>windows<#elseif report.system==2>ios<#elseif report.system==3>android<#elseif report.system==4>mac<#elseif report.system==5>wp<#elseif report.system==6>other</#if></td> 
-				        	<td class="tbodyTd">${report.viewRate!}</td> 
-				            <td class="tbodyTd">${report.pv!}</td>
-				            <td class="tbodyTd">${report.uv!}</td>
-				            <td class="tbodyTd">${report.impression!}</td>
-				            <td class="tbodyTd">${report.fillRate!}</td>
-				            <td class="tbodyTd">${report.click!}</td>
-				            <td class="tbodyTd">${report.clickRate!}</td>  
-				            <td class="tbodyTd">${report.eCpm!}</td>
-				            <td class="tbodyTd">${report.income!}</td>
-				        </tr>
-				        </#list>  
-			        	</#if>
-			    	</tbody>
-		     	</table>
-		        <div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('system','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
-				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
-			</form>
-	  	</div>        
-    </div>
-</div>
-</@override>
+<@override name="head">
+<title>系统报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">系统报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/system" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">系统</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.system==1>windows<#elseif report.system==2>ios<#elseif report.system==3>android<#elseif report.system==4>mac<#elseif report.system==5>wp<#elseif report.system==6>other</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('system','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl

@@ -1,136 +1,130 @@
-<@override name="head">
-<title>类型报表</title>
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
-</@override>
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-   		<div id="content">
-		    <div id="selectBar">
-				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
-				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
-		    </div>
- 			<div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li>类型报表</li>
-				</ul>  
- 			</div>
-        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/type" method="post">		
-        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
-        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
-		 		<div id="content_choose">	
-		 			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${selectedOperatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-					
-					<span id="dateChoose_span">
-						<a value="today">今天</a> |
-						<a id="yesterday" value="yesterday">昨天</a> |
-						<a value="lastSevenDays">前七天</a> |
-						<a value="lastWeek">上周</a> |
-						<a value="thisMonth">本月</a> |
-						<a value="lastMonth">上月</a> 
-					</span>
-					<span id="calendar_span">
-						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-					</span>
-					<input id="btn_formSubmit" type="submit" value="查询"/>
-				</div>
-				<div id="chartDivs"> 
-			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
-				</div>
-				<div id="content_chartLender">
-					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
-					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
-					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
-					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
-					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
-					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
-					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
-					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
-					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
-					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
-				</div>
-				<table border="1" class="tableFig">
-			    	<thead>
-			    		<tr class="theadTr">
-			            	<th class="theadTh" style="width:10%">类型</th>
-			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
-			                <th class="theadTh" style="width:9%">PV</th>
-			                <th class="theadTh" style="width:9%">UV</th>
-			                <th class="theadTh" style="width:9%">广告曝光数</th>
-			                <th class="theadTh" style="width:9%">广告填充率</th>
-			                <th class="theadTh" style="width:9%">广告点击数</th>
-			                <th class="theadTh" style="width:9%">广告点击率</th>
-			                <th class="theadTh" style="width:9%">eCPM</th>
-			                <th class="theadTh" style="width:9%">收入</th>
-			            </tr> 
-			        </thead>
-			        <tbody>
-			        	<#if reportList ??>
-			            <#list reportList as report>
-				        <tr id="tbodyTr">
-				        	<td class="tbodyTd tbodyTdLender"><#if report.device==1>网页<#else>app</#if></td> 
-				        	<td class="tbodyTd">${report.viewRate!}</td> 
-				            <td class="tbodyTd">${report.pv!}</td>
-				            <td class="tbodyTd">${report.uv!}</td>
-				            <td class="tbodyTd">${report.impression!}</td>
-				            <td class="tbodyTd">${report.fillRate!}</td>
-				            <td class="tbodyTd">${report.click!}</td>
-				            <td class="tbodyTd">${report.clickRate!}</td>  
-				            <td class="tbodyTd">${report.eCpm!}</td>
-				            <td class="tbodyTd">${report.income!}</td>
-				        </tr>
-				        </#list>  
-			        	</#if>
-			    	</tbody>
-		     	</table>
-		        <div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('type','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
-				</div>
-			</form>
-	  	</div>        
-    </div>
-</div>
-</@override>
+<@override name="head">
+<title>类型报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">类型报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/type" method="post">		
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">类型</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.device==1>网页<#else>app</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('type','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report.ftl

@@ -1,220 +1,194 @@
 <@override name="head">
-	<title>总体报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>
+<title>总体报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent" style="height:800px;">
+    <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">数据报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="date">
-				<ul id="main_dimensionul" style="float:left; margin-right:10px;">
-					<li class="select_box" id="dimensionul_box">
-						<span id="dimensionul_span">${selecteddimensionName!}</span>
-						<ul class="son_ul" id="dimension_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selecteddimensionId" id="dimensionId" value="${dimensionId!}">
-				<input type="hidden" name="selecteddimensionName" id="dimensionName" value="${selecteddimensionName!}">
-				
-		        <a id="a-dimension" href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a>
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a> 
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   	</div>
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		
-		   		<div id="date-radio" style="float:right;margin-right:20px;">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a class="selectBar_change" href="${ctx}/back/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">数据报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/back/main/ad/report/advertiser-report" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="content_choose">	
+					<ul id="main_dimensionul">
+						<li class="select_box" id="dimensionul_box">
+							<span id="dimensionul_span">${selecteddimensionName!}</span>
+							<ul class="son_ul" id="dimension_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selecteddimensionId" id="dimensionId" value="${dimensionId!}">
+					<input type="hidden" name="selecteddimensionName" id="dimensionName" value="${selecteddimensionName!}">
+		        	<a class="btn-dimension" href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a>
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>
-		  	</div>
-		   		
-			<div id="table" style="clear:both; width:99% !important;">
-				<table border="1" style="text-align:center; width:97%;margin-left:20px;" class="tablefig" id="tablefig">
+	 			<div id="selectuls_report">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+					<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}"/>
+			   		<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
+		  		</div>
+				<table border="1" class="tableFig tableReport">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
+						<tr class="theadTr">
 							<#if dimensionLength ??>
-								<th style="text-align:center; width:5%" colspan="${dimensionLength}"></th>
-		            		<#else>
-		            			<th style="text-align:center; width:5%" colspan=1></th>
-		            		</#if>
-		                    <th style="text-align:center; width:5%" class="hidden-impression">曝光</th>
-		                    <th style="text-align:center; width:10%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:10%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:10%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:10%" class="hidden-consume" colspan=2>花费</th>
+								<th style="width:5%" colspan="${dimensionLength!}"></th>
+			            	<#else>
+			            		<th style=" width:5%" colspan=1></th>
+			            	</#if>
+				        	<th class="theadTh hidden-impression" style="width:5%">曝光</th>
+				            <th class="theadTh hidden-click" style="width:10%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:10%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:10%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:10%" colspan=2>花费</th>
 						</tr>
-						<tr>
+						<tr class="theadTr">
 							<#if dimensionTarget ??>
 							<#list dimensionTarget as dimension>
-								<td style="text-align:center; width:5%">${dimension.dimension}</td>
+								<td class="theadTd" style="width:5%">${dimension.dimension!}</td>
 							</#list>
 		            		<#else>
-		            			<td style="text-align:center; width:5%">日期</td>
+		            			<td class="theadTd" style="width:5%">日期</td>
 		            		</#if>
-			                <td style="text-align:center; width:5%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:5%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:5%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:5%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:5%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:5%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:5%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:5%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:5%" class="hidden-consume">花费</td>
+			                <td class="theadTd hidden-impression" style="width:5%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:5%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:5%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:5%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:5%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:5%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:5%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:5%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:5%">花费</td>
 			            </tr>
-			            <tr>
+			            <tr class="theadTr">
 			            	<#if dimensionTarget ??>
 							<#list dimensionTarget as dimension>
-								<td style="text-align:center; width:5%">总计</td>
+								<td class="theadTd">总计</td>
 							</#list>
 		            		<#else>
-		            			<td style="text-align:center;">总计</td>
+		            			 <td class="theadTd">总计</td>
 		            		</#if>
-		                    <td style="text-align:center;" class="hidden-impression">${reportMap.impressionSum!}</td>
-		                    <td style="text-align:center;" class="hidden-click">${reportMap.clickSum!}</td>
-		                    <td style="text-align:center;" class="hidden-click">${reportMap.clickRatesum!}%</td> 
-		                    <td style="text-align:center;" class="hidden-visit">${reportMap.visitSum!}</td>
-		                    <td style="text-align:center;" class="hidden-visit">${reportMap.visitRatesum!}%</td>   
-		                    <td style="text-align:center;" class="hidden-conversion">${reportMap.conversionSum!}</td>
-		                    <td style="text-align:center;" class="hidden-conversion">${reportMap.conversionRatesum!}%</td>  
-		                    <td style="text-align:center;" class="hidden-consume">${reportMap.eCmpSum!}</td>
-		                    <td style="text-align:center;" class="hidden-consume">${reportMap.consumeSum!}</td>
+		                    <td class="theadTd hidden-impression">${reportMap.impressionSum!}</td>
+		                    <td class="theadTd hidden-click">${reportMap.clickSum!}</td>
+		                    <td class="theadTd hidden-click">${reportMap.clickRatesum!}%</td> 
+		                    <td class="theadTd hidden-visit">${reportMap.visitSum!}</td>
+		                    <td class="theadTd hidden-visit">${reportMap.visitRatesum!}%</td>   
+		                    <td class="theadTd hidden-conversion">${reportMap.conversionSum!}</td>
+		                    <td class="theadTd hidden-conversion">${reportMap.conversionRatesum!}%</td>  
+		                    <td class="theadTd hidden-consume">${reportMap.eCmpSum!}</td>
+		                    <td class="theadTd hidden-consume">${reportMap.consumeSum!}</td>
 	                	</tr>
 					</thead>
 					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
+						<#if reportList ??>
+		            	<#list reportList as report>
+						<tr id="tbodyTr">
 							<#if dimensionTarget ??>
 							<#list dimensionTarget as dimension>
 								<#if dimension.dimensionTarget == "reportDate">
 								<#setting datetime_format="yyyy-MM-dd"/> 
-									<td style="text-align:center;">${report[dimension.dimensionTarget]?datetime}</td> 
+									<td class="tbodyTd">${report[dimension.dimensionTarget]!?datetime}</td> 
 								<#else>
-									<td style="text-align:center;">${report[dimension.dimensionTarget]!}</td> 
+									<td class="tbodyTd">${report[dimension.dimensionTarget]!}</td> 
 								</#if>
 							</#list>
 		            		<#else>
 		            			<#setting datetime_format="yyyy-MM-dd"/> 
-		            			<td style="text-align:center;">${report.reportDate!?datetime}</td>
+		            			<td class="tbodyTd">${report.reportDate!?datetime}</td>
 		            		</#if>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			                <td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-conversion">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-conversion">${report.conversionRate!}%</td>
+			               	<td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
-					</#list>
-					</#if>
+						</#list>
+						</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('total','${ctx}/back/main/ad/report/advertiser-report/exportDataReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin: -10px 38px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
-            
-            </form>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('total','${ctx}/back/main/ad/report/advertiser-report/exportDataReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+           </form>
 		</div>
-		
     </div>
-</div>		     
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>
+

src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/create.ftl

@@ -1,109 +1,55 @@
-<@override name="head">
-	<title>新增维度</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:10px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				var Dimension = new Object();//账号对象
-				Dimension['name'] = $("#name").val();
-				Dimension['content'] = $("#selected_ops").val();
-				Dimension['isDefault'] = 0;
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				if($("#selected_ops").val() == ""){
-					bootbox.alert("请选择维度方案！");
-					return false;
-				}
-				$.ajax({
-			    	type: "POST",
-			        url: "${ctx}/back/main/ad/report/advertiser-report/save",
-			        data: Dimension,
-			        success: function(data){
-					 	location.href = "${ctx}/back/main/ad/report/advertiser-report/dimension";
-			        }
-				});	
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/ad/report/advertiser-report/dimension";
-			});
-			
-		});
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="content">
-			<div id="handler">
-				<ul>
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">新增维度</li>
-				</ul>  
-			</div>
-			
-			<div id="createForm">
-				<form id="validation-form" class="form-horizontal">
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>维度名称：</label>
-						<input class="input-text" autocomplete="off" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<ul class="choosen" id="chooseing">
-							<li value="2">广告主</li>
-							<li value="3">订单</li>
-							<li value="4">活动</li>
-							<li value="5">投放</li>
-							<li value="6">创意</li>
-							<li value="1">日期</li>	
-						</ul>
-						<span id="showspan" style="float:left;margin:131px 0 0 54px;color:red;display:block;">请将左侧维度加入此处</span>
-						<ul class="show" id="selected" ></ul>
-						<input type="hidden" id="selected_ops" name="content" value=""/>
-					</div>
-					
-					<div id="btn-class" class="form-actions1" style="float:both;">
-						<div id="create-btn-save">保存</div>
-					    <div id="create-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>新增维度</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/dimension.js"></script>
+</@override> 
+<@override name="body">
+	<!-- PAGE CONTENT BEGINS HERE -->
+	<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="content">
+			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">新增维度</li>
+				</ul>  
+ 			</div>
+			<form id="validateForm" action="${ctx}/back/main/ad/report/advertiser-report/save" method="post">
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>维度名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<ul id="dimension-chooseing">
+						<li value="2">广告主</li>
+						<li value="3">订单</li>
+						<li value="4">活动</li>
+						<li value="5">投放</li>
+						<li value="6">创意</li>
+						<li value="1">日期</li>	
+					</ul>
+					<span id="dimension-showspan">请将左侧维度加入此处</span>
+					<ul id="dimension-selected"></ul>
+					<input type="hidden" id="selected_ops" name="content" value=""/>
+					<input type="hidden" id="accountId" name="accountId" value="${accountId!}"/>
+					<input type="hidden" name="isDefault" value="0"/>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/dimension.ftl

@@ -1,156 +1,70 @@
-<@override name="head">
-	<title>维度管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-	
-		$(function(){
-		
-			//新增维度
-			$("#btn-add").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/ad/report/advertiser-report/create";
-			});
-			
-			//编辑
-			$("#btn-edit").live("click", function() {
-				var id = parseInt($(this).attr("value"));
-				location.href = "${ctx}/back/main/ad/report/advertiser-report/edit?id="+id;
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-			
-			//设置默认值
-			$("#input-radio").live("click", function() {
-				var id = $(this).attr("value");
-				$.post("${ctx}/back/main/ad/report/advertiser-report/updateDimensionDefault", {dimensionId:id}, function(data) {
-					$('#formPage').submit();
-				});
-			});
-
-			//批量删除
-			$("#all-btn-delete").click(function(){
-				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
-				var _param = checkboxs.serialize();
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							$.post("${ctx}/back/main/ad/report/advertiser-report/delete", _param, function(data) {
-								$('#formPage').submit();
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要删除的维度！");
-				}
-			});
-			
-			//删除
-			$('#btn-delete').live('click' ,function(){
-				var id = parseInt($(this).attr("value"));
-				$.post("${ctx}/back/main/ad/report/advertiser-report/delete", {id:id}, function(data) {
-					$('#formPage').submit();
-				});
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="content">
-			<div id="handler">
-				<ul>
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span></li>
-					<li class="size3" id="handlerName">维度管理</li>
-				</ul>  
-			</div>
-			<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/dimension" method="post">
-			<input type="hidden" id="page" name="page" value="${pager.page}">
-		  	<div id="buttons">
-		  		<div id="btn-add" class="btn1">新增维度</div>      
-		        <div id="all-btn-delete" class="btn1">批量删除</div>  
-		    </div>
-		</div>
-		<div id="account-table">
-			<table border="1" class="tablefig" id="tablefig">
-				<thead>
-					<tr>
-						<th width="10%">
-							<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-						</th>
-						<th width="20%">名称</th>
-						<th width="25%">维度</th>
-						<th width="20%">默认</th>
-						<th width="25%">操作</th>
-					</tr>
-				</thead>
-				<tbody>
-				<#if dimensionList ??>
-				<#list dimensionList as dimension>
-					<tr class="">
-						<td class="center">
-							<label><input  autocomplete="off" type="checkbox" name="id" value="#{dimension.id!}"><span class="lbl"></span></label>
-						</td>
-						<td class="breakword">${dimension.name!}</td>
-						<td class="breakword">${dimension.content!}</td>
-						<td class="breakword">
-							 <input name="isDefault" id="input-radio" type="radio" value="${dimension.id}" <#if dimension.isDefault==1>checked</#if> style="margin:-3px 5px 0 0;"><span  class="lbl">设为默认</span>
-						</td>
-						<td>
-							<div id="btndiv">
-								<div id="btn-edit" class="btn11" value="${dimension.id}">编辑</div>
-								<div id="btn-delete" class="btn11" value="${dimension.id}">删除</div>
-							</div>
-						</td>
-					</tr>
-				</#list>
-				</#if>
-			</tbody>
-			</table>
-						
-			<div id="pageDiv">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>	
-            
-			</form>
-			
-		</div>
-	</div>
-<!-- PAGE CONTENT ENDS HERE --/>
-</div><!--/row-->
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>维度管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/dimension.js"></script>
+</@override> 
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="contentOther">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">维度管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/ad/report/advertiser-report/dimension" method="post">
+ 				<input type="hidden" id="page" name="page" value="${pager.page}"/>
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/back/main/ad/report/advertiser-report/create" class="btn2">新增维度</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+				</div>
+				<table border="1" class="tableFig tableDimension">
+					<thead>
+						<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%;"><div class="checkboxStyleTh"></div></th>
+			                <th class="theadTh" style="width:20%;">名称</th>
+			                <th class="theadTh" style="width:25%;">维度</th>
+			                <th class="theadTh" style="width:20%;">默认</th>
+			                <th class="theadTh" style="width:25%;">操作</th>
+			            </tr> 
+					</thead>
+					<tbody>
+						<#if dimensionList ??>
+						<#list dimensionList as dimension>
+							<tr id="tbodyTr">
+								<td class="tbodyTd"><div class="checkboxStyleTd" id="${dimension.id!}"></div></td>
+								<td class="tbodyTd">${dimension.name!}</td>
+								<td class="tbodyTd">${dimension.content!}</td>
+								<td class="tbodyTd">
+									<input name="isDefault" id="input-radio" type="radio" value="${dimension.id!}" <#if dimension.isDefault==1>checked</#if>>设为默认
+								</td>
+								<td class="tbodyTd">
+									<div id="listButtons">
+										<a href="${ctx}/back/main/ad/report/advertiser-report/edit?id=${dimension.id!}" class="btn3">编辑</a>
+										<a id="btn-delete" value="${dimension.id!}" class="btn3">删除</a>
+									</div>
+								</td>
+							</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="pageDiv-other">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/edit.ftl

@@ -1,123 +1,61 @@
-<@override name="head">
-	<title>编辑维度</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin:10px 0 0 20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				var lis = $('#selected li');
- 	    		for(var i=0; i<lis.length;i++) {
- 		   			if(i == 0){
-						$("#selected_ops").val($(lis[i]).text());
-					}else{
-						$("#selected_ops").val($("#selected_ops").val()+"-"+$(lis[i]).text());
-					}		   
-    			}
-				var Dimension = new Object();//账号对象
-				Dimension['id'] = $("#dimensionId").val();
-				Dimension['name'] = $("#name").val();
-				Dimension['content'] = $("#selected_ops").val();
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				if($("#selected_ops").val() == ""){
-					bootbox.alert("请选择维度方案！");
-					return false;
-				}
-				$.ajax({
-			    	type: "POST",
-			        url: "${ctx}/back/main/ad/report/advertiser-report/save",
-			        data: Dimension,
-			        success: function(data){
-					 	location.href = "${ctx}/back/main/ad/report/advertiser-report/dimension";
-			        }
-				});	
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/ad/report/advertiser-report/dimension";
-			});
-			
-		});
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="content">
-			<div id="handler">
-				<ul>
-					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-					<li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a></li>
-					<span class="divider2"><i class="icon-angle-right"></i></span>
-					<li class="size3" id="handlerName">编辑维度</li>
-				</ul>  
-			</div>
-			
-			<div id="createForm">
-				<form id="validation-form" class="form-horizontal">
-				<input id="dimensionId"  type="hidden" name="id" value="${dimension.id}"/>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>维度名称：</label>
-						<input class="input-text" autocomplete="off" id="name" name="name" type="text" value="${dimension.name}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<ul class="choosen" id="chooseing">
-							<#if notdimensionTypeList ??>
-							<#list notdimensionTypeList as typename>
-								<li>${typename}</li>
-							</#list>
-							</#if>
-						</ul>
-						<span id="showspan" style="float:left;margin:131px 0 0 54px;color:red;display:block;">请将左侧维度加入此处</span>
-						<ul class="show" id="selected" >
-							<#if dimensionTypeList ??>
-							<#list dimensionTypeList as typename>
-								<li>${typename}<input type='button' class='movedel'/><input type='button' class='movedown'/><input type='button' class='moveup'/></li>
-							</#list>
-							</#if>
-						</ul>
-						<input type="hidden" id="selected_ops" name="content" value="${dimension.content}"/>
-					</div>
-					
-					<div id="btn-class" class="form-actions1" style="float:both;">
-						<div id="create-btn-save">保存</div>
-					    <div id="create-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>编辑维度</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/dimension.js"></script>
+</@override> 
+<@override name="body">
+	<!-- PAGE CONTENT BEGINS HERE -->
+	<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="content">
+			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">编辑维度</li>
+				</ul>  
+ 			</div>
+			<form id="validateForm" action="${ctx}/back/main/ad/report/advertiser-report/save" method="post">
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>维度名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="${dimension.name!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<ul id="dimension-chooseing">
+					<#if notdimensionTypeList ??>
+					<#list notdimensionTypeList as typename>
+						<li>${typename!}</li>
+					</#list>
+					</#if>	
+					</ul>
+					<span id="dimension-showspan">请将左侧维度加入此处</span>
+					<ul id="dimension-selected">
+					<#if dimensionTypeList ??>
+					<#list dimensionTypeList as typename>
+						<li>${typename!}<input type='button' class='movedel'/><input type='button' class='movedown'/><input type='button' class='moveup'/></li>
+					</#list>
+					</#if>
+					</ul>
+					<input type="hidden" id="selected_ops" name="content" value="${dimension.content!}"/>
+					<input type="hidden" id="accountId" name="accountId" value="${accountId!}"/>
+					<input type="hidden" name="isDefault" value="${dimension.isDefault!}"/>
+					<input id="dimensionId" type="hidden" name="id" value="${dimension.id!}"/>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/ideaReport.ftl

@@ -1,171 +1,148 @@
 <@override name="head">
-	<title>创意报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>
+<title>创意报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/back/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#" style="text-decoration:none">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report" style="text-decoration:none">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">创意报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a>
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">创意报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/back/main/ad/report/advertiser-report/ideaReport" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+					<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}"/>
+	 			</div>
+				<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
 				</div>
-		  	</div>
-		   		
-			<div id="table">
-				<table border="1" class="tablefig" id="tablefig">
+				<table border="1" class="tableReport-advertiser">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%"></th>
+		                    <th class="theadTh hidden-impression" style="width:18%" colspan=2>曝光</th>
+				            <th class="theadTh hidden-click" style="width:18%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:18%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:18%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:18%" colspan=2>花费</th>
 						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+						<tr class="theadTr">
+			               	<td class="theadTd" style="width:10%"></td>     
+			                <td class="theadTd hidden-impression" style="width:9%">曝光占比</td>
+			                <td class="theadTd hidden-impression" style="width:9%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:9%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:9%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:9%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:9%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:9%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:9%">花费</td>
 			            </tr>
 					</thead>
 					<tbody>
 					<#if reportList ??>
 		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;">${report.bannerName!}</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+						<tr class="tbodyTr">
+			            	<td class="tbodyTd">${report.bannerName!}</td> 
+			                <td class="tbodyTd hidden-impression">${report.impressionRate!}%</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			              	<td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-visit">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-visit">${report.conversionRate!}%</td>
+			                <td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
 					</#list>
 					</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px; margin-top:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin-right:37px !important;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('idea','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-		</form>
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/osReport.ftl

@@ -1,172 +1,147 @@
 <@override name="head">
-	<title>系统报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>		     
-	
+<title>系统报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent" style="height:800px;">
+    <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">系统报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/osReport" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a>
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">系统报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/back/main/ad/report/advertiser-report/osReport" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+					<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}"/>
+	 			</div>
+				<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
 				</div>
-		  	</div>
-		   		
-			<div id="table" style="width:99% !important;">
-				<table border="1" style="text-align:center; width:97%;margin-left:20px;"  class="tablefig" id="tablefig">
+				<table border="1" class="tableReport-advertiser">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%"></th>
+		                    <th class="theadTh hidden-impression" style="width:18%" colspan=2>曝光</th>
+				            <th class="theadTh hidden-click" style="width:18%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:18%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:18%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:18%" colspan=2>花费</th>
 						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+						<tr class="theadTr">
+			               	<td class="theadTd" style="width:10%"></td>     
+			                <td class="theadTd hidden-impression" style="width:9%">曝光占比</td>
+			                <td class="theadTd hidden-impression" style="width:9%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:9%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:9%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:9%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:9%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:9%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:9%">花费</td>
 			            </tr>
 					</thead>
 					<tbody>
 					<#if reportList ??>
 		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;"><#if report.os==1>Windows<#elseif report.os==2>IOS<#elseif report.os==3>Android<#elseif report.os==4>MAC<#elseif report.os==5>WP</#if></td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+						<tr class="tbodyTr">
+			            	<td class="tbodyTd"><#if report.os==1>iOS<#elseif report.os==2>Android<#elseif report.os==3>WP<#elseif report.os==4>Symbian<#elseif report.os==5>MAC OS<#elseif report.os==6>Windows<#elseif report.os==7>other</#if></td> 
+			                <td class="tbodyTd hidden-impression">${report.impressionRate!}%</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			              	<td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-visit">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-visit">${report.conversionRate!}%</td>
+			                <td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
 					</#list>
 					</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('system','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin: -10px 38px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('system','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-		</form>
     </div>
 </div>
 </@override>

src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/regionReport.ftl

@@ -1,172 +1,147 @@
 <@override name="head">
-	<title>地域报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>		     
-	
+<title>地域报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent" style="height:800px;">
+    <div id="pagecontent">
 		<div id="content">
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">地域报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/regionReport" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a> 
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/report/advertiser-report">总体报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">地域报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/back/main/ad/report/advertiser-report/regionReport" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+					<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}"/>
+	 			</div>
+				<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
 				</div>
-		  	</div>
-		   		
-			<div id="table" style="width:99% !important;">
-				<table border="1" style="text-align:center; width:97%;margin-left:20px;" class="tablefig" id="tablefig">
+				<table border="1" class="tableReport-advertiser">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%"></th>
+		                    <th class="theadTh hidden-impression" style="width:18%" colspan=2>曝光</th>
+				            <th class="theadTh hidden-click" style="width:18%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:18%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:18%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:18%" colspan=2>花费</th>
 						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+						<tr class="theadTr">
+			               	<td class="theadTd" style="width:10%"></td>     
+			                <td class="theadTd hidden-impression" style="width:9%">曝光占比</td>
+			                <td class="theadTd hidden-impression" style="width:9%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:9%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:9%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:9%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:9%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:9%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:9%">花费</td>
 			            </tr>
 					</thead>
 					<tbody>
 					<#if reportList ??>
 		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;">${report.location!}</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+						<tr class="tbodyTr">
+			            	<td class="tbodyTd">${report.location!}</td> 
+			                <td class="tbodyTd hidden-impression">${report.impressionRate!}%</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			              	<td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-visit">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-visit">${report.conversionRate!}%</td>
+			                <td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
 					</#list>
 					</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('location','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin:  -10px 38px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('location','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-		</form>
     </div>
 </div>
 </@override>

src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/sceneReport.ftl

@@ -1,172 +1,147 @@
 <@override name="head">
-	<title>场景报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
-	<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>
+<title>场景报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 </@override>
-
 <@override name="body">
    <div id=content_bg>
 	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent" style="height:800px;">
+    <div id="pagecontent">
 		<div id="content">
-			
-			<div id="second">
-				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
-				<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li> 
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
-				</ul>
-			</div>
-	   		<div id="third">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">场景报表</li>
-				 </ul>  
-	 		</div>
-	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/sceneReport" method="post">
-	 		<input type="hidden" id="page" name="page" value="${pager.page}">
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_campaignul">
-					<li class="select_box" id="campaignul_box">
-						<span id="campaignul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="campaignul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
-				<ul id="main_adGroupul">
-					<li class="select_box" id="adGroupul_box">
-						<span id="adGroupul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="adGroupul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a>
-				</span>
-				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列（此项可多选）</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
-					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
-					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+			<div id="selectBar_report" class="selectBar">
+				<a href="${ctx}/back/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/regionReport">地域报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/osReport">系统报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/report/advertiser-report/sceneReport">场景报表</a>
+				<a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport">创意报表</a>
+		    </div>
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">场景报表</li>
+				</ul>  
+ 			</div>
+	 		<form id="myform" action="${ctx}/back/main/ad/report/advertiser-report/sceneReport" method="post">
+	 			<input type="hidden" id="page" name="page" value="${pager.page!}"/>
+	 			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}"/>
+	 			<div id="selectuls">
+					<ul id="main_advertiserul">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}"/>
+					<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}"/>
+					<ul id="main_orderul">
+						<li class="select_box" id="orderul_box">
+							<span id="orderul_span">${selectedorderName!}</span>
+							<ul class="son_ul" id="orderul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}"/>
+					<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}"/>
+					<ul id="main_campaignul">
+						<li class="select_box" id="campaignul_box">
+							<span id="campaignul_span">${selectedcampaignName!}</span>
+							<ul class="son_ul" id="campaignul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}"/>
+					<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}"/>
+					<ul id="main_adGroupul">
+						<li class="select_box" id="adGroupul_box">
+							<span id="adGroupul_span">${selectedadGroupName!}</span>
+							<ul class="son_ul" id="adGroupul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}"/>
+					<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}"/>
+	 			</div>
+				<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="date-checkbox">
+			   			<span>显示列（此项可多选）</span>
+						<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+						<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+						<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
+						<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
+						<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
+					</div>
 				</div>
-		  	</div>
-		   		
-			<div id="table" style="width:99% !important;">
-				<table border="1" style="text-align:center; width:97%;margin-left:20px;"  class="tablefig" id="tablefig">
+				<table border="1" class="tableReport-advertiser">
 					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:10%"></th>
+		                    <th class="theadTh hidden-impression" style="width:18%" colspan=2>曝光</th>
+				            <th class="theadTh hidden-click" style="width:18%" colspan=2>点击</th>
+				            <th class="theadTh hidden-visit" style="width:18%" colspan=2>到达</th>
+				            <th class="theadTh hidden-conversion" style="width:18%" colspan=2>转化</th>
+				            <th class="theadTh hidden-consume" style="width:18%" colspan=2>花费</th>
 						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+						<tr class="theadTr">
+			               	<td class="theadTd" style="width:10%"></td>     
+			                <td class="theadTd hidden-impression" style="width:9%">曝光占比</td>
+			                <td class="theadTd hidden-impression" style="width:9%">曝光数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击数</td>
+			                <td class="theadTd hidden-click" style="width:9%">点击率</td> 
+			                <td class="theadTd hidden-visit" style="width:9%">到达数</td>
+			                <td class="theadTd hidden-visit" style="width:9%">到达率</td>   
+			                <td class="theadTd hidden-conversion" style="width:9%">转化数</td>
+			                <td class="theadTd hidden-conversion" style="width:9%">转化率</td>  
+			                <td class="theadTd hidden-consume" style="width:9%">eCPM</td>
+			                <td class="theadTd hidden-consume" style="width:9%">花费</td>
 			            </tr>
 					</thead>
 					<tbody>
 					<#if reportList ??>
 		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;">${report.placeName!}</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+						<tr class="tbodyTr">
+			            	<td class="tbodyTd">${report.placeName!}</td> 
+			                <td class="tbodyTd hidden-impression">${report.impressionRate!}%</td>
+			                <td class="tbodyTd hidden-impression">${report.impression!}</td>
+			                <td class="tbodyTd hidden-click">${report.click!}</td>
+			                <td class="tbodyTd hidden-click">${report.clickRate!}%</td>  
+			              	<td class="tbodyTd hidden-visit">${report.visit!}</td>
+			                <td class="tbodyTd hidden-visit">${report.visitRate!}%</td> 
+			                <td class="tbodyTd hidden-visit">${report.conversion!}</td>
+			                <td class="tbodyTd hidden-visit">${report.conversionRate!}%</td>
+			                <td class="tbodyTd hidden-consume">${report.eCmp!}</td>
+			                <td class="tbodyTd hidden-consume">${report.consume!}</td>
 			            </tr>
 					</#list>
 					</#if>
 					</tbody>
 				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
-			</div>
-						
-			<div id="pageDiv" style="margin: -10px 38px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
 		</div>
-		</form>
     </div>
 </div>
 </@override>

src/main/webapp/WEB-INF/pages/back/main/ap/apmac/create.ftl

@@ -1,194 +1,100 @@
-<@override name="head">
-	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac-back.js"></script>
-		
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#wifiForm").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				//alert($("#wifiForm").validate());
-				//if (!$("#wifiForm").validate()) {
-				//	return false;
-				//}
-				if($("#cn").val() == ""){
-					$("#main_cnul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("请选择省份");
-					return false;
-				}
-				if($("#cnCity").val() == ""){
-					$("#main_cnCityul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份对应的城市");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("请选择省份对应的城市");
-					return false;
-				}
-				if($("#place").val() == ""){
-					$("#main_placeul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择场景");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("请选择场景");
-					return false;
-				}
-				$("#wifiForm").submit();
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/ap/apmac/list";
-			});
-				
-			$("#cnul_box").mouseleave(function(){
-		 		if($("#cn").val() == ""){
-					$("#main_cnul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("请选择省份");
-				}else{
-					$("#main_cnul").css("box-shadow","none").attr("title","");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		 	$("#cnCityul_box").mouseleave(function(){
-		 		if($("#cnCity").val() == ""){
-					$("#main_cnCityul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份对应的城市");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("请选择省份对应的城市");
-				}else{
-					$("#main_cnCityul").css("box-shadow","none").attr("title","");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		 	$("#placeul_box").mouseleave(function(){
-		 		if($("#place").val() == ""){
-					$("#main_placeul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择场景");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("请选择场景");
-				}else{
-					$("#main_placeul").css("box-shadow","none").attr("title","");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		});
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">新建热点详情</li>
-			</ul>  
-		</div>
-		<div id="content">	
-			<div id="createForm">
-				<form id="wifiForm" action="${ctx}/back/main/ap/apmac/save" method="post" class="form-horizontal" >
-					
-					
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>请选择媒体：</label>
-						<ul style="margin-left:80px;" id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${operatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-						</ul>
-						<input type="hidden" name="operatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					</div>
-					
-					<div class="control-group" style="margin-bottom:20px;">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>热点名称：</label>
-						<input tabindex="1"  class="input-text" autocomplete="off" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
-					</div>
-					
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>SSID：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="SSID" name="SSID" type="text" value="" verify="text/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="cnul_selectdiv">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>省：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_cnul" style="margin-left:80px;">
-							<li class="select_box" id="cnul_box">
-								<span id="cnul_span">省</span>
-								<ul class="son_ul" id="cn_son_ul" style="left:-25px;"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="cn" id="cn" value="">
-					</div>
-					
-					<div class="control-group" id="cnCityul_selectdiv" style="margin-top:-10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>市：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_cnCityul" style="margin-left:80px;">
-							<li class="select_box" id="cnCityul_box">
-								<span id="cnCityul_span">市</span>
-								<ul class="son_ul" id="cnCityul_son_ul" style="left:-25px;"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="cnCity" id="cnCity" value="">
-					</div>
-					
-					<div class="control-group" style="margin-top:-10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>详细地址：</label>
-						<input tabindex="5" class="input-text" autocomplete="off" id="address" name="address" type="text" value="" verify="unspecial/1000/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>经度：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="longitude" name="longitude" type="text" value="" verify="longitude/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>纬度：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="latitude" name="latitude" type="text" value="" verify="latitude/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>apmac：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="apmac" name="apmac" type="text" value="" verify="mac/17/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="placeul_selectdiv">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>场景：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_placeul" style="margin-left:80px;">
-							<li class="select_box" id="placeul_box">
-								<span id="placeul_span">场景</span>
-								<ul class="son_ul" id="placeul_son_ul" style="left:-25px;"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="place" id="place" value="">
-					</div>
-					
-					<div id="btn-class" class="form-actions1" style="margin-top:10px;">
-						<div id="create-btn-save">保存</div>
-					    <div id="create-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-<!-- PAGE CONTENT ENDS HERE --/>
-</div><!--/row-->
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">	
+<title>新建热点详情</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmacForDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmac.js"></script>
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/back/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">新建热点详情</li>
+				</ul>  
+ 			</div>
+	 		<form id="apmacListForm" action="${ctx}/back/main/ap/apmac/save" method="post">
+				<div class="input-group" id="operatorListUl_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>请选择媒体：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_operatorUl" class="mainUl">
+						<li class="select_box" id="operatorListUl_box">
+						   	<span id="operatorListUl_span">全部媒体</span>
+						    <ul class="son_ul" id="son_operatorListUl"></ul>
+						 </li>
+					</ul>
+					<input type="hidden" name="operatorId" id="selectedOperatorId" value=""/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>热点名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>SSID：</label>
+					<input class="input-text" tabindex="2" id="SSID" name="SSID" type="text" value="" verify="text/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="cnUl_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>省：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_cnul" class="mainUl">
+						<li class="select_box" id="cnul_box">
+						   	<span id="cnul_span">省</span>
+						    <ul class="son_ul" id="cn_son_ul"></ul>
+						 </li>
+					</ul>
+					<input type="hidden" name="cn" id="cn" value=""/>
+				</div>
+				<div class="input-group" id="cnCityUl_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>市：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_cnCityul" class="mainUl">
+						<li class="select_box" id="cnCityul_box">
+						   	<span id="cnCityul_span">市</span>
+						    <ul class="son_ul" id="cnCityul_son_ul"></ul>
+						 </li>
+					</ul>
+					<input type="hidden" name="cnCity" id="cnCity" value=""/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>详细地址：</label>
+					<input class="input-text" tabindex="3" id="address" name="address" type="text" value="" verify="unspecial/1000/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>经度：</label>
+					<input class="input-text" tabindex="4" id="tel" name="longitude" type="longitude" value="" verify="longitude/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>纬度：</label>
+					<input class="input-text" tabindex="5" id="latitude" name="latitude" type="text" value="" verify="latitude/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>apmac：</label>
+					<input class="input-text" tabindex="6" id="apmac" name="apmac" type="text" value="" verify="mac/17/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="placeul_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>场景：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_placeul" class="mainUl">
+						<li class="select_box" id="placeul_box">
+						   	<span id="placeul_span">场景</span>
+						    <ul class="son_ul" id="placeul_son_ul"></ul>
+						 </li>
+					</ul>
+					<input type="hidden" name="place" id="place" value=""/>
+				</div>
+				<div id="footBtn">
+					<button id="btn-apmac-save" class="btn-save" type="submit">保存</button>
+					<button id="btn-apmac-cancel" class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ap/apmac/edit.ftl

@@ -1,194 +1,92 @@
-<@override name="head">
-	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac-back.js"></script>
-
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#wifiForm").autovalidate();
-			//保存按钮
-			$("#edit-btn-save").unbind('click').click(function(){
-				//if (!$("#wifiForm").validate()) {
-				//	return false;
-				//}
-				if($("#cn").val() == ""){
-					$("#main_cnul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("请选择省份");
-					return false;
-				}
-				if($("#cnCity").val() == ""){
-					$("#main_cnCityul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份对应的城市");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("请选择省份对应的城市");
-					return false;
-				}
-				if($("#place").val() == ""){
-					$("#main_placeul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择场景");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("请选择场景");
-					return false;
-				}
-				$("#wifiForm").submit();
-			});
-				
-			//取消按钮
-			$("#edit-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/ap/apmac/list";
-			});
-				
-			$("#cnul_box").mouseleave(function(){
-		 		if($("#cn").val() == ""){
-					$("#main_cnul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("请选择省份");
-				}else{
-					$("#main_cnul").css("box-shadow","none").attr("title","");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		 	$("#cnCityul_box").mouseleave(function(){
-		 		if($("#cnCity").val() == ""){
-					$("#main_cnCityul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份对应的城市");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("请选择省份对应的城市");
-				}else{
-					$("#main_cnCityul").css("box-shadow","none").attr("title","");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		 	$("#placeul_box").mouseleave(function(){
-		 		if($("#place").val() == ""){
-					$("#main_placeul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择场景");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("请选择场景");
-				}else{
-					$("#main_placeul").css("box-shadow","none").attr("title","");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		});
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">编辑热点详情</li>
-			</ul>  
-		</div>
-		<div id="content">	
-			<div id="editForm">
-				<form id="wifiForm" action="${ctx}/back/main/ap/apmac/save" method="post" class="form-horizontal" >
-					<input autocomplete="off"  type="hidden" name="id" value="${wifi.id}"/>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">&nbsp;</span>当前身份为：</label>
-						
-							<span style="margin-left:100px;" id="operatorListUl_span">${operatorName!}</span>
-						
-						<label style="width:100px;float:left;margin: -35px 0 0 200px;" class="control-label1" for="form-field-4"><span class="lbl1"></span>AP mac：</label>
-						
-							<span style="margin-left:120px;" id="operatorListUl_span">${wifi.apmac!}</span>
-						
-						<input type="hidden" name="operatorId" id="selectedOperatorId" value="${wifi.operatorId!}">
-						<input type="hidden" name="apmac" id="apmac" value="${wifi.apmac!}">
-					</div>
-					
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>热点名称：</label>
-						<input tabindex="1" class="input-text" autocomplete="off" id="name" name="name" type="text" value="${wifi.name!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>SSID：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="SSID" name="SSID" type="text" value="${wifi.SSID!}" verify="text/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="cnul_selectdiv">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>省：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_cnul" style="margin-left:80px;">
-							<li class="select_box" id="cnul_box">
-								<span id="cnul_span">${wifi.cn!}</span>
-								<ul class="son_ul" id="cn_son_ul" style="left:-25px;margin-left:25px;"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="cn" id="cn" value="${wifi.cn!}">
-					</div>
-					
-					<div class="control-group" id="cnCityul_selectdiv" style="margin-top:-10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>市：</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
-						<ul id="main_cnCityul" style="margin-left:80px;">
-							<li class="select_box" id="cnCityul_box">
-								<span id="cnCityul_span">${wifi.cnCity!}</span>
-								<ul class="son_ul" id="cnCityul_son_ul" style="left:-25px;margin-left:25px;"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="cnCity" id="cnCity" value="${wifi.cnCity!}">
-					</div>
-					
-					<div class="control-group" style="margin-top:-10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>详细地址：</label>
-						<input tabindex="5" class="input-text" autocomplete="off" id="address" name="address" type="text" value="${wifi.address!}" verify="unspecial/1000/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>经度：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="longitude" name="longitude" type="text" value="${wifi.longitude!}" verify="longitude/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>纬度：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="latitude" name="latitude" type="text" value="${wifi.latitude!}" verify="latitude/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>apmac：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="apmac" name="apmac" type="text" value="${wifi.apmac!}" verify="mac/17/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="placeul_selectdiv">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>场景：</label>
-						<span class="spanVaildate" style="margin-left:250px;margin-left:25px;"></span>
-						<ul id="main_placeul" style="margin-left:80px;">
-							<li class="select_box" id="placeul_box">
-								<span id="placeul_span">${wifi.place!}</span>
-								<ul class="son_ul" id="placeul_son_ul" style="left:-25px;margin-left:25px;"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="place" id="place" value="${wifi.place!}">
-					</div>
-					
-					<div id="btn-class" class="form-actions1" style="margin-top:10px;">
-						<div id="edit-btn-save">保存</div>
-					    <div id="edit-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-<!-- PAGE CONTENT ENDS HERE --/>
-</div><!--/row-->
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">	
+<title>编辑热点详情</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmacForDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmac.js"></script>
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/back/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">编辑热点详情</li>
+				</ul>  
+ 			</div>
+	 		<form id="apmacListForm" action="${ctx}/back/main/ap/apmac/save" method="post">
+	 			<input type="hidden" id="wifiId" name="id" value="${wifi.id!}"/>
+	 			<input type="hidden" name="operatorId" id="selectedOperatorId" value="${wifi.operatorId!}"/>
+				<input type="hidden" name="apmac" id="apmac" value="${wifi.apmac!}"/>
+				<div class="input-group">
+					<label class="input-label-apmac">当前身份为：${operatorName!}</label>
+					<label class="input-label-apmac">AP mac：${wifi.apmac!}</label>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>热点名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="${wifi.name!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>SSID：</label>
+					<input class="input-text" tabindex="2" id="SSID" name="SSID" type="text" value="${wifi.SSID!}" verify="text/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="cnUl_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>省：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_cnul" class="mainUl">
+						<li class="select_box" id="cnul_box">
+						   	<span id="cnul_span">${wifi.cn!}</span>
+						    <ul class="son_ul" id="cn_son_ul"></ul>
+						 </li>
+					</ul>
+					<input type="hidden" name="cn" id="cn" value="${wifi.cn!}"/>
+				</div>
+				<div class="input-group" id="cnCityUl_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>市：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_cnCityul" class="mainUl">
+						<li class="select_box" id="cnCityul_box">
+						   	<span id="cnCityul_span">${wifi.cnCity!}</span>
+						    <ul class="son_ul" id="cnCityul_son_ul"></ul>
+						 </li>
+					</ul>
+					<input type="hidden" name="cnCity" id="cnCity" value="${wifi.cnCity!}"/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>详细地址：</label>
+					<input class="input-text" tabindex="3" id="address" name="address" type="text" value="${wifi.address!}" verify="unspecial/1000/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>经度：</label>
+					<input class="input-text" tabindex="4" id="tel" name="longitude" type="longitude" value="${wifi.longitude!}" verify="longitude/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>纬度：</label>
+					<input class="input-text" tabindex="5" id="latitude" name="latitude" type="text" value="${wifi.latitude!}" verify="latitude/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="placeul_selectdiv">
+					<label class="input-label"><span class="lbl-yes">*</span>场景：</label>
+					<span class="spanVaildate_ul"></span>
+					<ul id="main_placeul" class="mainUl">
+						<li class="select_box" id="placeul_box">
+						   	<span id="placeul_span">${wifi.place!}</span>
+						    <ul class="son_ul" id="placeul_son_ul"></ul>
+						 </li>
+					</ul>
+					<input type="hidden" name="place" id="place" value="${wifi.place!}"/>
+				</div>
+				<div id="footBtn">
+					<button id="btn-apmac-save" class="btn-save" type="submit">保存</button>
+					<button id="btn-apmac-cancel" class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ap/apmac/list.ftl

@@ -1,263 +1,148 @@
-<@override name="head">
-	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac-back.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			$("#diagramHead span:first-child").css("border-bottom","1px solid #ffffff");
-			$("#diagramHead span:first-child").click(function(){
-				$("#diagramHead span:first-child").css("border-bottom","1px solid #ffffff");
-				$("#diagramHead span:last-child").css("border-bottom","1px solid #d5dee8");
-				location.href = "${ctx}/back/main/ap/apmac/list";
-			});
-			
-			$("#diagramHead span:last-child").click(function(){
-				$("#diagramHead span:first-child").css("border-bottom","1px solid #d5dee8");
-				$("#diagramHead span:last-child").css("border-bottom","1px solid #ffffff");
-				location.href = "${ctx}/back/main/ap/apmac/relationship";
-			});
-			
-			//新建热点详情
-			$("#btn-create").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/ap/apmac/create";
-			});
-			
-			//编辑
-			$("#btn-edit").live("click", function() {
-				var wifiId = parseInt($(this).attr("value"));
-				location.href = "${ctx}/back/main/ap/apmac/edit?id="+wifiId;
-			});
-			
-			//复选框按钮
-			$('.tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-
-			//批量开启,批量暂停,批量删除
-			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				var checkboxs = $(".tablefig tbody input[type='checkbox']:checked");
-				var _param = checkboxs.serialize();
-				var url = "";
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/back/main/ap/apmac/enable";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/back/main/ap/apmac/disable";
-				}else if($(this).attr("id") == "all-btn-delete"){
-					url = "${ctx}/back/main/ap/apmac/delete";
-				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							$.post(url, _param, function(data) {
-								$('#wifiForm').submit();
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的数据！");
-				}
-			});
-			
-			//开启,暂停
-			$('#btn-enable,#btn-disable').live('click' ,function(){
-				var url = "";
-				var wifiId = parseInt($(this).attr("value"));
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/back/main/ap/apmac/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/back/main/ap/apmac/disable";
-				}
-				$.post(url, {id:wifiId}, function(data) {
-					$('#wifiForm').submit();
-				});
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				//alert(_page);
-				var _form = $('#wifiForm');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-		//搜索输入框的样式改变
-		$("#searchValue").focus(function(){
-			$(this).val("");
-		});
-		$("#searchValue").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入mac地址进行搜索");
-			}
-		});
-		});
-		
-		//导出execl
-		function exportExcel(){
-			var param = "?cn="+$("#cn").val()+"&cnCity="+$("#cnCity").val()+"&place="+$("#place").val()+"&placeId="+$("#placeId").val()+"&searchValue="+$("#searchValue").val();
-			$("#exportExcel").attr("href","${ctx}/back/main/ap/apmac/exportApListExcel"+param);
-		};
-		
-		
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-    <#include "/back/main/ap/ap_head.ftl">
-		<div id="handler" style="margin-left: 3px;">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2" style=" margin: 0 0 0 10px;">热点管理</li>
-			</ul>  
-		</div>
-		<div id="content" style="margin: -36px 17px;">
-			
-			<div id="hotDetails">
-				<form id="wifiForm" action="${ctx}/back/main/ap/apmac/list" method="post">
-				  	<div id="buttons">
-				  		<div id="btn-create" class="btn1">新建热点详情</div>      
-				        <div id="all-btn-enable" class="btn1">批量开启</div>  
-				        <div id="all-btn-disable" class="btn1">批量暂停</div> 
-				        <div id="all-btn-delete" class="btn1">批量删除</div>
-				        <div id="serachData">
-				        	<input type="hidden" id="page" name="page" value="${pager.page}">
-							<input id="searchValue" type="text" name="searchValue" value="${searchValue!}"/>
-							<input id="serachData_img" type="submit" value="" />
-						</div>
-				    </div>
-				    <div id="selectuls">
-						<ul id="main_cnul">
-							<li class="select_box" id="cnul_box">
-								<span id="cnul_span">${cn!}</span>
-								<ul class="son_ul" id="cn_son_ul"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="cn" id="cn" value="${cn!}">
-						<ul id="main_cnCityul">
-							<li class="select_box" id="cnCityul_box">
-								<span id="cnCityul_span">${cnCity!}</span>
-								<ul class="son_ul" id="cnCityul_son_ul"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="cnCity" id="cnCity" value="${cnCity!}">
-					
-						<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box">
-							<span id="operatorListUl_span">${operatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
-						</li>
-						</ul>
-						
-						<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-						<ul id="main_placeul">
-							<li class="select_box" id="placeul_box">
-								<span id="placeul_span">${place!}</span>
-								<ul class="son_ul" id="placeul_son_ul"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="place" id="place" value="${place!}">
-						
-						<ul id="main_placeIdul">
-							<li class="select_box" id="placeIdul_box">
-								<span id="placeIdul_span">${placeName!}</span>
-								<ul class="son_ul" id="placeIdul_son_ul"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="placeClassId" id="placeId" value="${placeClassId!}">
-						<input type="hidden" name="placeClassName" id="placeName" value="${placeClassName!}">
-				  		<input id="sign" type="submit" value="查询">
-				  	</div>
-					<div id="account-table">
-						<table border="1" class="tablefig">
-							<thead>
-								<tr>
-									<th width="3%">
-										<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-									</th>
-									<th class="td1" style="width:3%">ID</th>
-				                    <th class="td1" style="width:5%">热点名称</th>
-				                    <th class="td1" style="width:7%">SSID</th>
-				                    <th class="td1" style="width:5%">省</th>
-				                    <th class="td1" style="width:5%">市</th>
-				                    <th class="td1" style="width:9%">详细地址</th>
-				                    <th class="td1" style="width:5%">经度</th>
-				                    <th class="td1" style="width:5%">纬度</th>
-				                    <th class="td1" style="width:8%">apmac</th>
-				                    <th class="td1" style="width:7%">场景</th>
-				                    <th class="td1" style="width:7%">数聚场景</th>
-				                    <th class="td1" style="width:10%">最后更新时间</th>
-				                    <th class="td1" style="width:5%">状态</th>
-				                    <th class="td1" style="width:10%">操作</th>
-								</tr>
-							</thead>
-							<tbody>
-							<#if wifiList ??>
-							<#list wifiList as wifi>
-								<tr class="">
-									<td class="center">
-										<label><input  autocomplete="off" type="checkbox" name="id" value="#{wifi.id!}"><span class="lbl"></span></label>
-									</td>
-									<td class="td2">${wifi.id!}</td> 
-					                <td class="td2">${wifi.name!}</td> 
-					                <td class="td2">${wifi.SSID!}</td>
-					                <td class="td2">${wifi.cn!}</td>
-					                <td class="td2">${wifi.cnCity!}</td>
-					                <td class="td2">${wifi.address!}</td>
-					                <td class="td2">${wifi.longitude!}</td>
-					                <td class="td2">${wifi.latitude!}</td>
-					                <td class="td2">${wifi.apmac!}</td>  
-					                <td class="td2">${wifi.place!}</td>
-					                <td class="td2">${wifi.placeName!}</td>
-					                <td class="td2"><a href="${ctx}/back/main/ap/apmac/update?id=${wifi.id!}">${wifi.updated!?datetime}</a></td>
-					                <td class="td2"><#if wifi.status==1>暂停<#else>开启</#if></td>
-									<td>
-										<div id="btndiv">
-											<div id="btn-edit" class="btn11" value="${wifi.id!}">编辑</div>
-											<#if wifi.status==0>
-											<div id="btn-disable" class="btn11" value="${wifi.id!}">暂停</div>
-											<#elseif wifi.status==1>
-											<div id="btn-enable" class="btn11" value="${wifi.id!}">开启</div>
-											</#if>
-										</div>
-									</td>
-								</tr>
-							</#list>
-							</#if>
-						</tbody>
-						</table>
-						
-						<div id="daochu" >
-							<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-						</div>
-									
-						<div id="pageDiv">
-			               	<#include "/common/pagination/simple.ftl"/>
-			            </div>	
-		            </div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>热点管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmacForDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmac.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="content">
+			<div id="selectBar_apmac" class="selectBar">
+				<a class="selectBar_change" href="${ctx}/back/main/ap/apmac/list">热点管理</a>
+				<a href="${ctx}/back/main/ap/place/unclassfiedPlaceName">新增数聚场景</a>
+				<a href="${ctx}/back/main/ap/place/place-sort">用户场景定义</a>
+				<a href="${ctx}/back/main/ap/apmac/relationship">场景对应关系</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">热点管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/ap/apmac/list" method="post">
+ 				<div id="navButtons">
+					<div id="button">		
+						<a href="${ctx}/back/main/ap/apmac/create" class="btn2">新建热点详情</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量暂停</a>
+						<a class="btn2" id="all-btn-delete">批量删除</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<div id="content_chooseOther">
+					<ul id="main_cnul">
+						<li class="select_box" id="cnul_box">
+							<span id="cnul_span">${cn!}</span>
+							<ul class="son_ul" id="cn_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="cn" id="cn" value="${cn!}"/>
+					<ul id="main_cnCityul">
+						<li class="select_box" id="cnCityul_box">
+							<span id="cnCityul_span">${cnCity!}</span>
+							<ul class="son_ul" id="cnCityul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="cnCity" id="cnCity" value="${cnCity!}"/>
+					<ul id="main_operatorUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${operatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}"/>
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}"/>
+					<ul id="main_placeul">
+						<li class="select_box" id="placeul_box">
+							<span id="placeul_span">${place!}</span>
+							<ul class="son_ul" id="placeul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="place" id="place" value="${place!}"/>
+					<ul id="main_placeIdul">
+						<li class="select_box" id="placeIdul_box">
+							<span id="placeIdul_span">${placeName!}</span>
+							<ul class="son_ul" id="placeIdul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="placeId" id="placeId" value="${placeId!}"/>
+					<input type="hidden" name="placeName" id="placeName" value="${placeName!}"/>
+				  	<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<table border="1" class="tableFig">
+				    <thead>
+				    	<tr class="theadTr">
+					    	<th class="theadTh" style="width:3%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:3%;">ID</th>
+							<th class="theadTh" style="width:7%;">热点名称</th>
+							<th class="theadTh" style="width:5%;">SSID</th>
+							<th class="theadTh" style="width:3%;">省</th>
+							<th class="theadTh" style="width:3%;">市</th>
+							<th class="theadTh" style="width:10%;">详细地址</th>
+							<th class="theadTh" style="width:3%;">经度</th>
+							<th class="theadTh" style="width:3%;">纬度</th>
+							<th class="theadTh" style="width:8%;">apmac</th>
+							<th class="theadTh" style="width:7%;">场景</th>
+							<th class="theadTh" style="width:7%;">数聚场景</th>
+							<th class="theadTh" style="width:7%;">数聚子场景</th>
+							<th class="theadTh" style="width:10%">最后更新时间</th>
+							<th class="theadTh" style="width:5%;">状态</th>
+							<th class="theadTh" style="width:14%;">操作</th>
+				    	</tr>
+					</thead>
+					<tbody>
+						<#if wifiList ??>
+						<#list wifiList as wifi>
+						<tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${wifi.id!}"></div></td>
+							<td class="tbodyTd">${wifi.id!}</td>
+							<td class="tbodyTd">${wifi.name!}</td>
+							<td class="tbodyTd">${wifi.SSID!}</td>
+							<td class="tbodyTd">${wifi.cn!}</td>
+							<td class="tbodyTd">${wifi.cnCity!}</td>
+							<td class="tbodyTd">${wifi.address!}</td>
+							<td class="tbodyTd">${wifi.longitude!}</td>
+							<td class="tbodyTd">${wifi.latitude!}</td>
+							<td class="tbodyTd">${wifi.apmac!}</td>
+							<td class="tbodyTd">${wifi.place!}</td>
+							<td class="tbodyTd">${wifi.placeClassName!}</td>
+							<td class="tbodyTd">${wifi.placeName!}</td>
+							<td class="tbodyTd"><a href="${ctx}/back/main/ap/apmac/update?id=${wifi.id!}" class="tableTdStyle">${wifi.updated!?datetime}</a></td>
+							<td class="tbodyTd"><#if wifi.status==1>暂停<#else>开启</#if></td>
+							<td class="tbodyTd">
+								<div id="listButtons">
+									<a href="${ctx}/back/main/ap/apmac/edit?id=${wifi.id!}" class="btn3">编辑</a>
+									<#if wifi.status==0>
+									<a id="btn-disable" value="${wifi.id!}" class="btn3">暂停</a>
+									<#elseif wifi.status==1>
+									<a id="btn-enable" value="${wifi.id!}" class="btn3">开启</a>
+									</#if>
+								</div>
+							</td>
+						</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_list()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+	 		</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ap/apmac/relationship.ftl

@@ -1,120 +1,64 @@
-<@override name="head">
-	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			$("#diagramHead span:last-child").css("border-bottom","1px solid #ffffff");
-			$("#diagramHead span:first-child").click(function(){
-				$("#diagramHead span:first-child").css("border-bottom","1px solid #ffffff");
-				$("#diagramHead span:last-child").css("border-bottom","1px solid #d5dee8");
-				location.href = "${ctx}/back/main/ap/apmac/list";
-			});
-			
-			$("#diagramHead span:last-child").click(function(){
-				$("#diagramHead span:first-child").css("border-bottom","1px solid #d5dee8");
-				$("#diagramHead span:last-child").css("border-bottom","1px solid #ffffff");
-				location.href = "${ctx}/back/main/ap/apmac/relationship";
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#wifiForm');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			//搜索输入框的样式改变
-		$("#operatorName").focus(function(){
-			$(this).val("");
-		});
-		$("#operatorName").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入媒体名进行搜索");
-			}
-		});
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/back/main/ap/apmac/exportRelationshipExcel?searchValue="+$("#searchValue").val());
-		};
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-    <#include "/back/main/ap/ap_head.ftl">
-		<div id="handler" style="margin-left: 15px;">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2" style="margin-top:0px !important;"><a  href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
-				<span class="divider2" style="margin:0 0 0 10px;"><i class="icon-angle-right"></i></span>
-				<li class="size3">场景对应关系</li>
-			</ul>  
-		</div>
-		<div id="content">
-			
-			<div id="relationship">
-				<form id="wifiForm" action="${ctx}/back/main/ap/apmac/relationship" method="post">
-				  	<div id="buttons">
-				        <div id="serachData">
-				        	<input type="hidden" id="page" name="page" value="${pager.page}">
-							<input id="operatorName" type="text" style="margin: -48px 20px 0 -619px;" name="operatorName" value="${operatorName!}"/>
-							<input id="serachData_img" style=" margin: -53px 20px -99px -320px;" type="submit" value="" />
-						</div>
-				    </div>
-					<div id="account-table" style="margin-top:0px;">
-						<table border="1" id="tablefig" style="width:50%;margin-left:1px;">
-							<thead>
-								<tr>
-									<th class="td1" style="width:5% ; height:40px;">媒体</th>
-									<th class="td1" style="width:5%">场景</th>
-				                    <th class="td1" style="width:5%">数聚场景</th>
-								</tr>
-							</thead>
-							<tbody>
-							<#if placeOperatorList ??>
-				            <#list placeOperatorList as placeOperator>
-				            	<tr id="tr22">
-				            		<td class="td2" style="height:35px;" >${placeOperator.operatorName!}</td> 
-					                <td class="td2" style="height:35px;">${placeOperator.name!}</td> 
-					                <td class="td2" style="height:35px;">${placeOperator.placeName!}</td> 
-					            </tr>
-					        </#list>  
-				            </#if>
-							</tbody>
-						</table>
-						
-						<div id="daochu" >
-							<a class="ljbtn2" style=" margin-top: 10px;" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-						</div>
-									
-						<div id="pageDiv">
-			               	<#include "/common/pagination/simple.ftl"/>
-			            </div>	
-		            </div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>场景对应关系</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmac.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="content">
+			<div id="selectBar_apmac" class="selectBar">
+				<a class="selectBar_change" href="${ctx}/back/main/ap/apmac/list">热点管理</a>
+				<a href="${ctx}/back/main/ap/place/create">新增数聚场景</a>
+				<a href="${ctx}/back/main/ap/place/place-sort">用户场景定义</a>
+				<a href="${ctx}/back/main/ap/apmac/relationship">场景对应关系</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">场景对应关系</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/ap/apmac/relationship" method="post">
+				<div id="navButtons">
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableApmac">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:20%;">媒体</th>
+							<th class="theadTh" style="width:20%;">场景</th>
+							<th class="theadTh" style="width:20%;">数聚场景</th>
+						</tr>
+					</thead>
+					<tbody>
+						<#if placeOperatorList ??>
+				        <#list placeOperatorList as placeOperator>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd">${placeOperator.operatorName!}</td>
+							<td class="tbodyTd">${placeOperator.name!}</td>
+							<td class="tbodyTd">${placeOperator.placeName!}</td>
+					    </tr>
+					    </#list>  
+				       	</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_relationship()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ap/apmac/update.ftl

@@ -1,90 +1,58 @@
-<@override name="head">
-	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#wifiForm');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/back/main/ap/apmac/exportLogExcel?id=${id!}");
-		};
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
-				<span class="divider2" style="margin:0 0 0 10px;"><i class="icon-angle-right"></i></span>
-				<li class="size3">热点详情信息修改记录</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<div id="hotDetails">
-				<form id="wifiForm" action="${ctx}/back/main/ap/apmac/update?id=${id!}" method="post">
-					<input  id="page" type="hidden" name="page" value="${pager.page}"> 
-					<div id="account-table" style="margin-top:-20px;">
-						<table border="1" class="tablefig" id="tablefig">
-							<thead>
-								<tr>
-									<th class="th1" style="width:15%;">变更时间</th>
-						   	   	 	<th class="th1" style="width:10%;">操作人</th>
-						   	   	 	<th class="th1" style="width:15%;">登录IP</th>
-						   	   	 	<th class="th1" style="width:10%;">操作类型</th>
-						   	   	 	<th class="th1" style="width:30%;">变更详情</th>
-								</tr>
-							</thead>
-							<tbody>
-							<#if logList ??>
-							<#list logList as log>
-								<tr class="">
-									<td class="td2">${log.operTime?datetime!}</td> 
-					                <td class="td2">${log.accountName!}</td> 
-					                <td class="td2">${log.userIp!}</td>
-					                <td class="td2">${log.actionType!}</td>
-					                <td class="td2">${log.action!}</td>
-								</tr>
-							</#list>
-							</#if>
-						</tbody>
-						</table>
-						
-						<div id="daochu" >
-							<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-						</div>
-									
-						<div id="pageDiv">
-			               	<#include "/common/pagination/simple.ftl"/>
-			            </div>	
-		            </div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>热点详情信息修改记录</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+</@override> 
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">热点详情信息修改记录</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/ap/apmac/update?id=${id!}" method="post">
+ 				<input  id="page" type="hidden" name="page" value="${pager.page}"/>
+				<table border="1" class="tableFig tableUpdate">
+					<thead>
+						<tr class="theadTr">
+			                <th class="theadTh" style="width:15%;">变更时间</th>
+			                <th class="theadTh" style="width:10%;">操作人</th>
+			                <th class="theadTh" style="width:15%;">登录IP</th>
+			                <th class="theadTh" style="width:10%;">操作类型</th>
+			                <th class="theadTh" style="width:30%;">变更详情</th>
+			            </tr> 
+					</thead>
+					<tbody>
+						<#if logList ??>
+						<#list logList as log>
+							<tr id="tbodyTr">
+								<td class="tbodyTd">${log.operTime?datetime!}</td>
+								<td class="tbodyTd">${log.accountName!}</td>
+								<td class="tbodyTd">${log.userIp!}</td>
+								<td class="tbodyTd">${log.actionType!}</td>
+								<td class="tbodyTd">${log.action!}</td>
+							</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="${ctx}/back/main/ap/apmac/exportLogExcel?id=${id!}">导出Excel</a>
+					<a class="btn-back" href="${ctx}/back/main/ap/apmac/list">返回</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ap/place/create.ftl

@@ -1,142 +0,0 @@
-<@override name="head">
-	<title>新增数聚场景</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-</@override>
-
-<@override name="body">
-<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-    	<#include "/back/main/ap/ap_head.ftl">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/operator/main/ap/apmac/list">热点详情</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">新增数聚场景</li>
-			</ul>  
-		</div>
-		
-		<div id="content">
-			
-			<div id="placeclassify">		
-				<div id="place_fronttitle" style="width:97.4%;padding-left:20px;height:40px;line-height:40px;border:1px solid #d5dee8;color:#4c637b;">	
-				数据场景分类
-				</div>
-				<div id="place_bottom" style="width:99%;">	
-				     <div id="place_bottom_left" style="float:left;width:50%;height:600px;border-left:1px solid #d5dee8;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
-					     	<div id="place_bottom_leftsubmit" style="float:left;width:50%;border:none;">	
-						     	<input type="text" id="newplace_submit_text" style="width:170px;height:20px;margin:20px 0px 0px 20px;border:1px solid #d5dee8;">
-						     	<button type="submit" id="newplace_submit" style="width:50px;height:30px;margin:20px 0px 0px 5px;border-radius:5px;color:#ffffff;border:1px solid #d5dee8;background-color:#36aeea;">提交</button>
-							</div>
-							
-							<div id="place_bottom_leftsearch" style="float:right;width:50%;border:none;">	
-						     	<input type="text" id="newplace_search_text" onkeydown="if(event.keyCode==13){return false;}" style="width:170px;height:20px;margin:20px 0px 0px 20px;border:1px solid #d5dee8;">
-						     	<button type="submit" id="newplace_search" style="width:50px;height:30px;margin:20px 0px 0px 5px;border-radius:5px;color:#ffffff;border:1px solid #d5dee8;background-color:#36aeea;">搜索</button>
-							</div>
-							
-							<div id="place_datalist" style="margin-top:75px;">	
-						     	<#if placeList ??>
-								<#list placeList as place>
-								<li id="${place.id!}" class="place_name" style="margin-top:20px;margin-left:20px;font-weight:bold;cursor:pointer;font-size:20px;color:#4c637b;">${place.name!}</li>
-								</#list>
-								</#if>
-							</div>
-							
-							<input id="page" type="hidden" name="page" value="${pager.page!}"/>
-							<div id="pageDiv" style="margin: -10px 38px 0 0;">
-				               	<#include "/common/pagination/simple.ftl"/>
-				            </div>
-					 
-					 </div>
-					 
-					<div id="place_bottom_right" style="float:right;width:49.7%;height:600px;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
-						   <div style="font-size:20px;color:#4c637b;padding-left:20px;padding-top:20px;">当前数聚场景名称：</div>
-						   <div class="current_placename" style="width:100%;height:40px;"> 
-						   </div>
-						   <br>
-						   <div style="font-size:20px;color:#4c637b;padding-left:20px;">当前用户场景名称：</div>
-						   <div class="current_definename" style="width:100%;"> 
-						   </div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-<!-- PAGE CONTENT ENDS HERE --/>
-</div><!--/row-->
-<script type="text/javascript" >
-//点击叉号
-	function cross(a){
-			var c = a.id;
-			var url = "${ctx}/back/main/ap/place/delete-place?id="+c;
-			$.getJSON(url);
-			var h = $(".current_placename li").attr("id");
-			var url_current_placename = "${ctx}/back/main/ap/place/get-place?placeId="+h;
-			$(".current_definename").empty();
-			$.getJSON(url_current_placename, function(data) {
-					var data_1 = data;
-					$.each( data_1, function( key, val ) {
-		 				$(".current_definename").append('<li style="padding-left:20px;font-size:20px;font-weight:bold;color:#4c637b;margin-top:20px;" id='+val.id+'>'+val.name+'<image class="cross_delete" onclick="cross(this)" src="${ctx}/assets/images/cross.png" style="cursor:pointer;"  id='+val.id+'></li>');
-		 			});
-			})		
-	}
-$(function(){
-//点击左边场景，显示在右边js
-	$(".place_name").click(function(){
-		var a=$(this).html();
-		var b=$(this).attr("id");
-		$(".current_placename").empty();
-		$(".current_definename").empty();
-		$(".current_placename").append('<br><li style="padding-left:20px;font-size:20px;font-weight:bold;color:#4c637b;" id='+b+'>'+a+'</li>');
-		var url = "${ctx}/back/main/ap/place/get-place?placeId="+b;
-		$.getJSON(url, function(data) {
-				var data_1 = data;
-				$.each( data_1, function( key, val ) {
-	 				$(".current_definename").append('<li style="padding-left:20px;font-size:20px;font-weight:bold;color:#4c637b;margin-top:20px;" id='+val.id+'>'+val.name+'<image class="cross_delete" onclick="cross(this)" src="${ctx}/assets/images/cross.png" style="cursor:pointer;"  id='+val.id+'></li>');
-	 			});
-		})	
-	});
-//点击提交按钮
-	$("#newplace_submit").click(function(){	
-		var text = $("#newplace_submit_text").val();
-		var url_2 = "${ctx}/back/main/ap/place/add?placeName="+text;
-		location.href=url_2;
-	})
-//点击搜索按钮
-	$("#newplace_search").click(function(){	
-		var text = $("#newplace_search_text").val();
-		var url_3 = "${ctx}/back/main/ap/place/create?placeName="+text;
-		location.href=url_3;
-	})	
-//按enter实现搜索
-$("#newplace_search_text").keydown(function(e){
-	    if(!e){
-	        e=window.event;
-	        }
-	        if((e.keyCode||e.which)===13){
-	          $('#newplace_search').trigger("click");
-	    }
-});	
-//控制页码
-    $('#pageDiv .pagination ul li a[href]').click(function(){
-		var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-		console.log(_page);
-		var url_4 = "${ctx}/back/main/ap/place/create?page="+_page;
-		location.href=url_4;
-	});
-})
-
-</script>
-</@override>
-<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ap/place/place-sort.ftl

@@ -1,157 +1,73 @@
-<@override name="head">
-	<title>用户场景定义</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac.js"></script>
-	
-</@override>
-
-<@override name="body">
-<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id="pagecontent">
-    <#include "/back/main/ap/ap_head.ftl">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3">用户场景定义</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<div id="user_classify">		
-				<div id="user_fronttitle" style="width:97.4%;padding-left:20px;height:40px;line-height:40px;font-weight:bold;border:1px solid #d5dee8;color:#4c637b;">	
-				用户场景分类
-				</div>
-				<div id="user_bottom" style="width:99%;">	
-				     <div id="user_bottom_left" style="float:left;width:50%;height:600px;border-left:1px solid #d5dee8;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
-					     	
-					     	<div id="user_bottom_lefttext" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
-						     	待分类媒体场景
-							</div>
-							
-							<div id="user_bottom_leftsearch" style="float:right;width:45%;border:none;">	
-						     	<input type="text"  id="userplace_search_text"  onkeydown="if(event.keyCode==13){return false;}" style="width:170px;height:20px;margin:20px 0px 0px 20px;border:1px solid #d5dee8;">
-						     	<button type="submit" id="userplace_search" style="width:50px;height:22px;font-size:14px;margin:20px 0px 0px 5px;border-radius:5px;color:#ffffff;border:1px solid #d5dee8;background-color:#36aeea;">搜索</button>
-							</div>
-							
-							<div id="user_datalist" style="margin-top:75px;">	
-						     	<#if placeOperatorList ??>
-								<#list placeOperatorList as placeoperator>
-								<li id="${placeoperator.id!}" class="placoperator_name" style="margin-top:6px;margin-left:20px; cursor:pointer;font-size:14px;color:#4c637b;">
-								<input type="checkbox" class="unclassify" id="${placeoperator.name!}&${placeoperator.id!}" style="float:left;">&nbsp;&nbsp;${placeoperator.name!}</li>
-								</#list>
-								</#if>
-							</div>
-							
-							<input id="page" type="hidden" name="page" value="${pager.page!}"/>
-							<div id="pageDiv" style="margin: -10px 38px 0 0;">
-				               	<#include "/common/pagination/simple.ftl"/>
-				            </div>
-					 
-					 </div>
-					 
-					<div id="user_bottom_right1" style="float:left;width:24.7%;height:600px;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
-						 <div id="user_bottom_right1text" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
-						        已选择媒体分类
-						 </div> 
-						 <div id="user_bottom_right1detail" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
-						        
-						 </div>  
-						 
-					</div>
-					<div id="user_bottom_right2" style="float:right;width:23.7%;height:600px;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
-						 <div id="user_bottom_right2text" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
-						        数聚媒体场景
-						 </div> 
-						  
-						 <div id="user_bottom_right2detail" style=" margin-top:15px;overflow:scroll;float:left;width:93%;height:400px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
-						 </div> 
-						 
-						 <button class="user_bottom_right2submit" style="width:100px;height:30px;border:none;background-color:#36aeea;color:#ffffff;margin-bottom:-1046px;margin-left:20px;border-radius:5px;">提交</button>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-<!-- PAGE CONTENT ENDS HERE --/>
-</div><!--/row-->
-<script type="text/javascript" >
-
-$(function(){
-//点击搜索按钮
-	$("#userplace_search").click(function(){	
-		var text = $("#userplace_search_text").val();
-		var url_3 = "${ctx}/back/main/ap/place/place-sort?place="+text;
-		location.href=url_3;
-	})	
-//按enter实现搜索
-$("#userplace_search_text").keydown(function(e){
-	    if(!e){
-	        e=window.event;
-	        }
-	        if((e.keyCode||e.which)===13){
-	          $('#userplace_search').trigger("click");
-	    }
-});	
-//控制页码
-    $('#pageDiv .pagination ul li a[href]').click(function(){
-		var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-		console.log(_page);
-		var url_4 = "${ctx}/back/main/ap/place/place-sort?page="+_page;
-		location.href=url_4;
-	});
-// 点击提交
-$(".user_bottom_right2submit").click(function(){
-	var checked_radio = $("#user_bottom_right2detail input");
-	for (i=0;i<checked_radio.length;++i){
-		if (checked_radio[i].checked){
-			var radio_id = checked_radio[i].id;
-		}
-	}
-	var checked_box = $("#user_datalist input");
-	var multiple_box = "";
-	for (i=0;i<checked_box.length;++i){
-		if (checked_box[i].checked){
-			var box_id = checked_box[i].id.split("&");
-			multiple_box = box_id[1]+"-"+multiple_box;
-		}
-	}
-	var url_sub = "${ctx}/back/main/ap/place/save?id="+multiple_box+"&placeId="+radio_id;
-	location.href = url_sub;
-})
-//获取数聚媒体场景
-		var url = "${ctx}/back/main/ap/place/placeName";
-		$.getJSON(url, function(data) {
-				var data_1 = data;
-				$.each( data_1, function( key, val ) {
-	 				$("#user_bottom_right2detail").append('<li style="font-size:14px; color:#4c637b;margin-top:20px;" id='+val.id+'><input name="media_place"  type="radio" style="float:left;" id='+val.id+'>&nbsp;&nbsp;'+val.name+'</li>');
-	 			});
-		})	
-//点击复选框在右边显示或隐藏未分类场景
-	$(".unclassify").click(function(){
-		var input_status = $(this).attr("checked");
-		//alert(input_status);
-		if(input_status=="checked"){
-			var n = $(this).attr("id").split("&");
-			$("#user_bottom_right1detail").append('<li style="padding-left:2px;margin-top:5px;font-size:14px; color:#4c637b;" id=checked'+n[1]+'>'+n[0]+'</li>');
-		}else{
-			var n = $(this).attr("id").split("&");
-			var id_checked = "#checked"+n[1];
-			$(id_checked).remove();
-		}
-	})
-})
-
-</script>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>用户场景定义</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apPlace.js"></script>
+</@override>
+<@override name="body">
+<!-- PAGE CONTENT BEGINS HERE -->
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+		<div id="content">
+			<div id="selectBar_apmac" class="selectBar">
+				<a href="${ctx}/back/main/ap/apmac/list">热点管理</a>
+				<a href="${ctx}/back/main/ap/place/unclassfiedPlaceName">新增数聚场景</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ap/place/place-sort">用户场景定义</a>
+				<a href="${ctx}/back/main/ap/apmac/relationship">场景对应关系</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">用户场景定义</li>
+				</ul>  
+ 			</div>
+		 	<div id="place_sort">
+		 		<form id="placeTopform" action="${ctx}/back/main/ap/place/place-sort" method="post">
+			 		<div class="place_left">
+						<label class="place_label">待分类媒体场景</label>
+						<div id="navButtons">
+							<div id="searchValueDiv">
+								<input type="hidden" id="page" name="page" value="${pager.page}"/>
+								<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+								<input id="serachData_img" type="submit" value=""/>
+							</div>
+						</div>
+						<div class="input-checkboxsDiv">
+							<#if placeOperatorList ??>
+							<#list placeOperatorList as placeoperator>
+							<div class="single_div">
+								<input class="single_div_checkbox" name="place" type="checkbox" value="${placeoperator.id!}"><span class="single_div_span">${placeoperator.name!}</span>
+							</div>
+							</#list>
+							</#if>
+						</div>
+						<div id="pageDiv-other">
+							<#include "/common/pagination/simple.ftl"/>
+						</div>
+					</div>
+				</from>
+				<div class="place_right">
+					<label class="place_label">子场景</label>
+					<div class="input-checkboxsDiv">
+						<#if placeOperatorList ??>
+						<#list placeOperatorList as placeoperator>
+						<div class="single_div">
+							<input class="single_div_checkbox" name="place" type="checkbox" value="${placeoperator.id!}"><span class="single_div_span">${placeoperator.name!}</span>
+						</div>
+						</#list>
+						</#if>
+					</div>
+					<div id="place_btnDiv">
+						<a id="btn-sort-submit" class="btn3" type="button">提交</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/ap/place/unclassfiedPlaceName.ftl

@@ -0,0 +1,92 @@
+<@override name="head">
+<title>新增数聚场景</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apPlace.js"></script>
+</@override>
+<@override name="body">
+<!-- PAGE CONTENT BEGINS HERE -->
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+		<div id="content">
+			<div id="selectBar_apmac" class="selectBar">
+				<a href="${ctx}/back/main/ap/apmac/list">热点管理</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ap/place/unclassfiedPlaceName">新增数聚场景</a>
+				<a href="${ctx}/back/main/ap/place/place-sort">用户场景定义</a>
+				<a href="${ctx}/back/main/ap/apmac/relationship">场景对应关系</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">新增数聚场景</li>
+				</ul>  
+ 			</div>
+ 			<div id="place_top">
+ 				<form id="placeTopform" action="${ctx}/back/main/ap/place/unclassfiedPlaceName" method="post">
+		 			<div class="place_left">
+						<label class="place_label">待分类子场景</label>
+						<div class="input-checkboxsDiv">
+							<#if placeList ??>
+							<#list placeList as place>
+							<div class="single_div">
+								<input class="single_div_checkbox" name="place" type="checkbox" value="${place.id!}"><span class="single_div_span">${place.name!}</span>
+							</div>
+							</#list>
+							</#if>
+						</div>
+					</div>
+					<div class="place_right">
+						<label class="place_label">数据场景</label>
+						<div class="input-radiosDiv">
+							<#if placeClassInformationList ??>
+							<#list placeClassInformationList as placeClass>
+							<div class="single_div">
+								<input class="single_div_radio" name="place" type="radio" value="${placeClass.id!}"><span class="single_div_span">${placeClass.name!}</span>
+							</div>
+							</#list>
+							</#if>
+						</div>
+						<div id="place_btnDiv">
+							<a id="btn-submit" class="btn3" type="button">提交</a>
+						</div>
+					</div>
+				</from>
+			</div>
+			<div id="place_bottom">
+	 			<div id="selectuls">
+					<ul id="main_placeClassIdul">
+						<li class="select_box" id="placeClassIdul_box">
+							<span id="placeClassIdul_span">请选择数据场景</span>
+							<ul class="son_ul" id="placeClassIdul_son_ul">
+								<li value='-1'>请选择数据场景</li>
+								<#if placeClassInformationList ??>
+								<#list placeClassInformationList as placeClass>
+									<li value="${placeClass.id!}">${placeClass.name!}</li>
+								</#list>
+								</#if>
+							</ul>
+						</li>
+					</ul>
+					<input type="hidden" name="placeClassId" id="placeClassId" value="${placeClassId!}"/>
+				</div>
+				<div class="input-checkboxsDiv">
+					<#if allplaceList ??>
+					<#list allplaceList as place>
+					<div class="single_div">
+						<input class="single_div_checkbox" name="place" type="checkbox" value="${place.id!}"><span class="single_div_span">${place.name!}</span>
+					</div>
+					</#list>
+					</#if>
+				</div>
+				<div id="place_btnDiv">
+					<a id="btn-delete" class="btn3" type="button">删除</a>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/banner-audit.ftl

@@ -1,58 +1,55 @@
-<table class="table">
-    <thead>
-        <tr>
-            <th class="center"><label><input type="checkbox"><span class="lbl"></span></label></th>
-            <th>ID</th>
-            <th>创意</th>
-            <th>创意名称</th>
-            <th>创意链接</th>
-            <th>尺寸</th>
-            <th>行业</th>
-            <th>广告主</th>
-            <th>状态</th>
-            <th>最后更新时间</th> 
-            <th>操作</th>
-        </tr>
-    </thead>
-    <tbody>
-		<#if auditBannerList ??>
-        <#list auditBannerList as auditBanner>
-        <tr class="">
-            <td class="center">
-				<label><input  autocomplete="off"   type="checkbox" name="id" value="${auditBanner.id}"><span class="lbl"></span></label>
-			</td>
-            <td >${auditBanner.id!}</td>
-            <td><img src="${auditBanner.bannerTemplate.pathSmall}"></td>
-            <td >${auditBanner.bannerTemplate.name!}</td>
-            <td>
-            	<a href='${auditBanner.visitAddress!}'>${auditBanner.visitAddress!}</a>
-            </td>
-            <td>${auditBanner.bannerTemplate.width!}x${auditBanner.bannerTemplate.height!}</td>
-            <td>${auditBanner.industryName!}</td>
-            <td>${auditBanner.advertiserName!}</td>
-            <td><#if auditBanner.checked == 0>未审核<#else>已审核</#if></td>
-            <td>${auditBanner.updated?datetime}</td>
-            <td>
-                <#if auditBanner.checked==1>
-            	<button class="labeled" href="#">审核通过</button>
-            	<#else>
-            	<button class="unlabeled" href="${ctx}/back/main/audit/audit-banner/enable?id=#{auditBanner.id!}">审核通过</button>
-            	</#if>
-            	<#if auditBanner.checked==2>
-                <button class="labeled" href="#">审核不通过</button>
-                <#else>
-                <button class="unlabeled" href="${ctx}/back/main/audit/audit-banner/disable?id=#{auditBanner.id!}">审核不通过</button>
-                </#if>
-            </td>
-        </tr>
-        </#list>
-		</#if>
-    </tbody>
-</table>
-
-<div id="footBar">
-	<button class='exportExcel' href="${ctx}/back/main/audit/audit-banner/auditBannerExcel">导出Excel</button>
-	<div id="paged1" style="float:right;margin:-35px -30px 0 0;">
-       <#include "/common/pagination/simple.ftl"/>
-    </div>
-</div>
+<table border="1" class="tableFig">
+	<thead>
+		<tr class="theadTr">
+			<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			<th class="theadTh" style="width:5%;">ID</th>
+			<th class="theadTh" style="width:10%;">创意</th>
+			<th class="theadTh" style="width:10%;">创意名称</th>
+			<th class="theadTh" style="width:12%;">创意链接</th>
+			<th class="theadTh" style="width:6%;">尺寸</th>
+			<th class="theadTh" style="width:10%;">行业</th>
+			<th class="theadTh" style="width:10%;">广告主</th>
+			<th class="theadTh" style="width:5%;">状态</th>
+			<th class="theadTh" style="width:12%;">最后更新时间</th>
+			<th class="theadTh" style="width:15%;">操作</th>
+		</tr>
+    </thead>
+    <tbody>
+		<#if auditBannerList ??>
+        <#list auditBannerList as auditBanner>
+        <tr id="tbodyTr">
+			<td class="tbodyTd"><div class="checkboxStyleTd" id="${auditBanner.id!}"></div></td>
+			<td class="tbodyTd">${auditBanner.id!}</td>
+			<td class="tbodyTd"><img src='${auditBanner.pathSmall!}'></td>
+			<td class="tbodyTd">${auditBanner.bannerTemplate.name!}</td>
+			<td class="tbodyTd"><a href='${auditBanner.visitAddress!}'>${auditBanner.visitAddress!}</a></td>
+			<td class="tbodyTd">${auditBanner.bannerTemplate.width!}x${auditBanner.bannerTemplate.height!}</td>
+			<td class="tbodyTd">${auditBanner.industryName!}</td>
+			<td class="tbodyTd">${auditBanner.advertiserName!}</td>
+			<td class="tbodyTd"><#if auditBanner.checked == 0>未审核<#else>已审核</#if></td>
+			<td class="tbodyTd">${auditBanner.updated!?datetime}</td>
+			<td class="tbodyTd">
+				<div id="listButtons">
+					<#if auditBanner.checked==1>
+	            	<a class="btn-audit btn-auditChange">审核通过</a>
+	            	<#else>
+	            	<a id="btn-pass" value="${auditBanner.id!}" class="btn-audit">审核通过</a>
+	            	</#if>
+	            	<#if auditBanner.checked==2>
+	                <a class="btn-audit btn-auditChange">审核不通过</a>
+	                <#else>
+	                <a id="btn-unpass" value="${auditBanner.id!}" class="btn-audit">审核不通过</a>
+	                </#if>
+				</div>
+			</td>
+        </tr>
+        </#list>
+		</#if>
+    </tbody>
+</table>
+<div id="exportReport">
+	<a id="exportExcel" class="btn_export" href="${ctx}/back/main/audit/audit-banner/auditBannerExcel">导出Excel</a>
+</div>
+<div id="pageDiv">
+	<#include "/common/pagination/simple.ftl"/>
+</div>

src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/index.ftl

@@ -1,50 +1,51 @@
-<@override name="head">
-	<title>广告投放系统</title>
-	<!--css-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/audit.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/audit.js"></script>
-
-</@override>
-<@override name="body">
-	<#include "/back/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="subNav">
-			<span class='sub'>素材审核</span>
-			<span class='sub2' href='${ctx}/back/main/audit/audit'>资质审核</span>
-		</div>
-		<div id="shortcutBar">
-			<ul>
-				<li ><i class="icon-home"></i> <a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li ><a class="homepage2" href="#">素材审核</a></li>			         
-			</ul>  
-		</div>
-		<div id="selectConditionBar">
-			<span>状态：</span>
-			<a >全部</a>
-			<a >审核通过</a>
-			<a >审核未通过</a>
-			<a >未审核</a>
-		</div>
-		<div id="searchBar">
-			<button class="batch_btn" href="${ctx}/back/main/audit/audit-banner/enable">批量通过</button>
-			<button class="batch_btn" href="${ctx}/back/main/audit/audit-banner/disable">批量不通过</button>
-			<form action="${ctx}/back/main/audit/audit-banner/list" method="post" class="search-form" >
-				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-				<input  autocomplete="off"  type="hidden" name="checked" value="${checked!}">
-         		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
-         		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入需要搜索的内容" onkeydown="if(event.keyCode==13){return false;}">
-         		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
-			</form>
-		</div>
-		<div id="tableList"><#include "banner-audit.ftl"></div>
-		
-	</div>
-</@override>
+<@override name="head">
+<title>素材审核</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/auditBanner.js"></script>
+</@override> 
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+	<div id= "pagecontent">
+		<div id="content">
+			<div id="selectBar_audit" class="selectBar">
+				<a class="selectBar_change" href="${ctx}/back/main/audit/audit-banner">素材审核</a>
+				<a href="${ctx}/back/main/audit/audit/list">资质审核</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">素材审核</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/audit/audit-banner" method="post">
+ 				<input type="hidden" id="status" name="checked" value="${checked!}"/>
+	 			<div id="selectBar_status" class="selectBar">
+		 			<span>状态：</span>
+					<a value="">全部</a>
+					<a value="1">审核通过</a>
+					<a value="2">审核未通过</a>
+					<a value="0">未审核</a>
+				</div>
+				<div id="navButtons">
+					<div id="button">					
+						<a class="btn2" id="all-btn-pass">批量通过</a>
+						<a class="btn2" id="all-btn-unpass">批量不通过</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<#include "banner-audit.ftl">
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/audit/audit/details.ftl

@@ -1,133 +1,78 @@
-<@override name="head">
-	<title>广告投放系统</title>
-	<!--css-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/audit.css"/>
-	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-<script type="text/javascript">
-	$(function(){
-		$("#subNav span").click(function(){
-			var _href = $(this).attr('href');
-			window.location.assign(_href);
-		});
-		
-		//搜索输入框的样式改变
-		$("#searchBar input[name='searchValue']").focus(function(){
-			$(this).val("");
-		});
-		$("#searchBar input[name='searchValue']").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入需要搜索的内容");
-			}
-		});
-		$('#searchBar button').click(function(){
-			var _href = $(this).attr('href');
-			var _value = $(this).attr('value');
-			var _text = $(this).text();
-			if(_text == '审核通过'){
-				var _param = {
-            			'auditId':_value,
-            			'checkStatus':1,
-            	};
-				$.post(_href,_param,function(data){
-					if(data == "ok"){
-						window.location = document.referrer;
-					} else {
-						bootbox.alert("审核失败!");
-					}
-				})
-			} else{
-				 bootbox.prompt("请输入审核不通过的理由", function(result) {
-		            if(result === null){
-		            	
-		            } else if (result == '') {
-		            	bootbox.alert("请输入审核不通过的理由");
-		            } else {
-		            	var _param = {
-		            			'auditId':_value,
-		            			'checkMemo':result,
-		            			'checkStatus':-1,
-		            	};
-		            	$.post(_href,_param,function(data){
-		            		if(data == "ok"){
-		            			window.location = document.referrer; 
-							} else {
-								bootbox.alert("审核失败!");
-							}
-						})
-		            }
-		        });
-			}
-		});
-	});
-</script>
-</@override>
-<@override name="body">
-	<#include "/back/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="subNav">
-			<span class='sub2' href='${ctx}/back/main/audit/audit-banner'>素材审核</span>
-			<span class='sub' href='${ctx}/back/main/audit/audit'>资质审核</span>
-		</div>
-		<div id="shortcutBar">
-			<ul>
-				<li ><i class="icon-home"></i> <a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li ><a class="homepage2" href="${ctx}/back/main/audit/audit">资质审核</a></li>			         
-			</ul>  
-		</div>
-		<div id="searchBar">
-			<button class="batch_btn" href="${ctx}/back/main/audit/audit/check" value='${auditId!}'>审核通过</button>
-			<button class="batch_btn" href="${ctx}/back/main/audit/audit/check" value='${auditId!}'>审核不通过</button>
-		</div>
-		<div id="tableList">
-			<div>
-				<span>广告主名称&nbsp;:&nbsp;${audit.name!}</span>
-				<span>广告主行业&nbsp;:&nbsp;${audit.industryName!}</span>
-				<span>广告主注册名&nbsp;:&nbsp;${audit.regName!}</span>
-				<span>网址&nbsp;:&nbsp;<a href="${audit.homePage!}">${audit.homePage!}</a></span>
-				<span>联系人&nbsp;:&nbsp;${audit.contacts!}</span>
-				<span>电话&nbsp;:&nbsp;${audit.tel!}</span>
-				<span>邮箱&nbsp;:&nbsp;${audit.email!}</span>
-			</div>
-			
-			<table class="table">
-			    <thead>
-			        <tr>
-			            <th>资质</th>
-			            <th>素材</th>
-			            <th>最后更新时间</th>
-			        </tr>
-			    </thead>
-			    <tbody>
-				    <tr class="">
-				        <td >ICP</td>
-				        <td><img src="${ctx}/assets/back/images/login-logo.png"></td>
-				        <td>${audit.updated?datetime!}</td>
-				    </tr>
-				    <tr class="">
-				        <td >企业营业执照</td>
-				        <td><img src="${ctx}/assets/back/images/login-logo.png"></td>
-				        <td>${audit.updated?datetime!}</td>
-				    </tr>
-				    <tr class="">
-				        <td >法人代表身份证</td>
-				        <td><img src="${ctx}/assets/back/images/login-logo.png"></td>
-				        <td>${audit.updated?datetime!}</td>
-				    </tr>
-				    <tr class="">
-				        <td >企业机构代码证</td>
-				        <td><img src="${ctx}/assets/back/images/login-logo.png"></td>
-				        <td>${audit.updated?datetime!}</td>
-				    </tr>
-			    </tbody>
-			</table>
-		</div>
-	</div>
-</@override>
+<@override name="head">
+<title>资质审核</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/auditBanner.js"></script>
+</@override> 
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+	<div id= "pagecontent">
+		<div id="content">
+			<div id="selectBar_audit" class="selectBar">
+				<a href="${ctx}/back/main/audit/audit-banner">素材审核</a>
+				<a class="selectBar_change" href="${ctx}/back/main/audit/audit">资质审核</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li><a href="${ctx}/back/main/audit/audit/list">资质审核</a></li>
+				    <li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">审核</li>
+				</ul>  
+ 			</div>
+			<div id="navButtons">
+				<div id="button">	
+					<input type="hidden" id="auditId" value="${auditId!}"/>				
+					<a class="btn2" id="btn-auditpass">批量通过</a>
+					<a class="btn2" id="btn-auditunpass">批量不通过</a>
+				</div>
+			</div>
+			<div class="auditDiv">
+				<span>广告主名称：${audit.name!}</span>
+				<span>广告主行业：${audit.industryName!}</span>
+				<span>广告主注册名：${audit.regName!}</span>
+				<span>网址：<a href="${audit.homePage!}">${audit.homePage!}</a></span>
+				<span>联系人：${audit.contacts!}</span>
+				<span>电话：${audit.tel!}</span>
+				<span>邮箱：${audit.email!}</span>
+			</div>
+			<table border="1" class="tableFig">
+				<thead>
+					<tr class="theadTr">
+						<th class="theadTh" style="width:30%;">资质</th>
+						<th class="theadTh" style="width:40%;">素材</th>
+						<th class="theadTh" style="width:30%;">最后更新时间</th>
+				    </tr>
+				</thead>
+				<tbody>
+				    <tr id="tbodyTr">
+						<td class="tbodyTd">ICP</td>
+						<td class="tbodyTd"><img src="${ctx}/assets/back/images/login-logo.png"></td>
+						<td class="tbodyTd">${audit.updated!?datetime}</td>
+					</tr>
+					<tr id="tbodyTr">
+						<td class="tbodyTd">企业营业执照</td>
+						<td class="tbodyTd"><img src="${ctx}/assets/back/images/login-logo.png"></td>
+						<td class="tbodyTd">${audit.updated!?datetime}</td>
+					</tr>
+					<tr id="tbodyTr">
+						<td class="tbodyTd">法人代表身份证</td>
+						<td class="tbodyTd"><img src="${ctx}/assets/back/images/login-logo.png"></td>
+						<td class="tbodyTd">${audit.updated!?datetime}</td>
+					</tr>
+					<tr id="tbodyTr">
+						<td class="tbodyTd">企业机构代码证</td>
+						<td class="tbodyTd"><img src="${ctx}/assets/back/images/login-logo.png"></td>
+						<td class="tbodyTd">${audit.updated!?datetime}</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/audit/audit/list.ftl

@@ -1,39 +1,92 @@
-<table class="table">
-    <thead>
-        <tr>
-            <th class="center"><label><input type="checkbox"><span class="lbl"></span></label></th>
-            <th>广告主名称</th>
-            <th>广告主行业</th>
-            <th>广告主注册名</th>
-            <th>代理商名称</th>
-            <th>操作</th>
-        </tr>
-    </thead>
-    <tbody>
-    	<#if auditList ??>
-        <#list auditList as audit>
-	    <tr class="">
-	        <td class="center">
-				<label><input  autocomplete="off"   type="checkbox" name="id" value="${audit.id!}"><span class="lbl"></span></label>
-			</td>
-	        <td >${audit.name!}</td>
-	        <td>${audit.industryName!}</td>
-	        <td>${audit.regName!}</td>
-	        <td>${audit.agentName!}</td>
-	        <td>
-	        	<#if audit.checkStatus == 0> <a href='${ctx}/back/main/audit/audit/details?auditId=${audit.id!}'>未审核</a></#if>
-                <#if audit.checkStatus == 1> 审核通过  </#if>
-            	<#if audit.checkStatus == -1> 审核不通过 </#if>
-            </td>
-	    </tr>
-	    </#list>
-		</#if>	
-    </tbody>
-</table>
-<div id="footBar">
-	<button class='exportExcel' href="${ctx}/back/main/audit/audit/exportDataReportExcel">导出Excel</button>
-	<div id="paged" style="margin-top:-35px !important;margin-right:-50px !important;">
-       <#include "/common/pagination/simple.ftl"/>
-    </div>
-</div>
-		
+<@override name="head">
+<title>资质审核</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/auditBanner.js"></script>
+</@override> 
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+	<div id= "pagecontent">
+		<div id="content">
+			<div id="selectBar_audit" class="selectBar">
+				<a href="${ctx}/back/main/audit/audit-banner">素材审核</a>
+				<a class="selectBar_change" href="${ctx}/back/main/audit/audit/list">资质审核</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">资质审核</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/audit/audit/list" method="post">
+ 				<input type="hidden" id="status" name="checked" value="${checked!}"/>
+	 			<div id="selectBar_status" class="selectBar">
+		 			<span>状态：</span>
+					<a value="">全部</a>
+					<a value="1">审核通过</a>
+					<a value="2">审核未通过</a>
+					<a value="0">未审核</a>
+				</div>
+				<div id="navButtons">
+					<div id="button">					
+						<a class="btn2" id="all-btn-pass">批量通过</a>
+						<a class="btn2" id="all-btn-unpass">批量不通过</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+				    <thead>
+				        <tr class="theadTr">
+				        	<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:20%;">广告主名称</th>
+							<th class="theadTh" style="width:10%;">广告主行业</th>
+							<th class="theadTh" style="width:20%;">广告主注册名</th>
+							<th class="theadTh" style="width:20%;">代理商名称</th>
+							<th class="theadTh" style="width:25%;">操作</th>
+				        </tr>
+				    </thead>
+				    <tbody>
+				    	<#if auditList ??>
+				        <#list auditList as audit>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${audit.id!}"></div></td>
+							<td class="tbodyTd">${audit.name!}</td>
+							<td class="tbodyTd">${audit.industryName!}</td>
+							<td class="tbodyTd">${audit.regName!}</td>
+							<td class="tbodyTd">${audit.agentName!}</td>
+							<td class="tbodyTd">
+								<div id="listButtons">
+									<#if audit.checkStatus == 0>
+					            	<a href='${ctx}/back/main/audit/audit/details?auditId=${audit.id!}'>未审核</a>
+					            	<#elseif audit.checkStatus == 1>
+					            		审核通过
+					            	<#elseif audit.checkStatus == -1>
+					            		审核不通过 
+					            	</#if>
+								</div>
+							</td>
+				        </tr>
+					    </#list>
+						</#if>	
+				    </tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="${ctx}/back/main/audit/audit/exportDataReportExcel">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/authority/create.ftl

@@ -1,202 +1,68 @@
-<@override name="head">
-	<title>创建账号</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				//var addParam = $("#validation-form").serialize();
-				var Account = new Object();//账号对象
-				Account['accountName'] = $("#accountName").val();
-				Account['password'] = $("#password").val();
-				Account['realName'] = $("#realName").val();
-				Account['tel'] = $("#tel").val();
-				Account['state'] = $('input[name="state"]:checked').val();
-				var authority = "";
-				$("#checkboxs input[type=checkbox]:checked").each(function(){
-				    authority+=$(this).val()+",";
-				});
-				authority = authority.substring(0,authority.length-1);
-				if (!$("#validation-form").validate()) {
-					return false;
-				}
-				var flag = isExistName();//判断账号名称是否重复
-				if(!flag){
-					$.ajax({
-				       type: "POST",
-				       url: "${ctx}/back/main/authority/save?authority="+authority+"&ensurePassword="+$("#ensurePassword").val(),
-				       data: Account,
-				       success: function(data){
-						 location.href = "${ctx}/back/main/authority/list";
-				       }
-					});
-				}
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/authority/list";
-			});
-				
-			//显示密码点击事件
-			$("#input-password").click(function(){
-				if($(this).attr("checked")){
-					$("#password-span").html('<input class="input-text" autocomplete="off" id="password" name="password" type="text" value="'+$("#password").val()+'" verify="unspecial/100/1/0">');
-					$("#ensurePassword-span").html('<input class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="text" value="'+$("#ensurePassword").val()+'" verify="unspecial/100/1/0">');
-				}else{
-					$("#password-span").html('<input class="input-text" autocomplete="off" id="password" name="password" type="password" value="'+$("#password").val()+'" verify="unspecial/100/1/0">');
-					$("#ensurePassword-span").html('<input class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="'+$("#ensurePassword").val()+'" verify="unspecial/100/1/0">');
-				}
-				//确认密码与密码一致
-				$("#ensurePassword").blur(function(){
-					validPassword();
-				});
-			});
-				
-			//确认密码与密码一致
-			$("#ensurePassword").blur(function(){
-				validPassword();
-			});
-				
-			function validPassword(){
-				var password = $("#password").val();
-				var ensurePassword = $("#ensurePassword").val();
-				if(ensurePassword != ""){
-					if(ensurePassword != password){
-						$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-						return false;
-					}else{
-						$("#ensurePassword").css("box-shadow","none").attr('title','');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-					}
-				}
-			}
-			
-			$("#accountName").blur(function(){
-				if($(this).val() != ""){
-					var reg=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-					if($(this).val().match(reg)!=null){
-						$(this).css("box-shadow","none").attr('title','');
-						$(this).parent("div").find("span.spanVaildate").html("");
-						isExistName();
-					}else{
-						$(this).css("box-shadow","0 0 6px red").attr('title','格式必须为邮箱类型， 如: example@email.com');
-						$(this).parent("div").find("span.spanVaildate").html("格式必须为邮箱类型， 如: example@email.com");
-						return false;
-					}
-				}
-			});
-			
-			function isExistName(){
-				var flag = false;
-				var accountName = $("#accountName").val();
-				$.ajax({
-		           	type: "POST",
-		            url: "${ctx}/back/main/authority/isExist",
-		            data: {accountName:accountName},
-		             success: function(data){
-				 		if(data == "YES"){
-				 			$("#accountName").css("box-shadow","0 0 6px red").attr('title','你输入的账号已存在！');
-				 			$("#accountName").parent("div").find("span.spanVaildate").html("你输入的账号已存在！");
-				 			flag = true;
-				 		}else{
-				 			$("#accountName").css("box-shadow","none").attr('title','');
-				 			$("#accountName").parent("div").find("span.spanVaildate").html("");
-				 			flag = false;
-				 		}
-		             }
-				});
-				return flag;
-			}
-			
-		});
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/authority/list">权限管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">创建账号</li>
-			</ul>  
-		</div>
-		<div id="content" style="padding-bottom:44px;">	
-			<div id="createForm">
-				<form id="validation-form" class="form-horizontal">
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号：</label>
-						<input tabindex="1" class="input-text" autocomplete="off" id="accountName" name="accountName" type="text" value="" verify="email/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="password-div">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>密码：</label>
-						<span id="password-span"><input tabindex="2" class="input-text" autocomplete="off" id="password" name="password" type="password" value="" verify="unspecial/100/1/0"></span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="ensurePassword-div">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码：</label>
-						<span id="ensurePassword-span"><input tabindex="3" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"></span>
-						<input id="input-password" autocomplete="off" type="checkbox" style="padding-bottom:2px;margin-top: 8px;"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">显示密码</span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>姓名：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="realName" name="realName" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系电话：</label>
-						<input tabindex="5" class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="" verify="tel-mobile/12/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio"  style="margin-left:135px;margin-top:-40px;"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
-					</div>
-					
-					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="101" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">需求方报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="102" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">媒体数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="103" /><span class="lbl" style="position:absolute;left:319px;"></span><span class="input-checkbox-span">审核</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="104" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="105" /><span class="lbl" style="position:absolute;left:477px;"></span><span class="input-checkbox-span">客户账号管理</span>
-					</div>
-					
-					<div id="btn-class" class="form-actions1">
-						<div id="create-btn-save">保存</div>
-					    <div id="create-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">	
+<title>创建账号</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/authority.js"></script>
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/back/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/authority/list">权限管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">创建账号</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/back/main/authority/save" method="post">
+	 			<input type="hidden" name="id" id="accountId" value="0"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号：</label>
+					<input class="input-text" tabindex="1" id="accountName" name="accountName" type="text" value="" verify="email/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="password-div">
+					<label class="input-label"><span class="lbl-yes">*</span>密码：</label>
+					<span id="password-span"><input class="input-text" tabindex="2" id="password" name="password" type="password" value="" verify="unspecial/100/1/0"/></span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="ensurePassword-div">
+					<label class="input-label"><span class="lbl-yes">*</span>确认密码：</label>
+					<span id="ensurePassword-span"><input class="input-text" tabindex="3" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"/></span>
+					<input id="input-password-create" type="checkbox" class="input-password"><span class="input-password-span">显示密码</span>
+					<span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>姓名：</label>
+					<input class="input-text" tabindex="4" id="realName" name="realName" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系电话：</label>
+					<input class="input-text" tabindex="5" id="tel" name="tel" type="text" value="" verify="tel-mobile/12/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号状态：</label>
+					<input class="input-radio" name="state" type="radio" value="1" checked="checked"/><span class="input-radio-span">开启</span>
+					<input class="input-radio" name="state" type="radio" value="0"/><span class="input-radio-span">暂停</span>
+				</div>
+				<div class="input-group" id="checkboxs">
+					<input id="authority" name="authority" type="hidden" value=""/>
+					<label class="input-label"><span class="lbl-no"></span>权限：</label>
+					<input class="input-checkbox" type="checkbox" value="101"/><span class="input-checkbox-span">需求方报表</span>
+					<input class="input-checkbox" type="checkbox" value="102"/><span class="input-checkbox-span">媒体数据报表</span>
+					<input class="input-checkbox" type="checkbox" value="103"/><span class="input-checkbox-span">审核</span>
+					<input class="input-checkbox" type="checkbox" value="104"/><span class="input-checkbox-span">财务管理</span>
+					<input class="input-checkbox" type="checkbox" value="105"/><span class="input-checkbox-span">客户账号管理</span>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" id="btn-cancel-authority" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/authority/edit.ftl

@@ -1,201 +1,68 @@
-<@override name="head">
-	<title>编辑账号</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#edit-btn-save").unbind('click').click(function(){
-				//var editParam = $("#validation-form").serialize();
-				var Account = new Object();//账号对象
-				Account['id'] = $("#accountId").val();
-				Account['accountName'] = $("#accountName").val();
-				Account['password'] = $("#password").val();
-				Account['realName'] = $("#realName").val();
-				Account['tel'] = $("#tel").val();
-				Account['state'] = $('input[name="state"]:checked').val();
-				var authority = "";
-				$("#checkboxs input[type=checkbox]:checked").each(function(){
-				    	authority+=$(this).val()+",";
-				});
-				authority = authority.substring(0,authority.length-1);
-				if (!$("#validation-form").validate()) {
-					return false;
-				} 
-				if($("#ensurePassword").val() !="" && $("#ensurePassword").val() !=$("#password").val()){
-					$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-					return false;
-				}
-				$.ajax({
-		            type: "POST",
-		             url: "${ctx}/back/main/authority/save?authority="+authority+"&ensurePassword="+$("#ensurePassword").val(),
-		             data: Account,
-		            success: function(data){
-				 		location.href = "${ctx}/back/main/authority/list";
-		            }
-				});
-			});
-				
-			//取消按钮
-			$("#edit-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/authority/list";
-			});
-				
-			//修改密码点击事件
-			$("#input-password").click(function(){
-				if($(this).attr("checked")){
-					$("#password").attr("disabled",false);
-					$("#ensurePassword").attr("disabled",false);
-					$("#password").attr("verify","unspecial/100/1/0");
-					$("#ensurePassword").attr("verify","unspecial/100/1/0");
-				}else{
-					$("#password").val("");
-					$("#ensurePassword").val("");
-					$("#password").attr("disabled",true);
-					$("#ensurePassword").attr("disabled",true);
-					$("#password").attr("verify","unspecial/100/0/0");
-					$("#ensurePassword").attr("verify","unspecial/100/0/0");
-					$("#password").css("box-shadow","none").attr('title','');
-					$("#password").parent("span").parent("div").find("span.spanVaildate").html("");
-					$("#ensurePassword").css("box-shadow","none").attr('title','');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-				}
-			});
-				
-			//确认密码与密码一致
-			$("#ensurePassword").blur(function(){
-				validPassword();
-			});
-			
-			$("#ensurePassword, #password").focus(function(){
-				$(this).css("box-shadow","0 0 6px red");
-			});
-			
-			$("#ensurePassword, #password").blur(function(){
-				$(this).css("box-shadow","none");
-			});
-				
-			function validPassword(){
-				var password = $("#password").val();
-				var ensurePassword = $("#ensurePassword").val();
-				if(ensurePassword != ""){
-					if(ensurePassword != password){
-						$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-						return false;
-					}else{
-						$("#ensurePassword").css("box-shadow","none").attr('title','');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-					}
-				}
-			}
-				
-			//权限控制
-			function getAuthority(){
-				var authority = $("#input-authority").val();
-				var authArr = authority.split(",");
-				var checkboxs = $("#checkboxs input[type='checkbox']");
-				checkboxs.each(function(i){
-					for(var i = 0;i<authArr.length;i++){
-						if($(this).val() == authArr[i]){
-							$(this).attr("checked","true");
-						}
-					}
-				});
-			}
-			getAuthority();
-		});
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/authority/list">权限管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">编辑账号</li>
-			</ul>  
-		</div>
-		<div id="content" style="padding-bottom:44px;">	
-			<div id="editForm">
-				<form id="validation-form" class="form-horizontal">
-					<input  autocomplete="off"  type="hidden" name="id" id="accountId" value="${account.id}"/>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号：</label>
-						<input class="input-text" autocomplete="off" id="accountName" name="accountName" type="text" value="${account.accountName}" disabled="true"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>密码：</label>
-						<span id="password-span"><input tabindex="1" class="input-text" autocomplete="off" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码：</label>
-						<span id="ensurePassword-span"><input tabindex="2" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span>
-						<input id="input-password" autocomplete="off" type="checkbox"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">修改密码</span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>姓名：</label>
-						<input tabindex="3" class="input-text" autocomplete="off" id="realName" name="realName" type="text" value="${account.realName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系电话：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="${account.tel}" verify="tel-mobile/12/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" <#if account.state=="1">checked</#if> value="1"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" <#if account.state=="0">checked</#if> value="0"><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
-					</div>
-					
-					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
-						<input id="input-authority" type="hidden" name="authority" value="${authority}" />
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" value="101" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">需求方报表</span>
-						<input class="input-checkbox" type="checkbox" value="102" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">媒体数据报表</span>
-						<input class="input-checkbox" type="checkbox" value="103" /><span class="lbl" style="position:absolute;left:319px;"></span><span class="input-checkbox-span">审核</span>
-						<input class="input-checkbox" type="checkbox" value="104" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
-						<input class="input-checkbox" type="checkbox" value="105" /><span class="lbl" style="position:absolute;left:477px;"></span><span class="input-checkbox-span">客户账号管理</span>
-					</div>
-					
-					<div id="btn-class" class="form-actions1">
-						<div id="edit-btn-save">保存</div>
-					    <div id="edit-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
+<@override name="head">	
+<title>编辑账号</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/authority.js"></script>
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/back/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/authority/list">权限管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">编辑账号</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/back/main/authority/save" method="post">
+	 			<input type="hidden" name="id" id="accountId" value="${account.id!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号：</label>
+					<input class="input-text" tabindex="1" id="accountName" name="accountName" type="text" value="${account.accountName!}" disabled="true"/>
+				</div>
+				<div class="input-group" id="password-div">
+					<label class="input-label"><span class="lbl-yes">*</span>密码：</label>
+					<span id="password-span"><input class="input-text" tabindex="2" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"/></span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="ensurePassword-div">
+					<label class="input-label"><span class="lbl-yes">*</span>确认密码：</label>
+					<span id="ensurePassword-span"><input class="input-text" tabindex="3" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"/></span>
+					<input id="input-password-edit" type="checkbox" class="input-password"><span class="input-password-span">修改密码</span>
+					<span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>姓名：</label>
+					<input class="input-text" tabindex="4" id="realName" name="realName" type="text" value="${account.realName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系电话：</label>
+					<input class="input-text" tabindex="5" id="tel" name="tel" type="text" value="${account.tel!}" verify="tel-mobile/12/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号状态：</label>
+					<input class="input-radio" name="state" type="radio" value="1" <#if account.state=="1">checked</#if> /><span class="input-radio-span">开启</span>
+					<input class="input-radio" name="state" type="radio" value="0" <#if account.state=="0">checked</#if> /><span class="input-radio-span">暂停</span>
+				</div>
+				<div class="input-group authority-edit" id="checkboxs">
+					<input id="authority" name="authority" type="hidden" value="${authority!}"/>
+					<label class="input-label"><span class="lbl-no"></span>权限：</label>
+					<input class="input-checkbox" type="checkbox" value="101"/><span class="input-checkbox-span">需求方报表</span>
+					<input class="input-checkbox" type="checkbox" value="102"/><span class="input-checkbox-span">媒体数据报表</span>
+					<input class="input-checkbox" type="checkbox" value="103"/><span class="input-checkbox-span">审核</span>
+					<input class="input-checkbox" type="checkbox" value="104"/><span class="input-checkbox-span">财务管理</span>
+					<input class="input-checkbox" type="checkbox" value="105"/><span class="input-checkbox-span">客户账号管理</span>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" id="btn-cancel-authority" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/authority/list.ftl

@@ -1,184 +1,84 @@
-<@override name="head">
-	<title>账号管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-			
-			//创建账号
-			$("#btn-create").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/authority/create";
-			});
-			
-			//编辑
-			$("#btn-edit").live("click", function() {
-				var accountId = parseInt($(this).attr("value"));
-				location.href = "${ctx}/back/main/authority/edit?accountId="+accountId;
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-
-			//批量开启,批量暂停
-			$("#all-btn-enable,#all-btn-disable").click(function(){
-				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
-				var _param = checkboxs.serialize();
-				var url = ""; var type = "";
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/back/main/authority/enable";
-					type = "开启";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/back/main/authority/disable";
-					type = "暂停";
-				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							$.post(url, _param, function(data) {
-								$('#formPage').submit();
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的用户！");
-				}
-			});
-			
-			//开启,暂停
-			$('#btn-enable,#btn-disable').live('click' ,function(){
-				var url = "";
-				var accountId = parseInt($(this).attr("value"));
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/back/main/authority/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/back/main/authority/disable";
-				}
-				$.post(url, {id:accountId}, function(data) {
-					$('#formPage').submit();
-				});
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			if($("#searchValue").val()!=""){
-				$("#exportExcel").attr("href","${ctx}/back/main/authority/exportDataReportExcel?value="+$("#searchValue").val());
-			}else{
-				$("#exportExcel").attr("href","${ctx}/back/main/authority/exportDataReportExcel");
-			}
-		};
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">权限管理</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/back/main/authority/list" method="post" style="margin:0px;">
-			  	<div id="buttons">
-			  		
-			  		<div id="btn-create" class="btna">创建账号</div>      
-			        <div id="all-btn-enable" class="btna">批量开启</div>  
-			        <div id="all-btn-disable" class="btna">批量暂停</div> 
-			        <div id="serachData">
-			        	<input type="hidden" id="page" name="page" value="${pager.page}">
-						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}"/>
-						<input id="serachData_img" type="submit" value="" />
-					</div>
-			    </div>
-				<div id="account-table" style="margin:20px 0px 0px 0px;">
-					<table border="1" class="tablefig" id="tablefig" style="width:100%;">
-						<thead>
-							<tr>
-								<th width="5%">
-									<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-								</th>
-								<th width="5%">ID</th>
-								<th width="20%">账号</th>
-								<th width="10%">姓名</th>
-								<th width="15%">联系电话</th>
-								<th width="5%">状态</th>
-								<th width="15%">最后登录时间</th>
-								<th width="25%">操作</th>
-							</tr>
-						</thead>
-						<tbody>
-						<#if accountList ??>
-						<#list accountList as account>
-							<tr class="">
-								<td class="center">
-									<label><input  autocomplete="off" type="checkbox" name="id" value="#{account.id}"><span class="lbl"></span></label>
-								</td>
-								<td class="breakword">${account.id!}</td>
-								<td class="breakword">${account.accountName!}</td>
-								<td class="breakword">${account.realName!}</td>
-								<td class="hide-piece">${account.tel!}</td>
-								<td><#if account.state=="1">正常<#else>暂停</#if></td>
-								<td>${account.createTime?datetime}</td>
-								<td>
-									<div id="btndiv">
-										<div id="btn-edit" class="btn11" value="${account.id}">编辑</div>
-										<#if account.state=="1">
-										<div id="btn-disable" class="btn11" value="${account.id}">暂停</div>
-										<#elseif account.state=="0">
-										<div id="btn-enable" class="btn11" value="${account.id}">开启</div>
-										</#if>
-									</div>
-								</td>
-							</tr>
-						</#list>
-						</#if>
-					</tbody>
-					</table>
-					
-					<div id="daochu1" style="margin-top:20px; margin-left:20px;">
-						<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-					</div>
-								
-					<div id="pageDiv" style="margin:-35px -10px 20px 0px;">
-		               	<#include "/common/pagination/simple.ftl"/>
-		            </div>	
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>权限管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/authority.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+    	<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">权限管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/authority/list" method="post">
+ 				<div id="navButtons">
+					<div id="button">		
+						<a href="${ctx}/back/main/authority/create" class="btn2">创建账号</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量暂停</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:5%;">ID</th>
+							<th class="theadTh" style="width:20%;">账号</th>
+							<th class="theadTh" style="width:10%;">姓名</th>
+							<th class="theadTh" style="width:15%;">联系电话</th>
+							<th class="theadTh" style="width:5%;">状态</th>
+							<th class="theadTh" style="width:15%;">最后登录时间</th>
+							<th class="theadTh" style="width:25%;">操作</th>
+						</tr>
+				    </thead>
+				    <tbody>
+						<#if accountList ??>
+				        <#list accountList as account>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${account.id!}"></div></td>
+							<td class="tbodyTd">${account.id!}</td>
+							<td class="tbodyTd">${account.accountName!}</td>
+							<td class="tbodyTd">${account.realName!}</td>
+							<td class="tbodyTd">${account.tel!}</td>
+							<td class="tbodyTd"><#if account.state=="1">正常<#else>暂停</#if></td>
+							<td class="tbodyTd">${account.createTime!?datetime}</td>
+							<td class="tbodyTd">
+								<div id="listButtons">
+									<a href="${ctx}/back/main/authority/edit?accountId=${account.id!}" class="btn3">编辑</a>
+									<#if account.state=="0">
+									<a id="btn-enable" value="${account.id!}" class="btn3">开启</a>
+									<#elseif account.state=="1">
+									<a id="btn-disable" value="${account.id!}" class="btn3">暂停</a>
+									</#if>
+								</div>
+							</td>
+						</tr>
+				        </#list>
+						</#if>           
+				    </tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/authority/loginperson.ftl

@@ -1,192 +1,74 @@
-<@override name="head">
-	<title>个人信息</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#edit-btn-save").unbind('click').click(function(){
-				//var editParam = $("#validation-form").serialize();
-				var Account = new Object();//账号对象
-				Account['id'] = $("#accountId").val();
-				Account['accountName'] = $("#accountName").val();
-				Account['password'] = $("#password").val();
-				Account['realName'] = $("#realName").val();
-				Account['tel'] = $("#tel").val();
-				Account['state'] = $('input[name="state"]:checked').val();
-				if (!$("#validation-form").validate()) {
-					return false;
-				} 
-				if($("#ensurePassword").val() !="" && $("#ensurePassword").val() !=$("#password").val()){
-					$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-					return false;
-				}
-				$.ajax({
-		            type: "POST",
-		             url: "${ctx}/back/main/authority/saveloginperson?operator_Id="+$("#operatorId").val()+"&operatoraccount="+$("#operatoraccount").val()+"&operatoraccountName="+$("#operatoraccountName").val()+"&operatorbank="+$("#operatorbank").val()+"&ensurePassword="+$("#ensurePassword").val(),
-		             data: Account,
-		            success: function(data){
-				 		location.href = "${ctx}/back/main/dashboard";
-		            }
-				});
-			});
-				
-			//取消按钮
-			$("#edit-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/dashboard";
-			});
-				
-			//修改密码点击事件
-			$("#input-password").click(function(){
-				if($(this).attr("checked")){
-					$("#password").attr("disabled",false);
-					$("#ensurePassword").attr("disabled",false);
-					$("#password").attr("verify","unspecial/100/1/0");
-					$("#ensurePassword").attr("verify","unspecial/100/1/0");
-					validPassword();
-					$("#ensurePassword").blur(function(){
-						validPassword();
-					});
-				}else{
-					$("#password").val("");
-					$("#ensurePassword").val("");
-					$("#password").attr("disabled",true);
-					$("#ensurePassword").attr("disabled",true);
-					$("#password").attr("verify","unspecial/100/0/0");
-					$("#ensurePassword").attr("verify","unspecial/100/0/0");
-					$("#password").css("box-shadow","none").attr('title','');
-					$("#password").parent("span").parent("div").find("span.spanVaildate").html("");
-					$("#ensurePassword").css("box-shadow","none").attr('title','');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-				}
-			});
-				
-			//确认密码与密码一致
-			$("#ensurePassword").blur(function(){
-				validPassword();
-			});
-			
-			$("#ensurePassword, #password").focus(function(){
-				$(this).css("box-shadow","0 0 6px red");
-			});
-			
-			$("#ensurePassword, #password").blur(function(){
-				$(this).css("box-shadow","none");
-			});
-				
-			function validPassword(){
-				var password = $("#password").val();
-				var ensurePassword = $("#ensurePassword").val();
-				if(ensurePassword != ""){
-					if(ensurePassword != password){
-						$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-						return false;
-					}else{
-						$("#ensurePassword").css("box-shadow","none").attr('title','');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-					}
-				}
-			}
-				
-		});
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span>
-				<li class="size2">个人信息</li>
-			</ul>  
-		</div>
-		<div id="content" style="padding-bottom:44px;">	
-			<div id="editForm">
-				<form id="validation-form" class="form-horizontal">
-					<input  autocomplete="off"  type="hidden" name="id" id="accountId" value="${account.id}"/>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号：</label>
-						<input class="input-text" autocomplete="off" id="accountName" name="accountName" type="text" value="${account.accountName}" disabled="true"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>密码：</label>
-						<span id="password-span"><input tabindex="1" class="input-text" autocomplete="off" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码：</label>
-						<span id="ensurePassword-span"><input tabindex="2" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span>
-						<input id="input-password" autocomplete="off" type="checkbox"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">修改密码</span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>姓名：</label>
-						<input tabindex="3" class="input-text" autocomplete="off" id="realName" name="realName" type="text" value="${account.realName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系电话：</label>
-						<input tabindex="4" class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="${account.tel}" verify="tel-mobile/12/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" <#if account.state=="1">checked</#if> value="1" disabled><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" <#if account.state=="0">checked</#if> value="0" disabled><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
-					</div>
-					
-					<#if operator ??>
-					<input type="hidden" name="operator_Id" id="operatorId" value="${operator.id}"/>
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>银行账号：</label>
-						<input tabindex="5" class="input-text" autocomplete="off" id="operatoraccount" name="operatoraccount" type="text" value="${operator.account}" verify="number/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>开户人姓名：</label>
-						<input tabindex="6" class="input-text" autocomplete="off" id="operatoraccountName" name="operatoraccountName" type="text" value="${operator.accountName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>开户行：</label>
-						<input tabindex="7" class="input-text" autocomplete="off" id="operatorbank" name="operatorbank" type="text" value="${operator.bank}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<#else>
-						<input type="hidden" name="operator_Id" id="operatorId" value="0"/>
-					</#if>
-					<div id="btn-class" class="form-actions1">
-						<div id="edit-btn-save">保存</div>
-					    <div id="edit-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">	
+<title>个人信息</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/authority.js"></script>
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/back/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">个人信息</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/back/main/authority/save" method="post">
+	 			<input type="hidden" name="id" id="accountId" value="${account.id!}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号：</label>
+					<input class="input-text" tabindex="1" id="accountName" name="accountName" type="text" value="${account.accountName!}" disabled="true"/>
+				</div>
+				<div class="input-group" id="password-div">
+					<label class="input-label"><span class="lbl-yes">*</span>密码：</label>
+					<span id="password-span"><input class="input-text" tabindex="2" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"/></span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="ensurePassword-div">
+					<label class="input-label"><span class="lbl-yes">*</span>确认密码：</label>
+					<span id="ensurePassword-span"><input class="input-text" tabindex="3" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"/></span>
+					<input id="input-password-edit" type="checkbox" class="input-password"><span class="input-password-span">修改密码</span>
+					<span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>姓名：</label>
+					<input class="input-text" tabindex="4" id="realName" name="realName" type="text" value="${account.realName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系电话：</label>
+					<input class="input-text" tabindex="5" id="tel" name="tel" type="text" value="${account.tel!}" verify="tel-mobile/12/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号状态：</label>
+					<input class="input-radio" name="state" type="radio" value="1" <#if account.state=="1">checked</#if> /><span class="input-radio-span">开启</span>
+					<input class="input-radio" name="state" type="radio" value="0" <#if account.state=="0">checked</#if> /><span class="input-radio-span">暂停</span>
+				</div>
+				<#if operator ??>
+				<input type="hidden" name="operator_Id" id="operatorId" value="${operator.id}"/>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>银行账号：</label>
+					<input class="input-text" tabindex="6" id="operatoraccount" name="operatoraccount" type="text" value="${operator.account!}" verify="number/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>开户人姓名：</label>
+					<input class="input-text" tabindex="7" id="operatoraccountName" name="operatoraccountName" type="text" value="${operator.accountName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>开户行：</label>
+					<input class="input-text" tabindex="8" id="operatorbank" name="operatorbank" type="text" value="${operator.bank!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<#else>
+					<input type="hidden" name="operator_Id" id="operatorId" value="0"/>
+				</#if>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" id="btn-cancel-account" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/client-account/correlation.ftl

@@ -1,100 +1,61 @@
-<@override name="head">
-	<title>账号管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-		// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				//alert(_page);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-		//新增账号关联
-			$("#new-correlate").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/client-account/createcorrelation";
-			});
-		});	
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/client-account/list">客户账号管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">账号关联</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/back/main/client-account/correlation" method="post" style="margin:0px;">
-			  	
-			  	<div id="new-correlate" class="btn1">新增关联</div>  
-			  	<input type="hidden" id="page" name="page" value="${pager.page}">
-				<div id="account-table" style="margin:20px 0px 0px 0px;">
-					<table border="1" class="tablefig" id="tablefig" style="width:90%;">
-						<thead>
-							<tr>
-							
-								<th width="20%">代理商</th>
-								<th width="10%">媒体</th>
-								<th width="25%">操作</th>
-							</tr>
-						</thead>
-						<tbody>
-						<#if correlations ??>
-						<#list correlations as correlation>
-							<tr class="">
-								
-								<td class="breakword">${correlation.agentName!}</td>
-								<td class="breakword">${correlation.operatorName!}</td>
-								<td class="hide-piece">
-									<div id="btndiv" >
-										<div id="cancel-correlate" class="btn11" style=" margin-left: 53px !important;">
-										<a style="color:#ffffff;" href="${ctx}/back/main/client-account/cancelcorrelation?agentId=#{correlation.agentId!}&operatorId=#{correlation.operatorId!}" >取消关联
-										</a>
-										</div>
-									</div>
-								</td>
-							</tr>
-						</#list>
-						</#if>
-					</tbody>
-					</table>
-					
-					<div id="daochu1" style="margin-top:20px; margin-left:20px;">
-						<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-					</div>
-								
-					<div id="pageDiv" style="margin:-55px 50px 20px 0px !important;">
-		               	<#include "/common/pagination/simple.ftl"/>
-		            </div>	
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>账号关联</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/clientAccount.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+    	<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/client-account/list">客户账号管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">账号关联</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/client-account/correlation" method="post">
+ 				<input type="hidden" id="page" name="page" value="${pager.page}"/>
+ 				<div id="navButtons">
+					<div id="button">		
+						<a href="${ctx}/back/main/client-account/createcorrelation" class="btn2">新增关联</a>
+					</div>
+				</div>
+				<table border="1" class="tableFig tableClientAccount">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:20%">代理商</th>
+							<th class="theadTh" style="width:20%">媒体</th>
+							<th class="theadTh" style="width:15%">操作</th>
+						</tr>
+				    </thead>
+				    <tbody>
+						<#if correlations ??>
+				        <#list correlations as correlation>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd">${correlation.agentName!}</td>
+							<td class="tbodyTd">${correlation.operatorName!}</td>
+							<td class="tbodyTd">
+								<a id="btn-correlate" valueAgentId="${correlation.agentId!}" valueOperatorId="${correlation.operatorId!}" class="btn3">取消关联</a>
+							</td>
+						</tr>
+				        </#list>
+						</#if>           
+				    </tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/client-account/create.ftl

@@ -1,246 +1,104 @@
-<@override name="head">
-	<title>创建账号</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-	</style>
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				var addParam = $("#validation-form").serialize();
-				if (!$("#validation-form").validate()) {
-					return false;
-				}else{
-					isExistName();//判断账号名称是否重复
-					$.ajax({
-			           	type: "POST",
-			            url: "${ctx}/back/main/client-account/save",
-			            data: addParam,
-			             success: function(data){
-					 		location.href = "${ctx}/back/main/client-account/list";
-			             }
-					});
-				} 
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/client-account/list";
-			});
-				
-			//显示密码点击事件
-			$("#input-password").click(function(){
-				if($(this).attr("checked")){
-					$("#password-span").html('<input class="input-text" autocomplete="off" id="password" name="password" type="text" value="'+$("#password").val()+'" verify="unspecial/100/1/0">');
-					$("#ensurePassword-span").html('<input class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="text" value="'+$("#ensurePassword").val()+'" verify="unspecial/100/1/0">');
-				}else{
-					$("#password-span").html('<input class="input-text" autocomplete="off" id="password" name="password" type="password" value="'+$("#password").val()+'" verify="unspecial/100/1/0">');
-					$("#ensurePassword-span").html('<input class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="'+$("#ensurePassword").val()+'" verify="unspecial/100/1/0">');
-				}
-				//确认密码与密码一致
-				$("#ensurePassword").blur(function(){
-					validPassword();
-				});
-			});
-				
-			//确认密码与密码一致
-			$("#ensurePassword").blur(function(){
-				validPassword();
-			});
-				
-			function validPassword(){
-				var password = $("#password").val();
-				var ensurePassword = $("#ensurePassword").val();
-				if(ensurePassword != ""){
-					if(ensurePassword != password){
-						$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-						return false;
-					}else{
-						$("#ensurePassword").css("box-shadow","none").attr('title','');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-					}
-				}
-			}
-			
-			$("#accountName").blur(function(){
-				var reg=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-				if($(this).val().match(reg)!=null){
-					$(this).css("box-shadow","none").attr('title','');
-					$(this).parent("div").find("span.spanVaildate").html("");
-					isExistName();
-				}else{
-					$(this).css("box-shadow","0 0 6px red").attr('title','格式必须为邮箱类型， 如: example@email.com');
-					$(this).parent("div").find("span.spanVaildate").html("格式必须为邮箱类型， 如: example@email.com");
-					return false;
-				}
-			});
-			
-			function isExistName(){
-				var clientAccountName = $("#accountName").val();
-				$.ajax({
-		           	type: "POST",
-		            url: "${ctx}/back/main/client-account/isExist",
-		            data: {clientAccountName:clientAccountName},
-		             success: function(data){
-				 		if(data == "YES"){
-				 			$("#accountName").css("box-shadow","0 0 6px red").attr('title','你输入的账号已存在！');
-				 			$("#accountName").parent("div").find("span.spanVaildate").html("你输入的账号已存在！");
-				 			return false;
-				 		}else{
-				 			$("#accountName").css("box-shadow","none").attr('title','');
-				 			$("#accountName").parent("div").find("span.spanVaildate").html("");
-				 		}
-		             }
-				});
-			}
-			
-			//点击媒体显示银行账户
-			$("#input-radio-oper").click(function(){
-				$(".hideOperator").css("display","block");
-				$(".hideAdverstier").css("display","none");
-				$("#title").attr("verify","unspecial/255/0/0");
-				$("#bank").attr("verify","unspecial/255/1/0");
-				$("#bankAccountName").attr("verify","unspecial/255/1/0");
-				$("#bankAccount").attr("verify","number/255/1/0");
-			});
-			//点击需求方显示发票抬头
-			$("#input-radio-adver").click(function(){
-				$(".hideAdverstier").css("display","block");
-				$(".hideOperator").css("display","none");
-				$("#title").attr("verify","unspecial/255/1/0");
-				$("#bank").attr("verify","unspecial/255/0/0");
-				$("#bankAccountName").attr("verify","unspecial/255/0/0");
-				$("#bankAccount").attr("verify","number/255/0/0");
-			});
-			
-		});
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/client-account/list">客户账号管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">创建账号</li>
-			</ul>  
-		</div>
-		<div id="content" style="padding-bottom:44px; margin: -41px 32px;">	
-			<div id="createForm">
-				<form id="validation-form" class="form-horizontal">
-				
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号类型：</label>
-						<label class="form-align-radio" style="float: left; margin-left: -75px;"><input id="input-radio-oper" autocomplete="off" name="sysType" type="radio" value="2" checked="checked"><span class="lbl" style="position:absolute;left:83px;"></span><span>媒体</span></label> 
-						<label class="form-align-radio"><input id="input-radio-adver" autocomplete="off" name="sysType" type="radio" value="3"><span class="lbl" style="position:absolute;left:219px;"></span><span>需求方</span></label>
-					</div>
-					
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号：</label>
-						<input class="input-text" autocomplete="off" id="accountName" name="accountName" type="text" value="" verify="email/20/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="password-div">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>密码：</label>
-						<span id="password-span"><input class="input-text" autocomplete="off" id="password" name="password" type="password" value="" verify="unspecial/100/1/0"></span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="ensurePassword-div">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码：</label>
-						<span id="ensurePassword-span"><input class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"></span>
-						<input id="input-password" autocomplete="off" type="checkbox" style="margin-top:9px"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">显示密码</span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系人：</label>
-						<input class="input-text" autocomplete="off" id="linkMan" name="linkMan" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>移动电话：</label>
-						<input class="input-text" autocomplete="off" id="mobilePhone" name="mobilePhone" type="text" value="" verify="mobile/11/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>固定电话：</label>
-						<input class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="" verify="tel/12/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>公司名称：</label>
-						<input class="input-text" autocomplete="off" id="companyName" name="companyName" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;网站：</label>
-						<input class="input-text" autocomplete="off" id="homePage" name="homePage" type="text" value="" verify="website/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;公司地址：</label>
-						<input class="input-text" autocomplete="off" id="address" name="address" type="text" value="" verify="unspecial/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;邮编：</label>
-						<input class="input-text" autocomplete="off" id="zip" name="zip" type="text" value="" verify="zipcode/6/0/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;电子邮件：</label>
-						<input class="input-text" autocomplete="off" id="email" name="email" type="text" value="" verify="email/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group hideOperator">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>银行名称：</label>
-						<input class="input-text" autocomplete="off" id="bank" name="bank" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group hideOperator">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>开户人：</label>
-						<input class="input-text" autocomplete="off" id="bankAccountName" name="bankAccountName" type="text" value="" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group hideOperator">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>银行账户：</label>
-						<input class="input-text" autocomplete="off" id="bankAccount" name="bankAccount" type="text" value="" verify="number/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group hideAdverstier" style="display:none;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>发票抬头：</label>
-						<input class="input-text" autocomplete="off" id="title" name="title" type="text" value="" verify="unspecial/255/0/0" style="margin-top:0px;color:#aaa;"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>
-						<label class="form-align-radio" ><input id="input-radio-open" autocomplete="off" name="status" type="radio" value="1" checked="checked"><span class="lbl"></span><span>开启</span></label> 
-						<label class="form-align-radio" style="margin-left: 130px; margin-top: -41px; margin-bottom: -10px;"><input id="input-radio-down" autocomplete="off" name="status" type="radio" value="0"><span class="lbl"></span><span>暂停</span></label>
-					</div>
-					<div id="btn-class" class="form-actions1">
-						<div id="create-btn-save">保存</div>
-					    <div id="create-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">	
+<title>创建账号</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/clientAccount.js"></script>
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/back/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/client-account/list">客户账号管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">创建账号</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/back/main/client-account/save" method="post">
+	 			<input type="hidden" name="id" id="accountId" value=""/>
+	 			<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号类型：</label>
+					<input class="input-radio" id="input-radio-oper" name="sysType" type="radio" value="2" checked="checked"/><span class="input-radio-span">媒体</span>
+					<input class="input-radio" id="input-radio-adver" name="sysType" type="radio" value="3"/><span class="input-radio-span">需求方</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号：</label>
+					<input class="input-text" tabindex="1" id="accountName" name="accountName" type="text" value="" verify="email/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="password-div">
+					<label class="input-label"><span class="lbl-yes">*</span>密码：</label>
+					<span id="password-span"><input class="input-text" tabindex="2" id="password" name="password" type="password" value="" verify="unspecial/100/1/0"/></span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="ensurePassword-div">
+					<label class="input-label"><span class="lbl-yes">*</span>确认密码：</label>
+					<span id="ensurePassword-span"><input class="input-text" tabindex="3" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"/></span>
+					<input id="input-password-create" type="checkbox" class="input-password"><span class="input-password-span">显示密码</span>
+					<span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系人：</label>
+					<input class="input-text" tabindex="4" id="linkMan" name="linkMan" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>移动电话：</label>
+					<input class="input-text" tabindex="5" id="mobilePhone" name="mobilePhone" type="text" value="" verify="mobile/11/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>固定电话：</label>
+					<input class="input-text" tabindex="6" id="tel" name="tel" type="text" value="" verify="tel/12/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>公司名称：</label>
+					<input class="input-text" tabindex="7" id="companyName" name="companyName" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>网站：</label>
+					<input class="input-text" tabindex="8" id="homePage" name="homePage" type="text" value="" verify="website/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>公司地址：</label>
+					<input class="input-text" tabindex="9" id="address" name="address" type="text" value="" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>邮编：</label>
+					<input class="input-text" tabindex="10" id="zip" name="zip" type="text" value="" verify="zipcode/6/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>电子邮件：</label>
+					<input class="input-text" tabindex="11" id="email" name="email" type="text" value="" verify="email/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group hideOperator">
+					<label class="input-label"><span class="lbl-yes">*</span>银行名称：</label>
+					<input class="input-text" tabindex="12" id="bank" name="bank" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group hideOperator">
+					<label class="input-label"><span class="lbl-yes">*</span>开户人：</label>
+					<input class="input-text" tabindex="13" id="bankAccountName" name="bankAccountName" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group hideOperator">
+					<label class="input-label"><span class="lbl-yes">*</span>银行账户：</label>
+					<input class="input-text" tabindex="14" id="bankAccount" name="bankAccount" type="text" value="" verify="number/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group hideAdverstier hideClientAccount">
+					<label class="input-label"><span class="lbl-yes">*</span>发票抬头：</label>
+					<input class="input-text" tabindex="12" id="title" name="title" type="text" value="" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号状态：</label>
+					<input class="input-radio" name="status" type="radio" value="1" checked="checked"/><span class="input-radio-span">开启</span>
+					<input class="input-radio" name="status" type="radio" value="0"/><span class="input-radio-span">暂停</span>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" id="btn-cancel-authority" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/client-account/createcorrelation.ftl

@@ -1,152 +1,52 @@
-<@override name="head">
-	<title>账号管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-
-	
-	<script type="text/javascript" >
-		$(function(){
-		  //请选择运营商
- 	if($("#main_operatorListUl").html()){
- 		if($("#selectedOperatorId").val() == -1 || $("#selectedOperatorId").val() == ""){
- 			$("#operatorListUl_span").html("运营商");
- 		}
- 		$("#son_operatorListUl").hide();
- 		var url = "/ssp_web/widget/selector/provide/operator?parentId=1";
- 		
- 		$("#operatorListUl_span").on("click",function(){
-	 		$("#son_operatorListUl").empty();
-	 		$('#son_operatorListUl').css({height:"auto",overflow:"hidden"});
-	 		
-	 	
-		 		$.getJSON( url, function(data){
-					var data_1 = data.operatorList;
-					//alert(data_1);
-					$.each( data_1, function( key, val ) {
-						$("#son_operatorListUl").append('<li value='+ val.id +'>' + val.companyName + '</li>');
-					});
-					$('#son_operatorListUl').show(); //ul显示
-					if($('#son_operatorListUl').height()>210){
-						$('#son_operatorListUl').css({"height":"210"+"px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-					};
-				});	
-	 		
-	 	});		
- 		
- 		$('ul#son_operatorListUl li').live("click",function(){
- 	 		$(this).parents('li').find('span').html($(this).html());
- 			$("#selectedOperatorId").val($(this).attr("value"));
- 			$("#selectedOperatorName").val($(this).html());
- 			$('#son_operatorListUl').hide(); //ul隐藏
- 			
- 		});
- 	}
- 	
- 	//请选择代理商
- 	if($("#main_agent").html()){
- 		if($("#selectedAgentId").val() == -1 || $("#selectedAgentId").val() == ""){
- 			$("#agent_span").html("代理商");
- 		}
- 		$("#son_agent").hide();
- 		
- 		var url_1 = "${ctx}/widget/selector/provide/adv-agent"; //请求地址
- 		$("#agent_span").on("click",function(){
-	 		$("#son_agent").empty();
-	 		$('#son_agent').css({height:"auto",overflow:"hidden"});
-	 		
-	 	
-		 		$.getJSON( url_1, function(data){
-					var data_1 = data.advAgentsList;
-					//alert(data_1);
-					$.each( data_1, function( key, val ) {
-						$("#son_agent").append('<li value='+ val.value  +'>' + val.label + '</li>');
-					});
-					$('#son_agent').show(); //ul显示
-					if($('#son_agent').height()>210){
-						$('#son_agent').css({"height":"210"+"px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-					};
-				});	
-	 		
-	 	});		
- 		
- 		$('ul#son_agent li').live("click",function(){
- 	 		$(this).parents('li').find('span').html($(this).html());
- 			$("#selectedAgentId").val($(this).attr("value"));
- 			//$("#selectedOperatorName").val($(this).html());
- 			$('#son_agent').hide(); //ul隐藏
- 			
- 		});
- 	}
- 	//新增账号关联
-			$("#cancel-correlate").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/client-account/correlation";
-			});
-		
-	});	
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler" style="margin-left: 24px;">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/authority/list">权限管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">账号关联</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/back/main/client-account/savecorrelation" method="post" style="margin:0px;">
-			  	
-			  	
-			  	<div id="selectuls">
-			  			<span id="choose" style="float:left;margin-left:20px;">请选择运营商:</span>
-			  			<ul id="main_operatorListUl">
-						<li class="select_box" id="operatorListUl_box" style="margin-right: 85px;">
-							<span id="operatorListUl_span">${operatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl" style="z-index: 9999;position:absolute;margin: 0 0 0 157px;"></ul>
-						</li>
-						</ul>
-						
-						<input type="hidden" name="operatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
-					
-						<span id="choose" style="float:left;">请选择代理商:</span>
-			  			<ul id="main_agent">
-						<li class="select_box" id="agent_box" style="margin-right: 85px;">
-							<span id="agent_span">${operatorName!}</span>
-							<ul class="son_ul" id="son_agent" style="z-index: 9999;position:absolute;margin: 0 0 0 490px;"></ul>
-						</li>
-						</ul>
-						
-						<input type="hidden" name="agentId" id="selectedAgentId" value="${selectedAgentId!}">
-						
-			  	</div> 
-			  	<div id="buttons">
-			  			 
-				  		<button id="save-correlate" type="submit" class="btn1" style="float:left;width:126px;">保存</button>      
-				        <div id="cancel-correlate" class="btn1">取消</div> 
-				      
-				    </div>
-			  	
-					
-		
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">	
+<title>新增关联</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/clientAccount.js"></script>
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/back/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/client-account/list">客户账号管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/client-account/correlation">账号关联</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">新增关联</li>
+				</ul>  
+	 		</div>
+	 		<form id="correlationForm" action="${ctx}/back/main/client-account/savecorrelation" method="post">
+				<div class="input-group" id="selectuls">
+			  		<label class="input-label">请选择运营商:</label>
+			  		<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">请选择运营商</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="operatorId" id="selectedOperatorId" value="${selectedOperatorId!}"/>
+					<label class="input-label">请选择代理商:</label>
+			  		<ul id="main_agentUl">
+						<li class="select_box" id="agentListUl_box">
+							<span id="agentListUl_span">请选择代理商</span>
+							<ul class="son_ul" id="son_agentListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="agentId" id="selectedAgentId" value="${selectedAgentId!}"/>
+			  	</div>
+				<div id="footBtn_other">
+					<button id="btn-correlation-save" class="btn-save" type="submit">保存</button>
+					<button id="btn-correlation-cancel" class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/client-account/edit.ftl

@@ -1,225 +1,112 @@
-<@override name="head">
-	<title>编辑账号</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
-	
-	<style>
-		.spanVaildate{
-			margin-left:20px;
-			color:red;
-			position: absolute;
-		}
-		/*#create-btn-save:hover{
-		     background:#344c67;
-		}**/
-	</style>
-	
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#validation-form").autovalidate();
-			//保存按钮
-			$("#edit-btn-save").unbind('click').click(function(){
-				var editParam = $("#validation-form").serialize();
-				if (!$("#validation-form").validate()) {
-					return false;
-				} 
-				if($("#ensurePassword").val() !="" && $("#ensurePassword").val() !=$("#password").val()){
-					$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-					return false;
-				}
-				$.ajax({
-		            type: "POST",
-		             url: "${ctx}/back/main/client-account/save",
-		             data: editParam,
-		            success: function(data){
-				 		location.href = "${ctx}/back/main/client-account/list";
-		            }
-				});
-			});
-				
-			//取消按钮
-			$("#edit-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/client-account/list";
-			});
-				
-			//修改密码点击事件
-			$("#input-password").click(function(){
-				if($(this).attr("checked")){
-					$("#password").attr("disabled",false);
-					$("#ensurePassword").attr("disabled",false);
-					$("#password").attr("verify","unspecial/100/1/0");
-					$("#ensurePassword").attr("verify","unspecial/100/1/0");
-				}else{
-					$("#password").val("");
-					$("#ensurePassword").val("");
-					$("#password").attr("disabled",true);
-					$("#ensurePassword").attr("disabled",true);
-					$("#password").attr("verify","unspecial/100/0/0");
-					$("#ensurePassword").attr("verify","unspecial/100/0/0");
-					$("#password").css("box-shadow","none").attr('title','');
-					$("#password").parent("span").parent("div").find("span.spanVaildate").html("");
-					$("#ensurePassword").css("box-shadow","none").attr('title','');
-					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-				}
-			});
-				
-			//确认密码与密码一致
-			$("#ensurePassword").blur(function(){
-				validPassword();
-			});
-			
-			$("#ensurePassword, #password").focus(function(){
-				$(this).css("box-shadow","0 0 6px red");
-			});
-			
-			$("#ensurePassword, #password").blur(function(){
-				$(this).css("box-shadow","none");
-			});
-				
-			function validPassword(){
-				var password = $("#password").val();
-				var ensurePassword = $("#ensurePassword").val();
-				if(ensurePassword != ""){
-					if(ensurePassword != password){
-						$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致！');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致！");
-						return false;
-					}else{
-						$("#ensurePassword").css("box-shadow","none").attr('title','');
-						$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("");
-					}
-				}
-			}
-				
-			
-		});
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler" style="margin:18px 0 -10px -10px; padding-top: 17px;">
-			<ul>
-				<li class="size1"><i class="icon-home"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/back/main/client-account/list">客户账号管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span></li>
-				<li class="size3" id="handlerName">编辑账号</li>
-			</ul>  
-		</div>
-		<div id="content" style="padding-bottom:44px;">	
-			<div id="editForm">
-				<form id="validation-form" class="form-horizontal">
-					<input  autocomplete="off"  type="hidden" name="id" id="accountId" value="${clientAccount.id}"/>
-					<input  autocomplete="off"  type="hidden" name="agentId" value="${clientAccount.agentId}"/>
-					<input  autocomplete="off"  type="hidden" name="operatorId" value="${clientAccount.operatorId}"/>
-					<input  autocomplete="off"  type="hidden" name="sysType" value="${clientAccount.sysType}"/>
-					<input  autocomplete="off"  type="hidden" name="accountName" value="${clientAccount.accountName}"/>
-					
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号类型：</label>
-						<label class="form-align-radio" style="float: left; margin-left: 82px;"><input id="input-radio-oper" autocomplete="off" name="sysType" type="radio" <#if clientAccount.sysType==2>checked</#if> value="2" disabled><span class="lbl" style="position:absolute;left:100px;"></span><span>媒体</span></label> 
-						<label class="form-align-radio"><input id="input-radio-adver" autocomplete="off" name="sysType" type="radio" <#if clientAccount.sysType==3>checked</#if> value="3" disabled><span class="lbl" style="position:absolute;left:230px;"></span><span>需求方</span></label>
-					</div>
-					<div class="control-group">
-						<label style="width:100px;" class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号：</label>
-						<input class="input-text" autocomplete="off" id="accountName" name="accountName" type="text" value="${clientAccount.accountName}" verify="email/20/1/0" disabled="true"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="password-div">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>密码：</label>
-						<span id="password-span"><input class="input-text" autocomplete="off" id="password" name="password" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group" id="ensurePassword-div">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码：</label>
-						<span id="ensurePassword-span"><input class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span>
-						<input id="input-password" autocomplete="off" type="checkbox" style="margin-top:9px"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">修改密码</span><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>联系人：</label>
-						<input class="input-text" autocomplete="off" id="linkMan" name="linkMan" type="text" value="${clientAccount.linkMan}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>移动电话：</label>
-						<input class="input-text" autocomplete="off" id="mobilePhone" name="mobilePhone" type="text" value="${clientAccount.mobilePhone}" verify="mobile/11/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>固定电话：</label>
-						<input class="input-text" autocomplete="off" id="tel" name="tel" type="text" value="${clientAccount.tel}" verify="tel/12/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>公司名称：</label>
-						<input class="input-text" autocomplete="off" id="companyName" name="companyName" type="text" value="${clientAccount.companyName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;网站：</label>
-						<input class="input-text" autocomplete="off" id="homePage" name="homePage" type="text" value="${clientAccount.homePage}" verify="website/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;公司地址：</label>
-						<input class="input-text" autocomplete="off" id="address" name="address" type="text" value="${clientAccount.address}" verify="unspecial/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;邮编：</label>
-						<input class="input-text" autocomplete="off" id="zip" name="zip" type="text" value="${clientAccount.zip}" verify="zipcode/6/0/0"><span class="spanVaildate"></span>
-					</div>
-					
-					<div class="control-group">
-						<label class="control-label1" for="form-field-4">&nbsp;&nbsp;电子邮件：</label>
-						<input class="input-text" autocomplete="off" id="email" name="email" type="text" value="${clientAccount.email}" verify="email/255/0/0"><span class="spanVaildate"></span>
-					</div>
-					<#if clientAccount.sysType==2>
-					<div class="control-group hideOperator">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>银行名称：</label>
-						<input class="input-text" autocomplete="off" id="bank" name="bank" type="text" value="${clientAccount.bank}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group hideOperator">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>开户人：</label>
-						<input class="input-text" autocomplete="off" id="bankAccountName" name="bankAccountName" type="text" value="${clientAccount.bankAccountName}" verify="unspecial/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					<div class="control-group hideOperator">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>银行账户：</label>
-						<input class="input-text" autocomplete="off" id="bankAccount" name="bankAccount" type="text" value="${clientAccount.bankAccount}" verify="number/255/1/0"><span class="spanVaildate"></span>
-					</div>
-					</#if>
-					<#if clientAccount.sysType==3>
-					<div class="control-group hideAdverstier">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>发票抬头：</label>
-						<input class="input-text" autocomplete="off" id="title" name="title" type="text" value="${clientAccount.title}" verify="unspecial/255/1/0" style="margin-top:0px;color:#aaa;"><span class="spanVaildate"></span>
-					</div>
-					</#if>
-					<div class="control-group" style="margin-bottom:10px;">
-						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="status" type="radio" <#if clientAccount.status==1>checked</#if> value="1"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio" style="margin-left: 130px; margin-top: -41px; margin-bottom: -10px;"><input id="input-radio-down" autocomplete="off" name="status" type="radio" <#if clientAccount.status==0>checked</#if> value="0"><span class="lbl" style="position:absolute;left:230px;"></span><span>暂停</span></label>
-					</div>
-					<div id="btn-class" class="form-actions1">
-						<div id="edit-btn-save">保存</div>
-					    <div id="edit-btn-cancel">取消</div>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">	
+<title>编辑账号</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/clientAccount.js"></script>
+</@override>	
+<@override name="body">
+<div id=content_bg>
+ 	<#include "/back/main/public-head.ftl"/>
+	<div id= "pagecontent">
+		<div id="content">
+	   		<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/client-account/list">客户账号管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li class="navDiv_currentLi">编辑账号</li>
+				</ul>  
+	 		</div>
+	 		<form id="validateForm" action="${ctx}/back/main/client-account/save" method="post">
+	 			<input type="hidden" name="id" id="accountId" value="${clientAccount.id!}"/>
+				<input type="hidden" name="agentId" value="${clientAccount.agentId!}"/>
+				<input type="hidden" name="operatorId" value="${clientAccount.operatorId!}"/>
+				<input type="hidden" name="sysType" value="${clientAccount.sysType!}"/>
+				<input type="hidden" name="accountName" value="${clientAccount.accountName!}"/>
+	 			<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号类型：</label>
+					<input class="input-radio" id="input-radio-oper" name="sysType" type="radio" value="2" <#if clientAccount.sysType==2>checked</#if> disabled/><span class="input-radio-span">媒体</span>
+					<input class="input-radio" id="input-radio-adver" name="sysType" type="radio" value="3" <#if clientAccount.sysType==3>checked</#if> disabled/><span class="input-radio-span">需求方</span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号：</label>
+					<input class="input-text" tabindex="1" id="accountName" name="accountName" type="text" value="${clientAccount.accountName!}" disabled="true"/>
+				</div>
+				<div class="input-group" id="password-div">
+					<label class="input-label"><span class="lbl-yes">*</span>密码：</label>
+					<span id="password-span"><input class="input-text" tabindex="2" id="password" name="password" type="password" value="" verify="unspecial/100/0/0"  disabled="true"/></span><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group" id="ensurePassword-div">
+					<label class="input-label"><span class="lbl-yes">*</span>确认密码：</label>
+					<span id="ensurePassword-span"><input class="input-text" tabindex="3" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0"  disabled="true"/></span>
+					<input id="input-password-create" type="checkbox" class="input-password"><span class="input-password-span">修改密码</span>
+					<span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>联系人：</label>
+					<input class="input-text" tabindex="4" id="linkMan" name="linkMan" type="text" value="${clientAccount.linkMan!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>移动电话：</label>
+					<input class="input-text" tabindex="5" id="mobilePhone" name="mobilePhone" type="text" value="${clientAccount.mobilePhone!}" verify="mobile/11/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>固定电话：</label>
+					<input class="input-text" tabindex="6" id="tel" name="tel" type="text" value="${clientAccount.tel!}" verify="tel/12/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>公司名称：</label>
+					<input class="input-text" tabindex="7" id="companyName" name="companyName" type="text" value="${clientAccount.companyName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>网站：</label>
+					<input class="input-text" tabindex="8" id="homePage" name="homePage" type="text" value="${clientAccount.homePage!}" verify="website/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>公司地址：</label>
+					<input class="input-text" tabindex="9" id="address" name="address" type="text" value="${clientAccount.address!}" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>邮编：</label>
+					<input class="input-text" tabindex="10" id="zip" name="zip" type="text" value="${clientAccount.zip!}" verify="zipcode/6/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-no"></span>电子邮件：</label>
+					<input class="input-text" tabindex="11" id="email" name="email" type="text" value="${clientAccount.email!}" verify="email/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				<#if clientAccount.sysType==2>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>银行名称：</label>
+					<input class="input-text" tabindex="12" id="bank" name="bank" type="text" value="${clientAccount.bank!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>开户人：</label>
+					<input class="input-text" tabindex="13" id="bankAccountName" name="bankAccountName" type="text" value="${clientAccount.bankAccountName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>银行账户：</label>
+					<input class="input-text" tabindex="14" id="bankAccount" name="bankAccount" type="text" value="${clientAccount.bankAccount!}" verify="number/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				</#if>
+				<#if clientAccount.sysType==3>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>发票抬头：</label>
+					<input class="input-text" tabindex="12" id="title" name="title" type="text" value="${clientAccount.title!}" verify="unspecial/255/0/0"/><span class="spanVaildate"></span>
+				</div>
+				</#if>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>账号状态：</label>
+					<input class="input-radio" name="status" type="radio" value="1" <#if clientAccount.status==1>checked</#if> /><span class="input-radio-span">开启</span>
+					<input class="input-radio" name="status" type="radio" value="0" <#if clientAccount.status==0>checked</#if> /><span class="input-radio-span">暂停</span>
+				</div>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" id="btn-cancel-authority" type="button">取消</button>
+				</div>
+			</form>
+		</div>
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/client-account/list.ftl

@@ -1,223 +1,98 @@
-<@override name="head">
-	<title>客户账号管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-			if($("#sysType").val() == 0){
-				$("#all").css('border-bottom-color','#36aeea');
-			}else if($("#sysType").val() == 2){
-				$("#oper").css('border-bottom-color','#36aeea');
-			}else if($("#sysType").val() == 3){
-				$("#adver").css('border-bottom-color','#36aeea');
-			}
-			//页面中审核通过，审核不通过，未审核链接跳转按钮
-			$('#selectConditionBar a').live("click", function() {
-				$(this).siblings().css('border-bottom-color','#f4f5f7');	
-				$(this).css('border-bottom-color','#36aeea');
-				if($(this).text() == "全部"){
-					$("#sysType").val(0);
-				}else if($(this).text() == "媒体"){
-					$("#sysType").val(2);
-				}else if($(this).text() == "需求方"){
-					$("#sysType").val(3);
-				}
-				$('#formPage').submit();
-			});
-			//账号关联
-			$("#btn-corelate").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/client-account/correlation";
-			});
-			//创建账号
-			$("#btn-create").unbind('click').click(function(){
-				location.href = "${ctx}/back/main/client-account/create";
-			});
-			
-			//编辑
-			$("#btn-edit").live("click", function() {
-				var accountId = parseInt($(this).attr("value"));
-				location.href = "${ctx}/back/main/client-account/edit?accountId="+accountId;
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-
-			//批量开启,批量暂停
-			$("#all-btn-enable,#all-btn-disable").click(function(){
-				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
-				var _param = checkboxs.serialize();
-				var url = ""; var type = "";
-				if($(this).attr("id") == "all-btn-enable"){
-					url = "${ctx}/back/main/client-account/enable";
-					type = "开启";
-				}else if($(this).attr("id") == "all-btn-disable"){
-					url = "${ctx}/back/main/client-account/disable";
-					type = "暂停";
-				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							$.post(url, _param, function(data) {
-								$('#formPage').submit();
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的数据！");
-				}
-			});
-			
-			//开启,暂停
-			$('#btn-enable,#btn-disable').live('click' ,function(){
-				var url = "";
-				var accountId = parseInt($(this).attr("value"));
-				if($(this).attr("id") == "btn-enable"){
-					url = "${ctx}/back/main/client-account/enable";
-				}else if($(this).attr("id") == "btn-disable"){
-					url = "${ctx}/back/main/client-account/disable";
-				}
-				$.post(url, {id:accountId}, function(data) {
-					$('#formPage').submit();
-				});
-			});
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/back/main/client-account/exportDataReportExcel?sysType="+$("#sysType").val()+"&searchValue="+$("#searchValue").val());
-		};
-		
-	</script>
-	<style>
-		 #second{
-		 margin-left:20px;
-		 margin-bottom: 15px;
-		 }
-	     #buttons{
-	     clear:both;
-	     }
-	</style>
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-<div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">客户账号管理</li>
-			</ul>
-		</div>
-		<div id="selectConditionBar">
-	        <span>账号类型：</span>
-	        <a id="all" value="0">全部</a>
-	        <a id="oper" value="2">媒体</a>
-			<a id="adver" value="3">需求方</a>
-	    </div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/back/main/client-account/list" method="post" style="margin:0px;">
-				<input type="hidden" id="sysType" name="sysType" value="${sysType!}">
-		  		<div id="buttons">
-		  			<div id="btn-corelate" class="btna">账号关联</div> 
-			  		<div id="btn-create" class="btna">创建账号</div>      
-			        <div id="all-btn-enable" class="btna">批量开启</div>  
-			        <div id="all-btn-disable" class="btna">批量停用</div> 
-			        <div id="serachData">
-			        	<input type="hidden" id="page" name="page" value="${pager.page}">
-						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}"/>
-						<input id="serachData_img" type="submit" value="" />
-					</div>
-		 		</div>
-				<div id="account-table" style="margin:20px 0px 0px 0px;">
-					<table border="1" class="tablefig" id="tablefig" style="width:100%;">
-						<thead>
-							<tr>
-								<th width="5%">
-									<label><input type="checkbox" style=" opacity: 1;" class="input_checkbox"><span class="lbl"></span></label>
-								</th>
-								<th width="5%">ID</th>
-								<th width="10%">账号</th>
-								<th width="10%">公司名称</th>
-								<th width="10%">联系人</th>
-								<th width="10%">移动电话</th>
-								<th width="10%">固定电话</th>
-								<th width="10%">账号类型</th>
-								<th width="5%">状态</th>
-								<th width="15%">最后登录时间</th>
-								<th width="20%">操作</th>
-							</tr>
-						</thead>
-						<tbody>
-						<#if clientAccountsList ??>
-						<#list clientAccountsList as account>
-							<tr class="">
-								<td class="center">
-									<label><input  autocomplete="off" style=" opacity: 1;" type="checkbox" name="id" value="#{account.id}"><span class="lbl"></span></label>
-								</td>
-								<td class="breakword">${account.id!}</td>
-								<td class="breakword">${account.accountName!}</td>
-								<td class="breakword">${account.companyName!}</td>
-								<td class="hide-piece">${account.linkMan!}</td>
-								<td class="breakword">${account.mobilePhone!}</td>
-								<td class="hide-piece">${account.tel!}</td>
-								<td><#if account.sysType==2>媒体<#elseif account.sysType==3>需求方</#if></td>
-								<td><#if account.status==1>正常<#else>暂停</#if></td>
-								<td>${account.loginTime?datetime}</td>
-								<td>
-									<div id="btndiv">
-										<div id="btn-edit" class="btn11" value="${account.id}">编辑</div>
-										<#if account.status==1>
-										<div id="btn-disable" class="btn11" value="${account.id}">停用</div>
-										<#elseif account.status==0>
-										<div id="btn-enable" class="btn11" value="${account.id}">开启</div>
-										</#if>
-									</div>
-								</td>
-							</tr>
-						</#list>
-						</#if>
-					</tbody>
-					</table>
-					<div id="daochu1" style="margin-top:20px; margin-left:20px;">
-						<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-					</div>
-								
-					<div id="pageDiv" style="margin:-35px -10px 20px 0px;">
-		               	<#include "/common/pagination/simple.ftl"/>
-		            </div>	
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+<title>客户账号管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/clientAccount.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+    	<div id="content">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">客户账号管理</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/client-account/list" method="post">
+ 				<input type="hidden" id="sysType" name="sysType" value="${sysType!}"/>
+ 				<div id="selectBar_clientaccount" class="selectBar">
+	 				<span>账号类型：</span>
+					<a value="0">全部</a>
+			        <a value="2">媒体</a>
+					<a value="3">需求方</a>
+			    </div>
+ 				<div id="navButtons">
+					<div id="button">		
+						<a href="${ctx}/back/main/client-account/correlation" class="btn2">账号关联</a>
+						<a href="${ctx}/back/main/client-account/create" class="btn2">创建账号</a>
+						<a class="btn2" id="all-btn-enable">批量开启</a>
+						<a class="btn2" id="all-btn-disable">批量停用</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:5%">ID</th>
+							<th class="theadTh" style="width:10%">账号</th>
+							<th class="theadTh" style="width:10%">公司名称</th>
+							<th class="theadTh" style="width:8%">联系人</th>
+							<th class="theadTh" style="width:10%">移动电话</th>
+							<th class="theadTh" style="width:10%">固定电话</th>
+							<th class="theadTh" style="width:10%">账号类型</th>
+							<th class="theadTh" style="width:5%">状态</th>
+							<th class="theadTh" style="width:12%">最后登录时间</th>
+							<th class="theadTh" style="width:30%;">操作</th>
+						</tr>
+				    </thead>
+				    <tbody>
+						<#if clientAccountsList ??>
+				        <#list clientAccountsList as account>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${account.id!}"></div></td>
+							<td class="tbodyTd">${account.id!}</td>
+							<td class="tbodyTd">${account.accountName!}</td>
+							<td class="tbodyTd">${account.companyName!}</td>
+							<td class="tbodyTd">${account.linkMan!}</td>
+							<td class="tbodyTd">${account.mobilePhone!}</td>
+							<td class="tbodyTd">${account.tel!}</td>
+							<td class="tbodyTd"><#if account.sysType==2>媒体<#elseif account.sysType==3>需求方</#if></td>
+							<td class="tbodyTd"><#if account.status==1>正常<#else>暂停</#if></td>
+							<td class="tbodyTd">${account.loginTime!?datetime}</td>
+							<td class="tbodyTd">
+								<div id="listButtons">
+									<a href="${ctx}/back/main/client-account/edit?accountId=${account.id!}" class="btn3">编辑</a>
+									<#if account.status==1>
+									<a id="btn-enable" value="${account.id!}" class="btn3">停用</a>
+									<#elseif account.status==0>
+									<a id="btn-disable" value="${account.id!}" class="btn3">开启</a>
+									</#if>
+								</div>
+							</td>
+						</tr>
+				        </#list>
+						</#if>           
+				    </tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/dashboard.ftl

@@ -1,151 +1,50 @@
-<@override name="head">
-<title>广告投放系统</title>
-	<!--linked css-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/dashboard.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	<!--js dependence-->
-<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-
-<script type="text/javascript">
-$(function () {
-	var flow=[];
-	var tipLabel=new Array("PV","UV","Impression","Click","Income");
-	var pv=tipLabel[0];
-	$.ajax({
-		type : 'post',
-		url : '/ssp_web/back/main/dashboard/list',
-		async : false,
-		cache : false,
-		dataType : 'json',
-		success : function(data){
-			var pvArray = [];
-			var uvArray = [];
-			var impressionArray = [];
-			var clickArray = [];
-			var incomeArray = [];
-			$.each(data,function(n,value) {
-				pvArray[n] = value.pv;
-				uvArray[n] = value.uv;
-				impressionArray[n] = value.impression;
-				clickArray[n] = value.click;
-				incomeArray[n] = value.income;
-			});
-			flow[0] = pvArray;
-			flow[1] = uvArray;
-			flow[2] = impressionArray;
-			flow[3] = clickArray;
-			flow[4] = incomeArray;	 
-		},
-		error : function (XMLHttpRequest, textStatus, errorThrown) {
-			// 通常 textStatus 和 errorThrown 之中
-			// 只有一个会包含信息
-			//alert('error');
-			this; // 调用本次AJAX请求时传递的options参数
-		}
-	});
-		
-	//设置日期，当前日期的前七天
-	var myDate = new Date(); //获取今天日期
-	var myYear = myDate.getFullYear();//获取年份
-	myDate.setDate(myDate.getDate() - 7);
-	var labels = [];
-	var dateTemp;
-	var flag = 1;
-	for (var i = 0; i < 7; i++) {
-		dateTemp = myDate.getFullYear() + "/" + (myDate.getMonth() + 1) + "/" + myDate.getDate();
-		labels.push(dateTemp);
-		myDate.setDate(myDate.getDate() + flag);
-	}		
-	drawDiagram(myDate,flow[0],pv);
-		
-	$('#data_number td').click(function(){
-		$('#data_number td').css({"background-color":"#ffffff","color":"black"});
-		$(this).css({"background-color":"#36aeea","color":"#ffffff"});
-		var n = $(this).index();
-		pv=tipLabel[n];
-		var data = flow[n];
-		$('#baseTitle').text('近7天全部广告位' + pv);
-		drawDiagram(myDate,data,pv);
-	});
-		
-	function drawDiagram(myDate,data,pv){		
-		$('#diagram').highcharts({ 
-			chart: { type: 'line' },
-			title: { text: '' }, //标题
-			//subtitle: { text: 'Source: WorldClimate.com' }, //副标题
-			xAxis: { categories: labels }, 
-			yAxis: { 
-				title: { text: '' }, 
-				plotLines: [{ value: 0, width: 1, color: '#808080' }]
-			}, 
-			tooltip: { crosshairs: true, shared: true }, 
-			legend: { 
-				enabled:false,
-			},
-			credits:{
-				enabled:false,
-			},
-			
-			series: [{ 
-				name: pv, 
-				data: data,
-				color:'#36aeea',
-				marker:{
-					symbol: 'circle',
-					fillColor:'#ffffff',
-					lineColor:'#87b9f6',
-					lineWidth: 2,
-					radius: 5,
-				}
-			}]
-		}); 
-	}
-});
-</script>
-</@override>
-
-<@override name="body">
-<!-- PAGE CONTENT BEGINS HERE -->
-<#include "public-head.ftl">
-	<div id="pagecontent">
-		<div id="quickJump" style="padding:20px 0 0 20px;">
-			<span><i class="icon-home">&nbsp;</i><a src="${ctx}/back/main/dashboard">首页</a></span>
-		</div>
-		
-		<div id="data_number">
-			<div class="today">今天</div>
-			<table class="table">
-				<tr>
-					<td class="pv">
-							<span class="title">PV</span>	
-							<span class="num">${todayRptZone.pv}</span>
-					</td>
-					<td class="uv">
-							<span class="title">UV</span>	
-							<span class="num">${todayRptZone.uv!}</span>
-					</td>
-					<td class="exposure">
-							<span class="title">广告曝光数</span>	
-							<span class="num">${todayRptZone.impression!}</span>
-					</td>
-					<td class="click">
-							<span class="title">广告点击数</span>
-							<span class="num">${todayRptZone.click!}</span>
-					</td>
-					<td class="income">
-							<span class="title">收入</span>
-							<span class="num">${todayRptZone.income!}</span>
-					</td>	
-				</tr>
-			</table>			
-		</div>
-		
-   		<div id="diagram"></div>
-   		<div id="baseTitle">近7天全部广告位PV</div>
-	</div>
-
-</@override>
+<@override name="head">
+<title>广告投放系统</title>
+<!--linked css-->
+<link rel="stylesheet" href="${ctx}/assets/css/dashboard_operator.css"/>
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/dashboard.js"></script>
+</@override>
+<@override name="body">
+<div id="content_bg">
+<#include "public-head.ftl">
+	<div id="pagecontent">
+		<div id="quickJump">
+			<span><i class="icon-home">&nbsp;</i><a src="${ctx}/back/main/dashboard">首页</a></span>
+		</div>
+		
+		<div id="data_number">
+			<div class="today">今天</div>
+			<table class="table">
+				<tr>
+					<td class="pv">
+							<span class="title">PV</span>	
+							<span class="num">${todayRptZone.pv}</span>
+					</td>
+					<td class="uv">
+							<span class="title">UV</span>	
+							<span class="num">${todayRptZone.uv!}</span>
+					</td>
+					<td class="exposure">
+							<span class="title">广告曝光数</span>	
+							<span class="num">${todayRptZone.impression!}</span>
+					</td>
+					<td class="click">
+							<span class="title">广告点击数</span>
+							<span class="num">${todayRptZone.click!}</span>
+					</td>
+					<td class="income">
+							<span class="title">收入</span>
+							<span class="num">${todayRptZone.income!}</span>
+					</td>	
+				</tr>
+			</table>			
+		</div>
+		
+   		<div id="diagram"></div>
+   		<div id="baseTitle">近7天全部广告位PV</div>
+	</div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/deposit.ftl

@@ -1,223 +1,92 @@
-<@override name="head">
-	<title>广告投放系统</title>
-	<!--css-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/finance.css"/>
-	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript">
-	$(function(){
-		//搜索输入框的样式改变
-		$(document).on('focus',"#searchBar input[name='searchValue']",function(){
-			$(this).val("");
-		});
-		$(document).on('blur',"#searchBar input[name='searchValue']",function(){
-			if($(this).val()== ""){
-				$(this).val("请输入日期进行搜索");
-			}
-		});
-		
-		//取消按钮
-		$(document).on('click',"#form1 button[type='button']",function(){
-			var _href = $(this).attr("href");
-			window.location.assign(_href);
-		});
-		
-		/*
-		*提交表单，验证是否选择代理商以及充值不能为负
-		*
-		*
-		*/
-		$('#form1 input').change(function(){
-			var money = parseInt($(this).val());
-			$(this).val(money);
-		});
-		$('#form1 select').change(function(){
-			$('#form1 select').css("border",'none');
-		});
-		$(document).on('click',"#form1 button[type='submit']",function(e){
-			e.preventDefault();//阻止表单提交
-			if($('#form1 select').val() == -1){
-				$('#form1 select').css("border",'1px solid red');
-				return false;
-			};
-			var _url = $('#form1').attr('action') + '?' + $('#form1').serialize();
-			window.location.assign(_url);
-		});
-		
-		//搜索数据
-		$(document).on('click','#serachData_img',function(){
-			console.info($(this));
-			var $searchValue = $("#searchBar .search-form input[name=searchValue]")
-			if($searchValue.val() == "请输入日期进行搜索"){
-				$searchValue.val(null);
-			};
-			var _form = $('#pagecontent .search-form');
-			var _url = _form.attr('action');
-			var _param = _form.serialize();
-			console.log("search url:"+_url+", param:"+_param);
-			//$('html').load(_url,_param);
-			/* $.post(_url, _param, function(data) {
-				$('html').html(data);
-			}); */
-			var _url = $('#searchBar form').attr('action') + '?' + $('#searchBar form').serialize();
-			window.location.assign(_url);
-			return false;
-		});
-		
-		// 分页中超链接跳转
-		$(document).on('click','#pagecontent .pagination ul li a[href]',function(){
-			var _page = $(this).attr('href').substr(1);
-			var _form = $('#pagecontent .search-form');
-			_form.find('input:hidden[name="page"]').val(_page);
-			_form.find('img').click();
-			return false;
-		});
-		
-		//以下实现导出excel
-		$(document).on('click','#exportExcel',function(){
-			var _href = $(this).attr('href');
-			var $searchValue = $("#searchBar .search-form input[name=searchValue]")
-			if($searchValue.val() == "请输入日期进行搜索" || $searchValue.val() == ""){
-				$searchValue.val(null);
-				window.location.assign(_href);
-			} else {
-				window.location.assign(_href + "?searchValue=" + $searchValue.val());
-			}
-			return false;
-		});
-		
-		
-		/*以下是获取所有代理商下拉框的实现
-		*/
-		//这里设置获取该代理商， 后端查询所有代理商，不需要参数;
-	    var _url = "${ctx}/widget/selector/provide/adv-agent"; //请求地址
-	    //调用获取代理商的方法
-	    loadDataForPullDownList($('#agentId'), "advAgentsList", _url, "请选择代理商");
-		function loadDataForPullDownList(controlView, parentId, url, defaultLabel) {
-			//清空下拉框列表
-			controlView.empty();
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//json请求,请求地址是url, 返回数据为data,回调函数去处理
-			$.getJSON(url, function(data) {
-				//打印控制台信息
-				//console.log(data);
-				//console.log(data[parentId]);
-				//遍历后端传回来的json数据，追加在select后面，value是id，label是值
-				$.each(data[parentId], function(key, val) {
-					controlView.append(
-						'<option value=' + val.value + '>' + val.label + '</option>'
-					);
-				});
-			});
-			//设置默认显示的列是-1；
-			controlView.val("-1");
-		}
-		
-		/*
-		*代理商充值撤销操作
-		*	@param advBalanceId
-		*	@return 删除成功返回ok， 删除失败返回false,提示账户不存在
-		*/
-		$(document).on('click','#tableList a',function(e){
-			e.preventDefault();
-			var _href = $(this).attr('href');
-			$.get(_href,function(data){
-				if(data == 'ok'){
-					$('#serachData_img').trigger('click');
-				}else{
-					bootbox.alert("账户不存在！");
-				}
-			});
-		})
-	});
-</script>
-</@override>
-<@override name="body">
-	<#include "/back/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="shortcutBar">
-			<ul>
-				<li >
-					<i class="icon-home"></i>
-					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-				</li>
-				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
-				<li >
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-					<a class="homepage2" href="">需求方充值</a>
-				</li>				         
-			</ul>
-		</div>
-		<div id="recharge">
-			<form id="form1" action="${ctx}/back/main/finance/finance-management/recharge" method="post">
-				<div>
-					<span>选择需求方：</span>
-					<select id="agentId" name="agentId" class="agentId">
-						<option value="-1">请选择代理商</option>
-					</select>
-				</div>
-				<div>
-					<span>充值：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-					<input type="text" name="money" value="100">
-					<span>元</span>
-					<span class='remind'></span>
-				</div>
-				<div>
-				<button type="submit" name="submit" value="submit">提交</button>
-				<button type='button' href='${ctx}/back/main/finance/finance-management'>取消</button>
-				</div>
-			</form>
-		</div>
-		<div id="searchBar">
-			<span>充值记录&nbsp;:</span>
-			<form action="${ctx}/back/main/finance/finance-management/deposit" method="post" class="search-form" >
-				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-		   		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
-		   		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入日期进行搜索" onkeydown="if(event.keyCode==13){return false;}">
-		   		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
-			</form>
-		</div>
-		
-		<div id="tableList">
-			<table class="table">
-				<thead>
-					<tr>
-						<th>日期</th>
-						<th>广告主/代理商</th>
-						<th>充值金额</th>
-						<th>余额</th>
-						<th>操作</th>
-					</tr>
-				</thead>
-				<tbody>
-					<#if advBalanceList ??>
-					<#list advBalanceList as advBalance>
-					<tr>
-						<td>${advBalance.actTime?date}</td>
-						<td>${advBalance.agentName!}</td>
-						<td>${advBalance.charge!}</td>
-						<td>${advBalance.balance!}</td>
-						<td><a href='${ctx}/back/main/finance/finance-management/backOut?advBalanceId=${advBalance.id}'>撤销</a></td>
-					</tr>
-				 	</#list>
-		            </#if>
-				</tbody>
-			</table>
-		</div>
-		<div id="footBar">
-			<button id="exportExcel" href="${ctx}/back/main/finance/finance-management/exportExcel">导出Excel</button>
-			<div id="paged">
-		       <#include "/common/pagination/simple.ftl"/>
-		    </div>
-		</div>
-	</div>
-</@override>
+<@override name="head">
+<title>需求方充值</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/validate.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/finance.js"></script>
+</@override> 
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="contentOther">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">需求方充值</li>
+				</ul>  
+ 			</div>
+ 			<form id="validateForm" action="${ctx}/back/main/finance/finance-management/recharge" method="post">
+			   	<div class="input-group" id="agentul_selectdiv">	
+			   		<label class="input-label"><span class="lbl-yes">*</span>选择需求方：</label>
+			   		<span class="spanVaildate_ul"></span>
+		 			<ul id="main_agentListUl">
+						<li class="select_box" id="agentListUl_box">
+							<span id="agentListUl_span">请选择代理商</span>
+							<ul class="son_ul" id="son_agentListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="agentId" id="agentId" value=""/>
+				</div>
+				<div class="input-group">
+					<label class="input-label"><span class="lbl-yes">*</span>充值：</label>
+					<input class="input-text" tabindex="1" id="money" name="money" type="text" value="" verify="float/11/1/2"/><span class="input-span">元</span><span class="spanVaildate"></span>
+				</div>
+				<div id="footBtn">
+					<button id="btn-recharge-save" class="btn-save" type="submit">提交</button>
+					<button id="btn-recharge-cancel" class="btn-cancel" type="button">取消</button>
+				</div>
+			</form>
+			<form id="myform" action="${ctx}/back/main/finance/finance-management/deposit" method="post">
+				<div id="navFinances">
+					<span>充值记录：</span>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableFig">
+					<thead>
+						<tr class="theadTr">
+							<th class="theadTh" style="width:20%;">日期</th>
+							<th class="theadTh" style="width:20%;">代理商</th>
+							<th class="theadTh" style="width:20%;">充值金额</th>
+							<th class="theadTh" style="width:20%;">余额</th>
+							<th class="theadTh" style="width:20%;">操作</th>
+						</tr>
+				    </thead>
+				    <tbody>
+						<#if advBalanceList ??>
+				        <#list advBalanceList as advBalance>
+				        <tr id="tbodyTr">
+							<td class="tbodyTd">${advBalance.actTime!?date}</td>
+							<td class="tbodyTd">${advBalance.agentName!}</td>
+							<td class="tbodyTd">${advBalance.charge!}</td>
+							<td class="tbodyTd">${advBalance.balance!}</td>
+							<td class="tbodyTd">
+								<a id="btn-recharge" value="${advBalance.id!}">撤销</a>
+							</td>
+						</tr>
+				        </#list>
+						</#if>           
+				    </tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="${ctx}/back/main/finance/finance-management/exportExcel">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+ 			</form>
+		</div>
+	</div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/index.ftl

@@ -1,183 +1,43 @@
-<@override name="head">
-	<title>广告投放系统</title>
-	<!--css-->
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/finance.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" charset="utf-8">
-	$(function(){
-		//搜索输入框的样式改变
-		$("#searchBar input[name='searchValue']").focus(function(){
-			$(this).val("");
-		});
-		$("#searchBar input[name='searchValue']").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入交易号进行搜索");
-			}
-		});
-		
-		//checkbox是否选中
-		$(document).on('click' ,'table th input:checkbox', function(){
-			var that = this;
-			$(this).closest('table').find('tr > td:first-child input:checkbox')
-				.each(function(){
-				this.checked = that.checked;
-			});
-		});
-		
-		//搜索数据
-		$(document).on('click','#serachData_img',function(){
-			console.info($(this));
-			var $searchValue = $("#searchBar .search-form input[name=searchValue]")
-			if($searchValue.val() == "请输入交易号进行搜索"){
-				$searchValue.val(null);
-			};
-			var _form = $('#pagecontent .search-form');
-			var _url = _form.attr('action');
-			var _param = _form.serialize();
-			console.log("search url:"+_url+", param:"+_param);
-			$.post(_url, _param, function(data) {
-				$('#tableList').html(data);
-			});
-			return false;
-		});
-		
-		//表格中的审核按钮
-		$(document).on("click",'#pagecontent .table .unlabeled',function(){
-			//点击按钮的href属性的值
-			var _href = $(this).attr('href');
-			var $this = $(this);
-			console.info("aaa1:" + _href);
-			//如果href的值不为空，未定义，且不等于#，执行函数
-			if (_href != undefined && _href && _href != '#') {
-				console.log("[debug]click a's label:" + $this.text());
-				// 防止二次点击
-				$this.attr('disabled', 'disabled');
-				var _text = $this.text();
-				if(_text == '审核通过'){
-					bootbox.confirm("确定" + _text + "吗?", function(ensure) {
-						if(ensure == true){
-							$.get(_href,function(data){
-								if(data == "ok"){
-									$this.removeAttr('disabled');
-									$('#serachData_img').click();
-								} else {
-									bootbox.alert("审核失败!");
-								}
-							});
-						} else {
-							$this.removeAttr('disabled');
-						}
-					});
-				} else{
-					 bootbox.prompt("请输入审核不通过的理由", function(result) {
-			            if(result === null){
-			            	
-			            } else if (result == '') {
-			            	bootbox.alert("请输入审核不通过的理由");
-			            } else {
-			            	var _param = {
-			            			'reason':result,
-			            	}
-			            	$.post(_href, _param ,function(data){
-			            		if(data == "ok"){
-			            			$this.removeAttr('disabled');
-									$('#serachData_img').click();
-								} else {
-									bootbox.alert("审核失败!");
-								}
-							})
-			            }
-			        });
-				}
-				/* bootbox.confirm("确定" + _text + "吗?", function(ensure) {
-					//get请求，地址_url，后端会调用对应controller方法并接受参数，返回数据为data传给回调函数
-					$.get(_href, function(data) {
-						console.info("aaa2:" + data);
-						$this.removeAttr('disabled');
-						//$this.parent().prev().html("aa");
-						$('#serachData_img').click();
-					});
-				}); */
-				return false;
-			}
-		});
-		
-		// 分页中超链接跳转
-		$(document).on('click','#pagecontent .pagination ul li a[href]',function(){
-			var _page = $(this).attr('href').substr(1);
-			var _form = $('#pagecontent .search-form');
-			_form.find('input:hidden[name="page"]').val(_page);
-			_form.find('img').click();
-			return false;
-		});
-		
-		// 批量启用/禁用按钮
-	 	$(document).on('click','#searchBar button',function() {
-				var _checkboxes = $('table tbody input:checkbox:checked');
-				var _url = $(this).attr('href');
-				var _param = _checkboxes.serialize();
-				// 批量开启停用删除时需要提醒
-				if ($(this).text() 
-					&& ($(this).text().indexOf("批量通过")>-1
-					||$(this).text().indexOf("批量不通过")>-1)) {
-					if(_checkboxes.size()>0){
-						var _text = $(this).text();
-						bootbox.confirm("确定" +_text + "吗?", function(ensure) {					
-							if (ensure) {	
-								console.info("url::" + _url + "param::" + _param);		
-								$.post(_url, _param, function(data) {
-									$('#searchBar img').click();
-								});
-							}
-						});
-					}
-				} else {
-					console.log(_url);
-					window.location.assign(_url);
-				}
-		});
-	});
-</script>
-</@override>
-<@override name="body">
-	<#include "/back/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="shortcutBar">
-			<ul>
-				<li >
-					<i class="icon-home"></i>
-					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-				</li>
-				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
-				<li >
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-					<a class="homepage2" href="">提现管理</a>
-				</li>				         
-			</ul>  
-		</div>
-		<div id="searchBar">
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management">媒体提现申请</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/deposit">需求方充值</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/enable">批量通过</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/disable">批量不通过</button>
-			<form action="${ctx}/back/main/finance/finance-management/list" method="post" class="search-form" >
-				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-          		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
-          		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入交易号进行搜索" onkeydown="if(event.keyCode==13){return false;}">
-          		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
-			</form>
-		</div>
-		<div id="tableList">
-			<#include "list.ftl">
-		</div>
-		
-	</div>
-</@override>
+<@override name="head">
+<title>财务管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/finance.js"></script>
+</@override> 
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="contentOther">
+   			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">媒体提现申请</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/finance/finance-management" method="post">
+			    <div id="navButtons">
+					<div id="button">					
+						<a href="${ctx}/back/main/finance/finance-management" class="btn2">媒体提现申请</a>
+						<a href="${ctx}/back/main/finance/finance-management/deposit" class="btn2">需求方充值</a>
+						<a class="btn2" id="all-btn-pass">批量通过</a>
+						<a class="btn2" id="all-btn-unpass">批量不通过</a>
+					</div>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<#include "list.ftl">
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/list.ftl

@@ -1,40 +1,38 @@
-<table class="table">
-	<thead>
-		<tr>
-		<th class="center"><label><input type="checkbox"><span class="lbl"></span></label></th>
-		<th>申请日期</th>
-		<th>交易号</th>
-		<th>提现金额</th>
-		<th>可提现金额</th>
-		<th>操作</th>
-		</tr>
-	</thead>
-	<tbody>
-		<#if operatorBalanceList ??>
-		<#list operatorBalanceList as operatorBalance>
-		<tr>
-			<td class="center">
-				<label><input  autocomplete="off"   type="checkbox" name="id" value="${operatorBalance.id!}"><span class="lbl"></span></label>
-			</td>
-			<td>${operatorBalance.actTime?date}</td>
-			<td>${operatorBalance.num}</td>
-			<td>${operatorBalance.amount}</td>
-			<td>${operatorBalance.balance}</td>
-			<td>
-				<#if operatorBalance.state==1>
-	            	<button class="unlabeled" href="${ctx}/back/main/finance/finance-management/enable?id=${operatorBalance.id!}">审核通过</button>
-	            	<button class="unlabeled" href="${ctx}/back/main/finance/finance-management/disable?id=${operatorBalance.id!}">审核不通过</button>
-	            <#else> 
-	            <button class="labeled" href="#">已审核</button> 
-	            </#if>
-			</td>
-		</tr>
-	 	</#list>
-        </#if>
-	</tbody>
-</table>
-<div id="footBar">
-	<div id="paged">
-       <#include "/common/pagination/simple.ftl"/>
-    </div>
+<table border="1" class="tableFig">
+	<thead>
+		<tr class="theadTr">
+			<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+			<th class="theadTh" style="width:20%;">申请日期</th>
+			<th class="theadTh" style="width:20%;">交易号</th>
+			<th class="theadTh" style="width:15%;">提现金额</th>
+			<th class="theadTh" style="width:15%;">可提现金额</th>
+			<th class="theadTh" style="width:25%;">操作</th>
+		</tr>
+	</thead>
+	<tbody>
+		<#if operatorBalanceList ??>
+		<#list operatorBalanceList as operatorBalance>
+		<tr id="tbodyTr">
+			<td class="tbodyTd"><div class="checkboxStyleTd" id="${operatorBalance.id!}"></div></td>
+			<td class="tbodyTd">${operatorBalance.actTime!?date}</td>
+			<td class="tbodyTd">${operatorBalance.num!}</td>
+			<td class="tbodyTd">${operatorBalance.amount!}</td>
+			<td class="tbodyTd">${operatorBalance.balance!}</td>
+			<td class="tbodyTd">
+				<div id="listButtons">
+					<#if operatorBalance.state==1>
+					<a id="btn-pass" value=${operatorBalance.id!} class="btn-audit">审核通过</a>
+					<a id="btn-unpass" value=${operatorBalance.id!} class="btn-audit">审核不通过</a>
+					<#else>
+					<a class="btn-audit btn-auditChange">已审核</a>
+					</#if>
+				</div>
+			</td>
+		</tr>
+	 	</#list>
+        </#if>
+	</tbody>
+</table>
+<div id="pageDiv-other">
+	<#include "/common/pagination/simple.ftl"/>
 </div>

src/main/webapp/WEB-INF/pages/back/main/public-head.ftl

@@ -1,83 +1,81 @@
-<#assign sec=JspTaglibs["http://www.springframework.org/security/tags"]>
-<div id="top">	
-    <div id="logoa">
-	<img class="logo1" src="${ctx}/assets/images/datacross.png">		
-	<img class="logo2" src="${ctx}/assets/images/cut-off-rule.png">		
-	<img class="logo3" src="${ctx}/assets/images/wificross.png">	
-	</div>	
-	<ul class="nav">
-		<li><a href="${ctx}/back/main/dashboard"><span>首页</span></a></li>
-		
-		<@sec.authorize access="hasAnyRole('ROLE_back_advertiser_report,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/ad/report/advertiser-report"><span>需求方报表</span></a></li>
-		</@sec.authorize>
-		
-		<@sec.authorize access="hasAnyRole('ROLE_back_operator_report,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/ad/operator/operator-report"><span>媒体数据报表</span></a></li>
-		</@sec.authorize>
-		
-		<@sec.authorize access="hasAnyRole('ROLE_back_audit,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/audit/audit-banner"><span>审核</span></a></li>
-		</@sec.authorize>
-		
-		<@sec.authorize access="hasAnyRole('ROLE_back_finance,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/finance/finance-management"><span>财务管理</span></a></li>
-		</@sec.authorize>
-		
-		<@sec.authorize access="hasAnyRole('ROLE_back_client_account,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/client-account"><span>客户账号管理</span></a></li>
-		</@sec.authorize>
-		
-		<@sec.authorize access="hasAnyRole('ROLE_back_ap,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/ap/apmac/list"><span>热点管理</span></a></li>
-		</@sec.authorize>
-		
-		<@sec.authorize access="hasAnyRole('ROLE_back_authority,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/authority"><span>权限管理</span></a></li>  	
-		</@sec.authorize>		
-	</ul>	
-	<div id="divselect" >
-	        <div id="opa">
-			<cite><li style=" text-overflow:ellipsis;padding-top:4px;">${userSession.description}</li><li>${userSession.accountName}</li></cite>
-			</div>
-		<ul>
-			<li><a href="${ctx}/back/main/authority/loginperson" selectid="1">修改个人信息</a></li>
-			<li><a href="${ctx}/login" selectid="2">退出登录</a></li>       
-		</ul>
-		<input type="hidden" value="${ctx!}" id="ctx"/>
-		<input type="hidden" id="role" value="${role!}"/>
-		<input type="hidden" id="sessionagentId" value="${userSession.agentId!}"/>
-		<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId!}"/>
-		<input type="hidden" id="sessionadvertiserName" value="${advertiserName!}"/>
-		<input type="hidden" id="sessionoperatorId" value="${userSession.operatorId!}"/>
-	</div>    		
-</div>	   	
-<script type="text/javascript">
-	$(function(){
-		var path = window.location.pathname;
-		if(path.indexOf("dashboard") != -1){
-			$("#top .nav li a:first").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("ad/report") != -1){
-			$("#top .nav li a:eq(1)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("ad/operator") != -1){
-			$("#top .nav li a:eq(2)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("audit") != -1){
-			$("#top .nav li a:eq(3)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("finance") != -1){
-			$("#top .nav li a:eq(4)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("client-account") != -1){
-			$("#top .nav li a:eq(5)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("ap") != -1){
-			$("#top .nav li a:eq(6)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("authority") != -1){
-			$("#top .nav li a:eq(7)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
-		};
-	});
-</script>
+<#assign sec=JspTaglibs["http://www.springframework.org/security/tags"]>
+<div id="headDiv">	
+    <div id="logoa">
+	<img class="logo1" src="${ctx}/assets/images/datacross.png">		
+	<img class="logo2" src="${ctx}/assets/images/cut-off-rule.png">		
+	<img class="logo3" src="${ctx}/assets/images/wificross.png">	
+	</div>	
+	<ul id="menu">
+		<li><a href="${ctx}/back/main/dashboard"><span>首页</span></a></li>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_advertiser_report,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/ad/report/advertiser-report"><span>需求方报表</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_operator_report,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/ad/operator/operator-report"><span>媒体数据报表</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_audit,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/audit/audit-banner"><span>审核</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_finance,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/finance/finance-management"><span>财务管理</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_client_account,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/client-account"><span>客户账号管理</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_ap,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/ap/apmac/list"><span>热点管理</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_authority,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/authority"><span>权限管理</span></a></li>  	
+		</@sec.authorize>		
+	</ul>	
+	<div id="divselect" >
+	    <div id="currentOpa">
+			<cite><li>${userSession.description}</li><li>${userSession.accountName}</li></cite>
+		</div>
+		<ul>
+			<li><a href="${ctx}/back/main/authority/loginperson" selectid="1">修改个人信息</a></li>
+			<li><a href="${ctx}/logout" selectid="2">退出登录</a></li>       
+		</ul>
+		<input type="hidden" value="${ctx!}" id="ctx"/>
+		<input type="hidden" id="role" value="agent"/>
+		<input type="hidden" id="sessionagentId" value="${userSession.agentId!}"/>
+		<input type="hidden" id="sessionoperatorId" value="${userSession.operatorId!}"/>
+	</div>    		
+</div>	   	
+<script type="text/javascript">
+	$(function(){
+		var path = window.location.pathname;
+		if(path.indexOf("dashboard") != -1){
+			$("#menu a:first").addClass("menu_change");
+		};
+		if(path.indexOf("ad/report") != -1){
+			$("#menu a:eq(1)").addClass("menu_change");
+		};
+		if(path.indexOf("ad/operator") != -1){
+			$("#menu a:eq(2)").addClass("menu_change");
+		};
+		if(path.indexOf("audit") != -1){
+			$("#menu a:eq(3)").addClass("menu_change");
+		};
+		if(path.indexOf("finance") != -1){
+			$("#menu a:eq(4)").addClass("menu_change");
+		};
+		if(path.indexOf("client-account") != -1){
+			$("#menu a:eq(5)").addClass("menu_change");
+		};
+		if((path.indexOf("ap/apmac") != -1) || (path.indexOf("ap/place") != -1)){
+			$("#menu a:eq(6)").addClass("menu_change");
+		};
+		if(path.indexOf("authority") != -1){
+			$("#menu a:eq(7)").addClass("menu_change");
+		};
+	});
+</script>

src/main/webapp/WEB-INF/pages/common/simple.ftl

@@ -1,26 +1,31 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
-		<meta http-equiv="Cache-Control" content="no-store"/>
-		<meta http-equiv="Pragma" content="no-cache"/>
-		<meta http-equiv="Expires" content="0"/>
-		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-		<link rel="shortcut icon" href="${ctx}/favorite.ico" >
-		<!-- basic styles -->
-		<link href="${ctx}/assets/css/bootstrap.min.css" rel="stylesheet" />
-		<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css" />
-		
-		<!--[if IE 7]>
-		  <link rel="stylesheet" href="${ctx}/assets/css/font-awesome-ie7.min.css" />
-		<![endif]-->
-		<!-- page specific plugin styles -->
-		 <link rel="stylesheet" href="${ctx}/assets/css/common_style.css"/>
-		<@block name="head"></@block>
-		
-		
-	</head>
-	<body>
-		<@block name="body"></@block>
-	</body>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+		<meta http-equiv="Cache-Control" content="no-store"/>
+		<meta http-equiv="Pragma" content="no-cache"/>
+		<meta http-equiv="Expires" content="0"/>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+		<meta http-equiv="Access-Control-Allow-Origin" content="*">
+		<link rel="shortcut icon" href="${ctx}/favorite.ico" >
+		<!-- basic styles -->
+		<link href="${ctx}/assets/css/bootstrap.min.css" rel="stylesheet" />
+		<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css" />
+		
+		<!--[if IE 7]>
+		  <link rel="stylesheet" href="${ctx}/assets/css/font-awesome-ie7.min.css" />
+		<![endif]-->
+		<!-- page specific plugin styles -->
+		 <link rel="stylesheet" href="${ctx}/assets/css/common.css"/>
+		 
+		<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+		<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+		<script type="text/javascript" src="${ctx}/assets/js/common/divselect.js"></script>
+		<@block name="head"></@block>
+		
+		
+	</head>
+	<body>
+		<@block name="body"></@block>
+	</body>
 </html>