3：新增贺卡工艺配件尺寸价格4：新增餐垫纸工艺5：新增产品

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

@@ -1003,6 +1003,15 @@ public class ProductService {
                             if ("8*12".equals(dto.getToothpick_size())) {
                                 carft_base_price = 19;
                             }
+                            if ("17*6".equals(dto.getToothpick_size())) {
+                                carft_base_price = 30;
+                            }
+                            if ("12*7".equals(dto.getToothpick_size())) {
+                                carft_base_price = 17;
+                            }
+                            if ("12*10".equals(dto.getToothpick_size())) {
+                                carft_base_price = 23;
+                            }
                             carft_price += carft_base_price * Math.ceil(product.getCount() / 1000.0);
                         }
                         //腰封的模切费单独计算
@@ -3982,6 +3991,7 @@ public class ProductService {
                 return priceList;
             case "餐垫纸":
                 priceList = new PriceUtils().getPlaceMatPrice(kind, length, width, count);
+                craft_list = dto.getCraft() != null ? Arrays.asList(dto.getCraft()) : new ArrayList<>();
                 // 根据款数重新算价格
                 for (Product product : priceList) {
                     if (kind.equals("0")) {
@@ -3989,8 +3999,12 @@ public class ProductService {
                     } else {
                         wei = 0.05;
                     }
+
                     product.setWeight(df.format(length * width * product.getCount() / 10000 * number * wei));
                     product.setPrice(Math.ceil(product.getPrice() * number * 1.3));
+                    if (craft_list.contains("异形模切")) {
+                        product.setPrice(Math.ceil(product.getPrice() * 1.9));
+                    }
                 }
                 return priceList;
             case "节目单":
@@ -4754,12 +4768,51 @@ public class ProductService {
                 return getJiadaoPrice(dto, length, width);
             case "特光不干胶":
                 return getLightPrice(dto, length, width);
+            case "淋膜纸":
+                return getLingmoPrice(dto, width, length);
             default:
                 break;
         }
         return null;
     }
 
+    private List<Product> getLingmoPrice(Product dto, Double width, Double length) {
+        List<String> carftList = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
+        String[] sizes = {"21*29", "36*24", "36*26", "42*28.5"};
+        double[][] prices = new double[][]{
+                {1150, 1950, 1950, 3300, 6150},
+                {1350, 2050, 2550, 4050, 7200},
+                {1450, 2100, 2650, 4250, 7500},
+                {1700, 2750, 3600, 6000, 11000},
+        };
+        int count_list[] = {10000, 20000, 30000, 50000, 100000};
+        int current_int = Arrays.binarySearch(sizes, dto.getSize());
+        double[] prices_list = prices[current_int];
+        List<Product> list = new ArrayList<>();
+        for (int i = 0; i < count_list.length; i++) {
+            double price = prices_list[i];
+
+            int item_count = count_list[i];
+
+            if (item_count < dto.getCount()) {
+                continue;
+            }
+            if (list.size() > 2) {
+                break;
+            }
+            double craft_price = 0;
+            if (dto.getCo_number() >= 2) {
+                craft_price = 150 * (dto.getCo_number() - 1);
+            }
+            Product pro = new Product();
+            pro.setCount(item_count);
+            pro.setWeight(df.format(0.005 * item_count * dto.getNumber()));
+            pro.setPrice(Math.ceil(price * dto.getNumber() + craft_price));
+            list.add(pro);
+        }
+        return list;
+    }
+
     private List<Product> getLightPrice(Product dto, Double width, Double length) {
         List<String> carftList = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft());
         double[][] prices = new double[][]{

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

@@ -2537,6 +2537,8 @@ public class PriceUtils {
                 pro.setPrice(Math.ceil(priceArr[i] * beishu - countArr[i] * 0.02));
             } else if ("0".equals(kind)) {// 80克
                 pro.setPrice(Math.ceil(priceArr[i] * beishu));
+            } else if ("2".equals(kind)) {// 100克
+                pro.setPrice(Math.ceil(priceArr[i] * beishu * 1.5));
             }
             list.add(pro);
         }

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

@@ -813,6 +813,9 @@
                                 <option value="10*5">10*5CM</option>
                                 <option value="12*5">12*5CM</option>
                                 <option value="12*6">12*6CM</option>
+                                <option value="12*7">12*7CM</option>
+                                <option value="17*6">17*6CM</option>
+                                <option value="12*10">12*10CM</option>
                             </select>
                         </div>
                         <input type="checkbox" class="peijian" name="craft" lay-filter="z4PeiJian" value="配棉绳"

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

@@ -0,0 +1,302 @@
+<%@ 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>
+<style>
+    .craft_layout .layui-form-select .layui-edge {
+        right: 20px;
+    }
+</style>
+<body>
+<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">白牛皮纸</option>
+                    <option value="2">黄牛皮纸</option>
+                </select>
+            </div>
+            <p>
+                尺寸(CM/厘米)
+            </p>
+            <div class="layui-form-item" id="ui_size">
+                <select name="size" class="select" id="size">
+                    <option value="21*29">21*29</option>
+                    <option value="36*24">36*24</option>
+                    <option value="36*26">36*26</option>
+                    <option value="42*28.5">42*28.5</option>
+                </select>
+            </div>
+
+            <p>
+                数量(个)
+            </p>
+            <div class="layui-form-item">
+                <select name="count" class="select">
+                    <option value="10000">10000</option>
+                    <option value="20000">20000</option>
+                    <option value="30000">30000</option>
+                    <option value="50000">50000</option>
+                    <option value="100000">100000</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 craft_layout">
+                <div class="layui-input-block">
+                    印面：
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="单面" title="单面" checked>
+                </div>
+                <div class="layui-input-block">
+                    裁切工艺：
+                    <input type="checkbox" name="craft" lay-filter="ui_craft" value="直角裁切" title="直角裁切" checked>
+                </div>
+                <div class="layui-input-block">
+                    印色：
+                    <div class="layui-inline" style="width: 100px">
+                        <select name="co_number" class="select">
+                            <option value=""></option>
+                            <option value="1">单色</option>
+                            <option value="2">双色</option>
+                            <option value="3">三色</option>
+                            <option value="4">四色</option>
+                            <option value="5">五色</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:100%;height: 100%;object-fit: contain" 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(ui_craft)', function (data) {
+            let craft_list = [];
+            $("input[name='craft']:checked").each(function () {
+                    if (!$(this).is(':disabled')) {
+                        craft_list.push($(this).val());
+                    }
+                }
+            );
+            if (craft_list.indexOf("单面") == -1) {
+                $(data.elem).prop("checked", true);
+                layer.msg("印面不能取消选择", {offset: ['300px', '300px']}, function () {
+                });
+                form.render();
+                return false;
+            }
+            if (craft_list.indexOf("直角裁切") == -1) {
+                $(data.elem).prop("checked", true);
+                layer.msg("直角裁切不能取消选择", {offset: ['300px', '300px']}, function () {
+                });
+                form.render();
+                return false;
+            }
+        })
+
+        // 点击计算，计算价格
+        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 = [];
+            let coNumber = $("select[name='co_number'] option:selected").val()
+            if(coNumber == ""){
+                layer.msg("请选择印色数量", {offset: ['300px', '300px']}, function () {
+                });
+            }
+            $("input:checkbox[name='craft']:checked").each(function (i) {
+                // 没有被禁用的工艺加到arr中
+                if (!$(this).is(':disabled')) {
+                    craft.push($(this).val());
+                }
+            });
+            craft.push($("select[name='co_number'] option:selected").text());
+            $.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>

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

@@ -1,21 +1,21 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
+         pageEncoding="UTF-8" %>
-	<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="UTF-8">
+    <meta charset="UTF-8">
-<title>Insert title here</title>
+    <title>Insert title here</title>
- <%@include file="/views/common.jsp"%>
+    <%@include file="/views/common.jsp" %>
 </head>
 <!-- 餐垫纸 -->
 <style>
-.edge .layui-edge{
+    .edge .layui-edge {
-	right:10px;
+        right: 10px;
-}
+    }
 </style>
 <body>
-	<div class="big_box">
+<div class="big_box">
     <div class="left_div">
         <h1 class="h2">餐垫纸</h1> <span style="color:red;font-weight:700;"></span>
         <hr>
@@ -27,7 +27,8 @@
             <div class="layui-form-item">
                 <select name="kindValue" id="kindValue" lay-filter="kindValue" class="select">
                     <option value="0">80克双胶纸</option>
-						<option value="1">60克双胶纸</option>
+                    <%--                    <option value="1">60克双胶纸</option>--%>
+                    <option value="2">100克双胶纸</option>
                 </select>
             </div>
             <!-- <p>
@@ -44,7 +45,8 @@
                 尺寸(CM/厘米) <span style="font-size:14px;color:red">输入格式: 长 * 宽</span>
             </p>
             <div class="layui-form-item">
-					<input type="text" placeholder="格式:长*宽" name="size" id="size" class="layui-input" lay-verify="required"  autocomplete="off">
+                <input type="text" placeholder="格式:长*宽" name="size" id="size" class="layui-input" lay-verify="required"
+                       autocomplete="off">
             </div>
             <p>
                 数量（个）
@@ -63,46 +65,58 @@
                 款数
             </p>
             <div class="layui-form-item">
-					<input type="text" placeholder="请输入整数" autocomplete="off" name="number" id="number" value="1" class="layui-input" lay-verify="number">
+                <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">
+                <input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
+                       class="layui-input">
+            </div>
+            <p>工艺</p>
+            <div class="layui-inline">
+                裁切方式：
+                <input type="checkbox" name="craft" lay-filter="craft" value="直角裁切" title="直角裁切" checked>
+                <input type="checkbox" name="craft" lay-filter="craft" value="异形模切" title="异形模切">
             </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>
+            <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"%>
+                <%@include file="../acountExpressFee.jsp" %>
             </div>
             <!--<h2>下单备注-<button type="button" class="layui-btn layui-btn-primary layui-btn-sm copyResult" onclick="copyBz()">点击复制</button></h2>
             <div>
                 <textarea rows="5" cols="75" id="bz_result" readonly="readonly"></textarea>
             </div>-->
-				<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 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>
+</div>
 </body>
 <script src="../../js/carousel.js" charset="utf-8"></script>
-<%@include file="/views/copyResult.jsp"%>
+<%@include file="/views/copyResult.jsp" %>
 <script>
-layui.use(['table','form','carousel'], function(){    
+    layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
         var table = layui.table;
@@ -110,41 +124,70 @@ layui.use(['table','form','carousel'], function(){
         //建造实例
         ins = carousel.render({});
 
+        form.on("checkbox(craft)", function (data) {
+            let craft_list = [];
+            $("input:checkbox[name='craft']:checked").each(function (i) {
+                if (!$(this).is(':disabled')) {
+                    craft_list.push($(this).val());
+                }
+            });
+            const carft_list1 = ["直角裁切", "异形模切"];
+            const carft1 = carft_list1.filter(craft => craft_list.includes(craft));
+            if (carft1.length > 1) {
+                $(data.elem).prop("checked", false);
+                layer.msg("直角裁切-异形模切不能同时选择", {offset: ['300px', '300px']}, function () {
+                });
+                form.render();
+                return false;
+            }
+        })
+
         // 点击计算，计算价格
-	form.on('submit(acount_btn)', function(data) {
+        form.on('submit(acount_btn)', function (data) {
             var kindData = {
-			0 :"80克双胶纸",
+                0: "80克双胶纸",
-			1 :"60克双胶纸"
+                1: "60克双胶纸",
+                2: "100克双胶纸"
             };
             var kind = kindData[$("#kindValue").val()];
             var number = $("#number").val();
             var size = $("#size").val();
+            let craft_list = [];
+            $("input:checkbox[name='craft']:checked").each(function (i) {
+                if (!$(this).is(':disabled')) {
+                    craft_list.push($(this).val());
+                }
+            });
             if (size.split("*")[0] < 20 || size.split("*")[1] < 20) {
-			layer.msg("餐垫纸尺寸不能小于20 cm",{offset:['300px','300px']},function(){});
+                layer.msg("餐垫纸尺寸不能小于20 cm", {offset: ['300px', '300px']}, function () {
+                });
                 return false;
             }
             if ((size.split("*")[0] > 115 || size.split("*")[1] > 85) && (size.split("*")[0] > 85 || size.split("*")[1] > 115)) {
-			layer.msg("餐垫纸尺寸不能超过115*85 cm",{offset:['300px','300px']},function(){});
+                layer.msg("餐垫纸尺寸不能超过115*85 cm", {offset: ['300px', '300px']}, function () {
+                });
                 return false;
             }
             $.ajax({
-			url : "${path}/getThanSum",
+                url: "${path}/getThanSum",
-			type : "GET",
+                type: "GET",
-			data : $(".big_box form").serialize(),
+                data: $(".big_box form").serialize(),
-			success : function(result) {
+                success: function (result) {
-				if(result.code == 100){
+                    if (result.code == 100) {
-					layer.msg(result.msg,{offset:['300px','300px']},function(){});
+                        layer.msg(result.msg, {offset: ['300px', '300px']}, function () {
+                        });
                         return false;
                     }
                     var data = result.data.proList;
 
-				var span_result ="餐垫纸 - " + kind +' - '+ size +' 厘米 -(同款内容)\n';
+                    var span_result = "餐垫纸 - " + kind + ' - ' + size + ' 厘米 -(同款内容)\n';
-				if(number > 1){
+                    span_result += "工艺：" + craft_list.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{
+                    } else {
                         for (let i = 0; i < data.length; i++) {
                             span_result += number + '款 ' + data[i].count + "张，共" + data[i].price + "元" + '\n'
                             data[i].number = number;
@@ -154,9 +197,9 @@ layui.use(['table','form','carousel'], function(){
                     $("#span_result").val(span_result);
 
                     var count = $("#count option:selected").val();
-				getRemark($("#proTypeValue").val(), size, count+"张", kind, number, "", "");
+                    getRemark($("#proTypeValue").val(), size, count + "张", kind, number, "", "");
                     //计算完自动复制文本
-				var e=document.getElementById("span_result");//对象是content
+                    var e = document.getElementById("span_result");//对象是content
                     if (e.value != "") {
                         e.select();//选择对象
                         document.execCommand("Copy");//执行浏览器复制命令
@@ -164,26 +207,26 @@ layui.use(['table','form','carousel'], function(){
 
                     //生成表格
                     table.render({
-					elem : '#priceTable',
+                        elem: '#priceTable',
-					even : true, //隔行变色
+                        even: true, //隔行变色
-					data : data, // 赋值已知数据
+                        data: data, // 赋值已知数据
-					width : 500,
+                        width: 500,
-					cols : [ [ 
+                        cols: [[
                             {
-							field : 'number',
+                                field: 'number',
-							width : '12%',
+                                width: '12%',
-							align : "center",
+                                align: "center",
-							title : '款数'
+                                title: '款数'
-						},{
+                            }, {
-							field : 'count',
+                                field: 'count',
-							width : '16%',
+                                width: '16%',
-							align : "center",
+                                align: "center",
-							title : '数量'
+                                title: '数量'
-						},{
+                            }, {
-							field : 'price',
+                                field: 'price',
-							width : '16%',
+                                width: '16%',
-							align : "center",
+                                align: "center",
-							title : '报价'
+                                title: '报价'
                             },/* {
 							field : 'wangwang',
 							align : "center",
@@ -201,12 +244,12 @@ layui.use(['table','form','carousel'], function(){
 								return Math.ceil(d.price * 0.96)
 							} 
 						}, */{
-							field : 'weight',
+                                field: 'weight',
-							width : '21%',
+                                width: '21%',
-							align : "center",
+                                align: "center",
-							title : '重量（kg）'
+                                title: '重量（kg）'
                             }
-					] ],
+                        ]],
                         done: function () {
                         }
                     });
@@ -214,7 +257,7 @@ layui.use(['table','form','carousel'], function(){
             });
             return false;
         });
-});
+    });
 
 </script>
 </html>