diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java index c1d13b6..b97030e 100644 --- a/src/main/java/lingtao/net/util/PriceUtils.java +++ b/src/main/java/lingtao/net/util/PriceUtils.java @@ -2156,12 +2156,12 @@ public class PriceUtils { width = width * 10 + 2 * 1.5; // 数量*款数就是张数 count = count * number; - if ((length > l || width > w) && (length > w || width > l)) { + if ((length - 3 > l || width - 3 > w) && (length - 3 > w || width - 3 > l)) { return null; } // 一张大纸43*30 能做多少个此类尺寸的 - double max = Math.max(Math.floor(l / length) * Math.floor(w / width), - Math.floor(l / width) * Math.floor(w / length)); + double max = Math.max(Math.max(Math.floor(l / length) * Math.floor(w / width), + Math.floor(l / width) * Math.floor(w / length)), 1); // 报的数量需要多少张大纸 int num = (int) Math.ceil(count / max); if (num <= 10) { diff --git a/src/main/webapp/views/product/disu.jsp b/src/main/webapp/views/product/disu.jsp index f2ceb3e..54b9785 100644 --- a/src/main/webapp/views/product/disu.jsp +++ b/src/main/webapp/views/product/disu.jsp @@ -189,8 +189,8 @@ }); return false; } - if ((size.split("*")[0] > 35 || size.split("*")[1] > 50) && (size.split("*")[0] > 50 || size.split("*")[1] > 35)) { - layer.msg("【滴塑】尺寸不能超过35*50 cm", {offset: ['300px', '300px']}, function () { + if ((size.split("*")[0] > 43 || size.split("*")[1] > 30) && (size.split("*")[0] > 43 || size.split("*")[1] > 30)) { + layer.msg("【滴塑】尺寸不能超过43*30 cm", {offset: ['300px', '300px']}, function () { }); return false; } diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp index 179b9f9..38eed47 100644 --- a/src/main/webapp/views/product/stickers.jsp +++ b/src/main/webapp/views/product/stickers.jsp @@ -1179,7 +1179,7 @@ $('.at').prop('disabled', 'disabled'); } // 透明不干胶带白墨工艺 - if (data.value == 2) { + if (data.value == 2 || data.value == "银平光") { // 复选框的disabled $(".yb").show(); $(".yb").find(":input").attr("disabled", false);