diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index b9382c5..e3775c8 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -4639,12 +4639,68 @@ public class ProductService {
                 return getAreaCenterPrice(count_list, count, area, prices, areas, number);
             case "水标":
                 return getShuibiaoPrice(dto, length, width);
+            case "镭射吊牌":
+                return getLeiseDiaoPrice(dto, length, width);
             default:
                 break;
         }
         return null;
     }
 
+    private List<Product> getLeiseDiaoPrice(Product dto, double length, double width) {
+        double[] prices = new double[]{170, 233, 370, 537, 643, 843, 1613, 3117, 4847};
+        int[] count_list = new int[]{500, 1000, 2000, 3000, 4000, 5000, 10000, 20000, 30000};
+        int num = getNum(width, length);
+        List<Product> priceList = new ArrayList<>();
+        List<String> craft_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
+
+        for (int i = 0; i < count_list.length; i++) {
+            int count_item = count_list[i];
+            if (priceList.size() > 2) {
+                break;
+            }
+            if (dto.getCount() > count_item) {
+                continue;
+            }
+            double price = prices[i];
+            price = price + price * 0.9 * (num - 1);
+            Product product = new Product();
+            product.setCount(count_item);
+            product.setPrice(Math.ceil(price));
+            priceList.add(product);
+        }
+        for (Product product : priceList) {
+            int item_count = product.getCount();
+            double carft_price = 0;
+
+            if (craft_list.contains("配葫芦针")) {
+                carft_price += Math.max(0.016 * item_count, 10);
+            }
+            if (craft_list.contains("配流苏")) {
+                carft_price += Math.max(0.15 * item_count, 30);
+            }
+            if (craft_list.contains("穿流苏")) {
+                carft_price += Math.max(0.5 * item_count, 100);
+            }
+            if (craft_list.contains("配尼龙绳")) {
+                if ("红色绳子".equals(dto.getShen_color())) {
+                    carft_price += Math.max(0.009 * item_count, 10);
+                } else {
+                    carft_price += Math.max(0.03 * item_count, 3);
+                }
+            }
+            if (craft_list.contains("穿尼龙绳")) {
+                carft_price += Math.max(0.2 * item_count, 40);
+            }
+            if (craft_list.contains("棉绳")) {
+                carft_price += Math.max(0.015 * item_count, 40);
+            }
+            product.setPrice(Math.ceil(product.getPrice() + carft_price) * dto.getNumber());
+        }
+
+        return priceList;
+    }
+
     private List<Product> getShuibiaoPrice(Product dto, double length, double width) {
         List<String> craft_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
         int count = dto.getCount();
diff --git a/src/main/webapp/views/main.jsp b/src/main/webapp/views/main.jsp
index f46cbdd..d3943fb 100644
--- a/src/main/webapp/views/main.jsp
+++ b/src/main/webapp/views/main.jsp
@@ -431,6 +431,7 @@
             <!--向上轮播-->
             <div class="swiper" style="height: 100%;width: 800px;">
                 <div class="swiper-wrapper">
+                    <div class="swiper-slide" data-swiper-autoplay="5000">【新增】镭射吊牌价格更新</div>
                     <div class="swiper-slide" data-swiper-autoplay="5000">【新增】特种纸新增打码 烫金工艺 注意!!!雅柔纸打码烫金的工艺材质会比报价系统的材质偏黄点 接单的时候要跟客户沟通清楚 以免造成不必要的售后</div>
                     <div class="swiper-slide" data-swiper-autoplay="5000">【新增】双面不干胶-水标价格更新</div>
                     <div class="swiper-slide" data-swiper-autoplay="5000">【修改】手提袋重量修改</div>
diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp
index f985a4e..f5893ae 100644
--- a/src/main/webapp/views/product/coupon.jsp
+++ b/src/main/webapp/views/product/coupon.jsp
@@ -630,8 +630,8 @@
                     </div>
                     <div class="layui-input-block">
                         常见工艺：
-                        <input type="checkbox" name="craft" class="nomq" lay-filter="switchCrafts" value="压痕"
-                               title="压痕"/>
+<%--                        <input type="checkbox" name="craft" class="nomq" lay-filter="switchCrafts" value="压痕"--%>
+<%--                               title="压痕"/>--%>
                         <div class="layui-inline yahenghide" style="width:60px;display:none">
                             <select name="yaheng" class="select yadianxian">
                                 <option value="1" selected>1</option>
diff --git a/src/main/webapp/views/product/leiTag.jsp b/src/main/webapp/views/product/leiTag.jsp
new file mode 100644
index 0000000..6e30879
--- /dev/null
+++ b/src/main/webapp/views/product/leiTag.jsp
@@ -0,0 +1,300 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
+</head>
+<body>
+<style>
+    #z4_craft .layui-form-select .layui-edge {
+        right: 20px;
+    }
+</style>
+<div class="big_box">
+    <div class="left_div">
+        <h1 class="h1">镭射吊牌</h1> <span style="color:red;font-weight:700;"></span>
+        <hr>
+        <form class="layui-form">
+            <input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="镭射吊牌"/>
+            <p>
+                材质
+            </p>
+            <div class="layui-form-item">
+                <select name="ui_bq_name" id="ui_bq_name" lay-filter="ui_fb_name" class="select" lay-search>
+                    <option value="1">300克铜版纸</option>
+                </select>
+            </div>
+            <p>
+                尺寸(CM/厘米) <span style="font-size: 14px; color: red">输入格式: 长 * 宽</span>
+            </p>
+            <div class="layui-form-item" id="ui_size">
+                <input type="text" name="size" id="size" placeholder="格式:长*宽" class="layui-input" autocomplete="off">
+            </div>
+
+            <p>
+                数量(个)
+            </p>
+            <div class="layui-form-item">
+                <select name="count" class="select">
+                    <option value="500">500</option>
+                    <option value="1000">1000</option>
+                    <option value="2000">2000</option>
+                    <option value="3000">3000</option>
+                    <option value="5000">5000</option>
+                    <option value="10000">10000</option>
+                    <option value="20000">20000</option>
+                    <option value="30000">30000</option>
+                </select>
+            </div>
+            <p>
+                款数
+            </p>
+            <div class="layui-form-item">
+                <input type="text" placeholder="请输入整数" autocomplete="off" name="number" id="number" value="1"
+                       class="layui-input" lay-verify="number">
+            </div>
+            <p>
+                客户旺旺
+            </p>
+            <div class="layui-form-item">
+                <input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
+                       class="layui-input">
+            </div>
+            <p>
+                工艺
+            </p>
+            <div class="layui-form-item" id='z4_craft'>
+                <div class="layui-input-block" style="display:inline-block;">
+                    配件：
+                    <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配葫芦针"
+                           title="配葫芦针">
+                    <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配棉绳"
+                           title="配棉绳">
+                    <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配尼龙绳"
+                           title="配尼龙绳">
+                    <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="穿尼龙绳"
+                           title="穿尼龙绳">
+                    <div class="layui-inline shengz scolor" style="width: 110px;display: none">
+                        <select class="select" name="shen_color">
+                            <option value="白色绳子">白色绳子</option>
+                            <option value="黑色绳子">黑色绳子</option>
+                            <option value="红色绳子">红色绳子</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <hr>
+            <div class="layui-form-item">
+                <button class="layui-btn" lay-submit="" lay-filter="acount_btn">计算</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+            <h2>计算结果-
+                <button type="button" class="layui-btn layui-btn-primary layui-btn-sm copyResult"
+                        onclick="copyResult()">点击复制
+                </button>
+            </h2>
+            <div>
+                <textarea rows="11" cols="75" id="span_result" readonly="readonly"></textarea>
+                <%@include file="../acountExpressFee.jsp" %>
+            </div>
+            <div>
+                <table class="layui-hide" id="priceTable" lay-filter="priceTable"></table>
+            </div>
+        </form>
+    </div>
+    <div class="right_div" style="margin-left:50px;">
+        <div class="layui-carousel" id="test1">
+            <div carousel-item id="carousel"></div>
+            <br>
+            <div id="remark" style="font-size:20px;color:red"></div>
+        </div>
+    </div>
+</div>
+</body>
+<%@include file="/views/copyResult.jsp" %>
+<script>
+    layui.use(['table', 'form', 'carousel'], function () {
+        var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
+        var carousel = layui.carousel;
+        var table = layui.table;
+
+
+        //建造实例
+        ins = carousel.render({});
+        var html = " ";
+        var remark = " ";
+        // 清空轮播图
+        $("#carousel").empty();
+        $("#remark").empty();
+        $(".ui_feb").show();
+        $(".ui_feb select").attr("disabled", false);
+        $.ajax({
+            url: "${pageContext.request.contextPath}/getImgs",
+            type: "GET",
+            data: {
+                proTypeValue: $("#proTypeValue").val(),
+                kindValue: $('input[name="kindValue"]').val()
+            },
+            success: function (result) {
+                for (let i = 0; i < result.length; i++) {
+                    // 只留一个remark
+                    remark = "";
+                    html += '<div><img style="width:' + result[0].imgWidth + 'px" src="' + result[i].imgUrl + '"></div>';
+                    remark += '<div><span>' + result[i].remark + '<span/></div>';
+                }
+                $("#carousel").append(html);
+                // 如果没有说明，就不显示null
+                if (remark.indexOf("null") < 0) {
+                    $("#remark").append(remark);
+                }
+                // 如果没有轮播图就隐藏
+                if (result.length == 0) {
+                    document.getElementById("test1").style.display = "none";   //隐藏
+                } else {
+                    document.getElementById("test1").style.display = "block";   //显示
+                    ins.reload({
+                        elem: '#test1',
+                        width: result[0].imgWidth,  //设置容器宽度
+                        height: result[0].imgHeight
+                    });
+                }
+            }
+        });
+        form.on('checkbox(peijian)', function (data) {
+            let peijiansize = $(".peijian:checked").length;
+            if (peijiansize > 1) {
+                $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
+                $(data.elem).prop("checked", false);
+                layer.msg('配件只能选择一种！', {offset: ['300px', '300px']}, {icon: 5});
+                return false;
+            }
+            if (data.value == "配尼龙绳" || data.value == "穿尼龙绳") {
+                if ($(data.elem).is(":checked")) {
+                    $("#z4_craft .shengz").show();
+                    $("#z4_craft .shengz").prop("disabled", false);
+                } else {
+                    $("#z4_craft .shengz").hide();
+                    $("#z4_craft .shengz").prop("disabled", true);
+                }
+            }
+        })
+
+        // 点击计算，计算价格
+        form.on('submit(acount_btn)', function (data) {
+            var number = $("#number").val();
+            var size = $("#size").val();
+            var count = $("#count").val();
+            var kind = $("#ui_bq_name option:selected").text();
+            var craft = [];
+            if (size == "") {
+                layer.msg('请填写尺寸！', {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            // if ((size.split("*")[0] < 4 || size.split("*")[1] < 4)) {
+            //     layer.msg("【镭射吊牌】尺寸不能小于4*4 cm", {offset: ['300px', '300px']}, function () {
+            //     });
+            //     return false;
+            // }
+            // if ((size.split("*")[0] > 30 || size.split("*")[1] > 30)) {
+            //     layer.msg("【镭射吊牌】尺寸不能大于30*30 cm", {offset: ['300px', '300px']}, function () {
+            //     });
+            //     return false;
+            // }
+            $("input:checkbox[name='craft']:checked").each(function (i) {
+                // 没有被禁用的工艺加到arr中
+                if (!$(this).is(':disabled')) {
+                    craft.push($(this).val());
+                }
+            });
+            $.ajax({
+                url: "${path}/getThanSum",
+                type: "GET",
+                data: $(".big_box form").serialize(),
+                success: function (result) {
+                    if (result.code == 100) {
+                        layer.msg(result.msg, {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    }
+                    var data = result.data.proList;
+
+                    var span_result = '镭射吊牌 - ' + kind + ' - ' + size + ' CM (同款内容)\n';
+
+                    span_result += `工艺：` + craft.join(",") + '\n';
+
+                    if (number > 1) {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 各' + data[i].count + "张，共" + data[i].price + "元" + '\n'
+                            data[i].number = number;
+                        }
+                    } else {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 ' + data[i].count + "张，共" + data[i].price + "元" + '\n'
+                            data[i].number = number;
+                        }
+                    }
+
+                    span_result += '包邮，免费设计呢~（偏远地区需补邮费）'
+                    $("#span_result").val(span_result);
+
+                    //计算完自动复制文本
+                    var e = document.getElementById("span_result");//对象是content
+                    if (e.value != "") {
+                        e.select();//选择对象
+                        document.execCommand("Copy");//执行浏览器复制命令
+                    }
+
+                    //生成表格
+                    table.render({
+                        elem: '#priceTable',
+                        even: true, //隔行变色
+                        data: data, // 赋值已知数据
+                        width: 500,
+                        cols: [[
+                            {
+                                field: 'number',
+                                width: '12%',
+                                align: "center",
+                                title: '款数'
+                            }, {
+                                field: 'count',
+                                width: '16%',
+                                align: "center",
+                                title: '数量'
+                            }, {
+                                field: 'price',
+                                width: '16%',
+                                align: "center",
+                                title: '报价'
+                            }, {
+                                field: 'wangwang',
+                                align: "center",
+                                width: '16%',
+                                title: '折扣价'
+                            }, {
+                                field: 'wangwang',
+                                align: "center",
+                                width: '19%',
+                                title: '跳楼价'
+                            }, {
+                                field: 'weight',
+                                width: '21%',
+                                align: "center",
+                                title: '重量（kg）'
+                            }
+                        ]],
+                        done: function () {
+                        }
+                    });
+                }
+            });
+            return false;
+        });
+    });
+</script>
+</html>
\ No newline at end of file