修改pVc价格

src/main/java/lingtao/net/util/ZsPrice.java

@@ -71,34 +71,16 @@ public class ZsPrice {
         if (number > 1) {
             double desFee = 0;
 
-            if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
+            if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
-                if (dto.getP() == 1) {
+                desFee = 3;
-                    desFee = 0.6 * (number - 1);
+            } else if (dto.getP() == 4) {
-                } else {
+                desFee = 5;
-                    desFee = 10 * (number - 1);
+            } else if (dto.getP() == 5) {
-//                    if (number == 2) {
+                desFee = 6;
-//                        desFee = 5.75;
-//                    }
-//                    if (number == 3) {
-//                        desFee = 5.75 + 3.75;
-//                    }
-//                    if (number > 3) {
-//                        desFee = 5.75 + 3.75 + 2.75 * (number - 3);
-//                    }
-                }
-                price += desFee;
             } else {
-                if (dto.getP() == 1 || dto.getP() == 2 || dto.getP() == 3) {
+                desFee = 10;
-                    desFee = 3;
-                } else if (dto.getP() == 4) {
-                    desFee = 5;
-                } else if (dto.getP() == 5) {
-                    desFee = 6;
-                } else {
-                    desFee = 10;
-                }
-                price += desFee * (number - 1);
             }
+            price += desFee * (number - 1);
         }
 
 
@@ -115,8 +97,6 @@ public class ZsPrice {
     }
 
 
-
-
     public int[] twoSum(int[] nums, int target) {
 
         List<Integer> list = new ArrayList<>();

src/main/webapp/views/product/pvcfigure.jsp

@@ -131,9 +131,10 @@
 <%@include file="/views/copyResult.jsp" %>
 <script>
     setNumberOptions();
+
     function setNumberOptions() {
         let html = '';
-        if (window.parent.system_isPdd) {
+        if (true) {
             html = `<option value=""></option>
                 <option value="1">改序号</option>
                 <option value="2">改名字</option>
@@ -148,6 +149,7 @@
         }
         $("#desType").empty().append(html);
     }
+
     layui.use(['table', 'form', 'carousel'], function () {
         var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         var carousel = layui.carousel;
@@ -312,8 +314,11 @@
                     if (dk != null) {
                         shua += dk;
                     }
-
+                    let desType = $("#desType option:selected").text();
                     var span_result = "数码PVC" + ' - ' + kindValue + '-' + size + 'cm' + '-' + shua + ' -(同款内容)\n';
+                    if (number > 1) {
+                        span_result += "款数：" + number + "-" + desType + "\n";
+                    }
                     if (number > 1) {
                         for (let i = 0; i < data.length; i++) {
                             span_result += number + '款 各' + data[i].count + "张，共" + data[i].price + "元" + '\n'