Browse Source

修改日期控件不可手动输入,修改个人信息的跳转问题

ying.rong 9 years ago
parent
commit
a6793ab145
51 changed files with 157 additions and 60 deletions
  1. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report.ftl
  2. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/ideaReport.ftl
  3. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/osReport.ftl
  4. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/regionReport.ftl
  5. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/sceneReport.ftl
  6. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/create.ftl
  7. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/edit.ftl
  8. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/create.ftl
  9. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/edit.ftl
  10. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/operator-ad-group/create.ftl
  11. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/operator-ad-group/edit.ftl
  12. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/authority/loginperson.ftl
  13. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/dashboard.ftl
  14. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/finance/adv-balance/distribution.ftl
  15. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/finance/adv-balance/list.ftl
  16. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl
  17. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/apmac.ftl
  18. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/areal.ftl
  19. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/place.ftl
  20. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/position.ftl
  21. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/size.ftl
  22. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/system.ftl
  23. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl
  24. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report.ftl
  25. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/ideaReport.ftl
  26. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/osReport.ftl
  27. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/regionReport.ftl
  28. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/sceneReport.ftl
  29. 1 1
      src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/banner-audit.ftl
  30. 2 2
      src/main/webapp/WEB-INF/pages/back/main/authority/loginperson.ftl
  31. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report.ftl
  32. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/apmac.ftl
  33. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/areal.ftl
  34. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/place.ftl
  35. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/position.ftl
  36. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/size.ftl
  37. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/system.ftl
  38. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/type.ftl
  39. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/authority/loginperson.ftl
  40. 1 1
      src/main/webapp/WEB-INF/pages/operator/main/financial/financial-management/list.ftl
  41. 7 0
      src/main/webapp/assets/js/advertiser/adGroup.js
  42. 19 2
      src/main/webapp/assets/js/advertiser/authority.js
  43. 7 0
      src/main/webapp/assets/js/advertiser/campaign.js
  44. 7 0
      src/main/webapp/assets/js/advertiser/finance.js
  45. 7 0
      src/main/webapp/assets/js/advertiser/operatoradGroup.js
  46. 19 2
      src/main/webapp/assets/js/back/authority.js
  47. 11 1
      src/main/webapp/assets/js/common/validate.js
  48. 18 2
      src/main/webapp/assets/js/operator/authority.js
  49. 5 2
      src/main/webapp/assets/js/operator/finance.js
  50. 5 2
      src/main/webapp/assets/js/report_advertiser.js
  51. 5 2
      src/main/webapp/assets/js/report_operator.js

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

@@ -51,7 +51,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -74,7 +74,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 					<div id="date-checkbox">

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

@@ -74,7 +74,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 					<div id="date-checkbox">

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

@@ -74,7 +74,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 					<div id="date-checkbox">

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

@@ -74,7 +74,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 					<div id="date-checkbox">

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

@@ -60,14 +60,14 @@
 					<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>
+						<input type="text" tabindex="2" name="activeTime" id="dateRangePicker" value="" readonly/>
 					</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>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span>
 				</div>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-yes">*</span>投放模式:</label>

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

@@ -60,14 +60,14 @@
 					<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>
+						<input type="text" tabindex="2" name="activeTime" id="dateRangePicker" value="${activeTime!}" readonly/>
 					</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>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span>
 				</div>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-yes">*</span>投放模式:</label>

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

@@ -41,7 +41,7 @@
 					<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>
+						<input type="text" tabindex="2" name="pickTime" id="dateRangePicker" value="" readonly/>
 					</span>
 				</div>
 				<div class="input-group">

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

@@ -41,7 +41,7 @@
 					<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>
+						<input type="text" tabindex="2" name="pickTime" id="dateRangePicker" value="${campaign.activeTime!?date} to ${campaign.expireTime!?date}" readonly/>
 					</span>
 				</div>
 				<div class="input-group">

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

@@ -62,14 +62,14 @@
 					<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>
+						<input type="text" tabindex="2" name="activeTime" id="dateRangePicker" value="" readonly/>
 					</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>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span>
 				</div>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-yes">*</span>投放模式:</label>

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

@@ -60,14 +60,14 @@
 					<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" readonly="readonly" name="activeTime" id="dateRangePicker" value="${activeTime!}" verify="date-to/24/1/0"/><span class="spanVaildate"></span>
+						<input type="text" tabindex="2" readonly="readonly" name="activeTime" id="dateRangePicker" value="${activeTime!}" readonly/>
 					</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>
+					<span class="input-span">元</span><span class="help-inline">总预算不能大于订单总预算</span>
 				</div>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-yes">*</span>投放模式:</label>

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

@@ -62,8 +62,8 @@
 				<#else>
 					<input type="hidden" name="operator_Id" id="operatorId" value="0"/>
 				</#if>
-				<div id="footBtn">
-					<button class="btn-save" type="submit">保存</button>
+				<div id="footBtn_account">
+					<button class="btn-save" id="btn-save-account" type="submit">保存</button>
 					<button class="btn-cancel" id="btn-cancel-account" type="button">取消</button>
 				</div>
 			</form>

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

@@ -101,7 +101,7 @@
 							<span class="span">时间周期选择</span>
 							<span id="calendar_span">
 								<i class="icon-calendar"></i>   
-								<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+								<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 							</span>
 						</div>
 						<div class="right">

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

@@ -50,7 +50,7 @@
 						<span class="selectuls_finance_span">查看周期:</span>
 						<span id="calendar_span">
 							<i class="icon-calendar"></i>   
-							<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+							<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 						</span>
 					</div>
 					<input id="btn_formSubmit" type="submit" value="查询"/>

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

@@ -50,7 +50,7 @@
 						<span class="selectuls_finance_span">查看周期:</span>
 						<span id="calendar_span">
 							<i class="icon-calendar"></i>   
-							<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+							<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 						</span>
 					</div>
 					<div class="selectuls_finance_div">

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

@@ -63,7 +63,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -59,7 +59,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -55,7 +55,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -59,7 +59,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -59,7 +59,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -59,7 +59,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -59,7 +59,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -58,7 +58,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -51,7 +51,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -78,7 +78,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 					<div id="date-checkbox">

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

@@ -78,7 +78,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 					<div id="date-checkbox">

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

@@ -78,7 +78,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 					<div id="date-checkbox">

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

@@ -78,7 +78,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 					<div id="date-checkbox">

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

@@ -21,7 +21,7 @@
 			<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" style="max-width:200px;overflow:hidden;">${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>

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

@@ -62,8 +62,8 @@
 				<#else>
 					<input type="hidden" name="operator_Id" id="operatorId" value="0"/>
 				</#if>
-				<div id="footBtn">
-					<button class="btn-save" type="submit">保存</button>
+				<div id="footBtn_account">
+					<button class="btn-save" id="btn-save-account" type="submit">保存</button>
 					<button class="btn-cancel" id="btn-cancel-account" type="button">取消</button>
 				</div>
 			</form>

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

@@ -55,7 +55,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/apmac.ftl

@@ -50,7 +50,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/areal.ftl

@@ -47,7 +47,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/place.ftl

@@ -50,7 +50,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/position.ftl

@@ -49,7 +49,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/size.ftl

@@ -50,7 +50,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/system.ftl

@@ -50,7 +50,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/type.ftl

@@ -49,7 +49,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/authority/loginperson.ftl

@@ -62,8 +62,8 @@
 				<#else>
 					<input type="hidden" name="operator_Id" id="operatorId" value="0"/>
 				</#if>
-				<div id="footBtn">
-					<button class="btn-save" type="submit">保存</button>
+				<div id="footBtn_account">
+					<button class="btn-save" id="btn-save-account" type="submit">保存</button>
 					<button class="btn-cancel" id="btn-cancel-account" type="button">取消</button>
 				</div>
 			</form>

+ 1 - 1
src/main/webapp/WEB-INF/pages/operator/main/financial/financial-management/list.ftl

@@ -45,7 +45,7 @@
 					</span>
 					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}" readonly/>
 					</span>
 					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>

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

@@ -319,6 +319,13 @@ $(document).ready(function(){
  		});
  	}
 	
+ 	//点击日期控件的按钮时,去掉前面时间标签的样式
+ 	$(".apply-btn").click(function(){
+		if(!$(this).hasClass("disabled")){
+			$('#dateRangePicker').val($(".start-day").text() +" to "+$(".end-day").text());
+		}
+	});
+ 	
  	$("#create-btn-save,#edit-btn-save").click(function(){
  		$("div.input-group").find("span.help-inline").text("").removeClass("help-inline").addClass("spanVaildate");
  		if (!$("#validateForm").validate()) {

+ 19 - 2
src/main/webapp/assets/js/advertiser/authority.js

@@ -75,7 +75,8 @@ $(document).ready(function(){
  		$("#validateForm").autovalidate();
  	}
 	
-	$(".btn-save").click(function(){
+	$("#footBtn .btn-save").click(function(){
+		alert(2);
 		var authority = "";
 		$("#checkboxs input[type=checkbox]:checked").each(function(){
 		    	authority+=$(this).val()+",";
@@ -100,10 +101,26 @@ $(document).ready(function(){
 		return false;
 	});
 	
-	$(".btn-cancel").click(function(){
+	$("#footBtn .btn-cancel").click(function(){
 		window.location.href = ctx+"/advertiser/main/authority/list";
 	});
 	
+	//个人信息保存按钮
+	$("#btn-save-account").click(function(){
+		if (!$("#validateForm").validate()) {
+			return false;
+		}
+		var myform = $("#validateForm").serialize();
+		$.post(ctx+"/advertiser/main/authority/save",myform,function(data){
+			if($("#password").val() == "" && $("#ensurePassword").val() == ""){
+				window.location.href = ctx+"/advertiser/main/dashboard";
+			}else{
+				window.location.href = ctx+"/login";
+			}
+		})
+		return false;
+	});
+	
 	//个人信息取消按钮
 	$("#btn-cancel-account").unbind('click').click(function(){
 		location.href = ctx+"/advertiser/main/dashboard";

+ 7 - 0
src/main/webapp/assets/js/advertiser/campaign.js

@@ -66,6 +66,13 @@ $(document).ready(function(){
  			$(this).parent("div.input-group").find("span.help-inline").text("").removeClass("help-inline").addClass("spanVaildate");
  		});
  	}
+ 	
+ 	//点击日期控件的按钮时,去掉前面时间标签的样式
+	$(".apply-btn").click(function(){
+		if(!$(this).hasClass("disabled")){
+			$('#dateRangePicker').val($(".start-day").text() +" to "+$(".end-day").text());
+		}
+	});
 	
 	$(".btn-save").click(function(){
 		$("div.input-group").find("span.help-inline").text("").removeClass("help-inline").addClass("spanVaildate");

+ 7 - 0
src/main/webapp/assets/js/advertiser/finance.js

@@ -9,6 +9,13 @@ $(document).ready(function(){
 			$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
 		}
 	}
+	
+	//点击日期控件的按钮时,去掉前面时间标签的样式
+	$(".apply-btn").click(function(event,obj){
+		if(!$(this).hasClass("disabled")){
+			$('#dateRangePicker').val($(".start-day").text() +" to "+$(".end-day").text());
+		}
+	});
 
 	/***************************    资金分配    ***************************/
 

+ 7 - 0
src/main/webapp/assets/js/advertiser/operatoradGroup.js

@@ -319,6 +319,13 @@ $(document).ready(function(){
  		});
  	}
 	
+ 	//点击日期控件的按钮时,去掉前面时间标签的样式
+ 	$(".apply-btn").click(function(){
+		if(!$(this).hasClass("disabled")){
+			$('#dateRangePicker').val($(".start-day").text() +" to "+$(".end-day").text());
+		}
+	});
+ 	
  	$("#create-btn-save,#edit-btn-save").click(function(){
  		$("div.input-group").find("span.help-inline").text("").removeClass("help-inline").addClass("spanVaildate");
  		if (!$("#validateForm").validate()) {

+ 19 - 2
src/main/webapp/assets/js/back/authority.js

@@ -30,7 +30,7 @@ $(document).ready(function(){
  		$("#validateForm").autovalidate();
  	}
 	
-	$(".btn-save").click(function(){
+	$("#footBtn .btn-save").click(function(){
 		var authority = "";
 		$("#checkboxs input[type=checkbox]:checked").each(function(){
 		    	authority+=$(this).val()+",";
@@ -55,10 +55,27 @@ $(document).ready(function(){
 		return false;
 	});
 	
-	$(".btn-cancel").click(function(){
+	$("#footBtn .btn-cancel").click(function(){
 		window.location.href = ctx+"/back/main/authority/list";
 	});
 	
+	//个人信息保存按钮
+	$("#btn-save-account").click(function(){
+		if (!$("#validateForm").validate()) {
+			return false;
+		}
+		var myform = $("#validateForm").serialize();
+		$.post(ctx+"/back/main/authority/save",myform,function(data){
+			alert($("#password").val() == "" && $("#ensurePassword").val() == "");
+			if($("#password").val() == "" && $("#ensurePassword").val() == ""){
+				window.location.href = ctx+"/back/main/dashboard";
+			}else{
+				window.location.href = ctx+"/login";
+			}
+		})
+		return false;
+	});
+	
 	//个人信息取消按钮
 	$("#btn-cancel-account").unbind('click').click(function(){
 		location.href = ctx+"/back/main/dashboard";

+ 11 - 1
src/main/webapp/assets/js/common/validate.js

@@ -45,7 +45,7 @@ $(document).ready(function() {
 			case 'tel-mobile' : msg='格式必须为国内固定电话或手机号类型,如:0511-4405222 或 021-87888822 或 18612345678';tolength='0';reg=/\d{3}-\d{8}|\d{4}-\d{7}|1[3|4|5|8][0-9]\d{8}$/;break;
 			case 'website' : msg='格式必须为网址类型,如:http://www.baidu.com?name=1';tolength='0';reg = '^[A-Za-z]+://[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$';break;
 			case 'china-english-num': msg='该输入项只能输入中文、英文、数字';tolength='1';reg=/^([\u4e00-\u9fa5]|[a-zA-Z0-9])+$/;break;
-			case 'date-to':  msg='格式必须为日期类型,如:2012-01-01 to 2013-01-01';tolength='0';reg = /^((?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)) to ((?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29))$/i;break;
+			case 'date-to':  msg='格式必须为日期类型,如:2012-01-01 to 2013-01-01';tolength='0';reg = /^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29) to (?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$/i;break;
 			case 'mac': msg='格式必须为mac地址类型,中间以横杠或冒号分隔,如:00-01-6C-06-A6-29 或 00:01:6C:06:A6:29';tolength='1';reg=/^(([0-9a-fA-F]{2})(([:][0-9a-fA-F]{2}){5}))|(([0-9a-fA-F]{2})(([-][0-9a-fA-F]{2}){5}))$/;break;
 			case 'longitude': msg='格式必须为经度类型,范围在-180°~180°,如:(-)180 或 (-)116.34528 或 (-)86.8';tolength='1';reg=/^(-?((180)|(((1[0-7]\d)|(\d{1,2}))(\.\d{1,5})?)))$/;break;
 			case 'latitude': msg='格式必须为经度类型,范围在-90°~90°,如:(-)90 或 (-)86.34528 或 (-)8.3';tolength='1';reg=/^(-?((90)|((([1-8]\d)|(\d{1}))(\.\d{1,5})?)))$/;break;
@@ -71,6 +71,8 @@ $(document).ready(function() {
     		}
     		if(e.type == "password"){
     			$e.parent("span").parent("div").find("span.spanVaildate").html("此项不能为空!");
+    		}if(e.id == "dateRangePicker"){
+    			$e.parent("span").parent("div").find("span.spanVaildate").html("此项不能为空!");
     		}else{
     			$e.parent("div").find("span.spanVaildate").html("此项不能为空!");
     		}
@@ -86,6 +88,8 @@ $(document).ready(function() {
 	        		var charLen = (len%2==0)?(len/2):((len-1)/2);
 	        		if(e.type == "password"){
 	        			$e.parent("span").parent("div").find("span.spanVaildate").html("数据长度最大为"+len+"个字符("+charLen+"个汉字)!");
+	        		}else if(e.id == "dateRangePicker"){
+	        			$e.parent("span").parent("div").find("span.spanVaildate").html("数据长度最大为"+len+"个字符("+charLen+"个汉字)!");
 	        		}else{
 	        			$e.parent("div").find("span.spanVaildate").html("数据长度最大为"+len+"个字符("+charLen+"个汉字)!");
 	        		}
@@ -98,6 +102,8 @@ $(document).ready(function() {
         			$e.attr('title','数据长度最大为'+len+'个字符');
         			if(e.type == "password"){
 	        			$e.parent("span").parent("div").find("span.spanVaildate").html("数据长度最大为"+len+"个字符!");
+	        		}else if(e.id == "dateRangePicker"){
+	        			$e.parent("span").parent("div").find("span.spanVaildate").html("数据长度最大为"+len+"个字符!");
 	        		}else{
 	        			$e.parent("div").find("span.spanVaildate").html("数据长度最大为"+len+"个字符!");
 	        		}
@@ -109,6 +115,8 @@ $(document).ready(function() {
         		$e.attr('title',msg);
         		if(e.type == "password"){
         			$e.parent("span").parent("div").find("span.spanVaildate").html(msg);
+        		}else if(e.id == "dateRangePicker"){
+        			$e.parent("span").parent("div").find("span.spanVaildate").html(msg);
         		}else{
         			$e.parent("div").find("span.spanVaildate").html(msg);
         		}
@@ -118,6 +126,8 @@ $(document).ready(function() {
 		$e.removeClass('invalid-text');
 		if(e.type == "password"){
 			$e.parent("span").parent("div").find("span.spanVaildate").html("");
+		}if(e.id == "dateRangePicker"){
+			$e.parent("span").parent("div").find("span.spanVaildate").html("");
 		}else{
 			$e.parent("div").find("span.spanVaildate").html("");
 		}

+ 18 - 2
src/main/webapp/assets/js/operator/authority.js

@@ -30,7 +30,7 @@ $(document).ready(function(){
  		$("#validateForm").autovalidate();
  	}
 	
-	$(".btn-save").click(function(){
+	$("#footBtn .btn-save").click(function(){
 		var authority = "";
 		$("#checkboxs input[type=checkbox]:checked").each(function(){
 		    	authority+=$(this).val()+",";
@@ -55,10 +55,26 @@ $(document).ready(function(){
 		return false;
 	});
 	
-	$(".btn-cancel").click(function(){
+	$("#footBtn .btn-cancel").click(function(){
 		window.location.href = ctx+"/operator/main/authority/list";
 	});
 	
+	//个人信息保存按钮
+	$("#btn-save-account").click(function(){
+		if (!$("#validateForm").validate()) {
+			return false;
+		}
+		var myform = $("#validateForm").serialize();
+		$.post(ctx+"/operator/main/authority/save",myform,function(data){
+			if($("#password").val() == "" && $("#ensurePassword").val() == ""){
+				window.location.href = ctx+"/operator/main/dashboard";
+			}else{
+				window.location.href = ctx+"/login";
+			}
+		})
+		return false;
+	});
+	
 	//个人信息取消按钮
 	$("#btn-cancel-account").unbind('click').click(function(){
 		location.href = ctx+"/operator/main/dashboard";

+ 5 - 2
src/main/webapp/assets/js/operator/finance.js

@@ -26,8 +26,11 @@ $(document).ready(function(){
 	});
 	//点击日期控件的按钮时,去掉前面时间标签的样式
 	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#dateChoose_span a').removeClass('dateChange');
+		if(!$(this).hasClass("disabled")){
+			$("#dateTab").val("");
+			$('#dateChoose_span a').removeClass('dateChange');
+			$('#dateRangePicker').val($(".start-day").text() +" to "+$(".end-day").text());
+		}
 	});
 	/***************************   提现    ***************************/
 

+ 5 - 2
src/main/webapp/assets/js/report_advertiser.js

@@ -20,8 +20,11 @@ $(document).ready(function(){
 	});
 	//点击日期控件的按钮时,去掉前面时间标签的样式
 	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#dateChoose_span a').removeClass('dateChange');
+		if(!$(this).hasClass("disabled")){
+			$("#dateTab").val("");
+			$('#dateChoose_span a').removeClass('dateChange');
+			$('#dateRangePicker').val($(".start-day").text() +" to "+$(".end-day").text());
+		}
 	});
 	
 	// 分页中超链接跳转

+ 5 - 2
src/main/webapp/assets/js/report_operator.js

@@ -546,8 +546,11 @@ $(document).ready(function(){
 	});
 	//点击日期控件的按钮时,去掉前面时间标签的样式
 	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#dateChoose_span a').removeClass('dateChange');
+		if(!$(this).hasClass("disabled")){
+			$("#dateTab").val("");
+			$('#dateChoose_span a').removeClass('dateChange');
+			$('#dateRangePicker').val($(".start-day").text() +" to "+$(".end-day").text());
+		}
 	});
 
  	//控制页码