zhuyiyi 8 місяців тому
батько
коміт
ea0c99e4d0

+ 3 - 3
src/main/java/lingtao/net/service/ProductService.java

@@ -3598,9 +3598,9 @@ public class ProductService {
                     }
                 } else if ("6".equals(kind)) {
                     priceList = new PriceUtils().tags600Price(dto, kind, kind2, area, count);
-                    for (Product product : priceList) {
-                        product.setPrice(Math.floor(product.getPrice() * 1.3));
-                    }
+//                    for (Product product : priceList) {
+//                        product.setPrice(Math.floor(product.getPrice() * 1.3));
+//                    }
                 } else if ("10".equals(kind) || "11".equals(kind)) {
                     int[] count_list = {50, 100, 200, 500, 1000};
                     double[] jitu = {};

+ 12 - 12
src/main/webapp/views/product/coaster.jsp

@@ -87,14 +87,14 @@
                     <div class="layui-input-block">
                         <input type="radio" name="craftQie" lay-filter="craftQie" value="异形模切" title="异形模切" checked>
                         |&nbsp;&nbsp;&nbsp;
-                        <span>
-                        <input type="radio" id="non" name="craftMo" lay-filter="craftMo" la value="不覆膜" title="不覆膜"
-                               checked>
-                    </span>
                         <span style="display: none">
-                        <input type="radio" id="double" name="craftMo" lay-filter="craftMo" la value="双面覆哑膜"
-                               title="双面覆哑膜">
-                    </span>
+                            <input type="radio" id="non" name="craftMo" lay-filter="craftMo" la value="不覆膜"
+                                   title="不覆膜"/>
+                        </span>
+                        <span>
+                            <input type="radio" id="double" name="craftMo" lay-filter="craftMo" la value="双面覆哑膜"
+                                   title="双面覆哑膜" checked/>
+                        </span>
                         |&nbsp;&nbsp;&nbsp;
                         <input type="radio" name="kind2Value" value="无" title="无" checked>
                         <input type="radio" name="kind2Value" value="单面烫黄金" title="单面烫黄金">
@@ -121,13 +121,13 @@
                         <input type="radio" name="craft" lay-filter="switch" value="击凸" title="击凸">
                         <div style="display: none" id="jtcolor">
 
-<%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="红色" title="红色" checked>--%>
-<%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="绿色" title="绿色">--%>
-<%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="紫色" title="紫色">--%>
-<%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="红褐色" title="红褐色">--%>
+                            <%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="红色" title="红色" checked>--%>
+                            <%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="绿色" title="绿色">--%>
+                            <%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="紫色" title="紫色">--%>
+                            <%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="红褐色" title="红褐色">--%>
                             <input type="checkbox" name="jtcolor" lay-filter="color" value="金色" title="金色" checked>
                             <input type="checkbox" name="jtcolor" lay-filter="color" value="黑色" title="黑色">
-<%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="青色" title="青色">--%>
+                            <%--                            <input type="checkbox" name="jtcolor" lay-filter="color" value="青色" title="青色">--%>
                             <input type="checkbox" name="jtcolor" lay-filter="color" value="洋红色" title="洋红色">
                         </div>
                     </div>

+ 11 - 1
src/main/webapp/views/product/poster.jsp

@@ -1426,7 +1426,17 @@
                         layer.msg($("select[name='kind2Value'] option:selected").html() + "最大尺寸超过150*150CM需要拼接!", {offset: ['300px', '300px']}, function () {
                         });
                     }
-                } else if ($("select[name='kind2Value'] option:selected").val() == 11 || $("select[name='kind2Value'] option:selected").val() == 13) {
+                } else if ($("select[name='kind2Value'] option:selected").val() == 11) {
+                    if (size.split("*")[1] < 20 || size.split("*")[0] < 20) {
+                        layer.msg($("select[name='kind2Value'] option:selected").html() + "最小尺寸20*20CM!", {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    }
+                    if ((size.split("*")[1] > 500 || size.split("*")[0] > 500)) {
+                        layer.msg($("select[name='kind2Value'] option:selected").html() + "最大尺寸超过500*500CM需要拼接!", {offset: ['300px', '300px']}, function () {
+                        });
+                    }
+                } else if ($("select[name='kind2Value'] option:selected").val() == 13) {
                     if (size.split("*")[1] < 20 || size.split("*")[0] < 20) {
                         layer.msg($("select[name='kind2Value'] option:selected").html() + "最小尺寸20*20CM!", {offset: ['300px', '300px']}, function () {
                         });