diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index 3ed5cb4..2e1599c 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -818,20 +818,21 @@ public class ProductService { } return priceList; } - - if (!"7".equals(dto.getKind()) && !"8".equals(dto.getKind()) && !"1".equals(dto.getKind())) { - if ((length < 4 || width < 4)) { - for (int i = 0; i < dto.getCraft().length; i++) { - if ("直角裁切".equals(dto.getCraft()[i])) { - dto.getCraft()[i] = "模切"; - } - } - } - } int min = getNum(length, width); String[] kind_list = {"3", "4", "5", "7"}; dto.setD(""); - priceList = getHekaPrice(min, dto, priceList, count); + if (!"7".equals(dto.getKind()) && !"8".equals(dto.getKind()) && !"1".equals(dto.getKind())) { + if ((length < 4 || width < 4)) { + Product product = new Product(); + product.setProTypeValue("3"); + product.setCount(dto.getCount()); + product.setKindValue("0"); + priceList = productMapper.getThanPrice(product); + } + } + if (priceList.size() == 0) { + priceList = getHekaPrice(min, dto, priceList, count); + } boolean isyaofeng = false; double moqiePrice = 0; @@ -4900,6 +4901,25 @@ public class ProductService { }; count_list = new int[]{10, 20, 30, 40, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000}; } + if ("4".equals(dto.getKind())) { + prices = new double[][]{ + {362, 678}, + {423, 802}, + {507, 980}, + {545, 1033}, + {643, 1225}, + }; + if (carftList.contains("满底全彩")) { + prices = new double[][]{ + {422, 832}, + {472, 922}, + {534, 1072}, + {575, 1160}, + {665, 1363}, + }; + } + count_list = new int[]{50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000}; + } List list = new ArrayList<>(); double last_price = 0; int last_count = 0; diff --git a/src/main/webapp/views/product/tape.jsp b/src/main/webapp/views/product/tape.jsp index b9d867a..cd877a9 100644 --- a/src/main/webapp/views/product/tape.jsp +++ b/src/main/webapp/views/product/tape.jsp @@ -23,6 +23,7 @@ + @@ -187,6 +188,7 @@ let kind = document.getElementById("kind").value; let html = ''; let count = document.getElementById("count").value; + if (kind == '1') { html = ` @@ -257,7 +259,12 @@ } } + if (kind == '4') { + html += ``; + html += ``; + } $("#color").empty().append(html); + form.render(); } @@ -266,6 +273,35 @@ }) form.on('select(kind)', function (data) { setColor(); + let countHtml = ` + + + + + + + + + + + + `; + if (data.value == '4') { + countHtml = ` + + + + + + + + + + + `; + } + $("#count").empty().append(countHtml); + form.render(); }) form.on('checkbox(ui_craft)', function (data) { let craft_list = []; diff --git a/src/main/webapp/views/system/customerTrain/skill/showSkillContent.jsp b/src/main/webapp/views/system/customerTrain/skill/showSkillContent.jsp index 740edc7..5ee5396 100644 --- a/src/main/webapp/views/system/customerTrain/skill/showSkillContent.jsp +++ b/src/main/webapp/views/system/customerTrain/skill/showSkillContent.jsp @@ -169,7 +169,7 @@ }); } else if (obj.event === 'view') { // 在此处输入 layer 的任意代码 - navigator.clipboard.writeText(data.content); + navigator.clipboard.writeText(data1.content); layer.msg('复制成功!', {icon: 6, offset: 'auto', time: 1000}); } })