zhuyiyi hai 5 meses
pai
achega
d55859d479
Modificáronse 61 ficheiros con 2039 adicións e 1932 borrados
  1. 4 4
      src/main/java/lingtao/net/util/PriceUtils.java
  2. 195 182
      src/main/webapp/views/product/acidTags.jsp
  3. 2 2
      src/main/webapp/views/product/angingCloth.jsp
  4. 2 2
      src/main/webapp/views/product/antifake.jsp
  5. 2 2
      src/main/webapp/views/product/banqi.jsp
  6. 2 2
      src/main/webapp/views/product/blackCard.jsp
  7. 2 2
      src/main/webapp/views/product/canopy.jsp
  8. 328 316
      src/main/webapp/views/product/canvas.jsp
  9. 2 2
      src/main/webapp/views/product/card.jsp
  10. 2 2
      src/main/webapp/views/product/chaqi.jsp
  11. 2 2
      src/main/webapp/views/product/chetie.jsp
  12. 2 2
      src/main/webapp/views/product/clothes.jsp
  13. 2 2
      src/main/webapp/views/product/coaster.jsp
  14. 2 2
      src/main/webapp/views/product/colorEnvelope.jsp
  15. 2 2
      src/main/webapp/views/product/copyPaper.jsp
  16. 32 20
      src/main/webapp/views/product/coupon.jsp
  17. 2 2
      src/main/webapp/views/product/credentials.jsp
  18. 2 2
      src/main/webapp/views/product/cupHolder.jsp
  19. 4 4
      src/main/webapp/views/product/cupSet.jsp
  20. 2 2
      src/main/webapp/views/product/deskSticker.jsp
  21. 2 2
      src/main/webapp/views/product/diploma.jsp
  22. 2 2
      src/main/webapp/views/product/disu.jsp
  23. 2 2
      src/main/webapp/views/product/envelope.jsp
  24. 2 2
      src/main/webapp/views/product/fan.jsp
  25. 2 2
      src/main/webapp/views/product/fgq.jsp
  26. 2 2
      src/main/webapp/views/product/fileCover.jsp
  27. 333 316
      src/main/webapp/views/product/flags.jsp
  28. 6 6
      src/main/webapp/views/product/flyer.jsp
  29. 2 2
      src/main/webapp/views/product/freehand.jsp
  30. 4 4
      src/main/webapp/views/product/handBag.jsp
  31. 2 2
      src/main/webapp/views/product/hykkt.jsp
  32. 2 2
      src/main/webapp/views/product/insertCard.jsp
  33. 2 2
      src/main/webapp/views/product/katie.jsp
  34. 181 170
      src/main/webapp/views/product/kzt.jsp
  35. 2 2
      src/main/webapp/views/product/landa.jsp
  36. 4 4
      src/main/webapp/views/product/leiTag.jsp
  37. 4 3
      src/main/webapp/views/product/lsz.jsp
  38. 2 2
      src/main/webapp/views/product/medal.jsp
  39. 4 4
      src/main/webapp/views/product/metal.jsp
  40. 2 2
      src/main/webapp/views/product/msd.jsp
  41. 4 4
      src/main/webapp/views/product/notePaper.jsp
  42. 2 2
      src/main/webapp/views/product/orders.jsp
  43. 2 2
      src/main/webapp/views/product/packingBox.jsp
  44. 186 175
      src/main/webapp/views/product/paperCup.jsp
  45. 2 2
      src/main/webapp/views/product/pet.jsp
  46. 419 398
      src/main/webapp/views/product/pictureAlbum.jsp
  47. 2 2
      src/main/webapp/views/product/placeMat.jsp
  48. 6 6
      src/main/webapp/views/product/poster.jsp
  49. 2 2
      src/main/webapp/views/product/programCard.jsp
  50. 2 2
      src/main/webapp/views/product/pvcCard.jsp
  51. 2 2
      src/main/webapp/views/product/pvcfigure.jsp
  52. 3 3
      src/main/webapp/views/product/rollLabel.jsp
  53. 2 2
      src/main/webapp/views/product/roomCard.jsp
  54. 234 224
      src/main/webapp/views/product/slq.jsp
  55. 2 2
      src/main/webapp/views/product/specialCard2.jsp
  56. 2 2
      src/main/webapp/views/product/stickers.jsp
  57. 2 2
      src/main/webapp/views/product/tablecolth.jsp
  58. 4 5
      src/main/webapp/views/product/tagClothes.jsp
  59. 2 2
      src/main/webapp/views/product/warmSticker.jsp
  60. 2 2
      src/main/webapp/views/product/waterGauge.jsp
  61. 2 2
      src/main/webapp/views/product/weddingCard.jsp

+ 4 - 4
src/main/java/lingtao/net/util/PriceUtils.java

@@ -2322,7 +2322,7 @@ public class PriceUtils {
                 // 根据款数重新算价格
                 for (Product product : list) {
                     product.setWeight(df.format(length * width * product.getCount() / 10000 * 0.3 * number));
-                    product.setPrice(Math.floor(product.getPrice() * number));
+                    product.setPrice(Math.ceil(product.getPrice() * number));
                 }
             } else if ("双面印刷".equals(craftShua)) {
                 // 数量
@@ -2341,7 +2341,7 @@ public class PriceUtils {
                 }
                 // 根据款数重新算价格
                 for (Product product : list) {
-                    product.setPrice(Math.floor(product.getPrice() * number));
+                    product.setPrice(Math.ceil(product.getPrice() * number));
                 }
             }
         } else {
@@ -2398,7 +2398,7 @@ public class PriceUtils {
                 price = fixPrice + (num - 5 > 0 ? num - 5 : 0) * zhang + designFee * number + 0.1 * count * number;
                 Product dto = new Product();
                 dto.setCount(count);
-                dto.setPrice(price);
+                dto.setPrice(Math.ceil(price));
                 list.add(dto);
             } else {
                 // 数量
@@ -2418,7 +2418,7 @@ public class PriceUtils {
                 // 根据款数重新算价格
                 for (Product product : list) {
                     product.setWeight(df.format(weight));
-                    product.setPrice(Math.floor(product.getPrice() * number));
+                    product.setPrice(Math.ceil(product.getPrice() * number));
                 }
             }
         }

+ 195 - 182
src/main/webapp/views/product/acidTags.jsp

@@ -1,186 +1,199 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+         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"%>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
 </head>
 <!-- 硫酸纸吊牌 -->
 <style>
-.layui-form-checkbox[lay-skin=primary] i{
-	border-radius: 50px;
-	width: 18px;
-	height: 18px;
-	line-height: 18px;
-	margin-top:3px;
-}
-.layui-form-checkbox[lay-skin=primary] span{
-	color:black;
-	margin-top:3px;
-	font-size: 14px;
-}
+    .layui-form-checkbox[lay-skin=primary] i {
+        border-radius: 50px;
+        width: 18px;
+        height: 18px;
+        line-height: 18px;
+        margin-top: 3px;
+    }
+
+    .layui-form-checkbox[lay-skin=primary] span {
+        color: black;
+        margin-top: 3px;
+        font-size: 14px;
+    }
 </style>
 <body>
-	<div class="big_box">
-		<div class="left_div">
-			<h1 class="h2">硫酸纸吊牌</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>
-					尺寸(CM/厘米) <span style="font-size: 14px; color: red">输入格式: 长 * 宽</span>
-				</p>
-				<div class="layui-form-item">
-					<span style="font-size: 14px; color: red">135克硫酸纸尺寸</span>
-					<input type="text" name="size"  placeholder="135克硫酸纸尺寸" id="size" lay-verify="required"  class="layui-input" autocomplete="off">
-					<span style="font-size: 14px; color: red">350克铜版纸尺寸</span>
-					<input type="text" name="size1" placeholder="350克铜版纸尺寸" id="size1" lay-verify="required" class="layui-input" autocomplete="off">
-				</div>	
-				<p>
-					数量(套)
-				</p>
-				<div class="layui-form-item">
-					<select name="count" class="select" id="count">
-						<option value="1000">1000</option>
-						<option value="2000">2000</option>
-						<option value="5000">5000</option>
-						<option value="10000">10000</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-input-block">
-					<input type="radio" name="craftQie" lay-filter="craftQie" value="直角裁切" title="直角裁切" checked>
-				</div>	
-				<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>
-				<!--<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>
-					<table class="layui-hide" id="priceTable" lay-filter="priceTable"></table>
-				</div>
-			</form>
-		</div>
-		<div class="right_div">
-			<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 class="big_box">
+    <div class="left_div">
+        <h1 class="h2">硫酸纸吊牌</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>
+                尺寸(CM/厘米) <span style="font-size: 14px; color: red">输入格式: 长 * 宽</span>
+            </p>
+            <div class="layui-form-item">
+                <span style="font-size: 14px; color: red">135克硫酸纸尺寸</span>
+                <input type="text" name="size" placeholder="135克硫酸纸尺寸" id="size" lay-verify="required"
+                       class="layui-input" autocomplete="off">
+                <span style="font-size: 14px; color: red">350克铜版纸尺寸</span>
+                <input type="text" name="size1" placeholder="350克铜版纸尺寸" id="size1" lay-verify="required"
+                       class="layui-input" autocomplete="off">
+            </div>
+            <p>
+                数量(套)
+            </p>
+            <div class="layui-form-item">
+                <select name="count" class="select" id="count">
+                    <option value="1000">1000</option>
+                    <option value="2000">2000</option>
+                    <option value="5000">5000</option>
+                    <option value="10000">10000</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-input-block">
+                <input type="radio" name="craftQie" lay-filter="craftQie" value="直角裁切" title="直角裁切" checked>
+            </div>
+            <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>
+            <!--<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>
+                <table class="layui-hide" id="priceTable" lay-filter="priceTable"></table>
+            </div>
+        </form>
+    </div>
+    <div class="right_div">
+        <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>
 <script src="../../js/carousel.js" charset="utf-8"></script>
-<%@include file="/views/copyResult.jsp"%>
+<%@include file="/views/copyResult.jsp" %>
 <script>
-	layui.use([ 'table', 'form' ], function() {
-		var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
-		var table = layui.table;
-		
-		// 点击计算,计算价格
-		form.on('submit(acount_btn)', function(data) {
-			var craftQie  = [$('input[name="craftQie"]:checked').val()];
-			var size   = $("#size").val();
-			var size1  = $("#size1").val();
-			var number = $("#number").val();
-			var count = $("#count option:selected").text();
-			if ((size.split("*")[0] < 5 || size.split("*")[1] < 5) && (size.split("*")[0] < 3 || size.split("*")[1] < 3)) {
-				layer.msg("尺寸不能小于5*3 cm",{offset:['300px','300px']},function(){});
-				return false;
-			}
-			if ((size1.split("*")[0] < 5 || size1.split("*")[1] < 5) && (size1.split("*")[0] < 3 || size1.split("*")[1] < 3)) {
-				layer.msg("尺寸不能小于5*3 cm",{offset:['300px','300px']},function(){});
-				return false;
-			}
-			if ((size.split("*")[0] > 9 || size.split("*")[1] > 5.4) && (size.split("*")[0] > 5.4 || size.split("*")[1] > 9)) {
-				layer.msg("尺寸不能大于9*5.4 cm",{offset:['300px','300px']},function(){});
-				return false;
-			}
-			if ((size1.split("*")[0] > 9 || size1.split("*")[1] > 5.4) && (size1.split("*")[0] > 5.4 || size1.split("*")[1] > 9)) {
-				layer.msg("尺寸不能大于9*5.4 cm",{offset:['300px','300px']},function(){});
-				return false;
-			}
-			$.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 = '硫酸纸吊牌 - ' + '135克硫酸纸尺寸' + size + 'cm - ' + '350克铜版纸尺寸' + size1 + 'cm\n' + "工艺: " + craftQie + "\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").val(span_result);	
+    layui.use(['table', 'form'], function () {
+        var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
+        var table = layui.table;
 
-					getRemark($("#proTypeValue").val(), size, count+"套", "单色", number, craftQie, "");
-					//计算完自动复制文本
-					var e = document.getElementById("span_result");//对象是content
-					if (e.value != "") {
-						e.select();//选择对象
-						document.execCommand("Copy");//执行浏览器复制命令
-					}
+        // 点击计算,计算价格
+        form.on('submit(acount_btn)', function (data) {
+            var craftQie = [$('input[name="craftQie"]:checked').val()];
+            var size = $("#size").val();
+            var size1 = $("#size1").val();
+            var number = $("#number").val();
+            var count = $("#count option:selected").text();
+            if ((size.split("*")[0] < 5 || size.split("*")[1] < 5) && (size.split("*")[0] < 3 || size.split("*")[1] < 3)) {
+                layer.msg("尺寸不能小于5*3 cm", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            if ((size1.split("*")[0] < 5 || size1.split("*")[1] < 5) && (size1.split("*")[0] < 3 || size1.split("*")[1] < 3)) {
+                layer.msg("尺寸不能小于5*3 cm", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            if ((size.split("*")[0] > 9 || size.split("*")[1] > 5.4) && (size.split("*")[0] > 5.4 || size.split("*")[1] > 9)) {
+                layer.msg("尺寸不能大于9*5.4 cm", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            if ((size1.split("*")[0] > 9 || size1.split("*")[1] > 5.4) && (size1.split("*")[0] > 5.4 || size1.split("*")[1] > 9)) {
+                layer.msg("尺寸不能大于9*5.4 cm", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            $.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;
 
-					//生成表格
-					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 : '报价'
-						},/* {
+                    var span_result = '硫酸纸吊牌 - ' + '135克硫酸纸尺寸' + size + 'cm - ' + '350克铜版纸尺寸' + size1 + 'cm\n' + "工艺: " + craftQie + "\n";
+                    if (number > 1) {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 各' + data[i].count + "套,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/套\n'
+                            data[i].number = number;
+                        }
+                    } else {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 ' + data[i].count + "套,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/套\n'
+                            data[i].number = number;
+                        }
+                    }
+
+                    $("#span_result").val(span_result);
+
+                    getRemark($("#proTypeValue").val(), size, count + "套", "单色", number, craftQie, "");
+                    //计算完自动复制文本
+                    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%',
@@ -191,18 +204,18 @@
 							width : '19%',
 							title : '跳楼价'
 						}, */{
-							field : 'weight',
-							width : '21%',
-							align : "center",
-							title : '重量(kg)'
-						} ] ],
-						done : function() {
-						}
-					});
-				}
-			});
-			return false;
-		});
-	});
+                            field: 'weight',
+                            width: '21%',
+                            align: "center",
+                            title: '重量(kg)'
+                        }]],
+                        done: function () {
+                        }
+                    });
+                }
+            });
+            return false;
+        });
+    });
 </script>
 </html>

+ 2 - 2
src/main/webapp/views/product/angingCloth.jsp

@@ -215,12 +215,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/antifake.jsp

@@ -207,12 +207,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n';
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n';
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/banqi.jsp

@@ -200,12 +200,12 @@ layui.use(['table','form','carousel'], function(){
 				
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
 						data[i].number = number;
 			        }   
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元"+ "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
 						data[i].number = number;
 			        }   
 				}

+ 2 - 2
src/main/webapp/views/product/blackCard.jsp

@@ -233,12 +233,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/canopy.jsp

@@ -270,12 +270,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 328 - 316
src/main/webapp/views/product/canvas.jsp

@@ -1,330 +1,342 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-	<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+         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"%>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
 </head>
 <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="帆布" />
-				<div class="layui-form-item">
-					<input type="radio" lay-filter="stickerKind" name="stickerKind" value="常规" title="常规" checked="checked">
-					<input type="radio" lay-filter="stickerKind" name="stickerKind" value="套餐" title="套餐">
-				</div>
-				<p> 
-					材质
-				</p>
-				<div class="layui-form-item">
-					<select name="ui_fb_name" id="ui_fb_name" lay-filter="ui_fb_name" class="select" lay-search>
-						<option value="1">露营布</option>
-						<option value="2">摆摊布</option>
-					</select>
-				</div>
-				<div class="ui_normal">
-					<p>
-						尺寸(CM/厘米)   <span style="font-size:14px;color:red">输入格式: 长 * 宽 </span>
-						<input type="checkbox" name="switchSize" class="switchSizeCoupon" lay-filter="switchSizeCoupon" title="自定义尺寸" lay-skin="primary">
-					</p>
-					<div class="layui-form-item ui_size">
-						<select name="size" id="ui_size" class="select">
-							<option value="100*45">100*45</option>
-							<option value="45*45">45*45</option>
-						</select>
-					</div>
-					<span class="ui_zdy_size" style="display:none">
+<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="帆布"/>
+            <div class="layui-form-item">
+                <input type="radio" lay-filter="stickerKind" name="stickerKind" value="常规" title="常规" checked="checked">
+                <input type="radio" lay-filter="stickerKind" name="stickerKind" value="套餐" title="套餐">
+            </div>
+            <p>
+                材质
+            </p>
+            <div class="layui-form-item">
+                <select name="ui_fb_name" id="ui_fb_name" lay-filter="ui_fb_name" class="select" lay-search>
+                    <option value="1">露营布</option>
+                    <option value="2">摆摊布</option>
+                </select>
+            </div>
+            <div class="ui_normal">
+                <p>
+                    尺寸(CM/厘米) <span style="font-size:14px;color:red">输入格式: 长 * 宽 </span>
+                    <input type="checkbox" name="switchSize" class="switchSizeCoupon" lay-filter="switchSizeCoupon"
+                           title="自定义尺寸" lay-skin="primary">
+                </p>
+                <div class="layui-form-item ui_size">
+                    <select name="size" id="ui_size" class="select">
+                        <option value="100*45">100*45</option>
+                        <option value="45*45">45*45</option>
+                    </select>
+                </div>
+                <span class="ui_zdy_size" style="display:none">
 						<input type="text" id="ui_zdy_size" placeholder="格式:长*宽" class="layui-input" autocomplete="off">
 					</span>
-					<p>
-						数量(个)
-					</p>
-					<div class="layui-form-item">
-						<input type="text" placeholder="请输入整数" autocomplete="off" name="count" class="layui-input" id="count">
-					</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>
-				</div>
-				<p>
-					客户旺旺
-				</p>
-				<div class="layui-form-item">
-					<input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang" class="layui-input">
-				</div>
-				<p>
-					工艺<span style="font-size:14px;color:red">木棍长度50cm</span>
-				</p>
-				<div class="layui-form-item">
-					<input type="checkbox" name="craft" value="封边" title="封边" lay-filter="craft">
-					<div class="layui-inline ui_feb" style="width:100px;display:none">
-						<select name="fb" class="select fb" lay-filter="fb">
-							<option value="1" selected>上封边</option>
-							<option value="2">下封边</option>
-							<option value="3">左封边</option>
-							<option value="4">右封边</option>
-							<option value="5">上下封边</option>
-							<option value="6">左右封边</option>
-						</select>
-					</div>
-			      	<input type="checkbox" name="craft" value="四角打孔" title="四角打孔" lay-filter="craft">
-			      	<input type="checkbox" name="craft" value="净裁" title="净裁" lay-filter="craft">
-			      	<input type="checkbox" name="craft" value="吊耳" title="吊耳" lay-filter="craft">
-			      	<span class="ui_normal">
+                <p>
+                    数量(个)
+                </p>
+                <div class="layui-form-item">
+                    <input type="text" placeholder="请输入整数" autocomplete="off" name="count" class="layui-input"
+                           id="count">
+                </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>
+            </div>
+            <p>
+                客户旺旺
+            </p>
+            <div class="layui-form-item">
+                <input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
+                       class="layui-input">
+            </div>
+            <p>
+                工艺<span style="font-size:14px;color:red">木棍长度50cm</span>
+            </p>
+            <div class="layui-form-item">
+                <input type="checkbox" name="craft" value="封边" title="封边" lay-filter="craft">
+                <div class="layui-inline ui_feb" style="width:100px;display:none">
+                    <select name="fb" class="select fb" lay-filter="fb">
+                        <option value="1" selected>上封边</option>
+                        <option value="2">下封边</option>
+                        <option value="3">左封边</option>
+                        <option value="4">右封边</option>
+                        <option value="5">上下封边</option>
+                        <option value="6">左右封边</option>
+                    </select>
+                </div>
+                <input type="checkbox" name="craft" value="四角打孔" title="四角打孔" lay-filter="craft">
+                <input type="checkbox" name="craft" value="净裁" title="净裁" lay-filter="craft">
+                <input type="checkbox" name="craft" value="吊耳" title="吊耳" lay-filter="craft">
+                <span class="ui_normal">
 			      		<input type="checkbox" name="craft" value="缝兜" title="缝兜" lay-filter="craft">
 			      	</span>
-			      	<input type="checkbox" name="craft" value="木棍" title="木棍" lay-filter="craft">
-				</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>
+                <input type="checkbox" name="craft" value="木棍" title="木棍" lay-filter="craft">
+            </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"%>
+<%@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();
-	$.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(switchSizeCoupon)', function(data) {
-		if(data.elem.checked){
-			$('.switchSizeCoupon').val("on")
-			$(".ui_zdy_size").show();
-			$("#ui_zdy_size").attr("name","size");
-			$(".ui_size").hide();
-			$("#ui_size").attr("name","");
-			$(".ui_zdy_size").find(":input").attr("disabled", false);
-			$(".ui_size").find(":input").attr("disabled", true);
-		} else {
-			$('.switchSizeCoupon').val("off")
-			$(".ui_size").show();
-			$("#ui_size").attr("name","size");
-			$(".ui_zdy_size").hide();
-			$("#ui_zdy_size").attr("name","");
-			$(".ui_size").find(":input").attr("disabled", false);
-			$(".ui_zdy_size").find(":input").attr("disabled", true);
-			// 恢复标准数量的时候会被禁用,加这个解决
-			form.render();
-		}
-	});
-	
-	form.on('checkbox(craft)', function(data){
-   		if($("input[name='craft']:checked").val() == "封边"){
-   			$(".ui_feb").show();
-   			$(".ui_feb select").attr("disabled", false);
-   		}else{
-   			$(".ui_feb").hide();
-   			$(".ui_feb select").attr("disabled", true);
-   		}
-   		form.render();
-   	});
-	
-	form.on('radio(stickerKind)', function(data) {
-		if(data.value == "常规"){
-			$(".ui_normal").show();
-			$(".ui_normal").find(":input").attr("disabled", false);
-		}else{
-			$(".ui_normal").hide();
-			$(".ui_normal").find(":input").attr("disabled", true);
-		}
-		form.render('radio');
-	});
-	
-	// 点击计算,计算价格
-	form.on('submit(acount_btn)', function(data) {
-		var number= $("#number").val();
-		var size  = $("#size").val();
-		var count = $("#count").val();
-		var kind = $("#kindValue option:selected").text();
-		var craft = $("input[name='craft']:checked").val();
-		var stickerKind = $("input[name='stickerKind']:checked").val();
-		if($("input[name='switchSize']:checked").val() == "on"){
-			if($("#ui_zdy_size").val().split("*")[0] < 25 || $("#ui_zdy_size").val().split("*")[1] < 25){
-				layer.msg('帆布最小尺寸25*25cm!',{offset:['300px','300px']},function(){});
-				return false;
-			}
-			if($("#ui_zdy_size").val().split("*")[0] > 140 && $("#ui_zdy_size").val().split("*")[1] > 140){
-				layer.msg('帆布尺寸超过140cm需要拼接!',{offset:['300px','300px']},function(){});
-			}
-		}
-		var craft = [];
-		$("input:checkbox[name='craft']:checked").each(function(i) {
-			// 没有被禁用的工艺加到arr中
-			if(!$(this).is(':disabled')){
-				craft.push($(this).val());
-			}
-		});
-		if(stickerKind == "常规"){
-			if(!count){
-				layer.msg('请填写数量!',{offset:['300px','300px']},function(){});
-				return false;
-			}
-		}
-		$.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;
-				if($("input[name='switchSize']:checked").val() == "on"){
-					size = $("#ui_zdy_size").val();
-				}else{
-					size = $("#ui_size option:selected").val();
-				}
-				var fb_name = $("#ui_fb_name option:selected").text();
-				
-				if(craft == "封边" || craft == "打孔"){
-					craft = craft + "绳子";
-				}
-				
-				var span_result = '帆布 - ' + fb_name + '-' +  craft + '-' ;
-				
-				if(stickerKind == "套餐"){
-					span_result += "套餐"+ data[0].price + "元\n150*60cm 2条\n130*60cm 2条\n";
-				}else{
-					span_result += size +' CM (同款内容)\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;
-	});
-});
+    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();
+        $.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(switchSizeCoupon)', function (data) {
+            if (data.elem.checked) {
+                $('.switchSizeCoupon').val("on")
+                $(".ui_zdy_size").show();
+                $("#ui_zdy_size").attr("name", "size");
+                $(".ui_size").hide();
+                $("#ui_size").attr("name", "");
+                $(".ui_zdy_size").find(":input").attr("disabled", false);
+                $(".ui_size").find(":input").attr("disabled", true);
+            } else {
+                $('.switchSizeCoupon').val("off")
+                $(".ui_size").show();
+                $("#ui_size").attr("name", "size");
+                $(".ui_zdy_size").hide();
+                $("#ui_zdy_size").attr("name", "");
+                $(".ui_size").find(":input").attr("disabled", false);
+                $(".ui_zdy_size").find(":input").attr("disabled", true);
+                // 恢复标准数量的时候会被禁用,加这个解决
+                form.render();
+            }
+        });
+
+        form.on('checkbox(craft)', function (data) {
+            if ($("input[name='craft']:checked").val() == "封边") {
+                $(".ui_feb").show();
+                $(".ui_feb select").attr("disabled", false);
+            } else {
+                $(".ui_feb").hide();
+                $(".ui_feb select").attr("disabled", true);
+            }
+            form.render();
+        });
+
+        form.on('radio(stickerKind)', function (data) {
+            if (data.value == "常规") {
+                $(".ui_normal").show();
+                $(".ui_normal").find(":input").attr("disabled", false);
+            } else {
+                $(".ui_normal").hide();
+                $(".ui_normal").find(":input").attr("disabled", true);
+            }
+            form.render('radio');
+        });
+
+        // 点击计算,计算价格
+        form.on('submit(acount_btn)', function (data) {
+            var number = $("#number").val();
+            var size = $("#size").val();
+            var count = $("#count").val();
+            var kind = $("#kindValue option:selected").text();
+            var craft = $("input[name='craft']:checked").val();
+            var stickerKind = $("input[name='stickerKind']:checked").val();
+            if ($("input[name='switchSize']:checked").val() == "on") {
+                if ($("#ui_zdy_size").val().split("*")[0] < 25 || $("#ui_zdy_size").val().split("*")[1] < 25) {
+                    layer.msg('帆布最小尺寸25*25cm!', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                if ($("#ui_zdy_size").val().split("*")[0] > 140 && $("#ui_zdy_size").val().split("*")[1] > 140) {
+                    layer.msg('帆布尺寸超过140cm需要拼接!', {offset: ['300px', '300px']}, function () {
+                    });
+                }
+            }
+            var craft = [];
+            $("input:checkbox[name='craft']:checked").each(function (i) {
+                // 没有被禁用的工艺加到arr中
+                if (!$(this).is(':disabled')) {
+                    craft.push($(this).val());
+                }
+            });
+            if (stickerKind == "常规") {
+                if (!count) {
+                    layer.msg('请填写数量!', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+            }
+            $.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;
+                    if ($("input[name='switchSize']:checked").val() == "on") {
+                        size = $("#ui_zdy_size").val();
+                    } else {
+                        size = $("#ui_size option:selected").val();
+                    }
+                    var fb_name = $("#ui_fb_name option:selected").text();
+
+                    if (craft == "封边" || craft == "打孔") {
+                        craft = craft + "绳子";
+                    }
+
+                    var span_result = '帆布 - ' + fb_name + '-' + craft + '-';
+
+                    if (stickerKind == "套餐") {
+                        span_result += "套餐" + data[0].price + "元\n150*60cm 2条\n130*60cm 2条\n";
+                    } else {
+                        span_result += size + ' CM (同款内容)\n';
+                        if (number > 1) {
+                            for (let i = 0; i < data.length; i++) {
+                                span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
+                                data[i].number = number;
+                            }
+                        } else {
+                            for (let i = 0; i < data.length; i++) {
+                                span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\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>

+ 2 - 2
src/main/webapp/views/product/card.jsp

@@ -358,12 +358,12 @@
                     var span_result = proTypeValueData[proTypeValue] + ' - ' + kindValue + ' - ' + kind2Value + ' - ' + craftMo + ' - ' + craftJiao + ' -(同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/chaqi.jsp

@@ -1730,11 +1730,11 @@
                         }
                         for (let i = 0; i < data.length; i++) {
                             data[i].number = number;
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n';
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n';
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/chetie.jsp

@@ -251,12 +251,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/clothes.jsp

@@ -541,12 +541,12 @@
                     }
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "件,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "件,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/件\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "件,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "件,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/件\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/coaster.jsp

@@ -491,12 +491,12 @@
                     }
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/colorEnvelope.jsp

@@ -404,12 +404,12 @@
                         }
                         if (number > 1) {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                 data[i].number = number;
                             }
                         } else {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                 data[i].number = number;
                             }
                         }

+ 2 - 2
src/main/webapp/views/product/copyPaper.jsp

@@ -206,12 +206,12 @@ layui.use(['table','form','carousel'], function(){
 				var span_result = '复印纸 - ' + kind2 + ' - ' + size + 'cm - '+ kind +' - '+ kind3 + '(同款内容)\n';
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "本,共" + data[i].price + "元" + '\n';
+						span_result += number + '款 各' + data[i].count + "本,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/本\n'
 						data[i].number = number;
 			        }
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "本,共" + data[i].price + "元" + '\n';
+						span_result += number + '款 ' + data[i].count + "本,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/本\n'
 						data[i].number = number;
 			        }   
 				}

+ 32 - 20
src/main/webapp/views/product/coupon.jsp

@@ -598,6 +598,9 @@
                         <span class="z3_craft_mq">
                             <input type="checkbox" name="craft" lay-filter="z3Crafts" value="模切" title="模切"/>
                         </span>
+                        <span class="z3_craft_opp">
+                            <input type="checkbox" name="craft" lay-filter="z3Crafts" value="装opp袋" title="装opp袋"/>
+                        </span>
                         <input type="checkbox" class="shengz" name="craft" lay-filter="z3Crafts" value="绳子"
                                title="绳子">
                         <div class="shengz scolor" style="width: 150px;display: none">
@@ -999,6 +1002,7 @@
                 $(".z3_craft_yj").show();
                 $(".z3_craft_zj").show();
                 $(".z3_craft_dk").show();
+                $(".z3_craft_opp").show();
                 $(".z3_craft_ssx").show();
                 $(".z3_craft_yh").show();
                 $(".z3_craft_bm").show();
@@ -1090,6 +1094,21 @@
                 }
             });
 
+            function peijianuiHide(){
+                $("#peijian_ui .tscolor").hide();
+                $("#peijian_ui .tscolor").prop("disabled", true);
+                $("#peijian_ui .scolor").hide();
+                $("#peijian_ui .scolor select").prop("disabled", true);
+                $("#peijian_ui .select_nilongshen").hide();
+                $("#peijian_ui .select_nilongshen select").prop("disabled", true);
+                $("#peijian_ui .select_liusu").hide();
+                $("#peijian_ui .select_liusu select").prop("disabled", true);
+                $("#peijian_ui .opp").hide();
+                $("#peijian_ui .opp").prop("disabled", true);
+                $("#peijian_ui .select_opp").hide();
+                $("#peijian_ui .select_opp select").prop("disabled", true);
+            }
+
             // 监听count输入框
             $(function () {
                 //输入框的值改变时触发(一边尺寸小于4自动选中模切)
@@ -1114,11 +1133,11 @@
             form.on("select(oppSelect)", function (data) {
                 if (data.value == "装opp袋") {
                     $("#peijian_ui .opp").hide();
-                    $("#peijian_ui .opp").prop("disabled", true);
+                    $("#peijian_ui .opp select").prop("disabled", true);
                 }
                 if (data.value == "配opp袋") {
                     $("#peijian_ui .opp").show();
-                    $("#peijian_ui .opp").prop("disabled", false);
+                    $("#peijian_ui .opp select").prop("disabled", false);
                 }
             })
             form.on("checkbox(z4PeiJian)", function (data) {
@@ -1147,12 +1166,12 @@
                 if (data.value == "尼龙绳") {
                     if ($(data.elem).is(":checked")) {
                         $("#peijian_ui .scolor").show();
-                        $("#peijian_ui .scolor").prop("disabled", false);
+                        $("#peijian_ui .scolor select").prop("disabled", false);
                         $("#peijian_ui .select_nilongshen").show();
                         $("#peijian_ui .select_nilongshen select").prop("disabled", false);
                     } else {
                         $("#peijian_ui .scolor").hide();
-                        $("#peijian_ui .scolor").prop("disabled", true);
+                        $("#peijian_ui .scolor select").prop("disabled", true);
                         $("#peijian_ui .select_nilongshen").hide();
                         $("#peijian_ui .select_nilongshen select").prop("disabled", true);
                     }
@@ -1169,14 +1188,16 @@
                 if (data.value == "opp袋") {
                     if ($(data.elem).is(":checked")) {
                         $("#peijian_ui .opp").show();
-                        $("#peijian_ui .opp").prop("disabled", false);
+                        $("#peijian_ui .opp select").prop("disabled", false);
                         $("#peijian_ui .select_opp").show();
                         $("#peijian_ui .select_opp select").prop("disabled", false);
+                        $("#peijian_ui .select_opp select option[value='配opp袋']").prop("selected", true);
+
                         getProductImage('opp袋');
 
                     } else {
                         $("#peijian_ui .opp").hide();
-                        $("#peijian_ui .opp").prop("disabled", true);
+                        $("#peijian_ui .opp select").prop("disabled", true);
                         $("#peijian_ui .select_opp").hide();
                         $("#peijian_ui .select_opp select").prop("disabled", true);
                         getProductImage();
@@ -1214,18 +1235,7 @@
                 }
             });
             form.on("radio(kindValue2)", function (data) {
-                $("#peijian_ui .tscolor").hide();
-                $("#peijian_ui .tscolor").prop("disabled", true);
-                $("#peijian_ui .scolor").hide();
-                $("#peijian_ui .scolor").prop("disabled", true);
-                $("#peijian_ui .select_nilongshen").hide();
-                $("#peijian_ui .select_nilongshen select").prop("disabled", true);
-                $("#peijian_ui .select_liusu").hide();
-                $("#peijian_ui .select_liusu select").prop("disabled", true);
-                $("#peijian_ui .opp").hide();
-                $("#peijian_ui .opp").prop("disabled", true);
-                $("#peijian_ui .select_opp").hide();
-                $("#peijian_ui .select_opp select").prop("disabled", true);
+                peijianuiHide();
                 if (data.value == 10) {
                     $("#craftForm").hide();
                     $("#craftForm").find(":input").attr("disabled", true);
@@ -1406,6 +1416,8 @@
                 $("#lesspeijian").find(":input").attr("disabled", true);
                 $(".ui_fm_l").show();
                 $('.ui_fm_l').find(":input").attr("disabled", false);
+                $("#peijian_ui form")[0].reset();
+                peijianuiHide()
                 if (data.value == '直角卡片' || data.value == '异形卡片' || data.value == '贺卡' || data.value == '特种纸名片') {
                     if (data.elem.checked) {
                         $("#lesspeijian").show();
@@ -3539,7 +3551,7 @@
                                 if (szkun) {
                                     price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
                                 }
-                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + price_text + '\n'
+                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + price_text + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                                 data[i].number = number;
                             }
                         } else {
@@ -3549,7 +3561,7 @@
                                 if (szkun) {
                                     price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
                                 }
-                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + price_text + '\n'
+                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + price_text + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                                 data[i].number = number;
                             }
                         }

+ 2 - 2
src/main/webapp/views/product/credentials.jsp

@@ -263,12 +263,12 @@
                     var span_result = "PVC证件" + ' - ' + kindValue + '-' + size + 'mm' + '-' + shua + ' -(同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/cupHolder.jsp

@@ -258,12 +258,12 @@
                     var span_result = size + "cm-" + $("input[name='kind']:checked").val() + $("input[name='kindValue']:checked").attr("title") + ' - 模切 (同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 4 - 4
src/main/webapp/views/product/cupSet.jsp

@@ -511,19 +511,19 @@
                     }
                     if (kind == "盲盒杯套") {
                         if (number > 1) {
-                            span_result += number + '款 各5个内容' + data[0].count + "个,共" + data[0].price + "元" + '\n';
+                            span_result += number + '款 各5个内容' + data[0].count + "个,共" + data[0].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                         } else {
-                            span_result += number + '款5个内容' + data[0].count + "个,共" + data[0].price + "元" + '\n';
+                            span_result += number + '款5个内容' + data[0].count + "个,共" + data[0].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                         }
                     } else {
                         if (number > 1) {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n';
+                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                 data[i].number = number;
                             }
                         } else {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n';
+                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                 data[i].number = number;
                             }
                         }

+ 2 - 2
src/main/webapp/views/product/deskSticker.jsp

@@ -281,12 +281,12 @@
                     var span_result = '桌贴 - ' + kind + ' - ' + size + ' CM' + ' - ' + craftShua + ' - ' + craftJiao + '\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/diploma.jsp

@@ -105,12 +105,12 @@ layui.use(['table','form'], function(){
 				var span_result ='证书 - ' + kindValue + ' - ' + size +'\n' + "工艺: " + "正面覆亮膜 + 中间压痕\n";
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 						data[i].number = number;
 			        }
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 						data[i].number = number;
 			        }
 				}

+ 2 - 2
src/main/webapp/views/product/disu.jsp

@@ -237,12 +237,12 @@
                     var span_result = '滴塑 - ' + kind + '-' + size + ' CM (同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/envelope.jsp

@@ -230,12 +230,12 @@ layui.use(['table','form','carousel'], function(){
 					
 					if(number > 1){
 						for (let i = 0; i < data.length; i++) {
-							span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+							span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 							data[i].number = number;
 				        }   
 					}else{
 						for (let i = 0; i < data.length; i++) {
-							span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+							span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 							data[i].number = number;
 				        }   
 					}

+ 2 - 2
src/main/webapp/views/product/fan.jsp

@@ -371,12 +371,12 @@
                     var span_result = '扇子 - ' + kind + "-" + kind2 + 'cm - ' + craft + '(同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/fgq.jsp

@@ -161,12 +161,12 @@ layui.use(['table','form','carousel'], function(){
 				var span_result = '仿古旗 - ' + kind + '-' +  craft + '-' + craftShua + '-' + size +' CM (同款内容)\n';
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 						data[i].number = number;
 			        }   
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 						data[i].number = number;
 			        }   
 				}

+ 2 - 2
src/main/webapp/views/product/fileCover.jsp

@@ -197,12 +197,12 @@ layui.use(['table','form','carousel'], function(){
 				var span_result ='档案袋 - ' + kind +'\n'+ kind2 +' -(同款内容)\n';
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 						data[i].number = number;
 			        }   
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 						data[i].number = number;
 			        }   
 				}

+ 333 - 316
src/main/webapp/views/product/flags.jsp

@@ -1,333 +1,350 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-	<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+         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"%>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
 </head>
 <!-- 吊旗 -->
 <style>
-.p{
-	color:green;font-weight:400;
-}
+    .p {
+        color: green;
+        font-weight: 400;
+    }
 </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="13" >
-				<p>材质</p>
-				<div class="kindValue">
-					<input type="radio" lay-filter="kindValue" name="kindValue" value="2" title="300克铜版纸" checked="checked">
-					<input type="radio" lay-filter="kindValue" name="kindValue" value="1" title="200克铜版纸">
-					<input type="radio" lay-filter="kindValue" name="kindValue" value="0" title="157克铜版纸">
-				</div>
-				<p>
-					尺寸(CM/厘米)   <span style="font-size:14px;color:red">输入格式: 长 * 宽</span>
-					<!--<span class="ui_normal_size"><input type="checkbox" name="normalSize" lay-filter="ui_normal_size" title="通用款"></span>-->
-				</p>
-				<div class="layui-form-item ui_cg">
-					<input type="text" placeholder="格式:长*宽" name="size" id="size" class="layui-input"  autocomplete="off">
-				</div>
-				<div class="ui_normal">
-					<input type="radio" name="size" value="28.5*21" title="28.5*21cm" checked="checked">
-					<input type="radio" name="size" value="28.5*42" title="28.5*42cm">
-					<input type="hidden" name="kind1Label" id="kind1Label" value="">
-				</div>
-				<p>
-					数量(个)
-				</p>
-				<div class="layui-form-item ui_cg">
-					<select name="count" id="count" class="select">
-						<option value="10">10</option>
-						<option value="20">20</option>
-						<option value="30">30</option>
-						<option value="50">50</option>
-						<option value="100">100</option>
-						<option value="200">200</option>
-						<option value="500">500</option>
-					</select>
-				</div>
-				<div class="ui_normal">
-					<select name="count" id="count1" class="select">
-						<option value="100">100</option>
-						<option value="200">200</option>
-						<option value="500">500</option>
-					</select>
-				</div>
-				<p><span style="font-size:14px;color:red">提示:数量超过500个请以 [ 宣传单 - 商务200克铜版纸 - 异形模切 ] 报价</span></p>
-				<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>
-					形状	<span style="font-size:14px;color:red">(吊旗 - 数量50个以内不限形状;50个及以上默认[ U型 ])</span>
-				</p>
-				<div>
-					<input type="checkbox" lay-filter="craftU" class="craftU" name="craftU" value="U型" title="U型">
-				</div>
-				<p>
-					工艺
-				</p>
-				<div>
-					<input type="checkbox" lay-filter="craft" class="craft" name="craft" value="绳子" title="绳子">
-					<span class="ui_sz">
+<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="13">
+            <p>材质</p>
+            <div class="kindValue">
+                <input type="radio" lay-filter="kindValue" name="kindValue" value="2" title="300克铜版纸" checked="checked">
+                <input type="radio" lay-filter="kindValue" name="kindValue" value="1" title="200克铜版纸">
+                <input type="radio" lay-filter="kindValue" name="kindValue" value="0" title="157克铜版纸">
+            </div>
+            <p>
+                尺寸(CM/厘米) <span style="font-size:14px;color:red">输入格式: 长 * 宽</span>
+                <!--<span class="ui_normal_size"><input type="checkbox" name="normalSize" lay-filter="ui_normal_size" title="通用款"></span>-->
+            </p>
+            <div class="layui-form-item ui_cg">
+                <input type="text" placeholder="格式:长*宽" name="size" id="size" class="layui-input" autocomplete="off">
+            </div>
+            <div class="ui_normal">
+                <input type="radio" name="size" value="28.5*21" title="28.5*21cm" checked="checked">
+                <input type="radio" name="size" value="28.5*42" title="28.5*42cm">
+                <input type="hidden" name="kind1Label" id="kind1Label" value="">
+            </div>
+            <p>
+                数量(个)
+            </p>
+            <div class="layui-form-item ui_cg">
+                <select name="count" id="count" class="select">
+                    <option value="10">10</option>
+                    <option value="20">20</option>
+                    <option value="30">30</option>
+                    <option value="50">50</option>
+                    <option value="100">100</option>
+                    <option value="200">200</option>
+                    <option value="500">500</option>
+                </select>
+            </div>
+            <div class="ui_normal">
+                <select name="count" id="count1" class="select">
+                    <option value="100">100</option>
+                    <option value="200">200</option>
+                    <option value="500">500</option>
+                </select>
+            </div>
+            <p><span style="font-size:14px;color:red">提示:数量超过500个请以 [ 宣传单 - 商务200克铜版纸 - 异形模切 ] 报价</span></p>
+            <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>
+                形状 <span style="font-size:14px;color:red">(吊旗 - 数量50个以内不限形状;50个及以上默认[ U型 ])</span>
+            </p>
+            <div>
+                <input type="checkbox" lay-filter="craftU" class="craftU" name="craftU" value="U型" title="U型">
+            </div>
+            <p>
+                工艺
+            </p>
+            <div>
+                <input type="checkbox" lay-filter="craft" class="craft" name="craft" value="绳子" title="绳子">
+                <span class="ui_sz">
 						<input type="text" placeholder="请输入绳子长度" name="ui_sz_size" style="width: 100px"/>米
 					</span>
-				</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="../acountExpressFeeTooWeight.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 >
-					<table class="layui-hide" id="priceTable" lay-filter="priceTable"></table>
-				</div>
-			</form>
-		</div>
-		<div class="right_div">
-			<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>
+            <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="../acountExpressFeeTooWeight.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>
+                <table class="layui-hide" id="priceTable" lay-filter="priceTable"></table>
+            </div>
+        </form>
+    </div>
+    <div class="right_div">
+        <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>
 <script src="../../js/carousel.js" charset="utf-8"></script>
-<%@include file="/views/copyResult.jsp"%>
+<%@include file="/views/copyResult.jsp" %>
 <script>
-layui.use(['table','form'], function(){    
-    var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
-    var table = layui.table;
-    $(".ui_normal").hide();
-	$(".ui_normal").find(":input").attr("disabled", true);
-	$(".ui_sz").hide();
-	$(".ui_sz").find(":input").attr("disabled", true);
-	
-	// 监听数量--50个以上勾选复选框 [U型]
-    form.on('select(count)', function(data) {
-    	if(data.value >= 50){
-			$('input[class = craftU]').prop('checked', true);
-    		// $(".craftU").attr("disabled", true);
-    	}else{
-			$('input[class = craftU]').prop('checked', false);
-    	}
-    	form.render();
+    layui.use(['table', 'form'], function () {
+        var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
+        var table = layui.table;
+        $(".ui_normal").hide();
+        $(".ui_normal").find(":input").attr("disabled", true);
+        $(".ui_sz").hide();
+        $(".ui_sz").find(":input").attr("disabled", true);
+
+        // 监听数量--50个以上勾选复选框 [U型]
+        form.on('select(count)', function (data) {
+            if (data.value >= 50) {
+                $('input[class = craftU]').prop('checked', true);
+                // $(".craftU").attr("disabled", true);
+            } else {
+                $('input[class = craftU]').prop('checked', false);
+            }
+            form.render();
+        });
+
+        //监听材质
+        form.on('radio(kindValue)', function (data) {
+            if (data.value == 2) {
+                $(".ui_normal_size").show();
+            } else {
+                $(".ui_normal_size").hide();
+            }
+        });
+
+        // 监听U型按钮,50个以上取消提示做其他产品
+        form.on('checkbox(craftU)', function (data) {
+            var kindValue = $('input[name="kindValue"]:checked').val();
+            var count = $("#count option:checked").val();
+            if (count >= 50) {
+                if (!data.elem.checked) {
+                    if (kindValue == 2) {
+                        layer.msg("[ 吊旗 - 300克铜版纸 ] 50个以上,取消[ U型 ]请以  [ 卡片 - 名片 ] 报价", {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    } else if (kindValue == 1) {
+                        layer.msg("[ 吊旗 - 200克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 宣传单 - 商务200克铜版纸 ] 报价", {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    } else if (kindValue == 0) {
+                        layer.msg("[ 吊旗 - 157克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 宣传单  - 商务157克铜版纸 ] 报价", {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    }
+                }
+            }
+        });
+
+        form.on('checkbox(ui_normal_size)', function (data) {
+            if (data.elem.checked) {
+                $(".ui_normal").show();
+                $(".ui_normal").find(":input").attr("disabled", false);
+                $(".ui_cg").hide();
+                $(".ui_cg").find(":input").attr("disabled", true);
+                $("#kind1Label").attr("value", 2);
+                $('input[class = craftU]').prop('checked', true);
+            } else {
+                $(".ui_cg").show();
+                $(".ui_cg").find(":input").attr("disabled", false);
+                $(".ui_normal").hide();
+                $(".ui_normal").find(":input").attr("disabled", true);
+                $('input[class = craftU]').prop('checked', false);
+                $("#kind1Label").attr("value", "");
+            }
+            form.render('checkbox');
+        });
+
+        form.on('checkbox(craft)', function (data) {
+            if (data.elem.checked) {
+                $(".ui_sz").show();
+                $(".ui_sz").find(":input").attr("disabled", false);
+            } else {
+                $(".ui_sz").hide();
+                $(".ui_sz").find(":input").attr("disabled", true);
+            }
+            form.render('checkbox');
+        });
+
+        // 点击计算,计算价格
+        form.on('submit(acount_btn)', function (data) {
+            var kindValue = $('input[name="kindValue"]:checked').val()
+            var count = $("#count option:checked").val();
+            if (!$(".craftU").is(':checked') && kindValue == 2 && count >= 50) {
+                layer.msg("[ 吊旗 - 300克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 卡片 - 名片 ] 报价", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            } else if (!$(".craftU").is(':checked') && kindValue == 1 && count >= 50) {
+                layer.msg("[ 吊旗 - 200克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 宣传单 - 商务200克铜版纸 ] 报价", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            } else if (!$(".craftU").is(':checked') && kindValue == 0 && count >= 50) {
+                layer.msg("[ 吊旗 - 157克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 宣传单  - 商务157克铜版纸 ] 报价", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            var kindData = {
+                2: "300克铜版纸",
+                1: "200克铜版纸",
+                0: "157克铜版纸"
+            };
+            var kind = kindData[kindValue];
+            var size = $("#size").val();
+            var number = $("#number").val();
+            var kind1Label = $("#kind1Label").val();
+            if ((size.split("*")[0] > 73 || size.split("*")[1] > 56) && (size.split("*")[0] > 56 || size.split("*")[1] > 73)) {
+                layer.msg("[ 吊旗  ] 尺寸超过 73*56 cm的请以  [ 卡片 - 名片 ] 报价", {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            if (size.indexOf("*") < 0 && kind1Label != 2) {
+                layer.msg('请填写尺寸!', {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            var sz_size = $("input[name='ui_sz_size']").val();
+            if ($("input[name='craft']:checked").val() == "绳子") {
+                if (sz_size == "") {
+                    layer.msg('请输入绳子长度!', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+            }
+            var arr = [];
+            $("input:checkbox[name='craftU']:checked").each(function (i) {
+                if (!$(this).is(':disabled')) {
+                    arr.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;
+                    if (kind1Label == "2") {
+                        size = $("input[name='size']:checked").val();
+                        kind += "(通用款)";
+                    }
+                    if ($("input[name='craft']:checked").val() == "绳子") {
+                        arr += ",绳子" + sz_size + "米";
+                    }
+                    var span_result = '吊旗 - ' + kind + ' - ' + size + ' CM -' + arr + ' -(同款内容)\n';
+                    if (number > 1) {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
+                            data[i].number = number;
+                        }
+                    } else {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
+                            data[i].number = number;
+                        }
+                    }
+                    span_result += '包邮,免费设计呢~(偏远地区需补邮费)'
+                    $("#span_result").val(span_result);
+
+                    var count = $("#count option:selected").val();
+                    getRemark("吊旗", size, count + "个", kind, number, arr, "");
+                    //计算完自动复制文本
+                    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;
+        });
     });
-	
-    //监听材质
-    form.on('radio(kindValue)', function(data){
-    	if(data.value == 2){
-    		$(".ui_normal_size").show();
-    	}else{
-    		$(".ui_normal_size").hide();
-    	}
-    });
-    
-    // 监听U型按钮,50个以上取消提示做其他产品
-    form.on('checkbox(craftU)', function(data) {
-    	var kindValue = $('input[name="kindValue"]:checked').val();	
-    	var count = $("#count option:checked").val();	
-    	if(count >= 50){
-		    if(!data.elem.checked){
-	    		if(kindValue == 2){
-		    		layer.msg("[ 吊旗 - 300克铜版纸 ] 50个以上,取消[ U型 ]请以  [ 卡片 - 名片 ] 报价",{offset:['300px','300px']},function(){});
-					return false;
-			    }else if(kindValue == 1){
-		    		layer.msg("[ 吊旗 - 200克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 宣传单 - 商务200克铜版纸 ] 报价",{offset:['300px','300px']},function(){});
-					return false;
-			    }else if(kindValue == 0){
-		    		layer.msg("[ 吊旗 - 157克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 宣传单  - 商务157克铜版纸 ] 报价",{offset:['300px','300px']},function(){});
-					return false;
-			    }
-		    }
-    	}
-    });
-    
-     form.on('checkbox(ui_normal_size)', function(data){
-    	if(data.elem.checked){
-    		$(".ui_normal").show();
-        	$(".ui_normal").find(":input").attr("disabled", false);
-        	$(".ui_cg").hide();
-        	$(".ui_cg").find(":input").attr("disabled", true);
-        	$("#kind1Label").attr("value", 2);
-        	$('input[class = craftU]').prop('checked', true);
-    	}else{
-        	$(".ui_cg").show();
-        	$(".ui_cg").find(":input").attr("disabled", false);
-        	$(".ui_normal").hide();
-        	$(".ui_normal").find(":input").attr("disabled", true);
-        	$('input[class = craftU]').prop('checked', false);
-         	$("#kind1Label").attr("value", "");
-    	}
-    	form.render('checkbox');
-    });
-    
-    form.on('checkbox(craft)', function(data){
-    	if(data.elem.checked){
-    		$(".ui_sz").show();
-        	$(".ui_sz").find(":input").attr("disabled", false);
-    	}else{
-        	$(".ui_sz").hide();
-        	$(".ui_sz").find(":input").attr("disabled", true);
-    	}
-    	form.render('checkbox');
-    });
-	
-	// 点击计算,计算价格
-	form.on('submit(acount_btn)', function(data) {
-		var kindValue = $('input[name="kindValue"]:checked').val()
-		var count = $("#count option:checked").val();	
-		if (!$(".craftU").is(':checked') && kindValue == 2 && count >= 50) {
-			layer.msg("[ 吊旗 - 300克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 卡片 - 名片 ] 报价",{offset:['300px','300px']},function(){});
-			return false;
-		}else if (!$(".craftU").is(':checked') && kindValue == 1 && count >= 50) {
-			layer.msg("[ 吊旗 - 200克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 宣传单 - 商务200克铜版纸 ] 报价",{offset:['300px','300px']},function(){});
-			return false;
-		}else if (!$(".craftU").is(':checked') && kindValue == 0 && count >= 50) {
-			layer.msg("[ 吊旗 - 157克铜版纸 ] 50个及以上,取消[ U型 ]请以  [ 宣传单  - 商务157克铜版纸 ] 报价",{offset:['300px','300px']},function(){});
-			return false;
-		}
-		var kindData={
-			2 :"300克铜版纸",	
-			1 :"200克铜版纸",	
-			0 :"157克铜版纸"
-		};		
-		var kind  = kindData[kindValue];		
-		var size  = $("#size").val();
-		var number= $("#number").val();
-		var kind1Label = $("#kind1Label").val();
-		if ((size.split("*")[0] > 73 || size.split("*")[1] > 56) && (size.split("*")[0] > 56 || size.split("*")[1] > 73)) {
-			layer.msg("[ 吊旗  ] 尺寸超过 73*56 cm的请以  [ 卡片 - 名片 ] 报价",{offset:['300px','300px']},function(){});
-			return false;
-		}
-		if(size.indexOf("*") < 0 && kind1Label != 2){
-			layer.msg('请填写尺寸!',{offset:['300px','300px']},function(){});
-			return false;
-		}
-		var sz_size = $("input[name='ui_sz_size']").val();
-		if($("input[name='craft']:checked").val() == "绳子"){
-			if(sz_size == ""){
-				layer.msg('请输入绳子长度!',{offset:['300px','300px']},function(){});
-				return false;	
-			}
-		}
-		var arr = [];
-		$("input:checkbox[name='craftU']:checked").each(function(i) {
-			if(!$(this).is(':disabled')){
-				arr.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;
-				if(kind1Label == "2"){
-					size = $("input[name='size']:checked").val();
-					kind += "(通用款)";
-				}
-				if($("input[name='craft']:checked").val() == "绳子"){
-					arr += ",绳子" + sz_size +"米";
-				}
-				var span_result = '吊旗 - ' + kind +' - '+ size +' CM -' + arr +' -(同款内容)\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 count = $("#count option:selected").val();
-				getRemark("吊旗", size, count+"个", kind, number, arr, "");
-				//计算完自动复制文本
-				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>

+ 6 - 6
src/main/webapp/views/product/flyer.jsp

@@ -197,16 +197,16 @@
             let kindValue = $("select[name='kindValue'] option:checked").val();
             $("#remark").empty();
             let html = '';
-            if(kindValue == 3){
+            if (kindValue == 3) {
                 html = '预计发货时间:<br>福建:直角裁切 (2-3天发货) 圆通 顺丰 <br>江苏:直角裁切 (2-3天发货) 韵达 顺丰<br>福建:直角折页 (3-4天发货) 圆通 顺丰 <br>江苏:直角折页 (3-4天发货) 韵达 顺丰<br>福建:异形模切 (4-5天发货) 圆通 顺丰'
             }
-            if(kindValue == 2){
+            if (kindValue == 2) {
                 html = '预计发货时间:<br>江苏:直角裁切 (2-3天发货) 韵达 顺丰<br>江苏:直角折页/压痕 (3-4天发货) 韵达 顺丰<br>江苏:异形模切 (4-5天发货) 韵达 顺丰'
             }
-            if(kindValue == 1){
+            if (kindValue == 1) {
                 html = '预计发货时间:<br>江苏:直角裁切 (2-3天发货) 韵达 顺丰<br>江苏:直角折页/压痕 (3-4天发货) 韵达 顺丰<br>江苏:异形模切 (4-5天发货) 韵达 顺丰'
             }
-            if(kindValue == 0){
+            if (kindValue == 0) {
                 html = '预计发货时间:<br>江苏:直角裁切 (2-3天发货) 韵达 顺丰<br>江苏:直角折页/压痕 (3-4天发货) 韵达 顺丰<br>福建:异形模切 (4-5天发货) 圆通 顺丰'
             }
 
@@ -293,12 +293,12 @@
                     var span_result = "宣传单 - " + kind + ' - ' + size + ' 厘米 -(同款内容)\n' + "工艺 :" + arr + "\n";
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/freehand.jsp

@@ -197,12 +197,12 @@
                     var span_result = '手绘 - ' + kind_name[kind] + type + ' (同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 4 - 4
src/main/webapp/views/product/handBag.jsp

@@ -74,7 +74,7 @@
                 <div class="layui-form-item npzd count">
                     <select name="count" class="select countCG" id="npzd_count">
                         <option value=""></option>
-<%--                        <option value="100">100</option>--%>
+                        <%--                        <option value="100">100</option>--%>
                         <option value="500">500</option>
                         <option value="1000">1000</option>
                         <option value="2000">2000</option>
@@ -352,7 +352,7 @@
             let spec = $("#spec").val();
             let kindValue = $(".npzd select[name='kindValue']").val();
             let count_html = `<option value=""></option>`;
-            if (spec <= 10  && kindValue == 0) {
+            if (spec <= 10 && kindValue == 0) {
                 // count_html +=
                 //     `<option value="100">100</option>`;
             }
@@ -616,13 +616,13 @@
                             var span_result = "手提袋 - 250克白卡纸手提袋 - " + kind + '--' + '\n';
                             if (number > 1) {
                                 for (let i = 0; i < data.length; i++) {
-                                    span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                                    span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                     data[i].number = number;
                                     data[i].kindLabel = '特价白卡纸手提袋'
                                 }
                             } else {
                                 for (let i = 0; i < data.length; i++) {
-                                    span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                                    span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                     data[i].number = number;
                                     data[i].kindLabel = '特价白卡纸手提袋'
                                 }

+ 2 - 2
src/main/webapp/views/product/hykkt.jsp

@@ -215,12 +215,12 @@
                     span_result += '\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/insertCard.jsp

@@ -290,12 +290,12 @@
 					var span_result ='插卡 - ' + kindValue + ' - ' + size + "厘米 -" + craftQie + "(同款内容) "+'\n';
 					if(number > 1){
 						for (let i = 0; i < data.length; i++) {
-							span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+							span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 							data[i].number = number;
 				        }   
 					}else{
 						for (let i = 0; i < data.length; i++) {
-							span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+							span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 							data[i].number = number;
 				        }   
 					}

+ 2 - 2
src/main/webapp/views/product/katie.jsp

@@ -262,12 +262,12 @@
                     var span_result = '卡贴 - 300克铜版纸 - 配双面胶 -' + arr + ' -(同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 181 - 170
src/main/webapp/views/product/kzt.jsp

@@ -1,170 +1,181 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-	<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+         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"%>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
 </head>
 <!-- 筷子套 -->
 <style>
-.edge .layui-edge{
-	right:10px;
-}
+    .edge .layui-edge {
+        right: 10px;
+    }
 </style>
 <body>
-	<div class="big_box">
-		<div class="left_div">
-			<h1 class="h2">筷子套</h1> <span style="color:red;font-weight:700;"></span>
-			<hr>
-			<form class="layui-form">
-				<p>
-					材质
-				</p>
-				<div class="layui-form-item">
-					<select name="kind1Value" id="kind1Value" class="select">
-						<option value="0">157克铜版纸</option>
-					</select>
-				</div>
-				<input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="筷子套" >
-				<p>
-					规格
-				</p>
-				<div class="layui-form-item">
-					<select name="size" id="size"  class="select">
-						<option value="15*3">15*3</option>
-						<option value="18*3">18*3</option>
-						<option value="19*3">19*3</option>
-						<option value="20*3">20*3</option>
-						<option value="24*3">24*3</option>
-						<option value="25*3">25*3</option>
-						<option value="26*3">26*3</option>
-					</select>
-				</div>
-				<p>
-					数量(张)
-				</p>
-				<div class="layui-form-item">
-					<select name="count" class="select" id="count">
-						<!--<option value="5000">5000</option>-->
-						<option value="10000">10000</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>
-				<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>
-				<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 >
-					<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>
+<div class="big_box">
+    <div class="left_div">
+        <h1 class="h2">筷子套</h1> <span style="color:red;font-weight:700;"></span>
+        <hr>
+        <form class="layui-form">
+            <p>
+                材质
+            </p>
+            <div class="layui-form-item">
+                <select name="kind1Value" id="kind1Value" class="select">
+                    <option value="0">157克铜版纸</option>
+                </select>
+            </div>
+            <input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="筷子套">
+            <p>
+                规格
+            </p>
+            <div class="layui-form-item">
+                <select name="size" id="size" class="select">
+                    <option value="15*3">15*3</option>
+                    <option value="18*3">18*3</option>
+                    <option value="19*3">19*3</option>
+                    <option value="20*3">20*3</option>
+                    <option value="24*3">24*3</option>
+                    <option value="25*3">25*3</option>
+                    <option value="26*3">26*3</option>
+                </select>
+            </div>
+            <p>
+                数量(张)
+            </p>
+            <div class="layui-form-item">
+                <select name="count" class="select" id="count">
+                    <!--<option value="5000">5000</option>-->
+                    <option value="10000">10000</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>
+            <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>
+            <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>
+                <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>
 <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(){    
-    var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
-    var carousel = layui.carousel;
-    var table = layui.table;
-    
-	//建造实例
-    ins = carousel.render({});
-	
-	// 点击计算,计算价格
-	form.on('submit(acount_btn)', function(data) {	
-		var number= $("#number").val();
-		var size = $("#size").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 ="筷子套- 157克铜版纸 - " + size + "cm- (同款内容)\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 count = $("#count option:selected").val();
-				getRemark("筷子套", size+"cm", count+"张", "157克铜版纸", number, "", "");
-				//计算完自动复制文本
-				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 : '报价'
-						},/* {
+    layui.use(['table', 'form', 'carousel'], function () {
+        var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
+        var carousel = layui.carousel;
+        var table = layui.table;
+
+        //建造实例
+        ins = carousel.render({});
+
+        // 点击计算,计算价格
+        form.on('submit(acount_btn)', function (data) {
+            var number = $("#number").val();
+            var size = $("#size").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 = "筷子套- 157克铜版纸 - " + size + "cm- (同款内容)\n";
+                    if (number > 1) {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
+                            data[i].number = number;
+                        }
+                    } else {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
+                            data[i].number = number;
+                        }
+                    }
+                    span_result += '包邮,免费设计呢~(偏远地区需补邮费)'
+                    $("#span_result").val(span_result);
+
+                    var count = $("#count option:selected").val();
+                    getRemark("筷子套", size + "cm", count + "张", "157克铜版纸", number, "", "");
+                    //计算完自动复制文本
+                    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%',
@@ -181,20 +192,20 @@ layui.use(['table','form','carousel'], function(){
 								return Math.ceil(d.price * 0.96)
 							} 
 						}, */{
-							field : 'weight',
-							width : '21%',
-							align : "center",
-							title : '重量(kg)'
-						}
-					] ],
-					done: function () {
-		            }
-				});
-			}
-		});
-		return false;
-	});
-});
-	
+                                field: 'weight',
+                                width: '21%',
+                                align: "center",
+                                title: '重量(kg)'
+                            }
+                        ]],
+                        done: function () {
+                        }
+                    });
+                }
+            });
+            return false;
+        });
+    });
+
 </script>
 </html>

+ 2 - 2
src/main/webapp/views/product/landa.jsp

@@ -249,12 +249,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
                             data[i].number = number;
                         }
                     }

+ 4 - 4
src/main/webapp/views/product/leiTag.jsp

@@ -228,12 +228,12 @@
             if (data.value == "尼龙绳") {
                 if ($(data.elem).is(":checked")) {
                     $("#peijian_ui .scolor").show();
-                    $("#peijian_ui .scolor").prop("disabled", false);
+                    $("#peijian_ui .scolor select").prop("disabled", false);
                     $("#peijian_ui .select_nilongshen").show();
                     $("#peijian_ui .select_nilongshen select").prop("disabled", false);
                 } else {
                     $("#peijian_ui .scolor").hide();
-                    $("#peijian_ui .scolor").prop("disabled", true);
+                    $("#peijian_ui .scolor select").prop("disabled", true);
                     $("#peijian_ui .select_nilongshen").hide();
                     $("#peijian_ui .select_nilongshen select").prop("disabled", true);
                 }
@@ -300,12 +300,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 4 - 3
src/main/webapp/views/product/lsz.jsp

@@ -148,6 +148,7 @@
         }
         $("#desType").empty().append(html);
     }
+
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -188,7 +189,7 @@
 
         $("#number").on("input", function (e) {
             var number = e.delegateTarget.value;
-            if ( number > 1 && $("input[name='stickerKind']:checked").val() == "专版打印") {
+            if (number > 1 && $("input[name='stickerKind']:checked").val() == "专版打印") {
                 $("#ui_des").show();
             } else {
                 $("#ui_des").hide();
@@ -323,12 +324,12 @@
                     span_result += '\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/medal.jsp

@@ -521,12 +521,12 @@
                     var span_result = '奖牌 - ' + kind + '-' + kind1 + '-' + size + ' (同款内容)\n' + "工艺 :" + craftList.join('、') + "\n";
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 4 - 4
src/main/webapp/views/product/metal.jsp

@@ -438,12 +438,12 @@
                         var span_result = '金属标 - ' + color + ' - ' + size + '厘米 -' + craftMo + '-(同款内容)\n';
                         if (number > 1) {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元"+ "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                 data[i].number = number;
                             }
                         } else {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                 data[i].number = number;
                             }
                         }
@@ -458,13 +458,13 @@
                             let numberType = $("#desType option:selected").text();
                             span_result += "款数:" + number + "-" + numberType + "\n";
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                 data[i].number = number;
                                 data[i].kindLabel = 'UV转印贴'
                             }
                         } else {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                                 data[i].number = number;
                                 data[i].kindLabel = 'UV转印贴'
                             }

+ 2 - 2
src/main/webapp/views/product/msd.jsp

@@ -188,12 +188,12 @@
                     var span_result = '900克慕斯垫 - ' + kind + "-" + craft + "(同款内容) " + '\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 4 - 4
src/main/webapp/views/product/notePaper.jsp

@@ -441,24 +441,24 @@
 					if(notePaperKind == "红头文件" || notePaperKind == "彩胶纸"){
 						if(number > 1){
 							for (let i = 0; i < data.length; i++) {
-								span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+								span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
 								data[i].number = number;
 					        }   
 						}else{
 							for (let i = 0; i < data.length; i++) {
-								span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+								span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元"+ "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
 								data[i].number = number;
 					        }   
 						}
 					}else{
 						if(number > 1){
 							for (let i = 0; i < data.length; i++) {
-								span_result += number + '款 各' + data[i].count + "本,共" + data[i].price + "元" + '\n'
+								span_result += number + '款 各' + data[i].count + "本,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
 								data[i].number = number;
 					        }   
 						}else{
 							for (let i = 0; i < data.length; i++) {
-								span_result += number + '款 ' + data[i].count + "本,共" + data[i].price + "元" + '\n'
+								span_result += number + '款 ' + data[i].count + "本,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
 								data[i].number = number;
 					        }   
 						}

+ 2 - 2
src/main/webapp/views/product/orders.jsp

@@ -294,12 +294,12 @@
                     var span_result = "菜单 - " + kind + ' - ' + size + ' 厘米 -(同款内容)\n' + "工艺 :" + arr + "\n";
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/packingBox.jsp

@@ -171,12 +171,12 @@ layui.use(['table','form','carousel'], function(){
 				var span_result = '包装盒 - 350克白卡纸 - ' + kind + ' - ' + size +' CM -(同款内容)\n';
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
 						data[i].number = number;
 			        }   
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"+ "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
 						data[i].number = number;
 			        }   
 				}

+ 186 - 175
src/main/webapp/views/product/paperCup.jsp

@@ -1,175 +1,186 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-	<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+         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"%>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
 </head>
 <!-- 一次性纸杯 -->
 <style>
-.edge .layui-edge{
-	right:10px;
-}
+    .edge .layui-edge {
+        right: 10px;
+    }
 </style>
 <body>
-	<div class="big_box">
-		<div class="left_div">
-			<h1 class="h2">一次性纸杯</h1> <span style="color:red;font-weight:700;"></span>
-			<hr>
-			<form class="layui-form">
-				<p>
-					材质
-				</p>
-				<div class="layui-form-item">
-					<select name="kind1Value" id="kind1Value" class="select">
-						<option value="280克">280克(260克原纸+20克淋膜)</option>
-					</select>
-				</div>
-				<p>
-					规格
-				</p>
-				<div class="layui-form-item">
-					<select name="size" id="size" class="select">
-						<option value="7.5*5.2*7.5">7蛊司(上口75mm/下口52mm/高度75mm )</option>
-						<option value="7.5*5.2*8.6">9蛊司(上口75mm/下口52mm/高度86mm)</option>
-					</select>
-				</div>
-				<input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="一次性纸杯" >
-				<p>
-					数量(个)
-				</p>
-				<div class="layui-form-item">
-					<select name="count" class="select" id="count">
-						<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>
-						<option value="50000">50000</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>
-				<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>
-				<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 >
-					<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>
+<div class="big_box">
+    <div class="left_div">
+        <h1 class="h2">一次性纸杯</h1> <span style="color:red;font-weight:700;"></span>
+        <hr>
+        <form class="layui-form">
+            <p>
+                材质
+            </p>
+            <div class="layui-form-item">
+                <select name="kind1Value" id="kind1Value" class="select">
+                    <option value="280克">280克(260克原纸+20克淋膜)</option>
+                </select>
+            </div>
+            <p>
+                规格
+            </p>
+            <div class="layui-form-item">
+                <select name="size" id="size" class="select">
+                    <option value="7.5*5.2*7.5">7蛊司(上口75mm/下口52mm/高度75mm )</option>
+                    <option value="7.5*5.2*8.6">9蛊司(上口75mm/下口52mm/高度86mm)</option>
+                </select>
+            </div>
+            <input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="一次性纸杯">
+            <p>
+                数量(个)
+            </p>
+            <div class="layui-form-item">
+                <select name="count" class="select" id="count">
+                    <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>
+                    <option value="50000">50000</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>
+            <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>
+            <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>
+                <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>
 <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(){    
-    var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
-    var carousel = layui.carousel;
-    var table = layui.table;
-    
-	//建造实例
-    ins = carousel.render({});
-	
-	// 点击计算,计算价格
-	form.on('submit(acount_btn)', function(data) {	
-		var number= $("#number").val();
-		var size = $("#size").val();
-		var kind = $("#size").find("option:selected").text();
-		var index = kind.indexOf("(");
-		kind = kind.substring(0, index);
-		var kindValue = $("#kind1Value").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 + " - " + kindValue + " - (同款内容)\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 count = $("#count option:selected").val();
-				getRemark("一次性纸杯", size+"cm", count+"张", kind, number, "", "");
-				//计算完自动复制文本
-				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 : '报价'
-						},/* {
+    layui.use(['table', 'form', 'carousel'], function () {
+        var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
+        var carousel = layui.carousel;
+        var table = layui.table;
+
+        //建造实例
+        ins = carousel.render({});
+
+        // 点击计算,计算价格
+        form.on('submit(acount_btn)', function (data) {
+            var number = $("#number").val();
+            var size = $("#size").val();
+            var kind = $("#size").find("option:selected").text();
+            var index = kind.indexOf("(");
+            kind = kind.substring(0, index);
+            var kindValue = $("#kind1Value").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 + " - " + kindValue + " - (同款内容)\n";
+                    if (number > 1) {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
+                            data[i].number = number;
+                        }
+                    } else {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
+                            data[i].number = number;
+                        }
+                    }
+                    span_result += '包邮,免费设计呢~(偏远地区需补邮费)'
+                    $("#span_result").val(span_result);
+
+                    var count = $("#count option:selected").val();
+                    getRemark("一次性纸杯", size + "cm", count + "张", kind, number, "", "");
+                    //计算完自动复制文本
+                    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%',
@@ -186,20 +197,20 @@ layui.use(['table','form','carousel'], function(){
 								return Math.ceil(d.price * 0.96)
 							} 
 						}, */{
-							field : 'weight',
-							width : '21%',
-							align : "center",
-							title : '重量(kg)'
-						}
-					] ],
-					done: function () {
-		            }
-				});
-			}
-		});
-		return false;
-	});
-});
-	
+                                field: 'weight',
+                                width: '21%',
+                                align: "center",
+                                title: '重量(kg)'
+                            }
+                        ]],
+                        done: function () {
+                        }
+                    });
+                }
+            });
+            return false;
+        });
+    });
+
 </script>
 </html>

+ 2 - 2
src/main/webapp/views/product/pet.jsp

@@ -250,12 +250,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 419 - 398
src/main/webapp/views/product/pictureAlbum.jsp

@@ -1,412 +1,433 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-	<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+         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"%>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
 </head>
 <!-- 画册 -->
 <style>
-.p{
-	color:green;font-weight:400;
-}
+    .p {
+        color: green;
+        font-weight: 400;
+    }
 </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" id="kindForm">
-				<input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="19" >
-				<div class="layui-form-item">
-			      	<input type="radio" lay-filter="kind" name="kind" value="常用种类" title="常规" checked="checked">
-			      	<input type="radio" lay-filter="kind" name="kind" value="少数量" title="少数量(自来稿件)">
-			    </div>
-			    <div class="normal">
-					<p>
-						封面
-					</p>
-					<div class="layui-form-item">
-						<input type="radio" name="kindValue" class="kindValue" value="0" title="250克哑膜" checked="checked"> 
-					</div>
-					<p>
-						内页
-					</p>
-					<div class="layui-form-item">
-						<div class="layui-input-block">
-							<input type="radio" name="kind2Value" class="kind2Value" value="0" title="157克合板" checked="checked"> 
-							<input type="radio" name="kind2Value" class="kind2Value" value="1" title="160克合板">
-							<input type="radio" name="kind2Value" class="kind2Value" value="2" title="200克合板">
-						</div>
-					</div>
-					<p>
-						装订
-					</p>
-					<div class="layui-form-item">
-						<input type="radio" name="kind3Value" class="kind3Value" value="0" title="骑马钉" checked="checked"> 
-						<!-- <input type="radio" name="kind3Value" class="kind3Value" value="1" title="胶装">  -->
-					</div>
-					<p>
-						尺寸(CM/厘米)   <span style="font-size:14px;color:red">输入格式: 长 * 宽</span>
-						<input type="checkbox" name="craft" class="craft" value="设计" title="含设计">
-					</p>
-					<div class="layui-form-item">
-						<input type="text" placeholder="格式:长*宽" name="size" id="size" class="layui-input" autocomplete="off">
-					</div>
-					<p>
-						封面P数   <span style="font-size:14px;color:green">(固定P数)</span>
-					</p>
-					<div class="layui-form-item">
-						<input type="text" value="4" readonly class="layui-input">
-					</div>
-					<p>
-						内页P数  	<span style="font-size:14px;color:red">请输入4的整数倍</span>
-					</p>
-					<div class="layui-form-item">
-						<input type="text" placeholder="请输入4的整数倍" autocomplete="off" name="pcount" id="pcount" class="layui-input">
-					</div>
-					<p>
-						数量(本)
-					</p>
-					<div class="layui-form-item">
-						<input type="text" placeholder="请输入整数" autocomplete="off" name="count" class="layui-input">
-					</div>
-				</div>
-				<div class="less" style="display:none">
-					<p>
-						封面
-					</p>
-					<div class="layui-form-item">
-						<input type="radio" name="kindValue" value="1" title="250克铜版纸"> 
-						<input type="radio" name="kindValue" value="2" title="皮纹纸">
-					</div>
-					<p>
-						内页
-					</p>
-					<div class="layui-form-item">
-						<div class="layui-input-block">
-							<input type="radio" name="kind2Value2" value="3" title="157克铜版纸" checked>
-							<input type="radio" name="kind2Value2" value="4" title="70克双胶纸">
-						</div>
-					</div>
-					<p>
-						装订
-					</p>
-					<div class="layui-form-item">
-						<input type="radio" name="kind3Value3" value="0" title="骑马钉" checked>
-						<input type="radio" name="kind3Value3" value="1" title="胶装">
-					</div>
-					<p>
-						印色
-					</p>
-					<div class="layui-form-item">
-						<input type="radio" name="craftShua" value="0" title="彩色" checked>
-						<input type="radio" name="craftShua" value="1" title="单色">
-					</div>
-					<p>
-						尺寸(CM/厘米)
-						<!-- <span class="switchSize">
-							<input type="checkbox" name="switchSize" class="Size" lay-filter="switchSize" title="自定义尺寸">
-						</span>
-						<span style="font-size:14px;color:red">输入格式: 长 * 宽</span> 
-						<div class="diySize" style="display:none">
-							<input type="text" name="size" placeholder="格式:长*宽" class="layui-input" autocomplete="off">
-						</div>-->
-					</p>
-					<div class="size">
-						<select name="size" id="sizeLess" class="select">
-							<option value="28.5*21">28.5 * 21 cm</option>
-						</select>
-					</div>
-					<p>
-						封面P数   <span style="font-size:14px;color:green">(固定P数)</span>
-					</p>
-					<div class="layui-form-item">
-						<input type="text" value="4" readonly class="layui-input">
-					</div>
-					<p>
-						内页P数  	<span style="font-size:14px;color:red"></span>
-					</p>
-					<div class="layui-form-item">
-						<input type="text" placeholder="请输入内页P数" autocomplete="off" name="pcount" id="lessPcount" class="layui-input">
-					</div>
-					<p>
-						数量(本)
-					</p>
-					<div class="layui-form-item">
-						<input type="text" placeholder="请输入整数" autocomplete="off" name="count" class="layui-input" id="count1">
-					</div>
-				</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>
-				<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>
-				<!--<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 >
-					<table class="layui-hide" id="priceTable" lay-filter="priceTable"></table>
-				</div>
-			</form>
-		</div>
-		<div class="right_div">
-			<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 class="big_box">
+    <div class="left_div">
+        <h1 class="h1">画册</h1> <span style="color:red;font-weight:700;"></span>
+        <hr>
+        <form class="layui-form" id="kindForm">
+            <input type="hidden" name="proTypeValue" id="proTypeValue" class="layui-input" value="19">
+            <div class="layui-form-item">
+                <input type="radio" lay-filter="kind" name="kind" value="常用种类" title="常规" checked="checked">
+                <input type="radio" lay-filter="kind" name="kind" value="少数量" title="少数量(自来稿件)">
+            </div>
+            <div class="normal">
+                <p>
+                    封面
+                </p>
+                <div class="layui-form-item">
+                    <input type="radio" name="kindValue" class="kindValue" value="0" title="250克哑膜" checked="checked">
+                </div>
+                <p>
+                    内页
+                </p>
+                <div class="layui-form-item">
+                    <div class="layui-input-block">
+                        <input type="radio" name="kind2Value" class="kind2Value" value="0" title="157克合板"
+                               checked="checked">
+                        <input type="radio" name="kind2Value" class="kind2Value" value="1" title="160克合板">
+                        <input type="radio" name="kind2Value" class="kind2Value" value="2" title="200克合板">
+                    </div>
+                </div>
+                <p>
+                    装订
+                </p>
+                <div class="layui-form-item">
+                    <input type="radio" name="kind3Value" class="kind3Value" value="0" title="骑马钉" checked="checked">
+                    <!-- <input type="radio" name="kind3Value" class="kind3Value" value="1" title="胶装">  -->
+                </div>
+                <p>
+                    尺寸(CM/厘米) <span style="font-size:14px;color:red">输入格式: 长 * 宽</span>
+                    <input type="checkbox" name="craft" class="craft" value="设计" title="含设计">
+                </p>
+                <div class="layui-form-item">
+                    <input type="text" placeholder="格式:长*宽" name="size" id="size" class="layui-input"
+                           autocomplete="off">
+                </div>
+                <p>
+                    封面P数 <span style="font-size:14px;color:green">(固定P数)</span>
+                </p>
+                <div class="layui-form-item">
+                    <input type="text" value="4" readonly class="layui-input">
+                </div>
+                <p>
+                    内页P数 <span style="font-size:14px;color:red">请输入4的整数倍</span>
+                </p>
+                <div class="layui-form-item">
+                    <input type="text" placeholder="请输入4的整数倍" autocomplete="off" name="pcount" id="pcount"
+                           class="layui-input">
+                </div>
+                <p>
+                    数量(本)
+                </p>
+                <div class="layui-form-item">
+                    <input type="text" placeholder="请输入整数" autocomplete="off" name="count" class="layui-input">
+                </div>
+            </div>
+            <div class="less" style="display:none">
+                <p>
+                    封面
+                </p>
+                <div class="layui-form-item">
+                    <input type="radio" name="kindValue" value="1" title="250克铜版纸">
+                    <input type="radio" name="kindValue" value="2" title="皮纹纸">
+                </div>
+                <p>
+                    内页
+                </p>
+                <div class="layui-form-item">
+                    <div class="layui-input-block">
+                        <input type="radio" name="kind2Value2" value="3" title="157克铜版纸" checked>
+                        <input type="radio" name="kind2Value2" value="4" title="70克双胶纸">
+                    </div>
+                </div>
+                <p>
+                    装订
+                </p>
+                <div class="layui-form-item">
+                    <input type="radio" name="kind3Value3" value="0" title="骑马钉" checked>
+                    <input type="radio" name="kind3Value3" value="1" title="胶装">
+                </div>
+                <p>
+                    印色
+                </p>
+                <div class="layui-form-item">
+                    <input type="radio" name="craftShua" value="0" title="彩色" checked>
+                    <input type="radio" name="craftShua" value="1" title="单色">
+                </div>
+                <p>
+                    尺寸(CM/厘米)
+                    <!-- <span class="switchSize">
+                        <input type="checkbox" name="switchSize" class="Size" lay-filter="switchSize" title="自定义尺寸">
+                    </span>
+                    <span style="font-size:14px;color:red">输入格式: 长 * 宽</span>
+                    <div class="diySize" style="display:none">
+                        <input type="text" name="size" placeholder="格式:长*宽" class="layui-input" autocomplete="off">
+                    </div>-->
+                </p>
+                <div class="size">
+                    <select name="size" id="sizeLess" class="select">
+                        <option value="28.5*21">28.5 * 21 cm</option>
+                    </select>
+                </div>
+                <p>
+                    封面P数 <span style="font-size:14px;color:green">(固定P数)</span>
+                </p>
+                <div class="layui-form-item">
+                    <input type="text" value="4" readonly class="layui-input">
+                </div>
+                <p>
+                    内页P数 <span style="font-size:14px;color:red"></span>
+                </p>
+                <div class="layui-form-item">
+                    <input type="text" placeholder="请输入内页P数" autocomplete="off" name="pcount" id="lessPcount"
+                           class="layui-input">
+                </div>
+                <p>
+                    数量(本)
+                </p>
+                <div class="layui-form-item">
+                    <input type="text" placeholder="请输入整数" autocomplete="off" name="count" class="layui-input"
+                           id="count1">
+                </div>
+            </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>
+            <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>
+            <!--<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>
+                <table class="layui-hide" id="priceTable" lay-filter="priceTable"></table>
+            </div>
+        </form>
+    </div>
+    <div class="right_div">
+        <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>
 <script src="../../js/carousel.js" charset="utf-8"></script>
-<%@include file="/views/copyResult.jsp"%>
+<%@include file="/views/copyResult.jsp" %>
 <script>
-layui.use(['table','form'], function(){    
-    var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
-    var table = layui.table;
-	
-    
-  	//输入框的值改变时触发
-	$("#lessPcount").on("input",function(e){
-		//获取input输入的值
-		if(e.delegateTarget.value > 36 && $('input[name="kind3Value3"]:checked').val() != "1"){
-			layer.msg('内页超过36P装订方式请选择【胶装】!',{offset:['300px','300px']},function(){});
-    	}
-	});
-    
-    var kind ;
- 	// 没选按钮时候默认禁用少数量(防止提交表单)
-    $(".less").find(":input").attr("disabled", true); 
-    form.on('radio(kind)', function(kindData) {
-		kind = kindData.value;
-	    if(kindData.value == "常用种类"){
-	    	// 切换按钮的时候,重置kind品种
-			$("#kindForm")[0].reset();
-			// 切换为品种单选框
-			$(".normal").show();
-			$(".normal").find(":input").attr("disabled", false); 
-			$(".less").hide();
-			$(".less").find(":input").attr("disabled", true); 
-		}else{
-			// 少数量、专版打印的时候,切换为品种下拉框
-			$(".less").show();
-			$(".less").find(":input").attr("disabled", false); 
-			$(".normal").hide();
-			$(".normal").find(":input").attr("disabled", true); 
-			$('input[class = craft]').prop('checked', false);
-		}
-	 	form.render();//必须写
-	})
-	
-	// 自定义少数量
-	/* form.on('checkbox(switchSize)', function(data) {
-		if (data.elem.checked) {
-			$(".diySize").show();
-			$(".size").hide();
-			$(".diySize").find(":input").attr("disabled", false);
-			$(".size").find(":input").attr("disabled", true);
-		}else{
-			$(".size").show();
-			$(".diySize").hide();
-			$(".size").find(":input").attr("disabled", false);
-			$(".diySize").find(":input").attr("disabled", true);	
-			// 恢复标准的时候会被禁用,加这个解决
-			form.render();
-		}
-	}) */
-	
-	// 点击计算,计算价格
-	form.on('submit(acount_btn)', function(data) {
-		var kindValue = $('input[name="kindValue"]:checked').val();
-		var kind2Value = $('input[name="kind2Value"]:checked').val();
-		var kind3Value = $('input[name="kind3Value"]:checked').val();
-		var kindData={
-			0 :"250克哑膜",
-			1 :"250克铜版纸",
-			2 :"皮纹纸"
-		},kind2Data={
-			0 :"157克合板",	
-			1 :"160克合板",
-			2 :"200克合板",
-			3 :"157克铜版纸",
-			4 :"70克双胶纸"
-		},kind3Data={
-			0 :"骑马钉",
-			1 :"胶装"
-		},caratShuaData={
-			0 :"彩色",
-			1 :"单色"	
-		};		
-		var size   = $("#size").val();
-		var pcount = $("#pcount").val();
-		var number = $("#number").val();
-		if(kind == "少数量"){
-			var pcount = $("#lessPcount").val();
-			var size = $("#sizeLess option:checked").val();	
-			var kind2Value = $('input[name="kind2Value2"]:checked').val();
-			var kind3Value = $('input[name="kind3Value3"]:checked').val();
-			var craftShua = $('input[name="craftShua"]:checked').val();
-			//获取input输入的值
-			if(pcount > 36 && $('input[name="kind3Value3"]:checked').val() != "1"){
-				layer.msg('内页超过36P装订方式请选择【胶装】!',{offset:['300px','300px']},function(){});
-				return false;
-	    	}
-			if(kindValue == 0){
-				layer.msg('请选择封面!',{offset:['300px','300px']},function(){});
-				return false;
-	    	}
-			
-		}
-		
-		if($('input[name="kind"]:checked').val() == "常用种类"){
-			if(!size){
-				layer.msg('请填写尺寸!',{offset:['300px','300px']},function(){});
-				return false;
-			}
-			if ((size.split("*")[0] > 21 || size.split("*")[1] > 28.5) && (size.split("*")[0] > 28.5 || size.split("*")[1] > 21)) {
-				layer.msg("尺寸超过 28.5*21 cm 请单独报价",{offset:['300px','300px']},function(){});
-				return false;
-			}
-		}
-		if(kind != "少数量"){
-			if(pcount%4 != 0){
-				layer.msg('内页P数需为 4 的整数倍!',{offset:['300px','300px']},function(){});
-				return false;
-			}
-			// 200克合板只有36P价格(含封面4P)
-			if(kind2Value == 2){
-				if (pcount > 32){
-					layer.msg('200克合板内页P数大于 32P 请单独报价!',{offset:['300px','300px']},function(){});
-					return false;
-				}
-			}else{
-				if (pcount > 48){
-					layer.msg('157、160克内页P数大于 48P 请单独报价!',{offset:['300px','300px']},function(){});
-					return false;
-				}
-			}
-		}
-		$.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 kind   = kindData[kindValue];		
-				var kind2  = kind2Data[kind2Value];		
-				var kind3  = kind3Data[kind3Value];	
-				var craft = caratShuaData[craftShua];
-				if($('input[name="kind"]:checked').val() == "少数量"){
-					var span_result = '画册(自来稿件) - 封面:' + kind +' - 内页:'+ kind2 +' - '+ kind3 + ' - '+ [craft] + ' - ' + size + ' CM -(同款内容)\n' + "封面P数 :4\n" + "内页P数 :" + pcount + '\n';
-				}else{
-					var span_result = '画册 - 封面:' + kind +' - 内页:'+ kind2 +' - '+ kind3 + ' - ' + size + ' CM -(同款内容)\n' + "封面P数 :4\n" + "内页P数 :" + pcount + '\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 += '包邮(偏远地区需补邮费)';
-				if($("input[name='craft']:checked").val() == "设计"){
-					span_result += ",(包含设计费)";
-				}
-				$("#span_result").val(span_result);
-				
-				var count = "";
-				if($(".less").css("display") == "none"){
-					count = $("input[name='count']").val();
-				}else{
-					count = $("#count1").val();
-				}
-				var medol = $("input[name='kind2Value']:checked").attr("title");
-				medol = medol.replace("合版", "");
-				kind = "250克铜版纸-"+pcount+"P封面覆哑膜" + medol + "内页骑马钉";
-				getRemark("画册", size, count+"本", kind, number, "", "");
-				//计算完自动复制文本
-				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;
-	});
-});
+    layui.use(['table', 'form'], function () {
+        var form = layui.form; //只有执行了这一步,部分表单元素才会自动修饰成功
+        var table = layui.table;
+
+
+        //输入框的值改变时触发
+        $("#lessPcount").on("input", function (e) {
+            //获取input输入的值
+            if (e.delegateTarget.value > 36 && $('input[name="kind3Value3"]:checked').val() != "1") {
+                layer.msg('内页超过36P装订方式请选择【胶装】!', {offset: ['300px', '300px']}, function () {
+                });
+            }
+        });
+
+        var kind;
+        // 没选按钮时候默认禁用少数量(防止提交表单)
+        $(".less").find(":input").attr("disabled", true);
+        form.on('radio(kind)', function (kindData) {
+            kind = kindData.value;
+            if (kindData.value == "常用种类") {
+                // 切换按钮的时候,重置kind品种
+                $("#kindForm")[0].reset();
+                // 切换为品种单选框
+                $(".normal").show();
+                $(".normal").find(":input").attr("disabled", false);
+                $(".less").hide();
+                $(".less").find(":input").attr("disabled", true);
+            } else {
+                // 少数量、专版打印的时候,切换为品种下拉框
+                $(".less").show();
+                $(".less").find(":input").attr("disabled", false);
+                $(".normal").hide();
+                $(".normal").find(":input").attr("disabled", true);
+                $('input[class = craft]').prop('checked', false);
+            }
+            form.render();//必须写
+        })
+
+        // 自定义少数量
+        /* form.on('checkbox(switchSize)', function(data) {
+            if (data.elem.checked) {
+                $(".diySize").show();
+                $(".size").hide();
+                $(".diySize").find(":input").attr("disabled", false);
+                $(".size").find(":input").attr("disabled", true);
+            }else{
+                $(".size").show();
+                $(".diySize").hide();
+                $(".size").find(":input").attr("disabled", false);
+                $(".diySize").find(":input").attr("disabled", true);
+                // 恢复标准的时候会被禁用,加这个解决
+                form.render();
+            }
+        }) */
+
+        // 点击计算,计算价格
+        form.on('submit(acount_btn)', function (data) {
+            var kindValue = $('input[name="kindValue"]:checked').val();
+            var kind2Value = $('input[name="kind2Value"]:checked').val();
+            var kind3Value = $('input[name="kind3Value"]:checked').val();
+            var kindData = {
+                0: "250克哑膜",
+                1: "250克铜版纸",
+                2: "皮纹纸"
+            }, kind2Data = {
+                0: "157克合板",
+                1: "160克合板",
+                2: "200克合板",
+                3: "157克铜版纸",
+                4: "70克双胶纸"
+            }, kind3Data = {
+                0: "骑马钉",
+                1: "胶装"
+            }, caratShuaData = {
+                0: "彩色",
+                1: "单色"
+            };
+            var size = $("#size").val();
+            var pcount = $("#pcount").val();
+            var number = $("#number").val();
+            if (kind == "少数量") {
+                var pcount = $("#lessPcount").val();
+                var size = $("#sizeLess option:checked").val();
+                var kind2Value = $('input[name="kind2Value2"]:checked').val();
+                var kind3Value = $('input[name="kind3Value3"]:checked').val();
+                var craftShua = $('input[name="craftShua"]:checked').val();
+                //获取input输入的值
+                if (pcount > 36 && $('input[name="kind3Value3"]:checked').val() != "1") {
+                    layer.msg('内页超过36P装订方式请选择【胶装】!', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                if (kindValue == 0) {
+                    layer.msg('请选择封面!', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+
+            }
+
+            if ($('input[name="kind"]:checked').val() == "常用种类") {
+                if (!size) {
+                    layer.msg('请填写尺寸!', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                if ((size.split("*")[0] > 21 || size.split("*")[1] > 28.5) && (size.split("*")[0] > 28.5 || size.split("*")[1] > 21)) {
+                    layer.msg("尺寸超过 28.5*21 cm 请单独报价", {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+            }
+            if (kind != "少数量") {
+                if (pcount % 4 != 0) {
+                    layer.msg('内页P数需为 4 的整数倍!', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                // 200克合板只有36P价格(含封面4P)
+                if (kind2Value == 2) {
+                    if (pcount > 32) {
+                        layer.msg('200克合板内页P数大于 32P 请单独报价!', {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    }
+                } else {
+                    if (pcount > 48) {
+                        layer.msg('157、160克内页P数大于 48P 请单独报价!', {offset: ['300px', '300px']}, function () {
+                        });
+                        return false;
+                    }
+                }
+            }
+            $.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 kind = kindData[kindValue];
+                    var kind2 = kind2Data[kind2Value];
+                    var kind3 = kind3Data[kind3Value];
+                    var craft = caratShuaData[craftShua];
+                    if ($('input[name="kind"]:checked').val() == "少数量") {
+                        var span_result = '画册(自来稿件) - 封面:' + kind + ' - 内页:' + kind2 + ' - ' + kind3 + ' - ' + [craft] + ' - ' + size + ' CM -(同款内容)\n' + "封面P数 :4\n" + "内页P数 :" + pcount + '\n';
+                    } else {
+                        var span_result = '画册 - 封面:' + kind + ' - 内页:' + kind2 + ' - ' + kind3 + ' - ' + size + ' CM -(同款内容)\n' + "封面P数 :4\n" + "内页P数 :" + pcount + '\n';
+                    }
+                    if (number > 1) {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 各' + data[i].count + "本,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/本\n'
+                            data[i].number = number;
+                        }
+                    } else {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 ' + data[i].count + "本,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/本\n'
+                            data[i].number = number;
+                        }
+                    }
+                    span_result += '包邮(偏远地区需补邮费)';
+                    if ($("input[name='craft']:checked").val() == "设计") {
+                        span_result += ",(包含设计费)";
+                    }
+                    $("#span_result").val(span_result);
+
+                    var count = "";
+                    if ($(".less").css("display") == "none") {
+                        count = $("input[name='count']").val();
+                    } else {
+                        count = $("#count1").val();
+                    }
+                    var medol = $("input[name='kind2Value']:checked").attr("title");
+                    medol = medol.replace("合版", "");
+                    kind = "250克铜版纸-" + pcount + "P封面覆哑膜" + medol + "内页骑马钉";
+                    getRemark("画册", size, count + "本", kind, number, "", "");
+                    //计算完自动复制文本
+                    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>

+ 2 - 2
src/main/webapp/views/product/placeMat.jsp

@@ -141,12 +141,12 @@ layui.use(['table','form','carousel'], function(){
 				var span_result ="餐垫纸 - " + kind +' - '+ size +' 厘米 -(同款内容)\n';
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
 						data[i].number = number;
 			        }   
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
 						data[i].number = number;
 			        }   
 				}

+ 6 - 6
src/main/webapp/views/product/poster.jsp

@@ -1668,12 +1668,12 @@
                                 span_result += "款数:" + number + "-" + numberType + "\n";
                             }
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 各' + data[i].count + unit + ",共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 各' + data[i].count + unit + ",共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/' + unit + '\n'
                                 data[i].number = number;
                             }
                         } else {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 ' + data[i].count + unit + ",共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 ' + data[i].count + unit + ",共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/' + unit + '\n'
                                 data[i].number = number;
                             }
                         }
@@ -1698,13 +1698,13 @@
                         var span_result = kindData[kind] + ' - ' + kind2 + ' - ' + size + 'cm * ' + width + ' - ' + craftTiao + '\n';
                         if (number > 1) {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
                                 data[i].number = number;
                                 data[i].kindLabel = "条幅"
                             }
                         } else {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
                                 data[i].number = number;
                                 data[i].kindLabel = "条幅"
                             }
@@ -1718,13 +1718,13 @@
                         var span_result = kindData[kind] + ' - ' + kind2 + ' - ' + size + 'cm' + '\n';
                         if (number > 1) {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
                                 data[i].number = number;
                                 data[i].kindLabel = "条幅"
                             }
                         } else {
                             for (let i = 0; i < data.length; i++) {
-                                span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + '\n'
+                                span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元"+ "," + (data[i].price / number / data[i].count).toFixed(2) + '/条\n'
                                 data[i].number = number;
                                 data[i].kindLabel = "条幅"
                             }

+ 2 - 2
src/main/webapp/views/product/programCard.jsp

@@ -154,12 +154,12 @@ layui.use(['table','form','carousel'], function(){
 				var span_result ="节目单- " + kind1 +' - '+ kind + " - " + kind2 +' -(同款内容)\n' + "工艺 :"+ arr + "\n";
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 						data[i].number = number;
 			        }   
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 						data[i].number = number;
 			        }   
 				}

+ 2 - 2
src/main/webapp/views/product/pvcCard.jsp

@@ -302,12 +302,12 @@
                     var span_result = 'PVC异形卡片 - ' + kind + ' - ' + size + ' CM' + ' - ' + craft + ' - ' + craftShua + ' - ' + craftJiao + '\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/pvcfigure.jsp

@@ -316,12 +316,12 @@
                     var span_result = "数码PVC" + ' - ' + kindValue + '-' + size + 'cm' + '-' + shua + ' -(同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 3 - 3
src/main/webapp/views/product/rollLabel.jsp

@@ -256,17 +256,17 @@
                     if (!!craftTang) {
                         craft_list.push(craftTang);
                     }
-                    if(craft_list.length > 0){
+                    if (craft_list.length > 0) {
                         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'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/roomCard.jsp

@@ -209,12 +209,12 @@ layui.use(['table','form','carousel'], function(){
 					
 					if(number > 1){
 						for (let i = 0; i < data.length; i++) {
-							span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+							span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 							data[i].number = number;
 				        }   
 					}else{
 						for (let i = 0; i < data.length; i++) {
-							span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+							span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
 							data[i].number = number;
 				        }   
 					}

+ 234 - 224
src/main/webapp/views/product/slq.jsp

@@ -1,234 +1,244 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-	<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+         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"%>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+    <%@include file="/views/common.jsp" %>
 </head>
 <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="kindValue" id="kindValue" lay-filter="kindValue" class="select" lay-search>
-						<option value=""></option>
-						<option value="1">春亚布</option>
-						<option value="2">贡缎布</option>
-					</select>
-				</div>
-				<p>
-					宽度
-				</p>
-				<div class="layui-form-item">
-					<select name="width" id="width" class="select">
-							<option value="17">17cm</option>
-							<option value="24">24cm</option>
-						</select>
-				</div>
-				<p>
-					长度(CM/厘米)
-				</p>
-				<div class="layui-form-item">
-					<input type="text" placeholder="请输入长度" name="size" id="size" class="layui-input" autocomplete="off">
-				</div>
-				<p>
-					数量(个)
-				</p>
-				<div class="layui-form-item">
-					<input type="text" placeholder="请输入整数" autocomplete="off" name="count" class="layui-input" id="count">
-				</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>
-				<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>
+<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="kindValue" id="kindValue" lay-filter="kindValue" class="select" lay-search>
+                    <option value=""></option>
+                    <option value="1">春亚布</option>
+                    <option value="2">贡缎布</option>
+                </select>
+            </div>
+            <p>
+                宽度
+            </p>
+            <div class="layui-form-item">
+                <select name="width" id="width" class="select">
+                    <option value="17">17cm</option>
+                    <option value="24">24cm</option>
+                </select>
+            </div>
+            <p>
+                长度(CM/厘米)
+            </p>
+            <div class="layui-form-item">
+                <input type="text" placeholder="请输入长度" name="size" id="size" class="layui-input" autocomplete="off">
+            </div>
+            <p>
+                数量(个)
+            </p>
+            <div class="layui-form-item">
+                <input type="text" placeholder="请输入整数" autocomplete="off" name="count" class="layui-input" id="count">
+            </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>
+            <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"%>
+<%@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();
-	$.ajax({
-		url:"${pageContext.request.contextPath}/getImgs",
-		type:"GET",
-		data:{
-			proTypeValue : $("#proTypeValue").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('submit(acount_btn)', function(data) {
-		var number= $("#number").val();
-		var length  = $("#size").val();
-		var width = $("#width option:selected").val();
-		var count = $("#count").val();
-		var kind = $("#kindValue option:selected").text();
-		var craft = $("input[name='craft']:checked").val();
-		if(!length){
-			layer.msg('请填写长度!',{offset:['300px','300px']},function(){});
-			return false;
-		}
-		if(length > 100){
-			layer.msg('最大长度100cm!',{offset:['300px','300px']},function(){});
-			return false;
-		}
-		if(!count){
-			layer.msg('请填写数量!',{offset:['300px','300px']},function(){});
-			return false;
-		}
-		$.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;
-				if((length == 70 && width == 24)||(length == 50 && width == 17)){
-					kind += "(特价)";
-				}
-				var span_result = '手拉旗 - ' + kind + '-' +  length + '*' + width +' CM (同款内容)\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;
-	});
-});
+    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();
+        $.ajax({
+            url: "${pageContext.request.contextPath}/getImgs",
+            type: "GET",
+            data: {
+                proTypeValue: $("#proTypeValue").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('submit(acount_btn)', function (data) {
+            var number = $("#number").val();
+            var length = $("#size").val();
+            var width = $("#width option:selected").val();
+            var count = $("#count").val();
+            var kind = $("#kindValue option:selected").text();
+            var craft = $("input[name='craft']:checked").val();
+            if (!length) {
+                layer.msg('请填写长度!', {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            if (length > 100) {
+                layer.msg('最大长度100cm!', {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            if (!count) {
+                layer.msg('请填写数量!', {offset: ['300px', '300px']}, function () {
+                });
+                return false;
+            }
+            $.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;
+                    if ((length == 70 && width == 24) || (length == 50 && width == 17)) {
+                        kind += "(特价)";
+                    }
+                    var span_result = '手拉旗 - ' + kind + '-' + length + '*' + width + ' CM (同款内容)\n';
+                    if (number > 1) {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
+                            data[i].number = number;
+                        }
+                    } else {
+                        for (let i = 0; i < data.length; i++) {
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\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>

+ 2 - 2
src/main/webapp/views/product/specialCard2.jsp

@@ -757,12 +757,12 @@
                             span_result += "款数:" + number + "-" + numberType + "\n";
                         }
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元"  + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/stickers.jsp

@@ -1797,11 +1797,11 @@
                         }
                         for (let i = 0; i < data.length; i++) {
                             data[i].number = number;
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/tablecolth.jsp

@@ -179,12 +179,12 @@
                     var span_result = '桌布 - ' + kind + '-' + size + ' CM (同款内容)\n';
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }

+ 4 - 5
src/main/webapp/views/product/tagClothes.jsp

@@ -572,7 +572,6 @@
                     $("#tag").show();
                     $("#tag").find(":input").attr("disabled", false);
 
-
                     form.render();
                 }
             } else {
@@ -884,7 +883,7 @@
                                     price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
                                 }
 
-                                span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + price_text + '\n'
+                                span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + price_text + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                                 data[i].number = number;
                             }
                         } else {
@@ -894,7 +893,7 @@
                                 if (shengku) {
                                     price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
                                 }
-                                span_result += data[i].count + "张" + data[i].price + "元" + price_text + '\n'
+                                span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + price_text + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                                 data[i].number = number;
                             }
                         }
@@ -914,7 +913,7 @@
                                 if (shengku) {
                                     price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
                                 }
-                                span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + price_text + '\n'
+                                span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + price_text + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                                 data[i].number = number;
                             }
                         } else {
@@ -925,7 +924,7 @@
                                 if (shengku) {
                                     price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
                                 }
-                                span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + price_text + '\n'
+                                span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + price_text + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                                 data[i].number = number;
                             }
                         }

+ 2 - 2
src/main/webapp/views/product/warmSticker.jsp

@@ -157,12 +157,12 @@ layui.use(['table','form','carousel'], function(){
 				var span_result ='暖心贴 - ' + kindValueData[kindValue] + ' - ' + kind2Value + '(每本50张)\n';
 				if(number > 1){
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 各' + data[i].count + "本,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 各' + data[i].count + "本,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/本\n'
 						data[i].number = number;
 			        }   
 				}else{
 					for (let i = 0; i < data.length; i++) {
-						span_result += number + '款 ' + data[i].count + "本,共" + data[i].price + "元" + '\n'
+						span_result += number + '款 ' + data[i].count + "本,共" + data[i].price + "元"  + "," + (data[i].price / number / data[i].count).toFixed(2) + '/本\n'
 						data[i].number = number;
 			        }   
 				}

+ 2 - 2
src/main/webapp/views/product/waterGauge.jsp

@@ -259,12 +259,12 @@
 
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
                             data[i].number = number;
                         }
                     }

+ 2 - 2
src/main/webapp/views/product/weddingCard.jsp

@@ -223,12 +223,12 @@
                     craft += craftShua + craftMo;
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     } else {
                         for (let i = 0; i < data.length; i++) {
-                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+                            span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + ","+(data[i].price / number / data[i].count).toFixed(2) + '/个\n'
                             data[i].number = number;
                         }
                     }