From d7a091708393a53a52adebbbe115b126c7b3aaa1 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Mon, 15 Dec 2025 10:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=99=E8=96=B0=E5=8D=A1?=
 =?UTF-8?q?=E3=80=81=E5=86=B0=E7=AE=B1=E8=B4=B4=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/lingtao/net/service/ProductService.java     |  6 +++---
 src/main/webapp/views/product/aromatherapyCard.jsp   | 12 ++++++------
 src/main/webapp/views/product/fridgeMagnet.jsp       |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

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 @@
                 </select>
             </div>
             <p>
-                尺寸(CM/厘米) <span style="font-size: 14px; color: red">输入格式: 长 * 宽</span>
+                尺寸(MM/毫米) <span style="font-size: 14px; color: red">输入格式: 长 * 宽</span>
             </p>
             <div class="layui-form-item" id="ui_size">
                 <input type="text" name="size" id="size" placeholder="格式:长*宽" class="layui-input" autocomplete="off">
@@ -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 @@
             <div class="layui-form-item">
                 <select name="cailiao" class="select">
                     <option value="2.3">2.3mm</option>
-                    <option value="4.6">4.6mm</option>
+                    <option value="4.2">4.2mm</option>
                 </select>
             </div>
             <p>