From d55859d4792bde014899925b32c7efdb97dac8e0 Mon Sep 17 00:00:00 2001
From: zhuyiyi <649091362@qq.com>
Date: Mon, 25 Aug 2025 15:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/lingtao/net/util/PriceUtils.java | 8 +-
src/main/webapp/views/product/acidTags.jsp | 377 ++++----
src/main/webapp/views/product/angingCloth.jsp | 4 +-
src/main/webapp/views/product/antifake.jsp | 4 +-
src/main/webapp/views/product/banqi.jsp | 4 +-
src/main/webapp/views/product/blackCard.jsp | 4 +-
src/main/webapp/views/product/canopy.jsp | 4 +-
src/main/webapp/views/product/canvas.jsp | 644 +++++++-------
src/main/webapp/views/product/card.jsp | 4 +-
src/main/webapp/views/product/chaqi.jsp | 4 +-
src/main/webapp/views/product/chetie.jsp | 4 +-
src/main/webapp/views/product/clothes.jsp | 4 +-
src/main/webapp/views/product/coaster.jsp | 4 +-
.../webapp/views/product/colorEnvelope.jsp | 4 +-
src/main/webapp/views/product/copyPaper.jsp | 4 +-
src/main/webapp/views/product/coupon.jsp | 52 +-
src/main/webapp/views/product/credentials.jsp | 4 +-
src/main/webapp/views/product/cupHolder.jsp | 4 +-
src/main/webapp/views/product/cupSet.jsp | 8 +-
src/main/webapp/views/product/deskSticker.jsp | 4 +-
src/main/webapp/views/product/diploma.jsp | 4 +-
src/main/webapp/views/product/disu.jsp | 4 +-
src/main/webapp/views/product/envelope.jsp | 4 +-
src/main/webapp/views/product/fan.jsp | 4 +-
src/main/webapp/views/product/fgq.jsp | 4 +-
src/main/webapp/views/product/fileCover.jsp | 4 +-
src/main/webapp/views/product/flags.jsp | 649 +++++++-------
src/main/webapp/views/product/flyer.jsp | 12 +-
src/main/webapp/views/product/freehand.jsp | 4 +-
src/main/webapp/views/product/handBag.jsp | 8 +-
src/main/webapp/views/product/hykkt.jsp | 4 +-
src/main/webapp/views/product/insertCard.jsp | 4 +-
src/main/webapp/views/product/katie.jsp | 4 +-
src/main/webapp/views/product/kzt.jsp | 351 ++++----
src/main/webapp/views/product/landa.jsp | 4 +-
src/main/webapp/views/product/leiTag.jsp | 8 +-
src/main/webapp/views/product/lsz.jsp | 7 +-
src/main/webapp/views/product/medal.jsp | 4 +-
src/main/webapp/views/product/metal.jsp | 8 +-
src/main/webapp/views/product/msd.jsp | 4 +-
src/main/webapp/views/product/notePaper.jsp | 8 +-
src/main/webapp/views/product/orders.jsp | 4 +-
src/main/webapp/views/product/packingBox.jsp | 4 +-
src/main/webapp/views/product/paperCup.jsp | 361 ++++----
src/main/webapp/views/product/pet.jsp | 4 +-
.../webapp/views/product/pictureAlbum.jsp | 817 +++++++++---------
src/main/webapp/views/product/placeMat.jsp | 4 +-
src/main/webapp/views/product/poster.jsp | 12 +-
src/main/webapp/views/product/programCard.jsp | 4 +-
src/main/webapp/views/product/pvcCard.jsp | 4 +-
src/main/webapp/views/product/pvcfigure.jsp | 4 +-
src/main/webapp/views/product/rollLabel.jsp | 6 +-
src/main/webapp/views/product/roomCard.jsp | 4 +-
src/main/webapp/views/product/slq.jsp | 458 +++++-----
.../webapp/views/product/specialCard2.jsp | 4 +-
src/main/webapp/views/product/stickers.jsp | 4 +-
src/main/webapp/views/product/tablecolth.jsp | 4 +-
src/main/webapp/views/product/tagClothes.jsp | 9 +-
src/main/webapp/views/product/warmSticker.jsp | 4 +-
src/main/webapp/views/product/waterGauge.jsp | 4 +-
src/main/webapp/views/product/weddingCard.jsp | 4 +-
61 files changed, 2039 insertions(+), 1932 deletions(-)
diff --git a/src/main/java/lingtao/net/util/PriceUtils.java b/src/main/java/lingtao/net/util/PriceUtils.java
index 7d80611..04e8cff 100644
--- a/src/main/java/lingtao/net/util/PriceUtils.java
+++ b/src/main/java/lingtao/net/util/PriceUtils.java
@@ -2322,7 +2322,7 @@ public class PriceUtils {
// 根据款数重新算价格
for (Product product : list) {
product.setWeight(df.format(length * width * product.getCount() / 10000 * 0.3 * number));
- product.setPrice(Math.floor(product.getPrice() * number));
+ product.setPrice(Math.ceil(product.getPrice() * number));
}
} else if ("双面印刷".equals(craftShua)) {
// 数量
@@ -2341,7 +2341,7 @@ public class PriceUtils {
}
// 根据款数重新算价格
for (Product product : list) {
- product.setPrice(Math.floor(product.getPrice() * number));
+ product.setPrice(Math.ceil(product.getPrice() * number));
}
}
} else {
@@ -2398,7 +2398,7 @@ public class PriceUtils {
price = fixPrice + (num - 5 > 0 ? num - 5 : 0) * zhang + designFee * number + 0.1 * count * number;
Product dto = new Product();
dto.setCount(count);
- dto.setPrice(price);
+ dto.setPrice(Math.ceil(price));
list.add(dto);
} else {
// 数量
@@ -2418,7 +2418,7 @@ public class PriceUtils {
// 根据款数重新算价格
for (Product product : list) {
product.setWeight(df.format(weight));
- product.setPrice(Math.floor(product.getPrice() * number));
+ product.setPrice(Math.ceil(product.getPrice() * number));
}
}
}
diff --git a/src/main/webapp/views/product/acidTags.jsp b/src/main/webapp/views/product/acidTags.jsp
index db9395f..1df68b7 100644
--- a/src/main/webapp/views/product/acidTags.jsp
+++ b/src/main/webapp/views/product/acidTags.jsp
@@ -1,186 +1,199 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
- pageEncoding="UTF-8"%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+ pageEncoding="UTF-8" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
@@ -999,6 +1002,7 @@
$(".z3_craft_yj").show();
$(".z3_craft_zj").show();
$(".z3_craft_dk").show();
+ $(".z3_craft_opp").show();
$(".z3_craft_ssx").show();
$(".z3_craft_yh").show();
$(".z3_craft_bm").show();
@@ -1090,6 +1094,21 @@
}
});
+ function peijianuiHide(){
+ $("#peijian_ui .tscolor").hide();
+ $("#peijian_ui .tscolor").prop("disabled", true);
+ $("#peijian_ui .scolor").hide();
+ $("#peijian_ui .scolor select").prop("disabled", true);
+ $("#peijian_ui .select_nilongshen").hide();
+ $("#peijian_ui .select_nilongshen select").prop("disabled", true);
+ $("#peijian_ui .select_liusu").hide();
+ $("#peijian_ui .select_liusu select").prop("disabled", true);
+ $("#peijian_ui .opp").hide();
+ $("#peijian_ui .opp").prop("disabled", true);
+ $("#peijian_ui .select_opp").hide();
+ $("#peijian_ui .select_opp select").prop("disabled", true);
+ }
+
// 监听count输入框
$(function () {
//输入框的值改变时触发(一边尺寸小于4自动选中模切)
@@ -1114,11 +1133,11 @@
form.on("select(oppSelect)", function (data) {
if (data.value == "装opp袋") {
$("#peijian_ui .opp").hide();
- $("#peijian_ui .opp").prop("disabled", true);
+ $("#peijian_ui .opp select").prop("disabled", true);
}
if (data.value == "配opp袋") {
$("#peijian_ui .opp").show();
- $("#peijian_ui .opp").prop("disabled", false);
+ $("#peijian_ui .opp select").prop("disabled", false);
}
})
form.on("checkbox(z4PeiJian)", function (data) {
@@ -1147,12 +1166,12 @@
if (data.value == "尼龙绳") {
if ($(data.elem).is(":checked")) {
$("#peijian_ui .scolor").show();
- $("#peijian_ui .scolor").prop("disabled", false);
+ $("#peijian_ui .scolor select").prop("disabled", false);
$("#peijian_ui .select_nilongshen").show();
$("#peijian_ui .select_nilongshen select").prop("disabled", false);
} else {
$("#peijian_ui .scolor").hide();
- $("#peijian_ui .scolor").prop("disabled", true);
+ $("#peijian_ui .scolor select").prop("disabled", true);
$("#peijian_ui .select_nilongshen").hide();
$("#peijian_ui .select_nilongshen select").prop("disabled", true);
}
@@ -1169,14 +1188,16 @@
if (data.value == "opp袋") {
if ($(data.elem).is(":checked")) {
$("#peijian_ui .opp").show();
- $("#peijian_ui .opp").prop("disabled", false);
+ $("#peijian_ui .opp select").prop("disabled", false);
$("#peijian_ui .select_opp").show();
$("#peijian_ui .select_opp select").prop("disabled", false);
+ $("#peijian_ui .select_opp select option[value='配opp袋']").prop("selected", true);
+
getProductImage('opp袋');
} else {
$("#peijian_ui .opp").hide();
- $("#peijian_ui .opp").prop("disabled", true);
+ $("#peijian_ui .opp select").prop("disabled", true);
$("#peijian_ui .select_opp").hide();
$("#peijian_ui .select_opp select").prop("disabled", true);
getProductImage();
@@ -1214,18 +1235,7 @@
}
});
form.on("radio(kindValue2)", function (data) {
- $("#peijian_ui .tscolor").hide();
- $("#peijian_ui .tscolor").prop("disabled", true);
- $("#peijian_ui .scolor").hide();
- $("#peijian_ui .scolor").prop("disabled", true);
- $("#peijian_ui .select_nilongshen").hide();
- $("#peijian_ui .select_nilongshen select").prop("disabled", true);
- $("#peijian_ui .select_liusu").hide();
- $("#peijian_ui .select_liusu select").prop("disabled", true);
- $("#peijian_ui .opp").hide();
- $("#peijian_ui .opp").prop("disabled", true);
- $("#peijian_ui .select_opp").hide();
- $("#peijian_ui .select_opp select").prop("disabled", true);
+ peijianuiHide();
if (data.value == 10) {
$("#craftForm").hide();
$("#craftForm").find(":input").attr("disabled", true);
@@ -1406,6 +1416,8 @@
$("#lesspeijian").find(":input").attr("disabled", true);
$(".ui_fm_l").show();
$('.ui_fm_l').find(":input").attr("disabled", false);
+ $("#peijian_ui form")[0].reset();
+ peijianuiHide()
if (data.value == '直角卡片' || data.value == '异形卡片' || data.value == '贺卡' || data.value == '特种纸名片') {
if (data.elem.checked) {
$("#lesspeijian").show();
@@ -3539,7 +3551,7 @@
if (szkun) {
price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
}
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + price_text + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + price_text + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
data[i].number = number;
}
} else {
@@ -3549,7 +3561,7 @@
if (szkun) {
price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
}
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + price_text + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + price_text + ","+(data[i].price / number / data[i].count).toFixed(2) + '/张\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/credentials.jsp b/src/main/webapp/views/product/credentials.jsp
index c89ba44..e5fb7b1 100644
--- a/src/main/webapp/views/product/credentials.jsp
+++ b/src/main/webapp/views/product/credentials.jsp
@@ -263,12 +263,12 @@
var span_result = "PVC证件" + ' - ' + kindValue + '-' + size + 'mm' + '-' + shua + ' -(同款内容)\n';
if (number > 1) {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
data[i].number = number;
}
} else {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/cupHolder.jsp b/src/main/webapp/views/product/cupHolder.jsp
index 145c5eb..f2dd24c 100644
--- a/src/main/webapp/views/product/cupHolder.jsp
+++ b/src/main/webapp/views/product/cupHolder.jsp
@@ -258,12 +258,12 @@
var span_result = size + "cm-" + $("input[name='kind']:checked").val() + $("input[name='kindValue']:checked").attr("title") + ' - 模切 (同款内容)\n';
if (number > 1) {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
data[i].number = number;
}
} else {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/cupSet.jsp b/src/main/webapp/views/product/cupSet.jsp
index 9eb49ac..2606a41 100644
--- a/src/main/webapp/views/product/cupSet.jsp
+++ b/src/main/webapp/views/product/cupSet.jsp
@@ -511,19 +511,19 @@
}
if (kind == "盲盒杯套") {
if (number > 1) {
- span_result += number + '款 各5个内容' + data[0].count + "个,共" + data[0].price + "元" + '\n';
+ span_result += number + '款 各5个内容' + data[0].count + "个,共" + data[0].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
} else {
- span_result += number + '款5个内容' + data[0].count + "个,共" + data[0].price + "元" + '\n';
+ span_result += number + '款5个内容' + data[0].count + "个,共" + data[0].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
}
} else {
if (number > 1) {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n';
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
} else {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n';
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/deskSticker.jsp b/src/main/webapp/views/product/deskSticker.jsp
index f47609e..e8463ac 100644
--- a/src/main/webapp/views/product/deskSticker.jsp
+++ b/src/main/webapp/views/product/deskSticker.jsp
@@ -281,12 +281,12 @@
var span_result = '桌贴 - ' + kind + ' - ' + size + ' CM' + ' - ' + craftShua + ' - ' + craftJiao + '\n';
if (number > 1) {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
data[i].number = number;
}
} else {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/张\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/diploma.jsp b/src/main/webapp/views/product/diploma.jsp
index 5d8bab2..d73e11a 100644
--- a/src/main/webapp/views/product/diploma.jsp
+++ b/src/main/webapp/views/product/diploma.jsp
@@ -105,12 +105,12 @@ layui.use(['table','form'], function(){
var span_result ='证书 - ' + kindValue + ' - ' + size +'\n' + "工艺: " + "正面覆亮膜 + 中间压痕\n";
if(number > 1){
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}else{
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/disu.jsp b/src/main/webapp/views/product/disu.jsp
index f2ceb3e..40a955b 100644
--- a/src/main/webapp/views/product/disu.jsp
+++ b/src/main/webapp/views/product/disu.jsp
@@ -237,12 +237,12 @@
var span_result = '滴塑 - ' + kind + '-' + size + ' CM (同款内容)\n';
if (number > 1) {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
} else {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/envelope.jsp b/src/main/webapp/views/product/envelope.jsp
index 7c8a9c4..9c076f0 100644
--- a/src/main/webapp/views/product/envelope.jsp
+++ b/src/main/webapp/views/product/envelope.jsp
@@ -230,12 +230,12 @@ layui.use(['table','form','carousel'], function(){
if(number > 1){
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}else{
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/fan.jsp b/src/main/webapp/views/product/fan.jsp
index 300dc7d..9f0d411 100644
--- a/src/main/webapp/views/product/fan.jsp
+++ b/src/main/webapp/views/product/fan.jsp
@@ -371,12 +371,12 @@
var span_result = '扇子 - ' + kind + "-" + kind2 + 'cm - ' + craft + '(同款内容)\n';
if (number > 1) {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
} else {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/fgq.jsp b/src/main/webapp/views/product/fgq.jsp
index cee735f..4c984fc 100644
--- a/src/main/webapp/views/product/fgq.jsp
+++ b/src/main/webapp/views/product/fgq.jsp
@@ -161,12 +161,12 @@ layui.use(['table','form','carousel'], function(){
var span_result = '仿古旗 - ' + kind + '-' + craft + '-' + craftShua + '-' + size +' CM (同款内容)\n';
if(number > 1){
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}else{
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/fileCover.jsp b/src/main/webapp/views/product/fileCover.jsp
index 5f92e07..0c5111d 100644
--- a/src/main/webapp/views/product/fileCover.jsp
+++ b/src/main/webapp/views/product/fileCover.jsp
@@ -197,12 +197,12 @@ layui.use(['table','form','carousel'], function(){
var span_result ='档案袋 - ' + kind +'\n'+ kind2 +' -(同款内容)\n';
if(number > 1){
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}else{
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/flags.jsp b/src/main/webapp/views/product/flags.jsp
index 329d21e..db964fe 100644
--- a/src/main/webapp/views/product/flags.jsp
+++ b/src/main/webapp/views/product/flags.jsp
@@ -1,333 +1,350 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
- pageEncoding="UTF-8"%>
- <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+ pageEncoding="UTF-8" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-
Insert title here
- <%@include file="/views/common.jsp"%>
+
+
Insert title here
+ <%@include file="/views/common.jsp" %>
-
-<%@include file="/views/copyResult.jsp"%>
+<%@include file="/views/copyResult.jsp" %>
\ No newline at end of file
diff --git a/src/main/webapp/views/product/flyer.jsp b/src/main/webapp/views/product/flyer.jsp
index e6800ac..f21badf 100644
--- a/src/main/webapp/views/product/flyer.jsp
+++ b/src/main/webapp/views/product/flyer.jsp
@@ -197,16 +197,16 @@
let kindValue = $("select[name='kindValue'] option:checked").val();
$("#remark").empty();
let html = '';
- if(kindValue == 3){
+ if (kindValue == 3) {
html = '预计发货时间:
福建:直角裁切 (2-3天发货) 圆通 顺丰
江苏:直角裁切 (2-3天发货) 韵达 顺丰
福建:直角折页 (3-4天发货) 圆通 顺丰
江苏:直角折页 (3-4天发货) 韵达 顺丰
福建:异形模切 (4-5天发货) 圆通 顺丰'
}
- if(kindValue == 2){
+ if (kindValue == 2) {
html = '预计发货时间:
江苏:直角裁切 (2-3天发货) 韵达 顺丰
江苏:直角折页/压痕 (3-4天发货) 韵达 顺丰
江苏:异形模切 (4-5天发货) 韵达 顺丰'
}
- if(kindValue == 1){
+ if (kindValue == 1) {
html = '预计发货时间:
江苏:直角裁切 (2-3天发货) 韵达 顺丰
江苏:直角折页/压痕 (3-4天发货) 韵达 顺丰
江苏:异形模切 (4-5天发货) 韵达 顺丰'
}
- if(kindValue == 0){
+ if (kindValue == 0) {
html = '预计发货时间:
江苏:直角裁切 (2-3天发货) 韵达 顺丰
江苏:直角折页/压痕 (3-4天发货) 韵达 顺丰
福建:异形模切 (4-5天发货) 圆通 顺丰'
}
@@ -293,12 +293,12 @@
var span_result = "宣传单 - " + kind + ' - ' + size + ' 厘米 -(同款内容)\n' + "工艺 :" + arr + "\n";
if (number > 1) {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
} else {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/freehand.jsp b/src/main/webapp/views/product/freehand.jsp
index cd6a6fc..bab1838 100644
--- a/src/main/webapp/views/product/freehand.jsp
+++ b/src/main/webapp/views/product/freehand.jsp
@@ -197,12 +197,12 @@
var span_result = '手绘 - ' + kind_name[kind] + type + ' (同款内容)\n';
if (number > 1) {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
} else {
for (let i = 0; i < data.length; i++) {
- span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + '\n'
+ span_result += number + '款 ' + data[i].count + "个,共" + data[i].price + "元" + "," + (data[i].price / number / data[i].count).toFixed(2) + '/个\n'
data[i].number = number;
}
}
diff --git a/src/main/webapp/views/product/handBag.jsp b/src/main/webapp/views/product/handBag.jsp
index 7d4ec73..af48fdb 100644
--- a/src/main/webapp/views/product/handBag.jsp
+++ b/src/main/webapp/views/product/handBag.jsp
@@ -74,7 +74,7 @@