Browse Source

修改自投页面问题

ying.rong 9 years ago
parent
commit
0f3f95844f

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

@@ -184,7 +184,7 @@
 			  	</div>
 			  	</div>
 			  	<div class="input-group edit_osDiv" id="osDiv">
 			  	<div class="input-group edit_osDiv" id="osDiv">
 					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统:</label>
 					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统:</label>
-					<input type="hidden" id="os" name="os" value="${os!}"/>
+					<input type="hidden" id="os" name="os" value="${adGroup.os!}"/>
 					<input class="input-checkbox" type="checkbox" value="1"><span class="input-checkbox-span otherspan">iOS</span>
 					<input class="input-checkbox" type="checkbox" value="1"><span class="input-checkbox-span otherspan">iOS</span>
 					<input class="input-checkbox" type="checkbox" value="2"><span class="input-checkbox-span otherspan">Android</span>
 					<input class="input-checkbox" type="checkbox" value="2"><span class="input-checkbox-span otherspan">Android</span>
 					<input class="input-checkbox" type="checkbox" value="3"><span class="input-checkbox-span otherspan">WP</span>
 					<input class="input-checkbox" type="checkbox" value="3"><span class="input-checkbox-span otherspan">WP</span>

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

@@ -204,7 +204,7 @@
 						<#if placeList ??>
 						<#if placeList ??>
 						<#list placeList as place>
 						<#list placeList as place>
 						<div class="single_div">
 						<div class="single_div">
-							<input class="single_div_checkbox" name="place" type="checkbox" value="${place.id!}"><span class="single_div_span">${place.name!}</span>
+							<input class="single_div_checkbox" name="place" type="checkbox" value="${place.id!}" title="${place.name!}"><span class="single_div_span" title="${place.name!}">${place.name!}</span>
 						</div>
 						</div>
 						</#list>
 						</#list>
 						</#if>
 						</#if>

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

@@ -46,7 +46,7 @@
 				</ul>  
 				</ul>  
 	 		</div>
 	 		</div>
 	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/operator-ad-group/save" method="post">
 	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/operator-ad-group/save" method="post">
-	 			<input type="hidden" id="adGroupId" name="id" value="${adGroupId!}"/>
+	 			<input type="hidden" id="adGroupId" name="id" value="${adGroup.id!}"/>
 	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
 	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
 	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>
 	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>
 	 			<input type="hidden" id="campaignId" name="campaignId" value="${campaignId!}"/>
 	 			<input type="hidden" id="campaignId" name="campaignId" value="${campaignId!}"/>
@@ -163,7 +163,7 @@
 			  	</div>
 			  	</div>
 				<div class="input-group edit_osDiv" id="osDiv">
 				<div class="input-group edit_osDiv" id="osDiv">
 					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统:</label>
 					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统:</label>
-					<input type="hidden" id="os" name="os" value="${os!}"/>
+					<input type="hidden" id="os" name="os" value="${adGroup.os!}"/>
 					<input class="input-checkbox" type="checkbox" value="1"><span class="input-checkbox-span otherspan">iOS</span>
 					<input class="input-checkbox" type="checkbox" value="1"><span class="input-checkbox-span otherspan">iOS</span>
 					<input class="input-checkbox" type="checkbox" value="2"><span class="input-checkbox-span otherspan">Android</span>
 					<input class="input-checkbox" type="checkbox" value="2"><span class="input-checkbox-span otherspan">Android</span>
 					<input class="input-checkbox" type="checkbox" value="3"><span class="input-checkbox-span otherspan">WP</span>
 					<input class="input-checkbox" type="checkbox" value="3"><span class="input-checkbox-span otherspan">WP</span>

+ 9 - 0
src/main/webapp/assets/js/advertiser/adGroup.js

@@ -349,9 +349,18 @@ $(document).ready(function(){
 		}
 		}
 		//提示操作系统选择
 		//提示操作系统选择
 		var oslist = $("#osDiv input[type='checkbox']:checked");
 		var oslist = $("#osDiv input[type='checkbox']:checked");
+		var osId = "";
 		if(oslist.length == 0){
 		if(oslist.length == 0){
 			bootbox.alert("操作系统为必填项,请选择!");
 			bootbox.alert("操作系统为必填项,请选择!");
 			return false;
 			return false;
+		}else{
+			oslist.each(function(){
+				osId += $(this).val()+",";
+			});
+			if(osId!=""){
+				osId = osId.substring(0, osId.length-1);
+				$("#os").val(osId);
+			}
 		}
 		}
 		//提示场景选择
 		//提示场景选择
 		var placelist = $("#adgroup_placeDiv input[type='checkbox']:checked");
 		var placelist = $("#adgroup_placeDiv input[type='checkbox']:checked");

+ 3 - 2
src/main/webapp/assets/js/advertiser/operatoradGroup.js

@@ -374,6 +374,7 @@ $(document).ready(function(){
 				placeId += $(this).val()+",";
 				placeId += $(this).val()+",";
 				placeName += $(this).attr("title")+",";
 				placeName += $(this).attr("title")+",";
 			});
 			});
+			
 			if(placeId!=""){
 			if(placeId!=""){
 				placeId = placeId.substring(0, placeId.length-1);
 				placeId = placeId.substring(0, placeId.length-1);
 				placeName = placeName.substring(0, placeName.length-1);
 				placeName = placeName.substring(0, placeName.length-1);
@@ -575,7 +576,7 @@ function setting_date(){
 		$(".time_box .time_item .btn_del").bind("click",function(e){
 		$(".time_box .time_item .btn_del").bind("click",function(e){
 				$(this).parents(".time_item").remove();
 				$(this).parents(".time_item").remove();
 			});
 			});
-		var date = $("#id-date-picker-1").val().split('to');
+		var date = $("#dateRangePicker").val().split('to');
 		var s_date = date[0];
 		var s_date = date[0];
 		var e_date = date[1];
 		var e_date = date[1];
 		$(".setting .tr_data").unbind("mousedown").bind("mousedown",function(){
 		$(".setting .tr_data").unbind("mousedown").bind("mousedown",function(){
@@ -597,7 +598,7 @@ function setting_date(){
 				}
 				}
 			}
 			}
 			obj_tr.unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
 			obj_tr.unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-				var date = $("#id-date-picker-1").val().split('to');
+				var date = $("#dateRangePicker").val().split('to');
 				var s_date = date[0];
 				var s_date = date[0];
 				var e_date = date[1];
 				var e_date = date[1];
 				var checked_date = new Array();
 				var checked_date = new Array();