edit

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

@@ -1247,7 +1247,7 @@ public class ProductService {
                     if (craft_list.size() == 0 || craft_list.contains("异形模切")) {
                         prices = new double[]{144, 272, 528, 660, 1280, 2560, 3840, 6400, 12800};
                     }
-                    if (craft_list.contains("圆角") && !craft_list.contains("击凸") && !craft_list.contains("压凹")) {
+                    if (craft_list.contains("圆角") && !craft_list.contains("击凸") && !craft_list.contains("压凹") && !craft_list.contains("单面烫金") && !craft_list.contains("双面烫金")) {
                         prices = new double[]{146, 276, 536, 670, 1300, 2600, 3900, 6500, 13000};
                     }
                     if (craft_list.contains("圆角") && (craft_list.contains("击凸") || craft_list.contains("压凹"))) {
@@ -1256,11 +1256,18 @@ public class ProductService {
                     if (!craft_list.contains("圆角") && (craft_list.contains("击凸") || craft_list.contains("压凹"))) {
                         prices = new double[]{214, 362, 658, 810, 1530, 3060, 4590, 7650, 15300};
                     }
+                    if (craft_list.contains("圆角") && (craft_list.contains("单面烫金") || craft_list.contains("双面烫金"))) {
+                        prices = new double[]{216, 366, 666, 820, 1550, 3100, 4600, 7800, 15500};
+                    }
+                    if (!craft_list.contains("圆角") && (craft_list.contains("单面烫金") || craft_list.contains("双面烫金"))) {
+                        prices = new double[]{214, 362, 658, 810, 1530, 3060, 4590, 7650, 15300};
+                    }
 
                     priceList = new ArrayList<>();
                     Product dto2 = null;
-                    double rate = 1.0;
+
                     for (int i = 0; i < count_list.length; i++) {
+                        double rate = 1.0;
                         if (count_list[i] < count) {
                             continue;
                         }
@@ -1270,6 +1277,9 @@ public class ProductService {
                         if (count_list[i] >= 400) {
                             rate = 0.8;
                         }
+                        if (craft_list.contains("双面烫金")) {
+                            rate = rate * 1.8;
+                        }
                         dto2 = new Product();
                         dto2.setCount(count_list[i]);
                         dto2.setPrice(Math.ceil(prices[i] * rate));
@@ -1282,6 +1292,7 @@ public class ProductService {
                         } else {
                             product.setPrice(Math.floor(product.getPrice() * number * min));
                         }
+
                     }
                     return priceList;
                 } else if ("草香".equals(kind) || "芳怡".equals(kind)) {

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

@@ -73,7 +73,7 @@ public class ZsPrice {
                 if (dto.getP() == 1) {
                     desFee = 0.6 * (number - 1);
                 } else {
-                    desFee = 8* (number - 1);
+                    desFee = 10* (number - 1);
 //                    if (number == 2) {
 //                        desFee = 5.75;
 //                    }
@@ -93,7 +93,7 @@ public class ZsPrice {
                 } else if (dto.getP() == 5) {
                     desFee = 6;
                 } else {
-                    desFee = 8;
+                    desFee = 10;
                 }
                 price += desFee * (number - 1);
             }

src/main/webapp/views/main.jsp

@@ -8,9 +8,11 @@
     <title>领淘报价网</title>
     <link href="${pageContext.request.contextPath}/static/layui/css/layui.css" rel="stylesheet">
     <link href="${pageContext.request.contextPath}/static/css/jquery-ui.min.css" rel="stylesheet"/>
+    <link href="${pageContext.request.contextPath}/static/css/swiper-bundle.min.css" rel="stylesheet"/>
     <script src="${pageContext.request.contextPath}/static/layui/layui.js"></script>
     <script src="${pageContext.request.contextPath}/static/js/jquery.min.js"></script>
     <script src="${pageContext.request.contextPath}/static/js/jquery-ui.min.js"></script>
+    <script src="${pageContext.request.contextPath}/static/js/swiper-bundle.min.js"></script>
     <style>
         /* 搜索框位置 */
         .search {
@@ -403,12 +405,12 @@
 </div>
 <div class="layui-layout layui-layout-admin">
     <div class="layui-header" id="flake" style="background-color: #780f0f">
-        <div class="layui-logo" style="font-weight: bolder;color: orange;font-family: STXingkai;"><span
+        <div class="layui-logo" style="font-weight: bolder;color: orange;font-family: STXingkai;z-index: 10"><span
                 style="font-size: 25px;"><i>lingtao·领淘</i></span></div>
         <%-- <c:if test ="${ !sessionScope.USER_SESSION.role.contains('999')}"> --%>
         <!-- 雪花背景 -->
         <canvas id="canvas"></canvas>
-        <!-- <div class="middle">
+        <!--<div class="middle">
             <h1 class="label">春节倒计时</h1>
             <div class="time">
                 <span>
@@ -421,9 +423,28 @@
                     <span id="s">53</span>秒
                 </span>
             </div>
-        </div> -->
+        </div>-->
+        <div style="width: 100%;height: 100%;display: flex;justify-content: center;position: absolute;left: 0;top: 0;">
+            <!--向上轮播-->
+            <div class="swiper" style="height: 100%;width: 800px;">
+                <div class="swiper-wrapper">
+                    <div class="swiper-slide" data-swiper-autoplay="10000">【新增】金属标-UV转印贴-添加烫金工艺</div>
+                    <div class="swiper-slide" data-swiper-autoplay="10000">【新增】卡片-腰封-吸管套-添加250克牛皮纸</div>
+                    <div class="swiper-slide" data-swiper-autoplay="10000">【调整】不干胶-不干胶-隐藏双面印不干胶选项</div>
+                </div>
+            </div>
+        </div>
+        <style>
+            .swiper-slide {
+                color: orange;
+                display: flex;
+                font-size: 16px;
+                align-items: center;
+                justify-content: center;
+            }
+        </style>
         <%-- </c:if> --%>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="z-index: 10">
             <input type="hidden" value="${sessionScope.USER_SESSION.readLogStatus}" id="readLogStatus">
             <input type="hidden" id="search-url">
             <!-- 答题通过显示 -->
@@ -433,7 +454,7 @@
                 <button type="button" onclick="searching()" class="layui-btn layui-btn-normal search">搜索</button>
             </c:if>
         </div>
-        <ul class="layui-nav layui-layout-right">
+        <ul class="layui-nav layui-layout-right" style="z-index: 10">
             <li class="layui-nav-item">
                 <a href="javascript:;">
                     <img src="http://t.cn/RCzsdCq" class="layui-nav-img"/>
@@ -554,6 +575,15 @@
         }
     }
 </script>
+<script>
+    var mySwiper = new Swiper('.swiper', {
+        direction: 'vertical', // 垂直切换选项
+        loop: true, // 循环模式选项
+        autoplay: {
+            delay: 3000,
+        }
+    })
+</script>
 <script>
     let shop_list = [1045, 1054, 1029];
     let role_list = [${sessionScope.USER_SESSION.role}];

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

@@ -162,9 +162,9 @@
             </div>
             <div id="mianka" style="display: none">
                 <input type="checkbox" name="craft" lay-filter="mianka" value="圆角" title="圆角" disabled>
+                <input type="checkbox" name="craft" lay-filter="mianka" value="异形模切" title="异形模切" disabled>
                 <input type="checkbox" name="craft" lay-filter="mianka" value="击凸" title="击凸" disabled>
                 <input type="checkbox" name="craft" lay-filter="mianka" value="压凹" title="压凹" disabled>
-                <input type="checkbox" name="craft" lay-filter="mianka" value="异形模切" title="异形模切" disabled>
                 <div id="color_type" class="layui-inline" style="display: none;width: 200px">
                     <select name="craft" class="select" disabled>
                         <option value="无色" selected>无色</option>
@@ -172,6 +172,19 @@
                         <option value="有色加凹凸">有色加凹凸</option>
                     </select>
                 </div>
+                <br/>
+                <input type="checkbox" name="craft" lay-filter="mianka" value="单面烫金" title="单面烫金" disabled>
+                <input type="checkbox" name="craft" lay-filter="mianka" value="双面烫金" title="双面烫金" disabled>
+                <div id="tang_type" class="layui-inline" style="display: none;width: 200px">
+                    <select name="craft" class="select" disabled>
+                        <option value="烫金" selected>烫金</option>
+                        <option value="烫银">烫银</option>
+                        <option value="烫蓝">烫蓝</option>
+                        <option value="烫绿">烫绿</option>
+                        <option value="烫紫">烫紫</option>
+                        <option value="烫玫瑰">烫玫瑰</option>
+                    </select>
+                </div>
             </div>
 
 
@@ -214,6 +227,7 @@
 <%@include file="/views/copyResult.jsp" %>
 <script>
     setNumberOptions();
+
     function setNumberOptions() {
         let html = '';
         if (window.parent.system_isPdd) {
@@ -231,6 +245,7 @@
         }
         $("#desType").empty().append(html);
     }
+
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -434,10 +449,12 @@
                     }
                 }
             );
-            if (craft_list.indexOf("击凸") > -1 && craft_list.indexOf("压凹") > -1) {
+            const requiredCrafts = ["击凸", "压凹", "单面烫金", "双面烫金"];
+            const allExist = requiredCrafts.filter(craft => craft_list.includes(craft));
+            if (allExist.length > 1) {
                 $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
                 $(data.elem).prop("checked", false);
-                layer.msg("击凸 - 压凹不能同时选择", {offset: ['300px', '300px']}, function () {
+                layer.msg("击凸 - 压凹 - 单面烫金 - 双面烫金不能同时选择", {offset: ['300px', '300px']}, function () {
                 });
                 return false;
             }
@@ -455,6 +472,13 @@
                 $("#color_type").hide();
                 $("#color_type").find("select").attr("disabled", true);
             }
+            if (craft_list.indexOf("双面烫金") > -1 || craft_list.indexOf("单面烫金") > -1) {
+                $("#tang_type").show();
+                $("#tang_type").find("select").attr("disabled", false);
+            } else {
+                $("#tang_type").hide();
+                $("#tang_type").find("select").attr("disabled", true);
+            }
             console.log(craft_list)
             form.render();
         })