diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index fe1c6e5..0cc7e13 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -2887,7 +2887,17 @@ public class ProductService {
price = fixPrice + (num - 1) * zhang + designFee + cutFee;
}
if ("刮刮卡".equals(dto.getKind())) {
- price = price + 0.2 * count * number;
+ List size1 = new ArrayList();
+ size1.add("70*50");
+ size1.add("35*58");
+ size1.add("41*72");
+ size1.add("60*25");
+ size1.add("15*48");
+ double sizePrice = 0.2 * count * number;
+ if (size1.contains(dto.getSize1())) {
+ sizePrice = Math.max(sizePrice, 5);
+ }
+ price = price + sizePrice;
}
Product dto2 = new Product();
dto2.setCount(count);
diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp
index ce994cb..86b113a 100644
--- a/src/main/webapp/views/product/coupon.jsp
+++ b/src/main/webapp/views/product/coupon.jsp
@@ -328,12 +328,20 @@
同个客户下单多款,其中一款数量在200张以上请全部按照印刷报价
200张以上车间贴,200张以下客户自己贴
diff --git a/src/main/webapp/views/product/specialCard2.jsp b/src/main/webapp/views/product/specialCard2.jsp
index 167310d..6c36b37 100644
--- a/src/main/webapp/views/product/specialCard2.jsp
+++ b/src/main/webapp/views/product/specialCard2.jsp
@@ -165,6 +165,7 @@
class="">
+
@@ -486,6 +487,7 @@
});
return false;
}
+
if (craft_list.indexOf("击凸") > -1 || craft_list.indexOf("压凹") > -1) {
$("#color_type").show();
$("#color_type").find("select").attr("disabled", false);
@@ -527,6 +529,13 @@
});
return false;
}
+ if (craft_list.indexOf("压痕") > -1 && craft_list.indexOf("异形模切") > -1) {
+ $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
+ $(data.elem).prop("checked", false);
+ layer.msg("压痕 - 异形模切不能同时选择", {offset: ['300px', '300px']}, function () {
+ });
+ return false;
+ }
$("#dakong").removeAttr('disabled');
$("#craft_mo").removeAttr('disabled');
$(".newCraft").children().removeAttr('disabled');