From 28428f6135f439949c21340b2a7f5d9354a46109 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Thu, 18 Jun 2026 11:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/views/product/cupSet.jsp    | 44 ++-------------------
 src/main/webapp/views/product/rollLabel.jsp | 34 +++++++++++-----
 2 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/src/main/webapp/views/product/cupSet.jsp b/src/main/webapp/views/product/cupSet.jsp
index 4195f6b..db63847 100644
--- a/src/main/webapp/views/product/cupSet.jsp
+++ b/src/main/webapp/views/product/cupSet.jsp
@@ -242,12 +242,6 @@
                 <input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
                        class="layui-input">
             </div>
-            <div class="layui-input-block">
-                <input type="checkbox" name="craft" lay-filter="ui_craft" value="抠图" title="抠图">
-                <div class="layui-inline crop" style="display:none;width: 80px">
-                    <input class="layui-input" type="text" name="cropNumber">
-                </div>
-            </div>
             <hr>
             <div class="layui-form-item">
                 <button class="layui-btn" lay-submit="" lay-filter="acount_btn">计算</button>
@@ -441,27 +435,6 @@
             }
         });
 
-        form.on('checkbox(ui_craft)', function (data) {
-            let craft_list = [];
-            let kindValue = $('input[name="kindValue"]:checked').val();
-            craft_list.push($("select[name='craft'] option:selected").val());
-            $("input[name='craft']:checked").each(function () {
-                if (!$(this).is(':disabled')) {
-                    craft_list.push($(this).val());
-                }
-            });
-
-            if (data.value == '抠图') {
-                $(".crop").hide();
-                $(".crop").find("input").prop("disabled", true)
-                if (data.elem.checked) {
-                    $(".crop").show();
-                    $(".crop").find("input").prop("disabled", false)
-                }
-            }
-            form.render();
-        })
-
         // 点击计算，计算价格
         form.on('submit(acount_btn)', function (data) {
             var kindData = {
@@ -494,14 +467,6 @@
                         });
                         return false;
                     }
-                    $("input[name='craft']:checked").each(function () {
-                        if (!$(this).is("disabled")) {
-                            if ($(this).val() == "抠图") {
-                                arr.push($(this).val() + $("input[name='cropNumber']").val());
-                                return;
-                            }
-                        }
-                    })
                     var data = result.data.proList;
                     if (kind == "300克异形杯套(不限形状)") {
                         var span_result = '杯套 - ' + kind + ' - ' + size + 'cm\n';
@@ -539,14 +504,11 @@
                         if ($("input[name='craftTang']").is(":checked")) {
                             size = $("select[name='width'] option:selected").val() + '*' + $("#ui_size").val()
                         }
-                        var span_result = '杯套 - ' + kind + ' - ' + size + 'cm\n';
+                        var span_result = '杯套 - ' + kind + '-' + arr + ' - ' + size + 'cm\n';
                     } else {
                         var span_result = '杯套 - ' + kind + ' - ' + [size] + '\n';
                         //var span_result ='杯套 - ' +  kind +'\n';
                     }
-                    if (arr.length > 0) {
-                        span_result += "工艺：" + arr.join(",") + '\n';
-                    }
                     if (kind == "盲盒杯套") {
                         if (number > 1) {
                             span_result += number + '款 各5个内容' + data[0].count + "个，共" + data[0].price + "元" + '\n';
@@ -567,8 +529,8 @@
                         }
                     }
                     span_result += '包邮，免费设计呢~（偏远地区需补邮费）'
-                    if (window.parent.system_isGai) {
-                        span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!"
+                    if(window.parent.system_isGai){
+                        span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!"
                     }
                     addLog(span_result);
                     $("#span_result").val(span_result);
diff --git a/src/main/webapp/views/product/rollLabel.jsp b/src/main/webapp/views/product/rollLabel.jsp
index 6b2231e..548f1c2 100644
--- a/src/main/webapp/views/product/rollLabel.jsp
+++ b/src/main/webapp/views/product/rollLabel.jsp
@@ -154,12 +154,14 @@
     </div>
 </div>
 </body>
-<script src="../../js/carousel.js" charset="utf-8"></script>
 <%@include file="/views/copyResult.jsp" %>
 <script>
-    layui.use(['table', 'form'], function () {
+    layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var table = layui.table;
+        var carousel = layui.carousel;
+
+        ins = carousel.render({});
         $(".sealant").hide();
         $(".sealant").find("input").attr("disabled", true);
         $(".sealant").find("select").attr("disabled", true);
@@ -173,23 +175,36 @@
                 $('.yb').prop('disabled', 'disabled');
             }
             form.render();
+            getImages(data.value)
+        })
+        getImages(0)
 
+        function getImages(kindValue) {
+            let kindValue2 = $("input[name='kind']:checked").val();
+            let davaValue = {
+                proTypeValue: $("#proTypeValue").val(),
+                kindValue: kindValue,
+                kind2Value: kindValue2
+            }
             var html = " ";
-
+            var remark = " ";
             // 清空轮播图
             $("#carousel").empty();
+            $("#remark").empty();
             $.ajax({
                 url: "${pageContext.request.contextPath}/getImgs",
                 type: "GET",
-                data: {
-                    proTypeValue: $("#proTypeValue").val(),
-                    kindValue: data.value
-                },
+                data: davaValue,
                 success: function (result) {
                     for (let i = 0; i < result.length; i++) {
-                        html += '<div><img style="width:' + result[0].imgWidth + 'px" src="' + result[i].imgUrl + '"></div>';
+                        remark = "";
+                        html += '<div><img style="width:100%;height: 100%;object-fit: contain" src="' + result[i].imgUrl + '"></div>';
+                        remark += '<div><span>' + result[i].remark + '<span/></div>';
                     }
                     $("#carousel").append(html);
+                    if (remark.indexOf("null") < 0) {
+                        $("#remark").append(remark);
+                    }
                     // 如果没有轮播图就隐藏
                     if (result.length == 0) {
                         document.getElementById("test1").style.display = "none";   //隐藏
@@ -203,7 +218,7 @@
                     }
                 }
             });
-        })
+        }
 
         form.on("radio(kind)", function (data) {
             let html = ` <option value="0">格底铜板纸卷标</option>
@@ -235,6 +250,7 @@
             $("input[name='yinbai']").attr("disabled", true);
             $("#kindValue").empty().append(html);
             form.render()
+            getImages(0)
         })
 
         form.on('checkbox(switch)', function (data) {