优惠券页面样式

src/main/java/com/caimei/modules/coupon/entity/CmCoupon.java

@@ -19,6 +19,11 @@ public class CmCoupon extends DataEntity<CmCoupon> {
 
     private static final long serialVersionUID = 1L;
 
+    // 优惠券折扣显示文案
+    private String couponText;
+
+    // 优惠券显示文案类型：1 满减 2折扣
+    private Integer couponTextFlag;
     private String shareCouponTopic;
 
     private String shareCouponImage;
@@ -71,6 +76,22 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         super(id);
     }
 
+    public Integer getCouponTextFlag() {
+        return couponTextFlag;
+    }
+
+    public void setCouponTextFlag(Integer couponTextFlag) {
+        this.couponTextFlag = couponTextFlag;
+    }
+
+    public String getCouponText() {
+        return couponText;
+    }
+
+    public void setCouponText(String couponText) {
+        this.couponText = couponText;
+    }
+
     public String getShareCouponTopic() {
         return shareCouponTopic;
     }

src/main/resources/mappings/modules/coupon/CmCouponMapper.xml

@@ -30,6 +30,8 @@
 		a.couponPayWay as "couponPayWay",
 		a.shareCouponImage as "shareCouponImage",
 		a.shareCouponTopic as "shareCouponTopic",
+		a.couponText as "couponText",
+		a.couponTextFlag as "couponTextFlag",
 		a.delFlag AS "delFlag"
 	</sql>
 
@@ -173,7 +175,9 @@
 			delFlag,
 			configure,
 			shareCouponImage,
-			shareCouponTopic
+			shareCouponTopic,
+			couponText,
+			couponTextFlag
 		) VALUES (
 			#{name},
 		    #{couponPayWay},
@@ -202,7 +206,9 @@
 			#{delFlag},
 		    #{configure},
 		    #{shareCouponImage},
-		    #{shareCouponTopic}
+		    #{shareCouponTopic},
+		    #{couponText},
+		    #{couponTextFlag}
 		)
 	</insert>
 
@@ -232,7 +238,9 @@
 			moneyCouponType = #{moneyCouponType},
 			configure = #{configure},
 			shareCouponImage = #{shareCouponImage},
-			shareCouponTopic = #{shareCouponTopic}
+			shareCouponTopic = #{shareCouponTopic},
+			couponText = #{couponText},
+			couponTextFlag = #{couponTextFlag}
 		WHERE id = #{id}
 	</update>
 

src/main/webapp/WEB-INF/views/modules/coupon/MoneyCouponForm.jsp

@@ -145,6 +145,19 @@
             <form:radiobutton path="couponPayWay" value="2" label="采美豆抵扣" class="required" onclick="nameChange(2)"/>
         </div>
     </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>折扣方式：</label>
+        <div class="controls">
+            <form:radiobutton path="couponTextFlag" value="1" label="满减" class="required" onclick="textChange(1)"/>
+            <form:radiobutton path="couponTextFlag" value="2" label="打折" class="required" onclick="textChange(2)"/>
+        </div>
+    </div>
+    <div class="control-group" id="texts" hidden="hidden">
+        <label class="control-label"><font color="red">*</font>折扣文案：</label>
+        <div class="controls">
+            <input type="text" id="couponText" name="couponText" value="${cmCoupon.couponText}" min="0" required>
+        </div>
+    </div>
     <div class="control-group">
         <c:if test="${cmCoupon.couponPayWay eq 1}">
             <label id="gmjg" class="control-label"><font color="red">*</font>购买价格：</label>
@@ -170,15 +183,18 @@
     <div class="control-group">
         <label class="control-label">分享优惠券标题：</label>
         <div class="controls">
-            <form:input path="shareCouponTopic" htmlEscape="false" maxlength="30" placeholder="30个汉字以内" class="input-xlarge"/>
+            <form:input path="shareCouponTopic" htmlEscape="false" maxlength="30" placeholder="30个汉字以内"
+                        class="input-xlarge"/>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label">分享优惠券封面：</label>
         <div class="controls upload-content-image iconBox">
             <div class="conList">
-                <form:hidden id="shareCouponImage" path="shareCouponImage" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-                <sys:ckfinder input="shareCouponImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <form:hidden id="shareCouponImage" path="shareCouponImage" htmlEscape="false" maxlength="255"
+                             class="input-xlarge"/>
+                <sys:ckfinder input="shareCouponImage" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100" maxHeight="100"/>
                 <br>
             </div>
         </div>
@@ -263,12 +279,12 @@
         <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="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()"/>
@@ -278,9 +294,9 @@
         <div class="control-group">
             <label class="control-label"><font color="red">*</font>优惠商品：</label>
             <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()"/>
             </div>
         </div>
@@ -459,6 +475,9 @@
         });
         productShow();
         initUseTimeFlag();
+        if(${cmCoupon.couponTextFlag eq 2}){
+            $("#texts").show();
+        }
     });
 
     var productIds = '';
@@ -525,6 +544,14 @@
         }
     });
 
+    function textChange(val) {
+        if (2 === val) {
+            $("#texts").show();
+        }else{
+            $("#texts").hide();
+        }
+    }
+
     function nameChange(val) {
         if (1 === val) {
             $("#ge").hide();
@@ -1113,7 +1140,7 @@
             if (receiveTemp > 0) {
                 $("#receivePeriod").val(receiveTemp);
                 $('[name="receiveFlag"]').val(0);
-            }else{
+            } else {
                 $('[name="receiveFlag"]').attr('checked', true);
                 $("#receivePeriod").attr('readonly', true);
             }

src/main/webapp/WEB-INF/views/modules/coupon/cmCouponForm.jsp

@@ -132,6 +132,19 @@
 				订单商品总额满&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="touchPrice" id="touchPrice" value="${cmCoupon.touchPrice}" min="0" required>
 			</div>
 		</div>
+		<div class="control-group">
+			<label class="control-label"><font color="red">*</font>折扣方式：</label>
+			<div class="controls">
+				<form:radiobutton path="couponTextFlag" value="1" label="满减" class="required" onclick="textChange(1)"/>
+				<form:radiobutton path="couponTextFlag" value="2" label="打折" class="required" onclick="textChange(2)"/>
+			</div>
+		</div>
+		<div class="control-group" id="texts" hidden="hidden">
+			<label class="control-label"><font color="red">*</font>折扣文案：</label>
+			<div class="controls">
+				<input type="text" id="couponText" name="couponText" value="${cmCoupon.couponText}" min="0" required>
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>上架时间：</label>
 			<div class="controls">
@@ -342,8 +355,20 @@
 		initInputDisplay();
 
 		initUseTimeFlag();
+
+		if(${cmCoupon.couponTextFlag eq 2}){
+			$("#texts").show();
+		}
 	});
 
+	function textChange(val) {
+		if (2 === val) {
+			$("#texts").show();
+		}else{
+			$("#texts").hide();
+		}
+	}
+
 	var productIds = '';
 	var imageList = [];
 

src/main/webapp/WEB-INF/views/modules/coupon/redemptionCodeCouponForm.jsp

@@ -125,6 +125,19 @@
             订单商品总额满&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="touchPrice" id="touchPrice" value="${cmCoupon.touchPrice}" min="0" required>
         </div>
     </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>折扣方式：</label>
+        <div class="controls">
+            <form:radiobutton path="couponTextFlag" value="1" label="满减" class="required" onclick="textChange(1)"/>
+            <form:radiobutton path="couponTextFlag" value="2" label="打折" class="required" onclick="textChange(2)"/>
+        </div>
+    </div>
+    <div class="control-group" id="texts" hidden="hidden">
+        <label class="control-label"><font color="red">*</font>折扣文案：</label>
+        <div class="controls">
+            <input type="text" id="couponText" name="couponText" value="${cmCoupon.couponText}" min="0" required>
+        </div>
+    </div>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>上架时间：</label>
         <div class="controls">
@@ -296,6 +309,13 @@
     </div>
 </form:form>
 <script>
+    function textChange(val) {
+        if (2 === val) {
+            $("#texts").show();
+        }else{
+            $("#texts").hide();
+        }
+    }
     //图片初始化
     $(function () {
         $('.upload-content-image .conList .btn:nth-of-type(1)').html('<div><span>+</span><h5>选择图片</h5></div>');
@@ -364,6 +384,9 @@
         });
         productShow();
         initUseTimeFlag();
+        if(${cmCoupon.couponTextFlag eq 2}){
+            $("#texts").show();
+        }
     });
 
     var productIds = '';