Browse Source

修改广告位尺寸显示样式及各页面的状态问题

ying.rong 9 years ago
parent
commit
03d9af8907
29 changed files with 83 additions and 118 deletions
  1. 1 1
      src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/OperatorAdGroupController.java
  2. 1 1
      src/main/java/com/cloudcross/ssp/web/back/main/audit/AuditBannerController.java
  3. 13 11
      src/main/java/com/cloudcross/ssp/web/back/main/audit/AuditController.java
  4. 1 0
      src/main/java/com/cloudcross/ssp/web/operator/main/BannerAuditController.java
  5. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/list.ftl
  6. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/banner-template/list.ftl
  7. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/list.ftl
  8. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/list.ftl
  9. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/list.ftl
  10. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/list.ftl
  11. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/clone-banner/index.ftl
  12. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/operator-ad-group/list.ftl
  13. 2 2
      src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/index.ftl
  14. 0 48
      src/main/webapp/WEB-INF/pages/back/main/audit/audit/index.ftl
  15. 2 2
      src/main/webapp/WEB-INF/pages/back/main/audit/audit/list.ftl
  16. 1 1
      src/main/webapp/WEB-INF/pages/back/main/client-account/list.ftl
  17. 6 2
      src/main/webapp/WEB-INF/pages/operator/main/ad/zone/create.ftl
  18. 3 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/zone/edit.ftl
  19. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/zone/index.ftl
  20. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/banner-audit/list.ftl
  21. 11 11
      src/main/webapp/assets/css/common.css
  22. 10 6
      src/main/webapp/assets/css/zone_operator.css
  23. 1 1
      src/main/webapp/assets/js/advertiser/adBanner.js
  24. 1 1
      src/main/webapp/assets/js/advertiser/advertiser.js
  25. 1 1
      src/main/webapp/assets/js/advertiser/campaign.js
  26. 1 1
      src/main/webapp/assets/js/advertiser/order.js
  27. 4 4
      src/main/webapp/assets/js/back/auditBanner.js
  28. 3 3
      src/main/webapp/assets/js/operator/auditBanner.js
  29. 5 5
      src/main/webapp/assets/js/operator/zone.js

+ 1 - 1
src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/OperatorAdGroupController.java

@@ -182,7 +182,7 @@ public class OperatorAdGroupController extends SimpleController{
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 		List<AdGroup> adGroupList = this.adGroupService.queryAdGroupByCondition(condition, pager);
-		
+		model.addAttribute("selectedStatus", selectedStatus);
 		model.addAttribute("pager", pager);
 		model.addAttribute("adGroupList", adGroupList);
 		return page("list");

+ 1 - 1
src/main/java/com/cloudcross/ssp/web/back/main/audit/AuditBannerController.java

@@ -51,6 +51,7 @@ public String index(Model model,
 		@RequestParam HashMap<String, Object> paramMap,
 		@RequestParam(defaultValue="1") int page) {	
 	
+	model.addAllAttributes(paramMap);
 	//统计所有审核素材
 	int totalRow = iabs.countByParams(paramMap);
 	
@@ -59,7 +60,6 @@ public String index(Model model,
 	pager.setTotalRow(totalRow);
 	
 	List<AuditBanner> auditBannerList = iabs.findByParams(paramMap, pager);
-	model.addAllAttributes(paramMap);
 	model.addAttribute("pager", pager);
 	model.addAttribute("auditBannerList", auditBannerList);
 	return page("index");

+ 13 - 11
src/main/java/com/cloudcross/ssp/web/back/main/audit/AuditController.java

@@ -58,17 +58,19 @@ public class AuditController extends SimpleController{
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam(defaultValue="1") int page) {
 		//按状态搜索用
-		if(paramMap.get("checked").equals("")) { 
-			paramMap.put("checkStatus", null);
-		}
-		if(paramMap.get("checked").equals("1")) { 
-			paramMap.put("checkStatus", 1);
-		}
-		if(paramMap.get("checked").equals("2")) { 
-			paramMap.put("checkStatus", -1);
-		}
-		if(paramMap.get("checked").equals("0")) { 
-			paramMap.put("checkStatus", 0);
+		if(paramMap.containsKey("checked")){
+			if(paramMap.get("checked").equals("")) { 
+				paramMap.put("checkStatus", null);
+			}
+			if(paramMap.get("checked").equals("1")) { 
+				paramMap.put("checkStatus", 1);
+			}
+			if(paramMap.get("checked").equals("2")) { 
+				paramMap.put("checkStatus", -1);
+			}
+			if(paramMap.get("checked").equals("0")) { 
+				paramMap.put("checkStatus", 0);
+			}
 		}
 		System.out.println("luo1:" + paramMap);
 		System.out.println("liu"+paramMap.toString());

+ 1 - 0
src/main/java/com/cloudcross/ssp/web/operator/main/BannerAuditController.java

@@ -103,6 +103,7 @@ public class BannerAuditController extends SimpleController {
 		//获取创意的列表
 		List<AuditBanner> bannerList = bannerService.findByOperatorIdandParams(
 				operatorId,paramMap,pager);
+		model.addAttribute("operatorChecked", paramMap.get("operatorChecked"));
 		model.addAttribute("pager", pager);
 		model.addAttribute("bannerList", bannerList);
 		return page("list");

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

@@ -31,7 +31,7 @@
 					<a value="0">正常</a>
 					<a value="1">停用</a>
 			    </div>
-			    <div id="navButtons">
+			    <div id="navButtons_other">
 					<div id="button">					
 						<a href="${ctx}/advertiser/main/ad/advertiser/create" class="btn2">创建广告主</a>
 						<a class="btn2" id="all-btn-enable">批量开启</a>

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

@@ -60,7 +60,7 @@
 					<a value="0">正常</a>
 					<a value="1">停用</a>
 			    </div>
-			    <div id="navButtons">
+			    <div id="navButtons_other">
 					<div id="button">					
 						<a class="btn2" id="all-btn-upload">创建创意素材</a>
 						<input type="file" id="all-input-file" multiple="mltiple"/>

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

@@ -26,7 +26,7 @@
  			<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">
+					<ul id="main_advertiserul" class="son_selectul">
 						<li class="select_box" id="advertiserul_box">
 							<span id="advertiserul_span">${selectedadvertiserName!}</span>
 							<ul class="son_ul" id="advertiser_son_ul"></ul>
@@ -41,7 +41,7 @@
 					<a value="0">正常</a>
 					<a value="1">停用</a>
 			    </div>
-			    <div id="navButtons">
+			    <div id="navButtons_other">
 					<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>

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

@@ -30,7 +30,7 @@
  			<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">
+					<ul id="main_advertiserul" class="son_selectul">
 						<li class="select_box" id="advertiserul_box">
 							<span id="advertiserul_span">${selectedadvertiserName!}</span>
 							<ul class="son_ul" id="advertiser_son_ul"></ul>
@@ -63,7 +63,7 @@
 					<a value="3">投放结束</a>
 					<a value="4">暂停</a>
 			    </div>
-			    <div id="navButtons">
+			    <div id="navButtons_other">
 					<div id="button">					
 						<a href="${ctx}/advertiser/main/ad/target/ad-group/create?campaignId=${campaignId!}" class="btn2" id="btn-create">创建投放</a>
 						<a class="btn2" id="all-btn-enable">批量开启</a>

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

@@ -32,7 +32,7 @@
  			<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">
+					<ul id="main_advertiserul" class="son_selectul">
 						<li class="select_box" id="advertiserul_box">
 							<span id="advertiserul_span">${selectedadvertiserName!}</span>
 							<ul class="son_ul" id="advertiser_son_ul"></ul>
@@ -71,7 +71,7 @@
 					<a value="0">正常</a>
 					<a value="1">停用</a>
 			    </div>
-			    <div id="navButtons">
+			    <div id="navButtons_other">
 					<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>

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

@@ -28,7 +28,7 @@
  			<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">
+					<ul id="main_advertiserul" class="son_selectul">
 						<li class="select_box" id="advertiserul_box">
 							<span id="advertiserul_span">${selectedadvertiserName!}</span>
 							<ul class="son_ul" id="advertiser_son_ul"></ul>
@@ -51,7 +51,7 @@
 					<a value="0">正常</a>
 					<a value="1">停用</a>
 			    </div>
-			    <div id="navButtons">
+			    <div id="navButtons_other">
 					<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>

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

@@ -31,7 +31,7 @@
 		            <a value="2">图片</a>      
 		            <a value="3">视频</a>
 			    </div>
-			    <div id="navButtons">
+			    <div id="navButtons_other">
 					<div id="searchValueDiv">
 						<input type="hidden" id="page" name="page" value="${pager.page!}"/>
 						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>

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

@@ -30,7 +30,7 @@
  			<form id="myform" action="${ctx}/advertiser/main/ad/target/operator-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">
+					<ul id="main_advertiserul" class="son_selectul">
 						<li class="select_box" id="advertiserul_box">
 							<span id="advertiserul_span">${selectedadvertiserName!}</span>
 							<ul class="son_ul" id="advertiser_son_ul"></ul>
@@ -63,7 +63,7 @@
 					<a value="3">投放结束</a>
 					<a value="4">暂停</a>
 			    </div>
-			    <div id="navButtons">
+			    <div id="navButtons_other">
 					<div id="button">					
 						<a href="${ctx}/advertiser/main/ad/target/operator-ad-group/create?campaignId=${campaignId!}" class="btn2" id="btn-create">创建投放</a>
 						<a class="btn2" id="all-btn-enable">批量开启</a>

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

@@ -24,14 +24,14 @@
  			</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">
+	 			<div id="selectBar_statusOther" 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="navButtons_other">
 					<div id="button">					
 						<a class="btn2" id="all-btn-pass">批量通过</a>
 						<a class="btn2" id="all-btn-unpass">批量不通过</a>

+ 0 - 48
src/main/webapp/WEB-INF/pages/back/main/audit/audit/index.ftl

@@ -1,48 +0,0 @@
-<@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/audit.js"></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'>资质审核</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/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 'list.ftl'/>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>

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

@@ -24,14 +24,14 @@
  			</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">
+	 			<div id="selectBar_statusOther" 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="navButtons_other">
 					<div id="button">					
 						<a class="btn2" id="all-btn-pass">批量通过</a>
 						<a class="btn2" id="all-btn-unpass">批量不通过</a>

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

@@ -26,7 +26,7 @@
 			        <a value="2">媒体</a>
 					<a value="3">需求方</a>
 			    </div>
- 				<div id="navButtons">
+ 				<div id="navButtons_other">
 					<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>

+ 6 - 2
src/main/webapp/WEB-INF/pages/operator/main/ad/zone/create.ftl

@@ -51,15 +51,19 @@
 				</div>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-yes">*</span>尺寸:</label>
-					<div class="opsdiv_control">
+					<div class="opsdiv_control" id="sizeDivs">
 						<#if sizeList ??>
 						<#list sizeList as size>
 						<#if size_index == 0>
+						<div class="son_sizeDiv">
 							<input  autocomplete="off"  type="radio" id="#{size.width}X#{size.height}" value="#{size.id}" name="sizeId" checked>
 							<label for="#{size.width}X#{size.height}">${size.width}X${size.height}</label>
+						</div>
 						<#else>
+						<div class="son_sizeDiv">
 							<input  autocomplete="off"  type="radio" id="#{size.width}X#{size.height}" value="#{size.id}" name="sizeId">
 							<label for="#{size.width}X#{size.height}">${size.width}X${size.height}</label>
+						</div>
 						</#if>
 						</#list>
 						</#if>
@@ -86,7 +90,7 @@
 						</div>
 						<div id="fileurl">
 							<label class="lable1">点击地址</label>
-							<input class="input-text" id="default_url" type="text" name="default_url" sverify="text/255/0/0"></span><span class="spanVaildate"></span>
+							<input class="input-text" id="default_url" type="text" name="default_url" sverify="text/255/0/0"><span class="spanVaildate"></span>
 						</div>
 					</div>
 				</div>

+ 3 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/zone/edit.ftl

@@ -52,11 +52,13 @@
 				</div>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-yes">*</span>尺寸:</label>
-					<div class="opsdiv_control">
+					<div class="opsdiv_control" id="sizeDivs">
 						<#if SizeList ??>
 						<#list SizeList as size>	
+						<div class="son_sizeDiv">
 							<input type="radio" id="#{size.width}X#{size.height}"  class="input_control" <#if zone.sizeId==size.id>checked</#if> value="${size.id!}" name="sizeId">
 							<label for="#{size.width}X#{size.height}">${size.width}X${size.height}</label>
+						</div>
 						</#list>
 						</#if>
 					</div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/zone/index.ftl

@@ -55,7 +55,7 @@
 					<a value="1">停用</a>
 				</div>
 				<!--下面是四个按钮的div及搜索框-->
-				<div id="navButtons">
+				<div id="navButtons_other">
 				   	<div id="button">
 						<a href="${ctx}/operator/main/ad/zone/create" class="btn2">创建广告位</a>   
 				        <a class="btn2" id="all-btn-enable">批量开启</a>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/banner-audit/list.ftl

@@ -21,14 +21,14 @@
  			<form id="myform" action="${ctx}/operator/main/banner-audit/list" method="post">
  				<input type="hidden" id="status" name="operatorChecked" value='${operatorChecked!}'/>
  				<input type="hidden" id="operatorId" name="operatorId" value="${userSession.operatorId!}"/>
-	 			<div id="selectBar_status" class="selectBar">
+	 			<div id="selectBar_statusOther" 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="navButtons_other">
 					<div id="button">					
 						<a class="btn2" id="all-btn-pass">批量通过</a>
 						<a class="btn2" id="all-btn-unpass">批量不通过</a>

+ 11 - 11
src/main/webapp/assets/css/common.css

@@ -200,6 +200,7 @@ li{
 	border-bottom: 2px solid #f4f5f7;
 	text-align:center;
 	padding:0 10px 20px;
+	margin-bottom:20px;
 	text-decoration: none;
 	color:#444444;
 }
@@ -213,27 +214,18 @@ li{
 	border-bottom: 2px solid #36aeea;
 }
 
-#selectBar_industry,#selectBar_size,#selectBar_clientaccount,#selectBar_position{
-	padding-top:20px;
-}
-
-#selectBar_status,#selectBar_type{
+#selectBar_industry,#selectBar_size,#selectBar_statusOther,#selectBar_clientaccount{
 	padding-top:20px;
-	margin-bottom:40px;
 }
 
 #selectBar_report,#selectBar_audit,#selectBar_apmac{
 	margin-bottom:60px;
 }
 
-.selectBar,#navDiv,#myform,#navButtons,#button,#content_choose,#content_chooseOther,#placeDiv,#footBtn{
+.selectBar,#navDiv,#myform,#navButtons,#navButtons_other,#button,#content_choose,#content_chooseOther,#placeDiv,#footBtn{
 	clear:both;
 }
 
-#navButtons{
-	padding-top:20px;
-}
-
 #button{
 	float:left;
 }
@@ -386,6 +378,10 @@ li{
 	padding-top:20px;
 }
 
+#selectuls .son_selectul{
+	margin-bottom:20px;
+}
+
 #content_choose ul,#content_chooseOther ul,#selectuls ul,#selectuls_report ul,#content_choose span#dateChoose_span,#dashboard_top_advertiser ul,#dashboard_chartContent .chart-up .pull-down ul{
 	float:left;
 }
@@ -421,6 +417,10 @@ li{
 	top: -2px;
 }
 
+#navButtons{
+	padding-top:20px;
+}
+
 /* 下拉框样式 */
 ul .select_box{
 	width:150px;

+ 10 - 6
src/main/webapp/assets/css/zone_operator.css

@@ -1,7 +1,11 @@
-.opsdiv_control{
-	height:34px;
-	line-height:34px;
+#sizeDivs{
+	margin-left:123px;
 }
+#sizeDivs .son_sizeDiv{
+	float:left;
+	padding:0 4px 20px 0;
+}
+
 .opsdiv_control input[type="radio"],input[type="checkbox"]{
 	display: none;
 }
@@ -33,7 +37,8 @@
 }
 
 #pathDiv{
-	margin-top:27px;
+	padding-top:4px;
+	clear:both;	
 }
 
 .opsdiv_control #filepicture_picture{
@@ -67,8 +72,7 @@
 }
 
 #recheckDiv{
-	margin-top:68px;
-	display:flex;
+	padding-top:82px;
 }
 
 .opsdiv_control .add_all,.opsdiv_control .clear_all{

+ 1 - 1
src/main/webapp/assets/js/advertiser/adBanner.js

@@ -18,7 +18,7 @@ $(document).ready(function(){
 	});
 	
  	//状态全部、开启、停用
- 	if($("#status").val() == 0 || $("#status").val() == ""){
+ 	if($("#status").val() == 2 || $("#status").val() == ""){
  		$("#selectBar_status a:first").addClass("selectBar_change");
 	}
  	$("#selectBar_status a").each(function(){

+ 1 - 1
src/main/webapp/assets/js/advertiser/advertiser.js

@@ -28,7 +28,7 @@ $(document).ready(function(){
 	});
 	
  	//状态全部、开启、停用
- 	if($("#status").val() == 0 || $("#status").val() == ""){
+ 	if($("#status").val() == 2 || $("#status").val() == ""){
  		$("#selectBar_status a:first").addClass("selectBar_change");
 	}
  	$("#selectBar_status a").each(function(){

+ 1 - 1
src/main/webapp/assets/js/advertiser/campaign.js

@@ -18,7 +18,7 @@ $(document).ready(function(){
 	});
 	
  	//状态全部、开启、停用
- 	if($("#status").val() == 0 || $("#status").val() == ""){
+ 	if($("#status").val() == 2 || $("#status").val() == ""){
  		$("#selectBar_status a:first").addClass("selectBar_change");
 	}
  	$("#selectBar_status a").each(function(){

+ 1 - 1
src/main/webapp/assets/js/advertiser/order.js

@@ -18,7 +18,7 @@ $(document).ready(function(){
 	});
 	
  	//状态全部、开启、停用
- 	if($("#status").val() == 0 || $("#status").val() == ""){
+ 	if($("#status").val() == 2 || $("#status").val() == ""){
  		$("#selectBar_status a:first").addClass("selectBar_change");
 	}
  	$("#selectBar_status a").each(function(){

+ 4 - 4
src/main/webapp/assets/js/back/auditBanner.js

@@ -4,16 +4,16 @@ $(document).ready(function(){
 	/***************************    素材列表页    ***************************/
 
  	//状态全部、开启、停用
- 	if($("#status").val() == 0 || $("#status").val() == ""){
- 		$("#selectBar_status a:first").addClass("selectBar_change");
+ 	if($("#status").val() == ""){
+ 		$("#selectBar_statusOther a:first").addClass("selectBar_change");
 	}
- 	$("#selectBar_status a").each(function(){
+ 	$("#selectBar_statusOther a").each(function(){
  		var value = $(this).attr("value");
  		if($("#status").val() == value){
  			$(this).addClass("selectBar_change").siblings('.selectBar_change').removeClass('selectBar_change');
  		}
  	});
- 	$("#selectBar_status a").click(function(){
+ 	$("#selectBar_statusOther a").click(function(){
  		$("#status").val($(this).attr("value"));
  		refreshData();
  	});

+ 3 - 3
src/main/webapp/assets/js/operator/auditBanner.js

@@ -5,15 +5,15 @@ $(document).ready(function(){
 
  	//状态全部、开启、停用
  	if($("#status").val() == ""){
- 		$("#selectBar_status a:first").addClass("selectBar_change");
+ 		$("#selectBar_statusOther a:first").addClass("selectBar_change");
 	}
- 	$("#selectBar_status a").each(function(){
+ 	$("#selectBar_statusOther a").each(function(){
  		var value = $(this).attr("value");
  		if($("#status").val() == value){
  			$(this).addClass("selectBar_change").siblings('.selectBar_change').removeClass('selectBar_change');
  		}
  	});
- 	$("#selectBar_status a").click(function(){
+ 	$("#selectBar_statusOther a").click(function(){
  		$("#status").val($(this).attr("value"));
  		refreshData();
  	});

+ 5 - 5
src/main/webapp/assets/js/operator/zone.js

@@ -27,7 +27,7 @@ $(document).ready(function(){
  	});
 	
 	//类型
- 	if($("#device").val() == 0 || $("#device").val() == ""){
+ 	if($("#device").val() == -1 || $("#device").val() == ""){
  		$("#selectBar_type a:first").addClass("selectBar_change");
 	}
  	$("#selectBar_type a").each(function(){
@@ -42,7 +42,7 @@ $(document).ready(function(){
  	});
  	
  	//获取创意尺寸
-	if($("#position").val() == 0 || $("#position").val() == ""){
+	if($("#position").val() == -1 || $("#position").val() == ""){
 		$("#selectBar_position a:first").addClass("selectBar_change");
 	}
 	$("#selectBar_position a").each(function(){
@@ -378,7 +378,7 @@ function getUploadFile(){
 				var orgImg = path.substring(0,path.indexOf(","));
 				var smallImg = path.substring(path.indexOf(",")+1);
 				$("#uploadfilehidden").val(orgImg);
-				$("#smallImg").val(smallImg);
+				$("#smallImg").attr("src",smallImg);
 				$("#default_path_small").val(smallImg);
 				$("#imgDivs").css("display","block");
 				var result = 0;
@@ -386,7 +386,7 @@ function getUploadFile(){
 				bootbox.alert("上传成功!");
 			}else if (result.status == 'error') {
 				$("#uploadfilehidden").val("");
-				$("#smallImg").val("");
+				$("#smallImg").attr("src","");
 				$("#default_path_small").val("");
 				$("#imgDivs").css("display","none");
 			    bootbox.alert(result.msg);
@@ -395,7 +395,7 @@ function getUploadFile(){
 		error: function (data, status, e)
 		{
 			$("#uploadfilehidden").val("");
-			$("#smallImg").val("");
+			$("#smallImg").attr("src","");
 			$("#default_path_small").val("");
 			$("#imgDivs").css("display","none");
 			removeFile("uploadfile","filepicture_picture","uploadfilehidden");