Merge remote-tracking branch 'origin/jxl_1201_jifenDraw' into jxl_1201_jifenDraw

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html

@@ -117,8 +117,8 @@
         <div id="detailsFormList" class="details-form-list" style="display: none">
             <!--奖品详情-->
             <div class="details-pop-inner">
-                <button type="button" class="btn btn-primary" onclick="addCouponShow()">添加</button>
-                <button type="button" class="btn btn-primary" onclick="closeCouponShow()">关闭窗口</button>
+                <button type="button" class="btn btn-primary" onclick="addCouponShow()">添加优惠券</button>
+                <button type="button" class="btn btn-warning" onclick="closeCouponShow()">关闭窗口</button>
                 <hr>
                 <div class="coupon-select" style="display: none">
                     <div class="scope_application">
@@ -248,7 +248,7 @@
                     align: 'center',
                     title: '奖品类型',
                     formatter: function(value, row, index) {
-                        let arr = ['积分', '优惠券', '实物', '登登登VIP'];
+                        let arr = ['积分', '优惠券', '实物', '登登登VIP', '优先购买券'];
                         let str = '';
                         arr.forEach((item,i)=> {
                             i++
@@ -769,6 +769,10 @@
         }
         // 添加优惠券
         function addCouponFun () {
+            if (!nowCouponSelect.couponId) {
+                this.alert('请先选择优惠券');
+                return;
+            }
             let postData = {
                 "couponId": nowCouponSelect.couponId,
                 "couponTitle": nowCouponSelect.title,