edit

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

@@ -1364,15 +1364,19 @@ public class ProductService {
                     //第二款开始的设计费按照式设计内容
                     if (number > 1) {
                         double desFee = 0;
-                        if (role.indexOf("1045") == -1) {
-                            if (number == 2) {
-                                desFee = 5.5;
-                            }
-                            if (number == 3) {
-                                desFee = 5.5 + 3.5;
-                            }
-                            if (number > 3) {
-                                desFee = 5.5 + 3.5 + 2.5 * (number - 3);
+                        if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
+                            if (dto.getP() == 1) {
+                                desFee = 0.6* (number - 1);
+                            } else {
+                                if (number == 2) {
+                                    desFee = 5.5;
+                                }
+                                if (number == 3) {
+                                    desFee = 5.5 + 3.5;
+                                }
+                                if (number > 3) {
+                                    desFee = 5.5 + 3.5 + 2.5 * (number - 3);
+                                }
                             }
                             for (Product product : priceList) {
                                 product.setPrice(Math.ceil(product.getPrice() + desFee));
@@ -1786,30 +1790,31 @@ public class ProductService {
                         double[] base_price = null;
                         length = 0.0;
                         height = 0.0;
-                        if ("0".equals(kindValue) && !"11".equals(kind2Value) && !"12".equals(kind2Value)) {
+                        List<String> kind2ValueList = Arrays.asList("11", "12", "31", "37", "38", "62");
+                        if ("0".equals(kindValue) && !kind2ValueList.contains(kind2Value)) {
                             base_count = new int[]{100, 500, 1000, 2000, 3000, 5000, 10000};
                         } else {
                             base_count = new int[]{500, 1000, 2000, 3000, 5000, 10000};
                         }
                         if ("1".equals(kind2Value)) {
                             if ("0".equals(kindValue)) {
-                                base_price = new double[]{420, 620, 1260, 2230, 3200, 5000, 9300};
+                                base_price = new double[]{420, 627, 1056, 1980, 2920, 4785, 9240};
                             }
                             if ("1".equals(kindValue)) {
-                                base_price = new double[]{600, 1300, 2400, 3400, 5200, 9500};
+                                base_price = new double[]{726, 1073, 1914, 2723, 4290, 7920};
                             }
                             length = 25.0;
-                            height = 24.0;
+                            height = 23.0;
                         }
                         if ("2".equals(kind2Value)) {
                             if ("0".equals(kindValue)) {
-                                base_price = new double[]{480, 772, 1300, 2400, 3500, 5200, 9800};
+                                base_price = new double[]{480, 644, 1089, 2046, 2970, 4785, 9240};
                             }
                             if ("1".equals(kindValue)) {
-                                base_price = new double[]{750, 1320, 2330, 3500, 5880, 11000};
+                                base_price = new double[]{743, 1089, 1947, 2772, 4372, 8085};
                             }
-                            length = 25.0;
-                            height = 27.0;
+                            length = 24.0;
+                            height = 26.5;
                         }
                         if ("3".equals(kind2Value)) {
                             if ("0".equals(kindValue)) {
@@ -1823,13 +1828,13 @@ public class ProductService {
                         }
                         if ("4".equals(kind2Value)) {
                             if ("0".equals(kindValue)) {
-                                base_price = new double[]{420, 560, 950, 1750, 2500, 4000, 7600};
+                                base_price = new double[]{420, 576, 896, 1600, 2304, 3760, 7040};
                             }
                             if ("1".equals(kindValue)) {
-                                base_price = new double[]{645, 1000, 1880, 2680, 4180, 7880};
+                                base_price = new double[]{576, 880, 1568, 2256, 3600, 6880};
                             }
-                            length = 23.0;
-                            height = 25.0;
+                            length = 13.0;
+                            height = 16.0;
                         }
                         if ("5".equals(kind2Value)) {
                             if ("0".equals(kindValue)) {
@@ -1903,14 +1908,54 @@ public class ProductService {
                         }
                         if ("12".equals(kind2Value)) {
                             if ("0".equals(kindValue)) {
-                                base_price = new double[]{1000, 1500, 2500, 3500, 5300, 10000};
+                                base_price = new double[]{1419, 2013, 3234, 4800, 7672, 11385};
                             }
                             if ("1".equals(kindValue)) {
-                                base_price = new double[]{850, 1400, 2100, 2800, 4100, 7800};
+                                base_price = new double[]{1338, 1898, 3069, 4500, 7260, 10395};
                             }
                             length = 25.0;
                             height = 32.0;
                         }
+                        if ("31".equals(kind2Value)) {
+                            if ("0".equals(kindValue)) {
+                                base_price = new double[]{528, 875, 1650, 2426, 3878, 7590};
+                            }
+                            if ("1".equals(kindValue)) {
+                                base_price = new double[]{680, 957, 1716, 2475, 3878, 7095};
+                            }
+                            length = 23.0;
+                            height = 21.0;
+                        }
+                        if ("37".equals(kind2Value)) {
+                            if ("0".equals(kindValue)) {
+                                base_price = new double[]{600, 990, 1848, 2723, 4455, 8580};
+                            }
+                            if ("1".equals(kindValue)) {
+                                base_price = new double[]{710, 1040, 1848, 2624, 4125, 7755};
+                            }
+                            length = 23.0;
+                            height = 21.0;
+                        }
+                        if ("38".equals(kind2Value)) {
+                            if ("0".equals(kindValue)) {
+                                base_price = new double[]{600, 924, 1650, 2376, 3878, 7260};
+                            }
+                            if ("1".equals(kindValue)) {
+                                base_price = new double[]{600, 908, 1617, 2328, 3713, 7095};
+                            }
+                            length = 21.0;
+                            height = 21.0;
+                        }
+                        if ("62".equals(kind2Value)) {
+                            if ("0".equals(kindValue)) {
+                                base_price = new double[]{578, 975, 1848, 2673, 5360, 10240};
+                            }
+                            if ("1".equals(kindValue)) {
+                                base_price = new double[]{693, 1008, 1749, 2475, 4960, 9600};
+                            }
+                            length = 24.0;
+                            height = 32.0;
+                        }
                         Product pro = null;
                         double color_price = 0;
                         double bei_price = 0;
@@ -2671,29 +2716,33 @@ public class ProductService {
                         }
                     }
                 }
-                if (role.indexOf("1045") == -1) {
+                if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
                     if (number > 1) {
                         double designFee = 0;
-                        if (!dto.getProTypeLabel().equals("婚礼报纸") && !dto.getProTypeLabel().equals("菜单")) {
-                            if (number == 2) {
-                                designFee = 5.5;
-                            }
-                            if (number == 3) {
-                                designFee = 5.5 + 3.5;
-                            }
-                            if (number > 3) {
-                                designFee = 5.5 + 3.5 + 2.5 * (number - 3);
-                            }
-                        }
-                        if (dto.getProTypeLabel().equals("菜单") || dto.getProTypeLabel().equals("婚礼报纸")) {
-                            if (number == 2) {
-                                designFee = 17;
-                            }
-                            if (number == 3) {
-                                designFee = 17 + 17;
+                        if (dto.getP() == 1) {
+                            designFee = 0.6 * (number - 1);
+                        } else {
+                            if (!dto.getProTypeLabel().equals("婚礼报纸") && !dto.getProTypeLabel().equals("菜单")) {
+                                if (number == 2) {
+                                    designFee = 5.5;
+                                }
+                                if (number == 3) {
+                                    designFee = 5.5 + 3.5;
+                                }
+                                if (number > 3) {
+                                    designFee = 5.5 + 3.5 + 2.5 * (number - 3);
+                                }
                             }
-                            if (number > 3) {
-                                designFee = 17 + 17 + 12 * (number - 3);
+                            if (dto.getProTypeLabel().equals("菜单") || dto.getProTypeLabel().equals("婚礼报纸")) {
+                                if (number == 2) {
+                                    designFee = 17;
+                                }
+                                if (number == 3) {
+                                    designFee = 17 + 17;
+                                }
+                                if (number > 3) {
+                                    designFee = 17 + 17 + 12 * (number - 3);
+                                }
                             }
                         }
 
@@ -3149,18 +3198,22 @@ public class ProductService {
 
                         if (("0".equals(kind) && "0".equals(kind2)) || ("1".equals(kind) && ("1".equals(kind2) || "3".equals(kind2) || "8".equals(kind2) || "15".equals(kind2))) || "2".equals(kind)) {
                             double desFee = 0;
-                            if (role.indexOf("1045") == -1) {
-                                if (number == 2) {
-                                    desFee = 11;
-                                }
-                                if (number == 3) {
-                                    desFee = 11 + 11;
-                                }
-                                if (number > 3) {
-                                    desFee = 11 + 11 + 11 * (number - 3);
-                                }
-                                for (Product product : priceList) {
-                                    product.setPrice(Math.ceil(product.getPrice() + desFee));
+                            if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
+                                if (dto.getP() == 1) {
+                                    desFee = 0.6 * (number - 1);
+                                } else {
+                                    if (number == 2) {
+                                        desFee = 11;
+                                    }
+                                    if (number == 3) {
+                                        desFee = 11 + 11;
+                                    }
+                                    if (number > 3) {
+                                        desFee = 11 + 11 + 11 * (number - 3);
+                                    }
+                                    for (Product product : priceList) {
+                                        product.setPrice(Math.ceil(product.getPrice() + desFee));
+                                    }
                                 }
                             } else {
                                 if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
@@ -4482,15 +4535,19 @@ public class ProductService {
         }
         if (number > 1) {
             double desFee = 0;
-            if (role.indexOf("1045") == -1) {
-                if (number == 2) {
-                    desFee = 3.5;
-                }
-                if (number == 3) {
-                    desFee = 3.5 + 2.5;
-                }
-                if (number > 3) {
-                    desFee = 3.5 + 2.5 + 1.5 * (number - 3);
+            if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
+                if (dto.getP() == 1) {
+                    desFee = 0.6* (number - 1);
+                } else {
+                    if (number == 2) {
+                        desFee = 3.5;
+                    }
+                    if (number == 3) {
+                        desFee = 3.5 + 2.5;
+                    }
+                    if (number > 3) {
+                        desFee = 3.5 + 2.5 + 1.5 * (number - 3);
+                    }
                 }
             } else {
                 if (dto.getP() == 1) {

src/main/java/lingtao/net/util/ZsPrice.java

@@ -69,15 +69,19 @@ public class ZsPrice {
         if (number > 1) {
             double desFee = 0;
 
-            if (role.indexOf("1045") == -1) {
-                if (number == 2) {
-                    desFee = 5.75;
-                }
-                if (number == 3) {
-                    desFee = 5.75 + 3.75;
-                }
-                if (number > 3) {
-                    desFee = 5.75 + 3.75 + 2.75 * (number - 3);
+            if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
+                if (dto.getP() == 1) {
+                    desFee = 0.6 * (number - 1);
+                } else {
+                    if (number == 2) {
+                        desFee = 5.75;
+                    }
+                    if (number == 3) {
+                        desFee = 5.75 + 3.75;
+                    }
+                    if (number > 3) {
+                        desFee = 5.75 + 3.75 + 2.75 * (number - 3);
+                    }
                 }
                 price += desFee;
             } else {

src/main/webapp/views/main.jsp

@@ -555,7 +555,14 @@
     }
 </script>
 <script>
-    var system_isPdd = ${ sessionScope.USER_SESSION.role.contains('1045') };
+    let shop_list = [1045, 1054, 1029];
+    let role_list = [${sessionScope.USER_SESSION.role}];
+    var system_isPdd = false;
+    shop_list.forEach(shop_id => {
+        if (role_list.includes(shop_id)) {
+            system_isPdd = true;
+        }
+    })
     // 不给客服看
     /* if(${ !sessionScope.USER_SESSION.role.contains('999') }){ */
     // 春节倒计时

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

@@ -24,9 +24,9 @@
         </span>
         <form class="layui-form">
             <div class="layui-form-item">
-<%--                <input type="radio" lay-filter="stickerKind" name="stickerKind" value="常用种类" title="常用种类">--%>
+                <%--                <input type="radio" lay-filter="stickerKind" name="stickerKind" value="常用种类" title="常用种类">--%>
                 <!-- <input type="radio" lay-filter="stickerKind" name="stickerKind" value="少数量"  title="少数量(100个以内)"> -->
-<%--                <input type="radio" lay-filter="stickerKind" name="stickerKind" value="专版打印" title="专版打印">--%>
+                <%--                <input type="radio" lay-filter="stickerKind" name="stickerKind" value="专版打印" title="专版打印">--%>
                 <%--                <input type="radio" lay-filter="stickerKind" name="stickerKind" value="封口贴" title="封口贴">--%>
                 <input type="radio" lay-filter="stickerKind" name="stickerKind" value="插旗" title="插旗">
                 <%--                <input type="radio" lay-filter="stickerKind" name="stickerKind" value="双面印刷不干胶" title="双面印刷不干胶">--%>
@@ -345,9 +345,9 @@
 
         </form>
         <form class="layui-form cq" style="display: none;">
-<%--            <p>--%>
-<%--                工艺--%>
-<%--            </p>--%>
+            <%--            <p>--%>
+            <%--                工艺--%>
+            <%--            </p>--%>
             <div class="layui-form-item yq">
 					<span class="ui_craftShua">
 						|&nbsp;&nbsp;&nbsp;&nbsp;
@@ -420,6 +420,25 @@
 <!-- <script src="../../js/acountExpressFee.js" charset="utf-8"></script> -->
 <%@include file="/views/copyResult.jsp" %>
 <script>
+    setNumberOptions();
+    function setNumberOptions() {
+        let html = '';
+        if (window.parent.system_isPdd) {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="2">改名字</option>
+                <option value="3">改二维码</option>
+                <option value="4">改图片</option>
+                <option value="5">改内容模板相同</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        } else {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        }
+        $("#desType").empty().append(html);
+    }
+
     layui.use(['element', 'table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -454,7 +473,7 @@
         });
         $("#number").on("input", function (e) {
             var number = e.delegateTarget.value;
-            if (window.parent.system_isPdd && $("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) {
+            if ($("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();
@@ -559,7 +578,7 @@
                 $(".ui_cq").find(":input").attr("disabled", true);
                 $(".normal").hide();
                 $('.normal input').prop("checked", false);
-                if (window.parent.system_isPdd && $("#number").val() > 1) {
+                if ($("#number").val() > 1) {
                     $("#ui_des").show();
                 }
                 $(".ui_sm").hide();
@@ -996,7 +1015,7 @@
             var remark = " ";
             if ($("input[name='stickerKind']:checked").val() == "插旗") {
                 var kind = "14";
-                if(data.value == "250克白卡纸对裱"){
+                if (data.value == "250克白卡纸对裱") {
                     kind = "250克白卡纸对裱";
                 }
             } else if ($("input[name='stickerKind']:checked").val() == "双面印刷不干胶") {
@@ -1545,7 +1564,7 @@
                 if (kindValue == "拉丝金" || kindValue == "拉丝银" || kindValue == "PP合成纸") {
                     craftMo = ""
                 }
-                if (window.parent.system_isPdd && number > 1) {
+                if (number > 1) {
                     if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) {
                         layer.msg('请选择设计内容！', {offset: ['300px', '300px']}, function () {
                         });
@@ -1705,7 +1724,7 @@
                     span_result += kind + ' - ' + size + "厘米 - " + craft_list.join("-") + '\n';
 
                     if (number > 1) {
-                        if (window.parent.system_isPdd && stickerKind == "专版打印") {
+                        if (stickerKind == "专版打印") {
                             let numberType = $("#desType option:selected").text();
                             span_result += "款数：" + number + "-" + numberType + "\n";
                         }

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

@@ -222,7 +222,7 @@
                         <div id="3z_yuan_size" style="display: none">
                             <select name="z3size1" lay-filter="z3size1" class="select">
                                 <option value="8.5*8.5">8.5*8.5 cm</option>
-                                <option value="10*10">10*10 cm</option>
+                                <option value="9*9">9*9 cm</option>
                             </select>
                         </div>
                     </div>
@@ -778,6 +778,26 @@
         }
     }
 
+    setNumberOptions();
+
+    function setNumberOptions() {
+        let html = '';
+        if (window.parent.system_isPdd) {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="2">改名字</option>
+                <option value="3">改二维码</option>
+                <option value="4">改图片</option>
+                <option value="5">改内容模板相同</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        } else {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        }
+        $("#desType").empty().append(html);
+    }
+
     layui.use(['table', 'form', 'carousel'], function () {
             var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
             var carousel = layui.carousel;
@@ -980,7 +1000,7 @@
             $("#number").on("input", function (e) {
                 var number = e.delegateTarget.value;
                 var kind = $("input[name='kind']:checked").val();
-                if (window.parent.system_isPdd && $("input[name='couponKind']:checked").val() == "少数量" && number > 1 && kind != "婚礼报纸" && kind != "菜单") {
+                if ($("input[name='couponKind']:checked").val() == "少数量" && number > 1 && kind != "婚礼报纸" && kind != "菜单") {
                     $("#ui_des").show();
                 } else {
                     $("#ui_des").hide();
@@ -1176,9 +1196,7 @@
                     if (kind != "婚礼报纸" || kind != "菜单") {
                         $("#ui_des").hide();
                     } else {
-                        if (window.parent.system_isPdd) {
-                            $("#ui_des").show();
-                        }
+                        $("#ui_des").show();
                     }
                     form.render();
                 } else {
@@ -1556,7 +1574,7 @@
                 } else if (data.value == 8) {
                     $('.ui_door_fm').prop('checked', true);
                     form.on('checkbox(switch)', function (switchData) {
-                        if (!switchData.elem.checked) {
+                        if (!switchData.elem.checked && switchData.value == "双面覆哑膜") {
                             layer.msg('门挂牌不能取消 [覆膜] 工艺！', {offset: ['300px', '300px']}, function () {
                             });
                             $('.ui_door_fm').prop('checked', true);
@@ -1766,7 +1784,7 @@
                     $(".ui_tzmp").find(":input").attr("disabled", true);
                     $(".kindValue6").hide();
                     $(".kindValue6").find(":input").attr("disabled", true);
-                    if (window.parent.system_isPdd && $("#number").val() > 1) {
+                    if ($("#number").val() > 1) {
                         $("#ui_des").show();
                     }
                     $("#kindValueForm").show();
@@ -1848,7 +1866,7 @@
                         $(".lessCountHideCraft").find(":input").attr("disabled", true);
                         $(".ui_yh").hide();
                         $(".ui_tz_yh").show();
-                        if (window.parent.system_isPdd && $("#number").val() > 1) {
+                        if ($("#number").val() > 1) {
                             $("#ui_des").show();
                         }
 
@@ -2309,6 +2327,14 @@
                 // 打码选中的时候，显示数量下拉框、编码类型、并把数量置为1（4/28改,原来只有存酒卡才显示）
                 if (data.value == '打码') {
                     if (data.elem.checked) {
+                        var size = $("#size").val();
+                        if ((size.split("*")[0] < 9 || size.split("*")[1] < 5.4) && (size.split("*")[1] < 9 || size.split("*")[0] < 5.4)) {
+                            $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
+                            $(data.elem).prop("checked", false);
+                            layer.msg('打码工艺最小尺寸9*5.4cm！', {offset: ['300px', '300px']}, function () {
+                            });
+                            return false;
+                        }
                         $(".bmType").show();
                         $(".damaHide").show();
                         $(".dama").val(1);
@@ -3033,7 +3059,7 @@
                             return false;
                         }
                     }
-                    if (window.parent.system_isPdd && number > 1) {
+                    if (number > 1) {
                         if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) {
                             if (kind != "婚礼报纸" && kind != "菜单") {
                                 layer.msg('请选择设计内容！', {offset: ['300px', '300px']}, function () {
@@ -3299,7 +3325,7 @@
                         }
 
                         if (number > 1) {
-                            if (window.parent.system_isPdd && couponKind == "少数量") {
+                            if (couponKind == "少数量") {
                                 let numberType = $("#desType option:selected").text();
                                 span_result += "款数：" + number + "-" + numberType + "\n";
                             }

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

@@ -132,6 +132,24 @@
 <script src="../../js/carousel.js" charset="utf-8"></script>
 <%@include file="/views/copyResult.jsp" %>
 <script>
+    setNumberOptions();
+    function setNumberOptions() {
+        let html = '';
+        if (window.parent.system_isPdd) {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="2">改名字</option>
+                <option value="3">改二维码</option>
+                <option value="4">改图片</option>
+                <option value="5">改内容模板相同</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        } else {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        }
+        $("#desType").empty().append(html);
+    }
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -192,12 +210,13 @@
         });
         $("#number").on("input", function (e) {
             var number = e.delegateTarget.value;
-            if (window.parent.system_isPdd && number > 1) {
+            if ( number > 1) {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();
             }
         });
+
         // 点击计算，计算价格
         form.on('submit(acount_btn)', function (data) {
             var kindData = {

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

@@ -299,35 +299,49 @@
         form.on("radio(typeValue)", function (data) {
             let html = ``;
             $("#spec").empty();
+            //烘焙 小+30 大+60
             if (data.value == 0) {
-                html = `<option value="1" selected>1号袋（宽250*高240*厚130）</option>
+                html = `<option value="1" selected>1号袋（宽230*高250*厚150）</option>
+                        <option value="31">小1号袋（宽230*高210*厚150）</option>
+                        <option value="62">大2号袋（宽240*高320*厚140）</option>
                         <option value="3">3号袋（宽280*高265*厚150）</option>
                         <option value="6">6号袋（宽160*高230*厚80）</option>
                         <option value="7">7号袋（宽210*高270*厚110）</option>
+                        <option value="37">小7号袋（宽210*高230*厚110）</option>
+                        <option value="38">小8号袋（宽210*高210*厚140）</option>
                         <option value="10">10号袋（宽320*高270*厚110）</option>
-                        <option value="12">12号袋（宽250*高320*厚130）</option>`;
+                        <option value="12">12号袋（宽350*高270*厚130）</option>`;
                 $("#spec").append(html);
 
             }
+            //外卖送餐
             if (data.value == 1) {
-                html = `<option value="2" selected>2号袋（宽250*高270*厚130）</option>
+                html = `<option value="2" selected>2号袋（宽240*高265*厚140）</option>
+                        <option value="31">小1号袋（宽230*高210*厚150）</option>
+                        <option value="62">大2号袋（宽240*高320*厚140）</option>
                         <option value="3">3号袋（宽280*高265*厚150）</option>
-                        <option value="4">4号袋（宽230*高250*厚150）</option>
+                        <option value="4">4号袋（宽130*高160*厚80）</option>
                         <option value="7">7号袋（宽210*高270*厚110）</option>
+                        <option value="37">小7号袋（宽210*高230*厚110）</option>
                         <option value="8">8号袋（宽210*高265*厚140）</option>
+                        <option value="38">小8号袋（宽210*高210*厚140）</option>
                         <option value="9">9号袋（宽250*高270*厚170）</option>`;
                 $("#spec").append(html);
             }
+            //饮品外卖
             if (data.value == 2) {
                 html = `<option value="5" selected>5号袋（宽110*高250*厚100）</option>
                         <option value="7">7号袋（宽210*高270*厚110）</option>
                         <option value="9">9号袋（宽250*高270*厚170）</option>`;
                 $("#spec").append(html);
             }
+            //礼品购物
             if (data.value == 3) {
-                html = `<option value="7" selected>7号袋（宽210*高270*厚110）</option>
+                html = `<option value="4" selected>4号袋（宽130*高160*厚80）</option>
+                        <option value="7">7号袋（宽210*高270*厚110）</option>
                         <option value="10">10号袋（宽320*高270*厚110）</option>
-                        <option value="11">11号袋（宽320*高390*厚110）</option>`;
+                        <option value="11">11号袋（宽320*高390*厚110）</option>
+                        <option value="12">12号袋（宽350*高270*厚130）</option>`;
                 $("#spec").append(html);
             }
             form.render();
@@ -338,7 +352,7 @@
             let spec = $("#spec").val();
             let kindValue = $(".npzd select[name='kindValue']").val();
             let count_html = `<option value=""></option>`;
-            if (spec <= 10 && kindValue == 0) {
+            if (spec <= 10  && kindValue == 0) {
                 count_html +=
                     `<option value="100">100</option>`;
             }

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

@@ -131,6 +131,23 @@
 <script src="../../js/carousel.js" charset="utf-8"></script>
 <%@include file="/views/copyResult.jsp" %>
 <script>
+    function setNumberOptions() {
+        let html = '';
+        if (window.parent.system_isPdd) {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="2">改名字</option>
+                <option value="3">改二维码</option>
+                <option value="4">改图片</option>
+                <option value="5">改内容模板相同</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        } else {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        }
+        $("#desType").empty().append(html);
+    }
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -171,7 +188,7 @@
 
         $("#number").on("input", function (e) {
             var number = e.delegateTarget.value;
-            if (window.parent.system_isPdd && number > 1 && $("input[name='stickerKind']:checked").val() == "专版打印") {
+            if ( number > 1 && $("input[name='stickerKind']:checked").val() == "专版打印") {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();
@@ -262,7 +279,7 @@
                 });
                 return false;
             }
-            if (window.parent.system_isPdd && number > 1 && stickerKind == "专版打印") {
+            if (number > 1 && stickerKind == "专版打印") {
                 if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) {
                     layer.msg('请选择设计内容！', {offset: ['300px', '300px']}, function () {
                     });

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

@@ -537,6 +537,24 @@
 </body>
 <%@include file="/views/copyResult.jsp" %>
 <script>
+    setNumberOptions();
+    function setNumberOptions() {
+        let html = '';
+        if (window.parent.system_isPdd) {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="2">改名字</option>
+                <option value="3">改二维码</option>
+                <option value="4">改图片</option>
+                <option value="5">改内容模板相同</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        } else {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        }
+        $("#desType").empty().append(html);
+    }
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -554,7 +572,7 @@
             var number = $("#number").val();
             let number_kindValue = $("input[name='kindValue']:checked").val();
             let number_kind2Value = $("select[name='kind2Value'] option:selected").val();
-            if (window.parent.system_isPdd && number > 1 && ((number_kindValue == 0 && number_kind2Value == 0) || (number_kindValue == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) {
+            if ( number > 1 && ((number_kindValue == 0 && number_kind2Value == 0) || (number_kindValue == 1 && (number_kind2Value == 3 || number_kind2Value == 8 || number_kind2Value == 15)) || number_kindValue == 2)) {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();
@@ -1644,7 +1662,7 @@
 
 
                         if (number > 1) {
-                            if (window.parent.system_isPdd && $("#ui_des").css("display") != "none") {
+                            if ($("#ui_des").css("display") != "none") {
                                 let numberType = $("#desType option:selected").text();
                                 span_result += "款数：" + number + "-" + numberType + "\n";
                             }

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

@@ -130,6 +130,24 @@
 </body>
 <%@include file="/views/copyResult.jsp" %>
 <script>
+    setNumberOptions();
+    function setNumberOptions() {
+        let html = '';
+        if (window.parent.system_isPdd) {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="2">改名字</option>
+                <option value="3">改二维码</option>
+                <option value="4">改图片</option>
+                <option value="5">改内容模板相同</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        } else {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        }
+        $("#desType").empty().append(html);
+    }
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -223,7 +241,7 @@
         })
         $("#number").on("input", function (e) {
             var number = e.delegateTarget.value;
-            if (window.parent.system_isPdd && number > 1) {
+            if (number > 1) {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();

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

@@ -213,6 +213,24 @@
 </body>
 <%@include file="/views/copyResult.jsp" %>
 <script>
+    setNumberOptions();
+    function setNumberOptions() {
+        let html = '';
+        if (window.parent.system_isPdd) {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="2">改名字</option>
+                <option value="3">改二维码</option>
+                <option value="4">改图片</option>
+                <option value="5">改内容模板相同</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        } else {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        }
+        $("#desType").empty().append(html);
+    }
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -225,7 +243,7 @@
         $("#number").on("input", function (e) {
             var number = e.delegateTarget.value;
             var kind = $("input[name='kind']:checked").val();
-            if (window.parent.system_isPdd && number > 1) {
+            if (number > 1) {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();

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

@@ -426,6 +426,26 @@
 <!-- <script src="../../js/acountExpressFee.js" charset="utf-8"></script> -->
 <%@include file="/views/copyResult.jsp" %>
 <script>
+    setNumberOptions();
+
+    function setNumberOptions() {
+        let html = '';
+        if (window.parent.system_isPdd) {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="2">改名字</option>
+                <option value="3">改二维码</option>
+                <option value="4">改图片</option>
+                <option value="5">改内容模板相同</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        } else {
+            html = `<option value=""></option>
+                <option value="1">改序号</option>
+                <option value="6" selected>改内容模板完全不同</option>`;
+        }
+        $("#desType").empty().append(html);
+    }
+
     layui.use(['element', 'table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -460,7 +480,7 @@
         });
         $("#number").on("input", function (e) {
             var number = e.delegateTarget.value;
-            if (window.parent.system_isPdd && $("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) {
+            if ($("input[name='stickerKind']:checked").val() == "专版打印" && number > 1) {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();
@@ -566,7 +586,7 @@
                 $(".ui_cq").find(":input").attr("disabled", true);
                 $(".normal").hide();
                 $('.normal input').prop("checked", false);
-                if (window.parent.system_isPdd && $("#number").val() > 1) {
+                if ($("#number").val() > 1) {
                     $("#ui_des").show();
                 }
                 $(".ui_sm").hide();
@@ -1568,7 +1588,7 @@
                 if (kindValue == "拉丝金" || kindValue == "拉丝银" || kindValue == "PP合成纸") {
                     craftMo = ""
                 }
-                if (window.parent.system_isPdd && number > 1) {
+                if (number > 1) {
                     if ($("#desType option:selected").val() == "" || $("#desType option:selected").val() == null) {
                         layer.msg('请选择设计内容！', {offset: ['300px', '300px']}, function () {
                         });
@@ -1735,7 +1755,7 @@
                     span_result += kind + ' - ' + size + "厘米 - " + craft_list.join("-") + '\n';
 
                     if (number > 1) {
-                        if (window.parent.system_isPdd && stickerKind == "专版打印") {
+                        if (stickerKind == "专版打印") {
                             let numberType = $("#desType option:selected").text();
                             span_result += "款数：" + number + "-" + numberType + "\n";
                         }