diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index d5c3a14..c507751 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -5091,7 +5091,7 @@ public class ProductService { prices = new int[]{0, 1500, 1400, 1350, 1300, 1280, 1250, 1100, 1000, 950, 900, 850, 850, 850, 850, 850}; last_price = 850; } - if ("4.6".equals(cailiao) && carft_list.contains("CNC")) { + if ("4.2".equals(cailiao) && carft_list.contains("CNC")) { prices = new int[]{0, 1600, 1500, 1480, 1450, 1400, 1380, 1350, 1300, 1250, 1200, 1200, 1200, 1200, 1200, 1200}; last_price = 1200; } @@ -5264,8 +5264,8 @@ public class ProductService { base_price = 35; min_price = 60; } - width = width * 10 + 4; - length = length * 10 + 4; + width = width + 4; + length = length + 4; double max = 1; diff --git a/src/main/webapp/views/product/aromatherapyCard.jsp b/src/main/webapp/views/product/aromatherapyCard.jsp index 9573d7e..0686620 100644 --- a/src/main/webapp/views/product/aromatherapyCard.jsp +++ b/src/main/webapp/views/product/aromatherapyCard.jsp @@ -31,7 +31,7 @@

- 尺寸(CM/厘米) 输入格式: 长 * 宽 + 尺寸(MM/毫米) 输入格式: 长 * 宽

@@ -313,13 +313,13 @@ }); return false; } - if ((size.split("*")[0] > 42 || size.split("*")[1] > 28.5) && (size.split("*")[1] > 42 || size.split("*")[0] > 28.5)) { - layer.msg('最大尺寸42*28.5cm!', {offset: ['300px', '300px']}, function () { + if ((size.split("*")[0] > 420 || size.split("*")[1] > 285) && (size.split("*")[1] > 420 || size.split("*")[0] > 285)) { + layer.msg('最大尺寸420*285MM!', {offset: ['300px', '300px']}, function () { }); return false; } - if ((size.split("*")[0] < 1 || size.split("*")[1] < 1)) { - layer.msg('最小尺寸1*1cm!', {offset: ['300px', '300px']}, function () { + if ((size.split("*")[0] < 10 || size.split("*")[1] < 10)) { + layer.msg('最小尺寸10*10MM!', {offset: ['300px', '300px']}, function () { }); return false; } @@ -365,7 +365,7 @@ } var data = result.data.proList; - var span_result = '香薰卡 - ' + kind + ' - ' + size + ' CM (同款内容)\n'; + var span_result = '香薰卡 - ' + kind + ' - ' + size + ' MM (同款内容)\n'; span_result += `工艺:` + craft.join(",") + '\n'; diff --git a/src/main/webapp/views/product/fridgeMagnet.jsp b/src/main/webapp/views/product/fridgeMagnet.jsp index 44d1860..b0b727b 100644 --- a/src/main/webapp/views/product/fridgeMagnet.jsp +++ b/src/main/webapp/views/product/fridgeMagnet.jsp @@ -54,7 +54,7 @@