diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java
index 674321e..9feeade 100644
--- a/src/main/java/lingtao/net/service/ProductService.java
+++ b/src/main/java/lingtao/net/service/ProductService.java
@@ -6550,6 +6550,13 @@ public class ProductService {
         pro.setPrice(Math.ceil(price + card_price));
         priceList.add(pro);
 
+        if (role.contains("1045")) {
+            for (Product product : priceList) {
+                product.setPrice(Math.ceil(pro.getPrice() * 0.85));
+            }
+        }
+
+
         return priceList;
     }
 
diff --git a/src/main/webapp/views/product/fridgeMagnet.jsp b/src/main/webapp/views/product/fridgeMagnet.jsp
index dab8827..e52ff8c 100644
--- a/src/main/webapp/views/product/fridgeMagnet.jsp
+++ b/src/main/webapp/views/product/fridgeMagnet.jsp
@@ -74,7 +74,7 @@
                        class="layui-input">
             </div>
             <p>
-                工艺<span style="font-size: 14px; color: red">一套为一款</span>
+                工艺<span id="craft_tip" style="display: none;font-size: 14px; color: red">一套为一款</span>
             </p>
             <div class="layui-form-item" id='z4_craft'>
                 <div class="layui-input-block">
@@ -250,6 +250,7 @@
             $(".xhbeika").find("input").prop("disabled", true)
             $("input[name='craft'][value='现货背卡']").parent().hide();
             $("input[name='craft'][value='现货背卡']").find("input").prop("disabled", true);
+            $("#craft_tip").hide();
             if (kindValue == "对联冰箱贴") {
                 $("input[name='craft'][value='现货背卡']").parent().show();
                 $("input[name='craft'][value='现货背卡']").find("input").prop("disabled", false);
@@ -265,6 +266,7 @@
                 $(".beika").find("input").prop("disabled", true)
                 $(".xhbeika").show();
                 $(".xhbeika").find("input").prop("disabled", false)
+                $("#craft_tip").show();
             }
             $("#cailiao").empty();
             $("#cailiao").append(cailiaoHtml);
@@ -484,6 +486,7 @@
                     if (window.parent.system_isGai) {
                         span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!"
                     }
+
                     addLog(span_result);
                     $("#span_result").val(span_result);
                     //计算完自动复制文本
diff --git a/src/main/webapp/views/product/keychain.jsp b/src/main/webapp/views/product/keychain.jsp
index 696dc3c..59b1673 100644
--- a/src/main/webapp/views/product/keychain.jsp
+++ b/src/main/webapp/views/product/keychain.jsp
@@ -77,18 +77,26 @@
                     <div class="layui-inline zyselect" style="width:200px; display:none">
                         <select name="bianma" class="layui-select ">
                             <option value="圆型钥匙扣银色">圆型钥匙扣银色</option>
-                            <option value="星星钥匙扣金/银色">星星钥匙扣金/银色</option>
-                            <option value="兔子钥匙扣金/银色">兔子钥匙扣金/银色</option>
+                            <option value="星星钥匙扣金色">星星钥匙扣金色</option>
+                            <option value="星星钥匙扣银色">星星钥匙扣银色</option>
+                            <option value="兔子钥匙扣金色">兔子钥匙扣金色</option>
+                            <option value="兔子钥匙扣银色">兔子钥匙扣银色</option>
                             <option value="龙虾型钥匙扣银色">龙虾型钥匙扣银色</option>
                             <option value="珠链银色">珠链银色</option>
-                            <option value="方形钥匙扣/金/银色">方形钥匙扣/金/银色</option>
-                            <option value="猫头钥匙扣金/银色">猫头钥匙扣金/银色</option>
-                            <option value="猫钥匙扣金/银色">猫钥匙扣金/银色</option>
+                            <option value="方形钥匙扣金色">方形钥匙扣金色</option>
+                            <option value="方形钥匙扣银色">方形钥匙扣银色</option>
+                            <option value="猫头钥匙扣金色">猫头钥匙扣金色</option>
+                            <option value="猫头钥匙扣银色">猫头钥匙扣银色</option>
+                            <option value="猫钥匙扣金色">猫钥匙扣金色</option>
+                            <option value="猫钥匙扣银色">猫钥匙扣银色</option>
                             <option value="D字扣银色">D字扣银色</option>
                             <option value="挂绳">挂绳</option>
-                            <option value="小樱花钥匙扣金/银色">小樱花钥匙扣金/银色</option>
-                            <option value="心形钥匙扣金/银色">心形钥匙扣金/银色</option>
-                            <option value="月亮钥匙扣金/银色">月亮钥匙扣金/银色</option>
+                            <option value="小樱花钥匙扣金色">小樱花钥匙扣金色</option>
+                            <option value="小樱花钥匙扣银色">小樱花钥匙扣银色</option>
+                            <option value="心形钥匙扣金色">心形钥匙扣金色</option>
+                            <option value="心形钥匙扣银色">心形钥匙扣银色</option>
+                            <option value="月亮钥匙扣金色">月亮钥匙扣金色</option>
+                            <option value="月亮钥匙扣银色">月亮钥匙扣银色</option>
                             <option value="钢丝圈红色">钢丝圈红色</option>
                         </select>
                     </div>
diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp
index cb17c0c..b96c1ca 100644
--- a/src/main/webapp/views/product/stickers.jsp
+++ b/src/main/webapp/views/product/stickers.jsp
@@ -2001,6 +2001,17 @@
                     if (window.parent.system_isGai) {
                         span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!"
                     }
+                    if ((kindValue == "15" || kindValue == "树纹纸") && window.parent.system_isPddPrice) {
+                        let padCraft = false;
+                        craft_list.forEach(item => {
+                            if (item == "彩色印刷") {
+                                padCraft = true;
+                            }
+                        })
+                        if (padCraft) {
+                            span_result += "\n\n亲亲  当天15点之前定稿  可以当天发货哦！"
+                        }
+                    }
                     addLog(span_result);
                     $("#span_result").val(span_result);
                     if (stickerKind == "封口贴") {