From e8a0669db72a22c25e447410e3986b829e09677f Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Thu, 14 May 2026 12:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eopp=E8=A2=8B=E5=B0=BA?=
 =?UTF-8?q?=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lingtao/net/service/ProductService.java   |  3 +++
 src/main/webapp/views/product/coupon.jsp      |  1 +
 .../views/product/handkerchiefPaper.jsp       | 21 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index e02cf48..38492ef 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -1139,6 +1139,9 @@ public class ProductService {
                             if ("8*12".equals(dto.getToothpick_size())) {
                                 carft_base_price = 19;
                             }
+                            if ("11*18".equals(dto.getToothpick_size())) {
+                                carft_base_price = 30;
+                            }
                             if ("17*6".equals(dto.getToothpick_size())) {
                                 carft_base_price = 30;
                             }
diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp
index c17a5d3..f9339f2 100644
--- a/src/main/webapp/views/product/coupon.jsp
+++ b/src/main/webapp/views/product/coupon.jsp
@@ -931,6 +931,7 @@
                                 <option value="8*10">8*10CM</option>
                                 <option value="8*12">8*12CM</option>
                                 <option value="10*5">10*5CM</option>
+                                <option value="11*18">11*18CM</option>
                                 <option value="12*5">12*5CM</option>
                                 <option value="12*6">12*6CM</option>
                                 <option value="12*7">12*7CM</option>
diff --git a/src/main/webapp/views/product/handkerchiefPaper.jsp b/src/main/webapp/views/product/handkerchiefPaper.jsp
index 027b72e..89a6cee 100644
--- a/src/main/webapp/views/product/handkerchiefPaper.jsp
+++ b/src/main/webapp/views/product/handkerchiefPaper.jsp
@@ -63,6 +63,16 @@
                     <option value="红色">红色</option>
                 </select>
             </div>
+            <div id="skuContainer" style="display: none">
+                <p>
+                    规格
+                </p>
+                <div class="layui-form-item">
+                    <input type="radio" name="sku" title="500/箱" value="500/箱" disabled>
+                    <input type="radio" name="sku" title="1000/箱" value="1000/箱" checked disabled>
+                </div>
+            </div>
+
             <div class="layui-form-item" style="display: none">
                 <select id="colorT" name="craft" class="layui-form-select" disabled>
                     <option value="黑色">黑色</option>
@@ -193,6 +203,9 @@
             $("input[name='shen_color'][value='双色']").attr("disabled", false);
             $("input[name='shen_color'][value='彩色']").parent().show();
             $("input[name='shen_color'][value='彩色']").attr("disabled", false);
+            $("#skuContainer").hide();
+            $("#skuContainer").find(":input").attr("disabled", true);
+
             $("#colorT").parent().hide();
             $("#colorT").attr("disabled", true)
             if (data.value == '23*23') {
@@ -206,6 +219,8 @@
         form.on("radio(colorType)", function (data) {
             $("#colorT").parent().hide();
             $("#colorT").attr("disabled", true)
+            $("#skuContainer").hide();
+            $("#skuContainer").find(":input").attr("disabled", true);
             let html = `<option value="黑色">黑色</option>
                     <option value="咖啡色">咖啡色</option>
                     <option value="浅绿色">浅绿色</option>
@@ -222,6 +237,8 @@
             if (data.value == "彩色") {
                 html = `<option value="彩色">彩色</option>`;
                 $("#colorS").empty().append(html);
+                $("#skuContainer").show();
+                $("#skuContainer").find(":input").attr("disabled", false);
             }
             form.render();
         })
@@ -295,7 +312,9 @@
                 });
                 return false;
             }
-
+            if(colorType == "彩色"){
+                craft.push($("input[name='sku']:checked").val());
+            }
             $.ajax({
                 url: "${path}/getThanSum",
                 type: "GET",