From 114d8f1449a1171280c73affea0af61673b0e1d8 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Thu, 28 Aug 2025 10:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/lingtao/net/service/ProductService.java     |  2 +-
 src/main/webapp/views/product/coupon.jsp             | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 7a0d824..13217f1 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -6061,7 +6061,7 @@ public class ProductService {
                     product.setPrice(Math.ceil(product.getPrice() + 0.15 * product.getCount()));
                 }
             }
-            if (craftList.contains("流苏")) {
+            if (craftList.contains("流苏") && "4".equals(dto.getKind())) {
                 for (Product product : priceList) {
                     product.setPrice(Math.ceil(product.getPrice() + 0.15 * product.getCount()));
                 }
diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp
index 235540b..2f7df41 100644
--- a/src/main/webapp/views/product/coupon.jsp
+++ b/src/main/webapp/views/product/coupon.jsp
@@ -1108,7 +1108,7 @@
 
             function peijianuiHide() {
                 $("#peijian_ui .tscolor").hide();
-                $("#peijian_ui .tscolor").prop("disabled", true);
+                $("#peijian_ui .tscolor select").prop("disabled", true);
                 $("#peijian_ui .scolor").hide();
                 $("#peijian_ui .scolor select").prop("disabled", true);
                 $("#peijian_ui .select_nilongshen").hide();
@@ -1116,9 +1116,10 @@
                 $("#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 .opp select").prop("disabled", true);
                 $("#peijian_ui .select_opp").hide();
                 $("#peijian_ui .select_opp select").prop("disabled", true);
+                form.render();
             }
 
             // 监听count输入框
@@ -1151,6 +1152,7 @@
                     $("#peijian_ui .opp").show();
                     $("#peijian_ui .opp select").prop("disabled", false);
                 }
+                form.render();
             })
             form.on("checkbox(z4PeiJian)", function (data) {
                 let peijiansize = [];
@@ -1191,10 +1193,10 @@
                 if (data.value == "配弹力绳" || data.value == "配弹力绳捆") {
                     if ($(data.elem).is(":checked")) {
                         $("#peijian_ui .tscolor").show();
-                        $("#peijian_ui .tscolor").prop("disabled", false);
+                        $("#peijian_ui .tscolor select").prop("disabled", false);
                     } else {
                         $("#peijian_ui .tscolor").hide();
-                        $("#peijian_ui .tscolor").prop("disabled", true);
+                        $("#peijian_ui .tscolor select").prop("disabled", true);
                     }
                 }
                 if (data.value == "opp袋") {
@@ -1318,7 +1320,7 @@
                     if (data.value == 2) {
                         $("#peijian_ui form")[0].reset();
                         $("#peijian_ui").show();
-                        $("#peijian_ui").find(":input").attr("disabled", false);
+                        $("#peijian_ui input").attr("disabled", false);
                         $("#peijian_ui .scolor").hide();
                     }
                 }