修改尺寸限制

src/main/java/lingtao/net/service/ProductService.java

@@ -4734,6 +4734,9 @@ public class ProductService {
         for (Product product : priceList) {
             int item_count = product.getCount();
             double carft_price = 0;
+            if (craft_list.contains("满底烫镭射银") && "双面".equals(dto.getCraftShua())) {
+                product.setPrice(Math.ceil(product.getPrice() * 1.4));
+            }
 
             if (craft_list.contains("配葫芦针")) {
                 carft_price += Math.max(0.016 * item_count, 10);

src/main/webapp/views/product/coaster.jsp

@@ -382,8 +382,8 @@
                 return false;
             }
             if (kindValue == 4) {
-                if ((size.split("*")[0] < 4 || size.split("*")[1] < 4)) {
-                    layer.msg("【杯垫900克】尺寸不能低于4*4 cm!", {offset: ['300px', '300px']}, function () {
+                if ((size.split("*")[0] < 3 || size.split("*")[1] < 3)) {
+                    layer.msg("【杯垫900克】尺寸不能低于3*3 cm!", {offset: ['300px', '300px']}, function () {
                     });
                     return false;
                 }

src/main/webapp/views/product/coupon.jsp

@@ -265,7 +265,7 @@
                     </div>
                     <span class="layui-form-item guaguaSize1">
 							<p>
-								<span style="font-size:14px;color:red">刮刮卡最小尺寸75*50mm，最大尺寸170*170mm</span>
+								<span style="font-size:14px;color:red">刮刮卡最小尺寸75*50mm，400*400mm</span>
 							</p>
 							<p>
 								刮刮膜尺寸(MM/毫米)

src/main/webapp/views/product/leiTag.jsp

@@ -68,6 +68,20 @@
                 工艺
             </p>
             <div class="layui-form-item" id='z4_craft'>
+
+                <div class="layui-input-block" style="display:inline-block;">
+                    裁切工艺：
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="直角裁切" title="直角裁切" checked>
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="异形模切" title="异形模切">
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="满底烫镭射银" title="满底烫镭射银">
+                    <div class="layui-inline shuangmian " style="width: 110px;display: none">
+                        <select class="select" name="craftShua">
+                            <option value="单面">单面</option>
+                            <option value="双面">双面</option>
+                        </select>
+                    </div>
+                </div>
+
                 <div class="layui-input-block" style="display:inline-block;">
                     配件：
                     <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配葫芦针"
@@ -127,6 +141,10 @@
         ins = carousel.render({});
         var html = " ";
         var remark = " ";
+        const carft_list1 = ["单面", "双面"];
+
+        const carft_list2 = ["直角裁切", "异形模切", "满底烫镭射银"];
+
         // 清空轮播图
         $("#carousel").empty();
         $("#remark").empty();
@@ -164,6 +182,34 @@
                 }
             }
         });
+        form.on('checkbox(ui_craft)', function (data) {
+            let craft_list = [];
+            $("input[name='craft']:checked").each(function () {
+                    if (!$(this).is(':disabled')) {
+                        craft_list.push($(this).val());
+                    }
+                }
+            );
+
+            const carft2 = carft_list2.filter(craft => craft_list.includes(craft));
+            if (carft2.length > 1) {
+                $(data.elem).prop("checked", false);
+                layer.msg("裁切工艺不能同时选择", {offset: ['300px', '300px']}, function () {
+                });
+                form.render();
+                return false;
+            }
+
+            if (data.value == "满底烫镭射银") {
+                if ($(data.elem).is(":checked")) {
+                    $("#z4_craft .shuangmian").show();
+                    $("#z4_craft .shuangmian").prop("disabled", false);
+                } else {
+                    $("#z4_craft .shuangmian").hide();
+                    $("#z4_craft .shuangmian").prop("disabled", true);
+                }
+            }
+        })
         form.on('checkbox(peijian)', function (data) {
             let peijiansize = $(".peijian:checked").length;
             if (peijiansize > 1) {
@@ -211,6 +257,19 @@
                     craft.push($(this).val());
                 }
             });
+            if (craft.indexOf("满底烫镭射银") > -1) {
+                craft.push($("select[name='craftShua'] option:selected").val());
+            }
+            if (craft.indexOf("配尼龙绳") > -1 || craft.indexOf("穿尼龙绳") > -1) {
+                craft.push($("select[name='shen_color'] option:selected").val());
+            }
+
+            const carft2 = carft_list2.filter(item => craft.includes(item));
+            if (carft2.length == 0) {
+                layer.msg("请选择裁切工艺", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
             $.ajax({
                 url: "${path}/getThanSum",
                 type: "GET",

src/main/webapp/views/product/specialCard2.jsp

@@ -693,8 +693,8 @@
                     });
                     return false;
                 }
-                if ((size.split("*")[0] > 17 || size.split("*")[1] > 15) && (size.split("*")[0] > 15 || size.split("*")[1] > 17)) {
-                    layer.msg("【特种纸名片-素芸】尺寸不能大于17*15 cm", {offset: ['300px', '300px']}, function () {
+                if ((size.split("*")[0] > 21 || size.split("*")[1] > 15) && (size.split("*")[0] > 15 || size.split("*")[1] > 21)) {
+                    layer.msg("【特种纸名片-素芸】尺寸不能大于21*15 cm", {offset: ['300px', '300px']}, function () {
                     });
                     return false;
                 }

src/main/webapp/views/product/tagClothes.jsp

@@ -698,8 +698,8 @@
             }
             if (kindValue == 6) {
                 size = $("#diySize").val();
-                if (size.split("*")[0] < 4 || size.split("*")[1] < 4) {
-                    layer.msg("【服装吊牌600克铜版纸】尺寸不能小于4*4 cm!", {offset: ['300px', '300px']}, function () {
+                if (size.split("*")[0] < 3 || size.split("*")[1] < 3) {
+                    layer.msg("【服装吊牌600克铜版纸】尺寸不能小于3*3 cm!", {offset: ['300px', '300px']}, function () {
                     });
                     return false;
                 }