首页 发现 帮助
登录
caimei365
/
caimei365-manager
3
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

使用期限同上下架时间

zhijiezhao 2 年之前
父节点
e6c8e0d7d0
当前提交
e4beb1ed9a
共有 8 个文件被更改，包括 377 次插入 和 108 次删除
合并视图 显示文件统计
  1. 2 2
      src/main/resources/mappings/modules/coupon/CmCouponMapper.xml
  2. 170 70
      src/main/webapp/WEB-INF/views/modules/coupon/MoneyCouponForm.jsp
  3. 33 7
      src/main/webapp/WEB-INF/views/modules/coupon/cmCouponForm.jsp
  4. 33 7
      src/main/webapp/WEB-INF/views/modules/coupon/couponCategoryForm.jsp
  5. 33 7
      src/main/webapp/WEB-INF/views/modules/coupon/couponNewUserForm.jsp
  6. 33 7
      src/main/webapp/WEB-INF/views/modules/coupon/couponShopForm.jsp
  7. 33 7
      src/main/webapp/WEB-INF/views/modules/coupon/couponUserExclusiveForm.jsp
  8. 40 1
      src/main/webapp/WEB-INF/views/modules/coupon/redemptionCodeCouponForm.jsp

+ 2 - 2
src/main/resources/mappings/modules/coupon/CmCouponMapper.xml
查看文件 

@@ -445,7 +445,7 @@
 
 		  cc.`startDate`,
 
 		  cc.`startDate`,
 
 		  cc.`endDate`,
 
 		  cc.`endDate`,
 
 		  a.`createDate` as `receiveDate`,
 
 		  a.`createDate` as `receiveDate`,
 
-		  date_add(a.createDate,interval cc.usePeriod DAY) as `useEndDate`,
 
+		  if(useTimeFlag = 1, cc.endDate,date_add(a.createDate,interval cc.usePeriod DAY)) as `useEndDate`,
 
 		  cc.`status`,
 
 		  cc.`status`,
 
 		  cc.`couponType`,
 
 		  cc.`couponType`,
 
 		  cc.`userId`,
 
 		  cc.`userId`,
 
@@ -551,7 +551,7 @@
 
 			OR (couponType = 2 AND userId = #{userId})
 
 			OR (couponType = 2 AND userId = #{userId})
 
 			OR ((SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ >= ]]> startDate
 
 			OR ((SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ >= ]]> startDate
 
 				AND couponType = 4))
 
 				AND couponType = 4))
 
-		  AND NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,
 
+		  AND NOW() <![CDATA[ < ]]> if(useTimeFlag = 1 or receiveFlag = 1,endDate,
 
 									   date_add(if((SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and (SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,(SELECT registerTime FROM USER WHERE userID = #{userId}),startDate),
 
 									   date_add(if((SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and (SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,(SELECT registerTime FROM USER WHERE userID = #{userId}),startDate),
 
 												interval receivePeriod day))
 
 												interval receivePeriod day))
 
 		ORDER BY
 
 		ORDER BY

+ 170 - 70
src/main/webapp/WEB-INF/views/modules/coupon/MoneyCouponForm.jsp
查看文件 

@@ -1,20 +1,20 @@
 
 <%@ page import="java.util.Date" %>
 
 <%@ page import="java.util.Date" %>
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
     <title>优惠券管理</title>
 
     <title>优惠券管理</title>
 
     <meta name="decorator" content="default"/>
 
     <meta name="decorator" content="default"/>
 
     <script type="text/javascript">
 
     <script type="text/javascript">
 
-        $(document).ready(function() {
 
+        $(document).ready(function () {
 
             $("#inputForm").validate({
 
             $("#inputForm").validate({
 
-                submitHandler: function(form){
 
+                submitHandler: function (form) {
 
                     if (imageList.length > 0) {
 
                     if (imageList.length > 0) {
 
                         var productInfo = JSON.stringify(imageList);
 
                         var productInfo = JSON.stringify(imageList);
 
                         $('#productInfo').val(productInfo);
 
                         $('#productInfo').val(productInfo);
 
                     }
 
                     }
 
-                    var couponAmount = $("#couponAmount").val()*1;
 
-                    var touchPrice = $("#touchPrice").val()*1;
 
+                    var couponAmount = $("#couponAmount").val() * 1;
 
+                    var touchPrice = $("#touchPrice").val() * 1;
 
                     if (couponAmount >= touchPrice) {
 
                     if (couponAmount >= touchPrice) {
 
                         alertx("优惠券金额必须小于优惠条件金额");
 
                         alertx("优惠券金额必须小于优惠条件金额");
 
                         return false;
 
                         return false;
 
@@ -29,9 +29,9 @@
 
                     form.submit();
 
                     form.submit();
 
                 },
 
                 },
 
                 errorContainer: "#messageBox",
 
                 errorContainer: "#messageBox",
 
-                errorPlacement: function(error, element) {
 
+                errorPlacement: function (error, element) {
 
                     $("#messageBox").text("输入有误，请先更正。");
 
                     $("#messageBox").text("输入有误，请先更正。");
 
-                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
 
                         error.appendTo(element.parent().parent());
 
                         error.appendTo(element.parent().parent());
 
                     } else {
 
                     } else {
 
                         error.insertAfter(element);
 
                         error.insertAfter(element);
 
@@ -44,9 +44,11 @@
 
         .iconBox {
 
         .iconBox {
 
             font-size: 0;
 
             font-size: 0;
 
         }
 
         }
 
-        .conList .btn:nth-of-type(1){
 
+
 
+        .conList .btn:nth-of-type(1) {
 
             margin-left: 25px;
 
             margin-left: 25px;
 
         }
 
         }
 
+
 
         .upload-content-image {
 
         .upload-content-image {
 
             margin-top: -70px;
 
             margin-top: -70px;
 
         }
 
         }
 
@@ -74,6 +76,7 @@
 
         .upload-content-image .conList .btn:nth-of-type(1) h5 {
 
         .upload-content-image .conList .btn:nth-of-type(1) h5 {
 
             color: #666;
 
             color: #666;
 
         }
 
         }
 
+
 
         .upload-content-image .conList ol li {
 
         .upload-content-image .conList ol li {
 
             width: 114px;
 
             width: 114px;
 
             min-height: 80px;
 
             min-height: 80px;
 
@@ -83,6 +86,7 @@
 
             top: 120px;
 
             top: 120px;
 
             margin-left: 2px;
 
             margin-left: 2px;
 
         }
 
         }
 
+
 
         .cancel-upload-image {
 
         .cancel-upload-image {
 
             background: transparent;
 
             background: transparent;
 
             border: none;
 
             border: none;
 
@@ -93,6 +97,7 @@
 
             cursor: pointer;
 
             cursor: pointer;
 
             z-index: 100;
 
             z-index: 100;
 
         }
 
         }
 
+
 
         .hide-pic-image {
 
         .hide-pic-image {
 
             display: none !important;
 
             display: none !important;
 
         }
 
         }
 
@@ -101,9 +106,12 @@
 
 <body>
 
 <body>
 
 <ul class="nav nav-tabs">
 
 <ul class="nav nav-tabs">
 
     <li><a href="${ctx}/coupon/cmCoupon/list?moneyCouponFlag=1&&couponType=5">价值优惠券列表</a></li>
 
     <li><a href="${ctx}/coupon/cmCoupon/list?moneyCouponFlag=1&&couponType=5">价值优惠券列表</a></li>
 
-    <li class="active"><a href="${ctx}/coupon/cmCoupon/moneyCouponForm?id=${cmCoupon.id}">${not empty cmCoupon.id?'编辑':'添加'}</a></li>
 
-</ul><br/>
 
-<form:form id="inputForm" modelAttribute="cmCoupon" action="${ctx}/coupon/cmCoupon/moneyCouponSave" method="post" class="form-horizontal">
 
+    <li class="active"><a
 
+            href="${ctx}/coupon/cmCoupon/moneyCouponForm?id=${cmCoupon.id}">${not empty cmCoupon.id?'编辑':'添加'}</a></li>
 
+</ul>
 
+<br/>
 
+<form:form id="inputForm" modelAttribute="cmCoupon" action="${ctx}/coupon/cmCoupon/moneyCouponSave" method="post"
 
+           class="form-horizontal">
 
     <form:hidden path="id"/>
 
     <form:hidden path="id"/>
 
     <form:hidden path="productInfo" id="productInfo"/>
 
     <form:hidden path="productInfo" id="productInfo"/>
 
     <sys:message content="${message}"/>
 
     <sys:message content="${message}"/>
 
@@ -111,19 +119,22 @@
 
     <div class="control-group">
 
     <div class="control-group">
 
         <label class="control-label"><font color="red">*</font>优惠券名称：</label>
 
         <label class="control-label"><font color="red">*</font>优惠券名称：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            <form:input path="name" htmlEscape="false" maxlength="30" placeholder="30个汉字以内" class="input-xlarge required"/>
 
+            <form:input path="name" htmlEscape="false" maxlength="30" placeholder="30个汉字以内"
 
+                        class="input-xlarge required"/>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
         <label class="control-label"><font color="red">*</font>优惠券金额：</label>
 
         <label class="control-label"><font color="red">*</font>优惠券金额：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            <input type="number" id="couponAmount" name="couponAmount" value="${cmCoupon.couponAmount}" min="0" required>
 
+            <input type="number" id="couponAmount" name="couponAmount" value="${cmCoupon.couponAmount}" min="0"
 
+                   required>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
         <label class="control-label"><font color="red">*</font>优惠条件：</label>
 
         <label class="control-label"><font color="red">*</font>优惠条件：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            订单商品总额满&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="touchPrice" id="touchPrice" value="${cmCoupon.touchPrice}" min="0" required>
 
+            订单商品总额满&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="touchPrice" id="touchPrice"
 
+                                                  value="${cmCoupon.touchPrice}" min="0" required>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
@@ -135,15 +146,16 @@
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
         <c:if test="${cmCoupon.couponPayWay eq 1}">
 
         <c:if test="${cmCoupon.couponPayWay eq 1}">
 
-            <label id ="gmjg" class="control-label"><font color="red">*</font>购买价格：</label>
 
+            <label id="gmjg" class="control-label"><font color="red">*</font>购买价格：</label>
 
             <label id="dksl" class="control-label" style="display: none"><font color="red">*</font>抵扣数量：</label>
 
             <label id="dksl" class="control-label" style="display: none"><font color="red">*</font>抵扣数量：</label>
 
         </c:if>
 
         </c:if>
 
         <c:if test="${cmCoupon.couponPayWay eq 2}">
 
         <c:if test="${cmCoupon.couponPayWay eq 2}">
 
-            <label id ="gmjg" class="control-label" style="display: none"><font color="red">*</font>购买价格：</label>
 
+            <label id="gmjg" class="control-label" style="display: none"><font color="red">*</font>购买价格：</label>
 
             <label id="dksl" class="control-label"><font color="red">*</font>抵扣数量：</label>
 
             <label id="dksl" class="control-label"><font color="red">*</font>抵扣数量：</label>
 
         </c:if>
 
         </c:if>
 
         <div class="controls">
 
         <div class="controls">
 
-            <input type="number" id="moneyCouponPrice" name="moneyCouponPrice" value="${cmCoupon.moneyCouponPrice}" min="0" required>
 
+            <input type="number" id="moneyCouponPrice" name="moneyCouponPrice" value="${cmCoupon.moneyCouponPrice}"
 
+                   min="0" required>
 
             <c:if test="${cmCoupon.couponPayWay eq 1}">
 
             <c:if test="${cmCoupon.couponPayWay eq 1}">
 
                 <span id="yuan">元</span>
 
                 <span id="yuan">元</span>
 
                 <span id="ge" hidden>个</span>
 
                 <span id="ge" hidden>个</span>
 
@@ -157,7 +169,8 @@
 
     <div class="control-group">
 
     <div class="control-group">
 
         <label class="control-label"><font color="red">*</font>上架时间：</label>
 
         <label class="control-label"><font color="red">*</font>上架时间：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            <input name="startDate" id="startDate" type="text" required readonly="readonly" maxlength="20" class="input-medium Wdate "
 
+            <input name="startDate" id="startDate" type="text" required readonly="readonly" maxlength="20"
 
+                   class="input-medium Wdate "
 
                    value="<fmt:formatDate value="${cmCoupon.startDate}" pattern="yyyy-MM-dd 00:00:00"/>"
 
                    value="<fmt:formatDate value="${cmCoupon.startDate}" pattern="yyyy-MM-dd 00:00:00"/>"
 
                    onclick="WdatePicker({dateFmt:'yyyy-MM-dd 00:00:00',isShowClear:false});" onblur="dateShow()"/>
 
                    onclick="WdatePicker({dateFmt:'yyyy-MM-dd 00:00:00',isShowClear:false});" onblur="dateShow()"/>
 
         </div>
 
         </div>
 
@@ -165,7 +178,8 @@
 
     <div class="control-group">
 
     <div class="control-group">
 
         <label class="control-label"><font color="red">*</font>下架时间：</label>
 
         <label class="control-label"><font color="red">*</font>下架时间：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            <input name="endDate" id="endDate" type="text" required readonly="readonly" maxlength="20" class="input-medium Wdate "
 
+            <input name="endDate" id="endDate" type="text" required readonly="readonly" maxlength="20"
 
+                   class="input-medium Wdate "
 
                    value="<fmt:formatDate value="${cmCoupon.endDate}" pattern="yyyy-MM-dd 23:59:59"/>"
 
                    value="<fmt:formatDate value="${cmCoupon.endDate}" pattern="yyyy-MM-dd 23:59:59"/>"
 
                    onclick="WdatePicker({dateFmt:'yyyy-MM-dd 23:59:59',isShowClear:false});" onblur="dateShow()"/>
 
                    onclick="WdatePicker({dateFmt:'yyyy-MM-dd 23:59:59',isShowClear:false});" onblur="dateShow()"/>
 
         </div>
 
         </div>
 
@@ -198,40 +212,58 @@
 
     <div class="control-group">
 
     <div class="control-group">
 
         <label class="control-label"><font color="red">*</font>购买期限：</label>
 
         <label class="control-label"><font color="red">*</font>购买期限：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            <input type="number" id="receivePeriod" name="receivePeriod" onkeyup="onlynum(this)" value="${cmCoupon.receivePeriod}" min="1" required> 天
 
-            <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
-                ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
+            <input type="number" id="receivePeriod" name="receivePeriod" onkeyup="onlynum(this)"
 
+                   value="${cmCoupon.receivePeriod}" min="1" required> 天
 
+            <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important"
 
+                   value="${cmCoupon.receiveFlag eq 1?1:0}"
 
+                ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')"/>同上下架时间
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
+            <input id="receiveFlagTemp" type="hidden" value="${cmCoupon.receiveFlag}">
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
         <label class="control-label"><font color="red">*</font>使用期限：</label>
 
         <label class="control-label"><font color="red">*</font>使用期限：</label>
 
         <div class="controls">
 
         <div class="controls">
 
             <input type="number" id="usePeriod" name="usePeriod" value="${cmCoupon.usePeriod}" min="1" required> 天
 
             <input type="number" id="usePeriod" name="usePeriod" value="${cmCoupon.usePeriod}" min="1" required> 天
 
+            <input type="checkbox" id="useTimeFlag" name="useTimeFlag" style="margin-left:20px !important"
 
+                   value="${cmCoupon.useTimeFlag eq 1?1:0}"
 
+                ${cmCoupon.useTimeFlag eq 1 ? "checked" : ""} onclick="changeUseTime('useTimeFlag')"/>同上下架时间
 
+            <input id="usePeriodTemp" type="hidden" value="${cmCoupon.usePeriod}">
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
         <label class="control-label"><font color="red">*</font>优惠券属性：</label>
 
         <label class="control-label"><font color="red">*</font>优惠券属性：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            <form:radiobutton path="moneyCouponType" value="1" label="意向券" class="required" onclick="moneyCouponShow()"/>
 
-            <form:radiobutton path="moneyCouponType" value="2" label="定向券" class="required" onclick="moneyCouponShow()"/>
 
+            <form:radiobutton path="moneyCouponType" value="1" label="意向券" class="required"
 
+                              onclick="moneyCouponShow()"/>
 
+            <form:radiobutton path="moneyCouponType" value="2" label="定向券" class="required"
 
+                              onclick="moneyCouponShow()"/>
 
             <b style="color: red">(意向券表示全商城通用或者支持多款商品，并且支持退款；定向券表示只支持一款商品，并且不能退款)</b>
 
             <b style="color: red">(意向券表示全商城通用或者支持多款商品，并且支持退款；定向券表示只支持一款商品，并且不能退款)</b>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group" id="yxq">
 
     <div class="control-group" id="yxq">
 
         <label class="control-label"><font color="red">*</font>优惠券类型：</label>
 
         <label class="control-label"><font color="red">*</font>优惠券类型：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            <form:radiobutton name="hdq" path="couponType" value="0" label="活动券" class="required" onclick="couponShow()"/>
 
-            <form:radiobutton id="plq" path="couponType" value="1" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="品类券" class="required" onclick="couponShow()"/>
 
-            <form:radiobutton id="zxq" path="couponType" value="2" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="用户专享券" class="required" onclick="couponShow()"/>
 
-            <form:radiobutton id="dpq" path="couponType" value="3" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="店铺券" class="required" onclick="couponShow()"/>
 
+            <form:radiobutton name="hdq" path="couponType" value="0" label="活动券" class="required"
 
+                              onclick="couponShow()"/>
 
+            <form:radiobutton id="plq" path="couponType" value="1"
 
+                              style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="品类券" class="required"
 
+                              onclick="couponShow()"/>
 
+            <form:radiobutton id="zxq" path="couponType" value="2"
 
+                              style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="用户专享券"
 
+                              class="required" onclick="couponShow()"/>
 
+            <form:radiobutton id="dpq" path="couponType" value="3"
 
+                              style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="店铺券" class="required"
 
+                              onclick="couponShow()"/>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div id="eventVoucher" class="yxq">
 
     <div id="eventVoucher" class="yxq">
 
         <div class="control-group">
 
         <div class="control-group">
 
             <label class="control-label"><font color="red">*</font>优惠商品：</label>
 
             <label class="control-label"><font color="red">*</font>优惠商品：</label>
 
             <div class="controls">
 
             <div class="controls">
 
-                <form:radiobutton id="qsc" path="productType" value="1" label="全商城商品" style="display: ${cmCoupon.moneyCouponType eq 2 ? 'none':''}" onclick="productShow()" checked ="${empty cmCoupon.productType ? true:false}" />
 
+                <form:radiobutton id="qsc" path="productType" value="1" label="全商城商品"
 
+                                  style="display: ${cmCoupon.moneyCouponType eq 2 ? 'none':''}" onclick="productShow()"
 
+                                  checked="${empty cmCoupon.productType ? true:false}"/>
 
                 <form:radiobutton path="productType" value="2" label="指定商品" onclick="productShow()"/>
 
                 <form:radiobutton path="productType" value="2" label="指定商品" onclick="productShow()"/>
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
@@ -239,7 +271,8 @@
 
     <div class="control-group" id="couponCategory" hidden="hidden">
 
     <div class="control-group" id="couponCategory" hidden="hidden">
 
         <label class="control-label"><font color="red">*</font>优惠品类：</label>
 
         <label class="control-label"><font color="red">*</font>优惠品类：</label>
 
         <div class="controls">
 
         <div class="controls">
 
-            <form:radiobutton path="categoryType" value="1" label="产品" checked ="${empty cmCoupon.categoryType ? true:false}"/>
 
+            <form:radiobutton path="categoryType" value="1" label="产品"
 
+                              checked="${empty cmCoupon.categoryType ? true:false}"/>
 
             <form:radiobutton path="categoryType" value="2" label="仪器"/>
 
             <form:radiobutton path="categoryType" value="2" label="仪器"/>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
@@ -287,7 +320,8 @@
 
             <div class="controls upload-content-image iconBox">
 
             <div class="controls upload-content-image iconBox">
 
                 <div class="conList">
 
                 <div class="conList">
 
                     <form:hidden id="pcBanner" path="pcBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>
 
                     <form:hidden id="pcBanner" path="pcBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>
 
-                    <sys:ckfinder input="pcBanner" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
 
+                    <sys:ckfinder input="pcBanner" type="images" uploadPath="/photo" selectMultiple="false"
 
+                                  maxWidth="100" maxHeight="100"/>
 
                     <br>
 
                     <br>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
@@ -296,8 +330,10 @@
 
             <label class="control-label">小程序活动页banner：</label>
 
             <label class="control-label">小程序活动页banner：</label>
 
             <div class="controls upload-content-image iconBox">
 
             <div class="controls upload-content-image iconBox">
 
                 <div class="conList">
 
                 <div class="conList">
 
-                    <form:hidden id="appletsBanner" path="appletsBanner" htmlEscape="false" maxlength="255" class="input-xlarge"/>
 
-                    <sys:ckfinder input="appletsBanner" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
 
+                    <form:hidden id="appletsBanner" path="appletsBanner" htmlEscape="false" maxlength="255"
 
+                                 class="input-xlarge"/>
 
+                    <sys:ckfinder input="appletsBanner" type="images" uploadPath="/photo" selectMultiple="false"
 
+                                  maxWidth="100" maxHeight="100"/>
 
                     <br>
 
                     <br>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
@@ -398,7 +434,8 @@
 
                 }
 
                 }
 
             }, 500);
 
             }, 500);
 
         });
 
         });
 
-        productShow()
 
+        productShow();
 
+        initUseTimeFlag();
 
     });
 
     });
 
 
 
     var productIds = '';
 
     var productIds = '';
 
@@ -426,15 +463,15 @@
 
             batchSaveSort();
 
             batchSaveSort();
 
         }
 
         }
 
 
 
-        if(${cmCoupon.moneyCouponType eq 2}){
 
-            document.querySelector('[for="qsc"]').style.display='none';
 
-            document.querySelector('[for="zxq"]').style.display='none';
 
-            document.querySelector('[for="plq"]').style.display='none';
 
-            document.querySelector('[for="dpq"]').style.display='none';
 
+        if (${cmCoupon.moneyCouponType eq 2}) {
 
+            document.querySelector('[for="qsc"]').style.display = 'none';
 
+            document.querySelector('[for="zxq"]').style.display = 'none';
 
+            document.querySelector('[for="plq"]').style.display = 'none';
 
+            document.querySelector('[for="dpq"]').style.display = 'none';
 
         }
 
         }
 
 
 
         //用户专享券机构回显
 
         //用户专享券机构回显
 
-        if (${not empty cmUser}){
 
+        if (${not empty cmUser}) {
 
             var items = {
 
             var items = {
 
                 "userID": "${cmUser.userID}",
 
                 "userID": "${cmUser.userID}",
 
                 "name": "${cmUser.name}",
 
                 "name": "${cmUser.name}",
 
@@ -459,26 +496,27 @@
 
 
 
         couponShow();
 
         couponShow();
 
 
 
-        if(${cmCoupon.receiveFlag eq 1}){
 
+        if (${cmCoupon.receiveFlag eq 1}) {
 
             $("#receivePeriod").attr('readonly', true);
 
             $("#receivePeriod").attr('readonly', true);
 
             $("#receivePeriod").attr('required', false);
 
             $("#receivePeriod").attr('required', false);
 
         }
 
         }
 
     });
 
     });
 
 
 
-    function nameChange(val){
 
-        if(1===val){
 
+    function nameChange(val) {
 
+        if (1 === val) {
 
             $("#ge").hide();
 
             $("#ge").hide();
 
             $("#yuan").show();
 
             $("#yuan").show();
 
             $("#dksl").hide();
 
             $("#dksl").hide();
 
             $("#gmjg").show();
 
             $("#gmjg").show();
 
 
 
-        }else{
 
+        } else {
 
             $("#yuan").hide();
 
             $("#yuan").hide();
 
             $("#ge").show();
 
             $("#ge").show();
 
             $("#gmjg").hide();
 
             $("#gmjg").hide();
 
             $("#dksl").show();
 
             $("#dksl").show();
 
         }
 
         }
 
     }
 
     }
 
+
 
     //点击添加商品
 
     //点击添加商品
 
     function showSelectProduct() {
 
     function showSelectProduct() {
 
         var url = "${ctx}/coupon/cmCoupon/toAddProduct?productIds=" + productIds;
 
         var url = "${ctx}/coupon/cmCoupon/toAddProduct?productIds=" + productIds;
 
@@ -505,7 +543,8 @@
 
                         $('#contentTable').show();
 
                         $('#contentTable').show();
 
                         $("#del").removeAttr("disabled");
 
                         $("#del").removeAttr("disabled");
 
                         batchSaveSort();
 
                         batchSaveSort();
 
-                    };
 
+                    }
 
+                    ;
 
                 }
 
                 }
 
                 return true;
 
                 return true;
 
             }
 
             }
 
@@ -626,7 +665,7 @@
 
         return confirmx("确定删除吗？", function () {
 
         return confirmx("确定删除吗？", function () {
 
             var image = imageList[index];
 
             var image = imageList[index];
 
             if (image.productId != '') {
 
             if (image.productId != '') {
 
-                productIds = productIds.replace(image.productId,"");
 
+                productIds = productIds.replace(image.productId, "");
 
             }
 
             }
 
             imageList.splice(index, 1);
 
             imageList.splice(index, 1);
 
             insertHtmlProduct(imageList);
 
             insertHtmlProduct(imageList);
 
@@ -668,15 +707,15 @@
 
     }
 
     }
 
 
 
     function productShow() {
 
     function productShow() {
 
-        var  productType = $("input[name='productType']:checked").val();
 
+        var productType = $("input[name='productType']:checked").val();
 
         var moneyCouponType = $("input[name='moneyCouponType']:checked").val();
 
         var moneyCouponType = $("input[name='moneyCouponType']:checked").val();
 
-        if(moneyCouponType == 2){
 
-            $("#productType1").attr("checked",true);
 
+        if (moneyCouponType == 2) {
 
+            $("#productType1").attr("checked", true);
 
             return;
 
             return;
 
         }
 
         }
 
-        if (productType == 2){
 
+        if (productType == 2) {
 
             $(".productData").show();
 
             $(".productData").show();
 
-        }else {
 
+        } else {
 
             $(".productData").hide();
 
             $(".productData").hide();
 
         }
 
         }
 
     }
 
     }
 
@@ -740,7 +779,7 @@
 
     }
 
     }
 
 
 
     function showSelect(couponId) {
 
     function showSelect(couponId) {
 
-        if (couponId == null){
 
+        if (couponId == null) {
 
             alertx("暂未生成兑换码");
 
             alertx("暂未生成兑换码");
 
             return false;
 
             return false;
 
         }
 
         }
 
@@ -814,6 +853,7 @@
 
         $('#contentTableShop').show();
 
         $('#contentTableShop').show();
 
         $("#shopId").val(data.shopId);
 
         $("#shopId").val(data.shopId);
 
     }
 
     }
 
+
 
     function changeCondition(flag, name) {
 
     function changeCondition(flag, name) {
 
         var obj = $("#" + flag);
 
         var obj = $("#" + flag);
 
         var val = obj.val();
 
         var val = obj.val();
 
@@ -836,7 +876,7 @@
 
                 inputObj.attr('onclick', "WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false})");
 
                 inputObj.attr('onclick', "WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false})");
 
                 inputObj.addClass('required');
 
                 inputObj.addClass('required');
 
             }
 
             }
 
-        }else {
 
+        } else {
 
             if (val === '1') {
 
             if (val === '1') {
 
                 inputObj.attr('readonly', true);
 
                 inputObj.attr('readonly', true);
 
                 inputObj.attr('required', false);
 
                 inputObj.attr('required', false);
 
@@ -876,7 +916,7 @@
 
                 inputObj.attr('onclick', "WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false})");
 
                 inputObj.attr('onclick', "WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false})");
 
                 inputObj.addClass('required');
 
                 inputObj.addClass('required');
 
             }
 
             }
 
-        }else {
 
+        } else {
 
             if (val === '1') {
 
             if (val === '1') {
 
                 inputObj.attr('readonly', true);
 
                 inputObj.attr('readonly', true);
 
                 inputObj.attr('required', false);
 
                 inputObj.attr('required', false);
 
@@ -934,8 +974,8 @@
 
     function couponShow() {
 
     function couponShow() {
 
         var couponType = $("input[name='couponType']:checked").val();
 
         var couponType = $("input[name='couponType']:checked").val();
 
         var moneyCouponType = $("input[name='moneyCouponType']:checked").val();
 
         var moneyCouponType = $("input[name='moneyCouponType']:checked").val();
 
-        if(moneyCouponType == 2){
 
-            $("#couponType1").attr("checked",true);
 
+        if (moneyCouponType == 2) {
 
+            $("#couponType1").attr("checked", true);
 
             return;
 
             return;
 
         }
 
         }
 
         if (couponType == 0) {
 
         if (couponType == 0) {
 
@@ -977,8 +1017,8 @@
 
             $("#plq").show();
 
             $("#plq").show();
 
             $("#dpq").show();
 
             $("#dpq").show();
 
             $("#qsc").show();
 
             $("#qsc").show();
 
-            $("#qsc").attr("checked",true);
 
-            $("#couponType1").attr("checked",true);
 
+            $("#qsc").attr("checked", true);
 
+            $("#couponType1").attr("checked", true);
 
             $("#yxq").show();
 
             $("#yxq").show();
 
             $("#dxq").hide();
 
             $("#dxq").hide();
 
             $("#couponCategory").hide();
 
             $("#couponCategory").hide();
 
@@ -986,28 +1026,88 @@
 
             $(".productData").hide();
 
             $(".productData").hide();
 
             $("#couponClub").hide();
 
             $("#couponClub").hide();
 
             $("#couponShop").hide();
 
             $("#couponShop").hide();
 
-            document.querySelector('[for="qsc"]').style.display='';
 
-            document.querySelector('[for="zxq"]').style.display='';
 
-            document.querySelector('[for="plq"]').style.display='';
 
-            document.querySelector('[for="dpq"]').style.display='';
 
-        }
 
-        if(couponType == 2) {
 
-            $("#couponType1").attr("checked",true);
 
-            $("#productType1").attr("checked",true);
 
+            document.querySelector('[for="qsc"]').style.display = '';
 
+            document.querySelector('[for="zxq"]').style.display = '';
 
+            document.querySelector('[for="plq"]').style.display = '';
 
+            document.querySelector('[for="dpq"]').style.display = '';
 
+        }
 
+        if (couponType == 2) {
 
+            $("#couponType1").attr("checked", true);
 
+            $("#productType1").attr("checked", true);
 
             $("#eventVoucher").show();
 
             $("#eventVoucher").show();
 
             $(".productData").show();
 
             $(".productData").show();
 
             $("#couponClub").hide();
 
             $("#couponClub").hide();
 
             $("#couponShop").hide();
 
             $("#couponShop").hide();
 
-            document.querySelector('[for="qsc"]').style.display='none';
 
-            document.querySelector('[for="zxq"]').style.display='none';
 
-            document.querySelector('[for="plq"]').style.display='none';
 
-            document.querySelector('[for="dpq"]').style.display='none';
 
+            document.querySelector('[for="qsc"]').style.display = 'none';
 
+            document.querySelector('[for="zxq"]').style.display = 'none';
 
+            document.querySelector('[for="plq"]').style.display = 'none';
 
+            document.querySelector('[for="dpq"]').style.display = 'none';
 
             $("#qsc").hide();
 
             $("#qsc").hide();
 
             $("#zxq").hide();
 
             $("#zxq").hide();
 
             $("#plq").hide();
 
             $("#plq").hide();
 
             $("#dpq").hide();
 
             $("#dpq").hide();
 
         }
 
         }
 
     }
 
     }
 
+
 
+    function changeUseTime(flag) {
 
+        var obj = $("#" + flag);
 
+        var val = obj.val();
 
+        if (val === '1') {
 
+            obj.val(0);
 
+            val = '0';
 
+        } else {
 
+            obj.val(1);
 
+            val = '1';
 
+        }
 
+        var temp = $("#usePeriodTemp").val();
 
+        var use = $("#usePeriod").val();
 
+        var receive = $("#receivePeriod").val();
 
+        var receiveTemp = $("#receivePeriodTemp").val();
 
+        var receiveFlag = $("#receiveFlag").val();
 
+        if (val === '1') {
 
+            $("#usePeriod").attr('readonly', true);
 
+            $("#usePeriod").attr('required', false);
 
+            $("#receivePeriodTemp").val(receive);
 
+            $("#usePeriodTemp").val(use);
 
+            $("#usePeriod").val('');
 
+            $("#receivePeriod").val('');
 
+            $("#receivePeriod").attr('readonly', true);
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
+            $('[name="receiveFlag"]').attr('disabled', true);
 
+        } else {
 
+            $("#usePeriod").attr('readonly', false);
 
+            $("#usePeriod").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            if (receive > 0) {
 
+                $("#receivePeriod").attr('readonly', true);
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+            } else {
 
+                $("#receivePeriod").attr('readonly', false);
 
+                $('[name="receiveFlag"]').attr('checked', false);
 
+            }
 
+            if (receiveTemp > 0) {
 
+                $("#receivePeriod").val(receiveTemp);
 
+            }else{
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+                $("#receivePeriod").attr('readonly', true);
 
+            }
 
+            $("#usePeriod").val(temp);
 
+        }
 
+    }
 
+
 
+    function initUseTimeFlag() {
 
+        var receiveFlag = $("#useTimeFlag").val();
 
+        if (receiveFlag === '1') {
 
+            $("#usePeriod").attr('readonly', true);
 
+            $("#usePeriod").attr('required', false);
 
+            $('[name="receiveFlag"]').attr('disabled', 'disabled');
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
+        } else {
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            $("#usePeriod").attr('readonly', false);
 
+            $("#usePeriod").attr('required', true);
 
+        }
 
+    }
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 33 - 7
src/main/webapp/WEB-INF/views/modules/coupon/cmCouponForm.jsp
查看文件 

@@ -154,6 +154,7 @@
 
 				<input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
 				<input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
 					${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
 					${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
 				<input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
 				<input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
+				<input id="receiveFlagTemp" type="hidden" value="${cmCoupon.receiveFlag}">
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
 		<div class="control-group">
 
 		<div class="control-group">
 
@@ -627,7 +628,7 @@
 
 		}
 
 		}
 
 	}
 
 	}
 
 
 
-	function changeUseTime(flag){
 
+	function changeUseTime(flag) {
 
 		var obj = $("#" + flag);
 
 		var obj = $("#" + flag);
 
 		var val = obj.val();
 
 		var val = obj.val();
 
 		if (val === '1') {
 
 		if (val === '1') {
 
@@ -639,26 +640,51 @@
 
 		}
 
 		}
 
 		var temp = $("#usePeriodTemp").val();
 
 		var temp = $("#usePeriodTemp").val();
 
 		var use = $("#usePeriod").val();
 
 		var use = $("#usePeriod").val();
 
+		var receive = $("#receivePeriod").val();
 
+		var receiveTemp = $("#receivePeriodTemp").val();
 
+		var receiveFlag = $("#receiveFlag").val();
 
 		if (val === '1') {
 
 		if (val === '1') {
 
 			$("#usePeriod").attr('readonly', true);
 
 			$("#usePeriod").attr('readonly', true);
 
 			$("#usePeriod").attr('required', false);
 
 			$("#usePeriod").attr('required', false);
 
-			$("#usePeriod").val('');
 
+			$("#receivePeriodTemp").val(receive);
 
 			$("#usePeriodTemp").val(use);
 
 			$("#usePeriodTemp").val(use);
 
+			$("#usePeriod").val('');
 
+			$("#receivePeriod").val('');
 
+			$("#receivePeriod").attr('readonly', true);
 
+			$('[name="receiveFlag"]').attr('checked', true);
 
+			$('[name="receiveFlag"]').attr('disabled', true);
 
 		} else {
 
 		} else {
 
 			$("#usePeriod").attr('readonly', false);
 
 			$("#usePeriod").attr('readonly', false);
 
 			$("#usePeriod").attr('required', true);
 
 			$("#usePeriod").attr('required', true);
 
+			$('[name="receiveFlag"]').attr('disabled', false);
 
+			if (receive > 0) {
 
+				$("#receivePeriod").attr('readonly', true);
 
+				$('[name="receiveFlag"]').attr('checked', true);
 
+			} else {
 
+				$("#receivePeriod").attr('readonly', false);
 
+				$('[name="receiveFlag"]').attr('checked', false);
 
+			}
 
+			if (receiveTemp > 0) {
 
+				$("#receivePeriod").val(receiveTemp);
 
+			}else{
 
+				$('[name="receiveFlag"]').attr('checked', true);
 
+				$("#receivePeriod").attr('readonly', true);
 
+			}
 
 			$("#usePeriod").val(temp);
 
 			$("#usePeriod").val(temp);
 
 		}
 
 		}
 
 	}
 
 	}
 
 
 
-	function initUseTimeFlag(){
 
+	function initUseTimeFlag() {
 
 		var receiveFlag = $("#useTimeFlag").val();
 
 		var receiveFlag = $("#useTimeFlag").val();
 
 		if (receiveFlag === '1') {
 
 		if (receiveFlag === '1') {
 
-			$("#useTimeFlag").attr('readonly', true);
 
-			$("#useTimeFlag").attr('required', false);
 
+			$("#usePeriod").attr('readonly', true);
 
+			$("#usePeriod").attr('required', false);
 
+			$('[name="receiveFlag"]').attr('disabled', 'disabled');
 
+			$('[name="receiveFlag"]').attr('checked', true);
 
 		} else {
 
 		} else {
 
-			$("#useTimeFlag").attr('readonly', false);
 
-			$("#useTimeFlag").attr('required', true);
 
+			$('[name="receiveFlag"]').attr('disabled', false);
 
+			$("#usePeriod").attr('readonly', false);
 
+			$("#usePeriod").attr('required', true);
 
 		}
 
 		}
 
 	}
 
 	}
 
 </script>
 
 </script>

+ 33 - 7
src/main/webapp/WEB-INF/views/modules/coupon/couponCategoryForm.jsp
查看文件 

@@ -98,6 +98,7 @@
 
             <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
             <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
                 ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
                 ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
+            <input id="receiveFlagTemp" type="hidden" value="${cmCoupon.receiveFlag}">
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
@@ -230,7 +231,7 @@
 
         }
 
         }
 
     }
 
     }
 
 
 
-    function changeUseTime(flag){
 
+    function changeUseTime(flag) {
 
         var obj = $("#" + flag);
 
         var obj = $("#" + flag);
 
         var val = obj.val();
 
         var val = obj.val();
 
         if (val === '1') {
 
         if (val === '1') {
 
@@ -242,26 +243,51 @@
 
         }
 
         }
 
         var temp = $("#usePeriodTemp").val();
 
         var temp = $("#usePeriodTemp").val();
 
         var use = $("#usePeriod").val();
 
         var use = $("#usePeriod").val();
 
+        var receive = $("#receivePeriod").val();
 
+        var receiveTemp = $("#receivePeriodTemp").val();
 
+        var receiveFlag = $("#receiveFlag").val();
 
         if (val === '1') {
 
         if (val === '1') {
 
             $("#usePeriod").attr('readonly', true);
 
             $("#usePeriod").attr('readonly', true);
 
             $("#usePeriod").attr('required', false);
 
             $("#usePeriod").attr('required', false);
 
-            $("#usePeriod").val('');
 
+            $("#receivePeriodTemp").val(receive);
 
             $("#usePeriodTemp").val(use);
 
             $("#usePeriodTemp").val(use);
 
+            $("#usePeriod").val('');
 
+            $("#receivePeriod").val('');
 
+            $("#receivePeriod").attr('readonly', true);
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
+            $('[name="receiveFlag"]').attr('disabled', true);
 
         } else {
 
         } else {
 
             $("#usePeriod").attr('readonly', false);
 
             $("#usePeriod").attr('readonly', false);
 
             $("#usePeriod").attr('required', true);
 
             $("#usePeriod").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            if (receive > 0) {
 
+                $("#receivePeriod").attr('readonly', true);
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+            } else {
 
+                $("#receivePeriod").attr('readonly', false);
 
+                $('[name="receiveFlag"]').attr('checked', false);
 
+            }
 
+            if (receiveTemp > 0) {
 
+                $("#receivePeriod").val(receiveTemp);
 
+            }else{
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+                $("#receivePeriod").attr('readonly', true);
 
+            }
 
             $("#usePeriod").val(temp);
 
             $("#usePeriod").val(temp);
 
         }
 
         }
 
     }
 
     }
 
 
 
-    function initUseTimeFlag(){
 
+    function initUseTimeFlag() {
 
         var receiveFlag = $("#useTimeFlag").val();
 
         var receiveFlag = $("#useTimeFlag").val();
 
         if (receiveFlag === '1') {
 
         if (receiveFlag === '1') {
 
-            $("#useTimeFlag").attr('readonly', true);
 
-            $("#useTimeFlag").attr('required', false);
 
+            $("#usePeriod").attr('readonly', true);
 
+            $("#usePeriod").attr('required', false);
 
+            $('[name="receiveFlag"]').attr('disabled', 'disabled');
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
         } else {
 
         } else {
 
-            $("#useTimeFlag").attr('readonly', false);
 
-            $("#useTimeFlag").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            $("#usePeriod").attr('readonly', false);
 
+            $("#usePeriod").attr('required', true);
 
         }
 
         }
 
     }
 
     }
 
 </script>
 
 </script>

+ 33 - 7
src/main/webapp/WEB-INF/views/modules/coupon/couponNewUserForm.jsp
查看文件 

@@ -85,6 +85,7 @@
 
             <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
             <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
                 ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
                 ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
+            <input id="receiveFlagTemp" type="hidden" value="${cmCoupon.receiveFlag}">
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
@@ -217,7 +218,7 @@
 
         }
 
         }
 
     }
 
     }
 
 
 
-    function changeUseTime(flag){
 
+    function changeUseTime(flag) {
 
         var obj = $("#" + flag);
 
         var obj = $("#" + flag);
 
         var val = obj.val();
 
         var val = obj.val();
 
         if (val === '1') {
 
         if (val === '1') {
 
@@ -229,26 +230,51 @@
 
         }
 
         }
 
         var temp = $("#usePeriodTemp").val();
 
         var temp = $("#usePeriodTemp").val();
 
         var use = $("#usePeriod").val();
 
         var use = $("#usePeriod").val();
 
+        var receive = $("#receivePeriod").val();
 
+        var receiveTemp = $("#receivePeriodTemp").val();
 
+        var receiveFlag = $("#receiveFlag").val();
 
         if (val === '1') {
 
         if (val === '1') {
 
             $("#usePeriod").attr('readonly', true);
 
             $("#usePeriod").attr('readonly', true);
 
             $("#usePeriod").attr('required', false);
 
             $("#usePeriod").attr('required', false);
 
-            $("#usePeriod").val('');
 
+            $("#receivePeriodTemp").val(receive);
 
             $("#usePeriodTemp").val(use);
 
             $("#usePeriodTemp").val(use);
 
+            $("#usePeriod").val('');
 
+            $("#receivePeriod").val('');
 
+            $("#receivePeriod").attr('readonly', true);
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
+            $('[name="receiveFlag"]').attr('disabled', true);
 
         } else {
 
         } else {
 
             $("#usePeriod").attr('readonly', false);
 
             $("#usePeriod").attr('readonly', false);
 
             $("#usePeriod").attr('required', true);
 
             $("#usePeriod").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            if (receive > 0) {
 
+                $("#receivePeriod").attr('readonly', true);
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+            } else {
 
+                $("#receivePeriod").attr('readonly', false);
 
+                $('[name="receiveFlag"]').attr('checked', false);
 
+            }
 
+            if (receiveTemp > 0) {
 
+                $("#receivePeriod").val(receiveTemp);
 
+            }else{
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+                $("#receivePeriod").attr('readonly', true);
 
+            }
 
             $("#usePeriod").val(temp);
 
             $("#usePeriod").val(temp);
 
         }
 
         }
 
     }
 
     }
 
 
 
-    function initUseTimeFlag(){
 
+    function initUseTimeFlag() {
 
         var receiveFlag = $("#useTimeFlag").val();
 
         var receiveFlag = $("#useTimeFlag").val();
 
         if (receiveFlag === '1') {
 
         if (receiveFlag === '1') {
 
-            $("#useTimeFlag").attr('readonly', true);
 
-            $("#useTimeFlag").attr('required', false);
 
+            $("#usePeriod").attr('readonly', true);
 
+            $("#usePeriod").attr('required', false);
 
+            $('[name="receiveFlag"]').attr('disabled', 'disabled');
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
         } else {
 
         } else {
 
-            $("#useTimeFlag").attr('readonly', false);
 
-            $("#useTimeFlag").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            $("#usePeriod").attr('readonly', false);
 
+            $("#usePeriod").attr('required', true);
 
         }
 
         }
 
     }
 
     }
 
 </script>
 
 </script>

+ 33 - 7
src/main/webapp/WEB-INF/views/modules/coupon/couponShopForm.jsp
查看文件 

@@ -119,6 +119,7 @@
 
             <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
             <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
                 ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
                 ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
+            <input id="receiveFlagTemp" type="hidden" value="${cmCoupon.receiveFlag}">
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
@@ -325,7 +326,7 @@
 
         }
 
         }
 
     }
 
     }
 
 
 
-    function changeUseTime(flag){
 
+    function changeUseTime(flag) {
 
         var obj = $("#" + flag);
 
         var obj = $("#" + flag);
 
         var val = obj.val();
 
         var val = obj.val();
 
         if (val === '1') {
 
         if (val === '1') {
 
@@ -337,26 +338,51 @@
 
         }
 
         }
 
         var temp = $("#usePeriodTemp").val();
 
         var temp = $("#usePeriodTemp").val();
 
         var use = $("#usePeriod").val();
 
         var use = $("#usePeriod").val();
 
+        var receive = $("#receivePeriod").val();
 
+        var receiveTemp = $("#receivePeriodTemp").val();
 
+        var receiveFlag = $("#receiveFlag").val();
 
         if (val === '1') {
 
         if (val === '1') {
 
             $("#usePeriod").attr('readonly', true);
 
             $("#usePeriod").attr('readonly', true);
 
             $("#usePeriod").attr('required', false);
 
             $("#usePeriod").attr('required', false);
 
-            $("#usePeriod").val('');
 
+            $("#receivePeriodTemp").val(receive);
 
             $("#usePeriodTemp").val(use);
 
             $("#usePeriodTemp").val(use);
 
+            $("#usePeriod").val('');
 
+            $("#receivePeriod").val('');
 
+            $("#receivePeriod").attr('readonly', true);
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
+            $('[name="receiveFlag"]').attr('disabled', true);
 
         } else {
 
         } else {
 
             $("#usePeriod").attr('readonly', false);
 
             $("#usePeriod").attr('readonly', false);
 
             $("#usePeriod").attr('required', true);
 
             $("#usePeriod").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            if (receive > 0) {
 
+                $("#receivePeriod").attr('readonly', true);
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+            } else {
 
+                $("#receivePeriod").attr('readonly', false);
 
+                $('[name="receiveFlag"]').attr('checked', false);
 
+            }
 
+            if (receiveTemp > 0) {
 
+                $("#receivePeriod").val(receiveTemp);
 
+            }else{
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+                $("#receivePeriod").attr('readonly', true);
 
+            }
 
             $("#usePeriod").val(temp);
 
             $("#usePeriod").val(temp);
 
         }
 
         }
 
     }
 
     }
 
 
 
-    function initUseTimeFlag(){
 
+    function initUseTimeFlag() {
 
         var receiveFlag = $("#useTimeFlag").val();
 
         var receiveFlag = $("#useTimeFlag").val();
 
         if (receiveFlag === '1') {
 
         if (receiveFlag === '1') {
 
-            $("#useTimeFlag").attr('readonly', true);
 
-            $("#useTimeFlag").attr('required', false);
 
+            $("#usePeriod").attr('readonly', true);
 
+            $("#usePeriod").attr('required', false);
 
+            $('[name="receiveFlag"]').attr('disabled', 'disabled');
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
         } else {
 
         } else {
 
-            $("#useTimeFlag").attr('readonly', false);
 
-            $("#useTimeFlag").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            $("#usePeriod").attr('readonly', false);
 
+            $("#usePeriod").attr('required', true);
 
         }
 
         }
 
     }
 
     }
 
 </script>
 
 </script>

+ 33 - 7
src/main/webapp/WEB-INF/views/modules/coupon/couponUserExclusiveForm.jsp
查看文件 

@@ -116,6 +116,7 @@
 
             <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
             <input type="checkbox" id="receiveFlag" name="receiveFlag" style="margin-left:20px !important" value="${cmCoupon.receiveFlag eq 1?1:0}"
 
                 ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
                 ${cmCoupon.receiveFlag eq 1 ? "checked" : ""} onclick="changeCondition('receiveFlag','receivePeriod')" />同上下架时间
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
             <input id="receivePeriodTemp" type="hidden" value="${cmCoupon.receivePeriod}">
 
+            <input id="receiveFlagTemp" type="hidden" value="${cmCoupon.receiveFlag}">
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
@@ -330,7 +331,7 @@
 
         }
 
         }
 
     }
 
     }
 
 
 
-    function changeUseTime(flag){
 
+    function changeUseTime(flag) {
 
         var obj = $("#" + flag);
 
         var obj = $("#" + flag);
 
         var val = obj.val();
 
         var val = obj.val();
 
         if (val === '1') {
 
         if (val === '1') {
 
@@ -342,26 +343,51 @@
 
         }
 
         }
 
         var temp = $("#usePeriodTemp").val();
 
         var temp = $("#usePeriodTemp").val();
 
         var use = $("#usePeriod").val();
 
         var use = $("#usePeriod").val();
 
+        var receive = $("#receivePeriod").val();
 
+        var receiveTemp = $("#receivePeriodTemp").val();
 
+        var receiveFlag = $("#receiveFlag").val();
 
         if (val === '1') {
 
         if (val === '1') {
 
             $("#usePeriod").attr('readonly', true);
 
             $("#usePeriod").attr('readonly', true);
 
             $("#usePeriod").attr('required', false);
 
             $("#usePeriod").attr('required', false);
 
-            $("#usePeriod").val('');
 
+            $("#receivePeriodTemp").val(receive);
 
             $("#usePeriodTemp").val(use);
 
             $("#usePeriodTemp").val(use);
 
+            $("#usePeriod").val('');
 
+            $("#receivePeriod").val('');
 
+            $("#receivePeriod").attr('readonly', true);
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
+            $('[name="receiveFlag"]').attr('disabled', true);
 
         } else {
 
         } else {
 
             $("#usePeriod").attr('readonly', false);
 
             $("#usePeriod").attr('readonly', false);
 
             $("#usePeriod").attr('required', true);
 
             $("#usePeriod").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            if (receive > 0) {
 
+                $("#receivePeriod").attr('readonly', true);
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+            } else {
 
+                $("#receivePeriod").attr('readonly', false);
 
+                $('[name="receiveFlag"]').attr('checked', false);
 
+            }
 
+            if (receiveTemp > 0) {
 
+                $("#receivePeriod").val(receiveTemp);
 
+            }else{
 
+                $('[name="receiveFlag"]').attr('checked', true);
 
+                $("#receivePeriod").attr('readonly', true);
 
+            }
 
             $("#usePeriod").val(temp);
 
             $("#usePeriod").val(temp);
 
         }
 
         }
 
     }
 
     }
 
 
 
-    function initUseTimeFlag(){
 
+    function initUseTimeFlag() {
 
         var receiveFlag = $("#useTimeFlag").val();
 
         var receiveFlag = $("#useTimeFlag").val();
 
         if (receiveFlag === '1') {
 
         if (receiveFlag === '1') {
 
-            $("#useTimeFlag").attr('readonly', true);
 
-            $("#useTimeFlag").attr('required', false);
 
+            $("#usePeriod").attr('readonly', true);
 
+            $("#usePeriod").attr('required', false);
 
+            $('[name="receiveFlag"]').attr('disabled', 'disabled');
 
+            $('[name="receiveFlag"]').attr('checked', true);
 
         } else {
 
         } else {
 
-            $("#useTimeFlag").attr('readonly', false);
 
-            $("#useTimeFlag").attr('required', true);
 
+            $('[name="receiveFlag"]').attr('disabled', false);
 
+            $("#usePeriod").attr('readonly', false);
 
+            $("#usePeriod").attr('required', true);
 
         }
 
         }
 
     }
 
     }
 
 </script>
 
 </script>

+ 40 - 1
src/main/webapp/WEB-INF/views/modules/coupon/redemptionCodeCouponForm.jsp
查看文件 

@@ -145,6 +145,9 @@
 
         <label class="control-label"><font color="red">*</font>使用期限：</label>
 
         <label class="control-label"><font color="red">*</font>使用期限：</label>
 
         <div class="controls">
 
         <div class="controls">
 
             <input type="number" id="usePeriod" name="usePeriod" value="${cmCoupon.usePeriod}" min="1" required> 天
 
             <input type="number" id="usePeriod" name="usePeriod" value="${cmCoupon.usePeriod}" min="1" required> 天
 
+            <input type="checkbox" id="useTimeFlag" name="useTimeFlag" style="margin-left:20px !important" value="${cmCoupon.useTimeFlag eq 1?1:0}"
 
+                ${cmCoupon.useTimeFlag eq 1 ? "checked" : ""} onclick="changeUseTime('useTimeFlag')"/>同上下架时间
 
+            <input id="usePeriodTemp" type="hidden" value="${cmCoupon.usePeriod}">
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <div class="control-group">
 
     <div class="control-group">
 
@@ -359,7 +362,8 @@
 
                 }
 
                 }
 
             }, 500);
 
             }, 500);
 
         });
 
         });
 
-        productShow()
 
+        productShow();
 
+        initUseTimeFlag();
 
     });
 
     });
 
 
 
     var productIds = '';
 
     var productIds = '';
 
@@ -810,6 +814,41 @@
 
             $("#couponShop").hide();
 
             $("#couponShop").hide();
 
         }
 
         }
 
     }
 
     }
 
+
 
+    function changeUseTime(flag){
 
+        var obj = $("#" + flag);
 
+        var val = obj.val();
 
+        if (val === '1') {
 
+            obj.val(0);
 
+            val = '0';
 
+        } else {
 
+            obj.val(1);
 
+            val = '1';
 
+        }
 
+        var temp = $("#usePeriodTemp").val();
 
+        var use = $("#usePeriod").val();
 
+        if (val === '1') {
 
+            $("#usePeriod").attr('readonly', true);
 
+            $("#usePeriod").attr('required', false);
 
+            $("#usePeriod").val('');
 
+            $("#usePeriodTemp").val(use);
 
+        } else {
 
+            $("#usePeriod").attr('readonly', false);
 
+            $("#usePeriod").attr('required', true);
 
+            $("#usePeriod").val(temp);
 
+        }
 
+    }
 
+
 
+    function initUseTimeFlag(){
 
+        var receiveFlag = $("#useTimeFlag").val();
 
+        if (receiveFlag === '1') {
 
+            $("#usePeriod").attr('readonly', true);
 
+            $("#usePeriod").attr('required', false);
 
+        } else {
 
+            $("#usePeriod").attr('readonly', false);
 
+            $("#usePeriod").attr('required', true);
 
+        }
 
+    }
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>