修改配件样式逻辑

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

@@ -906,7 +906,10 @@ public class ProductService {
                         if (craft_list.contains("配棉绳")) {
                             carft_price += Math.max(Math.ceil(product.getCount() * 0.015), 15);
                         }
-                        if (craft_list.contains("opp袋")) {
+                        if (craft_list.contains("装opp袋")) {
+                            carft_price += Math.max(Math.ceil(product.getCount() * 0.15), 5);
+                        }
+                        if (craft_list.contains("配opp袋")) {
                             double carft_base_price = 0;
                             if ("8*5".equals(dto.getToothpick_size())) {
                                 carft_base_price = 10;

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

@@ -598,9 +598,6 @@
                         <span class="z3_craft_mq">
                             <input type="checkbox" name="craft" lay-filter="z3Crafts" value="模切" title="模切"/>
                         </span>
-                        <span class="z3_craft_opp">
-                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="装opp袋" title="装opp袋"/>
-                        </span>
                         <input type="checkbox" class="shengz" name="craft" lay-filter="z3Crafts" value="绳子"
                                title="绳子">
                         <div class="shengz scolor" style="width: 150px;display: none">
@@ -729,14 +726,22 @@
                         配件：
                         <input type="checkbox" class="peijian" name="craft" lay-filter="z4PeiJian" value="配葫芦针"
                                title="配葫芦针">
-                        <input type="checkbox" class="peijian" name="craft" lay-filter="z4PeiJian" value="配流苏"
-                               title="配流苏">
-                        <input type="checkbox" class="peijian" name="craft" lay-filter="z4PeiJian" value="穿流苏"
-                               title="穿流苏">
-                        <input type="checkbox" class="peijian" name="craft" lay-filter="z4PeiJian" value="配尼龙绳"
-                               title="配尼龙绳">
-                        <input type="checkbox" class="peijian" name="craft" lay-filter="z4PeiJian" value="穿尼龙绳"
-                               title="穿尼龙绳">
+                        <input type="checkbox" class="peijian" lay-filter="z4PeiJian" value="流苏"
+                               title="流苏">
+                        <div class="layui-inline select_liusu" style="width: 110px;display: none">
+                            <select class="select" name="craft" disabled>
+                                <option value="配流苏">配流苏</option>
+                                <option value="穿流苏">穿流苏</option>
+                            </select>
+                        </div>
+                        <input type="checkbox" class="peijian" name="craft" lay-filter="z4PeiJian" value="尼龙绳"
+                               title="尼龙绳">
+                        <div class="layui-inline select_nilongshen" style="width: 110px;display: none">
+                            <select class="select" name="craft" disabled>
+                                <option value="配尼龙绳">配尼龙绳</option>
+                                <option value="穿尼龙绳">穿尼龙绳</option>
+                            </select>
+                        </div>
                         <div class="layui-inline shengz scolor" style="width: 110px;display: none">
                             <select class="select" name="shen_color">
                                 <option value="白色绳子">白色绳子</option>
@@ -755,7 +760,13 @@
                             </select>
                         </div>
                         <input type="checkbox" class="peijian" name="craft" lay-filter="z4PeiJian" value="opp袋"
-                               title="配opp袋">
+                               title="opp袋">
+                        <div class="layui-inline select_opp" style="width: 110px;display: none">
+                            <select class="select" name="craft" disabled lay-filter="oppSelect">
+                                <option value="配opp袋">配opp袋</option>
+                                <option value="装opp袋">装opp袋</option>
+                            </select>
+                        </div>
                         <div class="layui-inline opp" style="width: 110px;display: none">
                             <select class="select" name="toothpick_size">
                                 <option value="8*5">8*5CM</option>
@@ -991,8 +1002,6 @@
                 $(".z3_craft_ssx").show();
                 $(".z3_craft_yh").show();
                 $(".z3_craft_bm").show();
-                $(".z3_craft_mq").hide();
-                $(".z3_craft_opp").show();
                 $("#3z_menpiao_size").hide();
                 $("#3z_kapian_size").hide();
                 $("#3z_yuan_size").hide();
@@ -1102,6 +1111,16 @@
                     }
                 });
             });
+            form.on("select(oppSelect)", function (data) {
+                if (data.value == "装opp袋") {
+                    $("#peijian_ui .opp").hide();
+                    $("#peijian_ui .opp").prop("disabled", true);
+                }
+                if (data.value == "配opp袋") {
+                    $("#peijian_ui .opp").show();
+                    $("#peijian_ui .opp").prop("disabled", false);
+                }
+            })
             form.on("checkbox(z4PeiJian)", function (data) {
                 let peijiansize = [];
                 $(".peijian:checked").each(function (i) {
@@ -1116,14 +1135,26 @@
                     layer.msg('配件只能选择一种！', {offset: ['300px', '300px']}, {icon: 5});
                     return false;
                 }
-
-                if (data.value == "配尼龙绳" || data.value == "穿尼龙绳") {
+                if (data.value == "流苏") {
+                    if ($(data.elem).is(":checked")) {
+                        $("#peijian_ui .select_liusu").show();
+                        $("#peijian_ui .select_liusu select").prop("disabled", false);
+                    } else {
+                        $("#peijian_ui .select_liusu").hide();
+                        $("#peijian_ui .select_liusu select").prop("disabled", true);
+                    }
+                }
+                if (data.value == "尼龙绳") {
                     if ($(data.elem).is(":checked")) {
                         $("#peijian_ui .scolor").show();
                         $("#peijian_ui .scolor").prop("disabled", false);
+                        $("#peijian_ui .select_nilongshen").show();
+                        $("#peijian_ui .select_nilongshen select").prop("disabled", false);
                     } else {
                         $("#peijian_ui .scolor").hide();
                         $("#peijian_ui .scolor").prop("disabled", true);
+                        $("#peijian_ui .select_nilongshen").hide();
+                        $("#peijian_ui .select_nilongshen select").prop("disabled", true);
                     }
                 }
                 if (data.value == "配弹力绳" || data.value == "配弹力绳捆") {
@@ -1139,15 +1170,20 @@
                     if ($(data.elem).is(":checked")) {
                         $("#peijian_ui .opp").show();
                         $("#peijian_ui .opp").prop("disabled", false);
+                        $("#peijian_ui .select_opp").show();
+                        $("#peijian_ui .select_opp select").prop("disabled", false);
                         getProductImage('opp袋');
 
                     } else {
                         $("#peijian_ui .opp").hide();
                         $("#peijian_ui .opp").prop("disabled", true);
+                        $("#peijian_ui .select_opp").hide();
+                        $("#peijian_ui .select_opp select").prop("disabled", true);
                         getProductImage();
 
                     }
                 }
+                form.render();
             });
             form.on("checkbox(lessz4PeiJian)", function (data) {
                 let peijiansize = $(".lesspeijian:checked").length;
@@ -1182,6 +1218,14 @@
                 $("#peijian_ui .tscolor").prop("disabled", true);
                 $("#peijian_ui .scolor").hide();
                 $("#peijian_ui .scolor").prop("disabled", true);
+                $("#peijian_ui .select_nilongshen").hide();
+                $("#peijian_ui .select_nilongshen select").prop("disabled", true);
+                $("#peijian_ui .select_liusu").hide();
+                $("#peijian_ui .select_liusu select").prop("disabled", true);
+                $("#peijian_ui .opp").hide();
+                $("#peijian_ui .opp").prop("disabled", true);
+                $("#peijian_ui .select_opp").hide();
+                $("#peijian_ui .select_opp select").prop("disabled", true);
                 if (data.value == 10) {
                     $("#craftForm").hide();
                     $("#craftForm").find(":input").attr("disabled", true);
@@ -2892,8 +2936,12 @@
                             }
 
                         }
-                        if ($(this).val() === '配尼龙绳' || $(this).val() === '穿尼龙绳') {
-                            arr.push($(this).val() + "-" + $("select[name='shen_color'] option:selected").val())
+                        if ($(this).val() === '尼龙绳') {
+                            arr.push($(".select_nilongshen select[name='craft'] option:selected").val() + "-" + $("select[name='shen_color'] option:selected").val())
+                            return;
+                        }
+                        if ($(this).val() === '流苏') {
+                            arr.push($(".select_liusu select[name='craft'] option:selected").val())
                             return;
                         }
                         if ($(this).val() == "配弹力绳捆") {
@@ -2907,7 +2955,12 @@
                             return;
                         }
                         if ($(this).val() == "opp袋") {
-                            arr.push($("select[name='toothpick_size'] option:selected").text() + "opp袋");
+                            let oppdai = $(".select_opp select[name='craft'] option:selected").val();
+                            let oppSize = $("select[name='toothpick_size'] option:selected").text();
+                            if (oppdai == "装opp袋") {
+                                oppSize = "";
+                            }
+                            arr.push(oppdai + oppSize);
                             return;
                         }
                         arr.push($(this).val());