From 99067b19d1422375181697093762f1ba510a9f39 Mon Sep 17 00:00:00 2001 From: zhuyiyi <649091362@qq.com> Date: Wed, 20 May 2026 17:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/controller/ProductController.java | 4 +- .../net/controller/QuoteLogController.java | 44 ++++++----- .../lingtao/net/service/ProductService.java | 17 ++++ .../lingtao/net/service/QuoteLogService.java | 79 +++++++++++++++++++ src/main/webapp/views/copyResult.jsp | 51 ++++++------ .../webapp/views/priceView/angingCloth.jsp | 1 + src/main/webapp/views/priceView/banqi.jsp | 1 + src/main/webapp/views/priceView/canvas.jsp | 1 + src/main/webapp/views/priceView/coupon.jsp | 3 +- src/main/webapp/views/priceView/metal.jsp | 1 + src/main/webapp/views/priceView/poster.jsp | 1 + src/main/webapp/views/priceView/slq.jsp | 1 + src/main/webapp/views/priceView/stickers.jsp | 1 + src/main/webapp/views/product/acidTags.jsp | 3 +- src/main/webapp/views/product/angingCloth.jsp | 1 + src/main/webapp/views/product/antifake.jsp | 1 + .../webapp/views/product/aromatherapyCard.jsp | 1 + src/main/webapp/views/product/badge.jsp | 1 + src/main/webapp/views/product/banqi.jsp | 1 + src/main/webapp/views/product/blackCard.jsp | 1 + src/main/webapp/views/product/canopy.jsp | 1 + src/main/webapp/views/product/canvas.jsp | 1 + src/main/webapp/views/product/canvasBag.jsp | 1 + src/main/webapp/views/product/card.jsp | 1 + src/main/webapp/views/product/chaqi.jsp | 1 + src/main/webapp/views/product/chetie.jsp | 1 + src/main/webapp/views/product/chuanqi.jsp | 3 +- src/main/webapp/views/product/clothes.jsp | 1 + src/main/webapp/views/product/coaster.jsp | 1 + .../webapp/views/product/colorEnvelope.jsp | 3 +- src/main/webapp/views/product/copyPaper.jsp | 3 +- src/main/webapp/views/product/coupon.jsp | 3 +- src/main/webapp/views/product/coupon1.jsp | 3 +- src/main/webapp/views/product/credentials.jsp | 1 + src/main/webapp/views/product/cupHolder.jsp | 1 + src/main/webapp/views/product/cupSet.jsp | 1 + src/main/webapp/views/product/deckChair.jsp | 1 + src/main/webapp/views/product/deskSticker.jsp | 1 + src/main/webapp/views/product/diploma.jsp | 3 +- src/main/webapp/views/product/disu.jsp | 1 + src/main/webapp/views/product/envelope.jsp | 3 +- src/main/webapp/views/product/fan.jsp | 1 + src/main/webapp/views/product/fgq.jsp | 3 +- src/main/webapp/views/product/fileCover.jsp | 3 +- src/main/webapp/views/product/flags.jsp | 3 +- src/main/webapp/views/product/flyer.jsp | 1 + src/main/webapp/views/product/freehand.jsp | 1 + .../webapp/views/product/fridgeMagnet.jsp | 10 +-- src/main/webapp/views/product/handBag.jsp | 3 +- .../views/product/handkerchiefPaper.jsp | 1 + src/main/webapp/views/product/hykkt.jsp | 1 + src/main/webapp/views/product/insertCard.jsp | 1 + src/main/webapp/views/product/katie.jsp | 1 + src/main/webapp/views/product/kzt.jsp | 3 +- src/main/webapp/views/product/landa.jsp | 1 + src/main/webapp/views/product/leiTag.jsp | 1 + src/main/webapp/views/product/light.jsp | 1 + src/main/webapp/views/product/lingmo.jsp | 1 + src/main/webapp/views/product/lsz.jsp | 1 + src/main/webapp/views/product/medal.jsp | 1 + .../webapp/views/product/metal - 副本.jsp | 3 +- src/main/webapp/views/product/metal.jsp | 11 ++- src/main/webapp/views/product/mousePad.jsp | 1 + src/main/webapp/views/product/msd.jsp | 1 + src/main/webapp/views/product/notePaper.jsp | 3 +- src/main/webapp/views/product/orders.jsp | 1 + src/main/webapp/views/product/packingBox.jsp | 3 +- src/main/webapp/views/product/paperBowl.jsp | 1 + src/main/webapp/views/product/paperCup.jsp | 3 +- src/main/webapp/views/product/pet.jsp | 1 + .../webapp/views/product/pictureAlbum.jsp | 3 +- src/main/webapp/views/product/placeMat.jsp | 1 + .../webapp/views/product/plasticHandbag.jsp | 1 + src/main/webapp/views/product/poster.jsp | 1 + .../webapp/views/product/printedAcrylic.jsp | 1 + src/main/webapp/views/product/programCard.jsp | 3 +- src/main/webapp/views/product/pvcCard.jsp | 1 + src/main/webapp/views/product/pvcfigure.jsp | 1 + src/main/webapp/views/product/rollLabel.jsp | 1 + src/main/webapp/views/product/roomCard.jsp | 3 +- src/main/webapp/views/product/slq.jsp | 1 + .../webapp/views/product/specialCard2.jsp | 1 + .../webapp/views/product/stickers - 副本.jsp | 3 +- src/main/webapp/views/product/stickers.jsp | 1 + src/main/webapp/views/product/tablecolth.jsp | 1 + src/main/webapp/views/product/tagClothes.jsp | 1 + src/main/webapp/views/product/tags.jsp | 3 +- src/main/webapp/views/product/takeoutBox.jsp | 1 + src/main/webapp/views/product/tape.jsp | 1 + src/main/webapp/views/product/tearingJoy.jsp | 1 + .../webapp/views/product/wallPainting.jsp | 1 + src/main/webapp/views/product/warmSticker.jsp | 1 + src/main/webapp/views/product/waterGauge.jsp | 1 + src/main/webapp/views/product/weddingCard.jsp | 1 + src/main/webapp/views/product/wireTape.jsp | 1 + .../webapp/views/product/wrappingPaper.jsp | 1 + src/main/webapp/views/product/wristBand.jsp | 1 + src/main/webapp/views/product/yafen.jsp | 1 + src/main/webapp/views/product/ykl.jsp | 3 +- 99 files changed, 279 insertions(+), 77 deletions(-) diff --git a/src/main/java/lingtao/net/controller/ProductController.java b/src/main/java/lingtao/net/controller/ProductController.java index 1c8f82d..dca3b80 100644 --- a/src/main/java/lingtao/net/controller/ProductController.java +++ b/src/main/java/lingtao/net/controller/ProductController.java @@ -248,8 +248,8 @@ public class ProductController { product.setKindValue(toumingKind); } // 插入操作日志 - String log = quoteLogService.log(product, request, proList); - if ("登陆失效".equals(log)) { +// String log = quoteLogService.log(product, request, proList); + if (user == null) { return Msg.fail("登录信息失效~请刷新页面！"); } diff --git a/src/main/java/lingtao/net/controller/QuoteLogController.java b/src/main/java/lingtao/net/controller/QuoteLogController.java index e3f6b26..4a14663 100644 --- a/src/main/java/lingtao/net/controller/QuoteLogController.java +++ b/src/main/java/lingtao/net/controller/QuoteLogController.java @@ -2,6 +2,7 @@ package lingtao.net.controller; import java.util.List; +import lingtao.net.bean.Msg; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -13,27 +14,34 @@ import com.github.pagehelper.PageInfo; import lingtao.net.bean.QuoteLog; import lingtao.net.service.QuoteLogService; +import javax.servlet.http.HttpServletRequest; + @RestController public class QuoteLogController { - @Autowired - private QuoteLogService quoteLogService; + @Autowired + private QuoteLogService quoteLogService; - /** - * 获取操作日志列表 - * - * @param page - * @param limit - * @param quoteLog - * @return - */ - @RequestMapping("/getQuoteLog") - public PageInfo logList(@RequestParam(value = "page", defaultValue = "1") Integer page, - @RequestParam(value = "limit", defaultValue = "10") Integer limit, QuoteLog quoteLog) { - PageHelper.startPage(page, limit); - List logList = quoteLogService.quoteLogs(quoteLog); - PageInfo pageInfo = new PageInfo(logList); - return pageInfo; - } + /** + * 获取操作日志列表 + * + * @param page + * @param limit + * @param quoteLog + * @return + */ + @RequestMapping("/getQuoteLog") + public PageInfo logList(@RequestParam(value = "page", defaultValue = "1") Integer page, + @RequestParam(value = "limit", defaultValue = "10") Integer limit, QuoteLog quoteLog) { + PageHelper.startPage(page, limit); + List logList = quoteLogService.quoteLogs(quoteLog); + PageInfo pageInfo = new PageInfo(logList); + return pageInfo; + } + @RequestMapping("/addQuoteLog") + public Msg addQuoteLog(QuoteLog quoteLog, HttpServletRequest request) { + String log = quoteLogService.log(quoteLog, request); + return Msg.success(); + } } diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index b51b653..f9b73eb 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -2633,6 +2633,23 @@ public class ProductService { } apprise = product.getPrice(); } + + if ("宠物转印贴".equals(dto.getKind())) { + for (Product product : priceList) { + product.setPrice(Math.ceil(product.getPrice() == 50 ? product.getPrice() : product.getPrice() * 1.3)); + double number_price = 0; + double number_price_base = 3; + for (int i = 0; i < number; i++) { + number_price += Math.max(1, number_price_base); + number_price_base--; + } + if ("宠物转印贴".equals(dto.getKind()) && craft_list.contains("内部裁切")) { + product.setPrice(Math.ceil(product.getPrice() + 5 * dto.getN_mq_num())); + } + product.setPrice(Math.ceil(product.getPrice() + number_price)); + } + } + if (craft_list.contains("熨斗")) { dto.setPo_number(dto.getPo_number() == null ? 1 : dto.getPo_number()); for (Product product : priceList) { diff --git a/src/main/java/lingtao/net/service/QuoteLogService.java b/src/main/java/lingtao/net/service/QuoteLogService.java index adeb74b..0f77e20 100644 --- a/src/main/java/lingtao/net/service/QuoteLogService.java +++ b/src/main/java/lingtao/net/service/QuoteLogService.java @@ -247,4 +247,83 @@ public class QuoteLogService { } return null; } + + public String log(QuoteLog quoteLog, HttpServletRequest request) { + long startTime, endTime = 0; + startTime = System.currentTimeMillis(); + SysUser user = (SysUser) request.getSession().getAttribute("USER_SESSION"); + String remark_judge = quoteLog.getRemark(); + if (user == null) { + return "登陆失效"; + } + QuoteLog log = new QuoteLog(); + log.setRemark(remark_judge); + log.setRealname(user.getRealname()); + log.setUsername(user.getUsername()); + log.setQuoteIp(IPUtils.getIpAddr(request));// 获取ip + log.setBrower(IPUtils.getBrowserName(request));// 获取浏览器名称 + log.setOs(IPUtils.getOsName(request)); // 获取操作系统名称 + log.setPrice((double) 0); + List allRoleNames = sysRoleService.getAllRoleName(null); + String roleName = ""; + String[] split = user.getRole().split(","); + for (SysRole sysRole : allRoleNames) { + for (int i = 0; i < split.length; i++) { + if (split[i].equals(String.valueOf(sysRole.getRoleId()))) { + roleName += sysRole.getRoleName() + "、"; + } + } + } + log.setShopname(roleName); + quoteLogMapper.insertSelective(log); + + endTime = System.currentTimeMillis(); + System.out.println("【insertSelective】使用的时间:" + (endTime - startTime)); + + long startTime2, endTime2 = 0; + startTime2 = System.currentTimeMillis(); + boolean flag = false; + // 查询3分钟内自己报的数据 + List remarkJudgeData = quoteDataMapper.getQuoteDataByMinutes(user.getUsername()); + endTime2 = System.currentTimeMillis(); + System.out.println("【getQuoteDataByMinutes】使用的时间:" + (endTime2 - startTime2)); + for (String remarkJudge : remarkJudgeData) { + if (remarkJudge.equals(remark_judge)) { + // 如果3分钟内报过相同数据 + flag = true; + break; + } + } + // 插入数据（给客服数据新增用的） + String role = user.getRole(); + // 客服报的且3分钟内没有同一个客户报的数据才插入 + if (role.contains("999,") && !flag) { + QuoteData quoteData = new QuoteData(); + quoteData.setUsername(user.getUsername()); + quoteData.setRealname(user.getRealname()); + quoteData.setPrice((double) 0); + quoteData.setRole(user.getRole()); + // 默认都是没选择店铺 + quoteData.setIsSelect("0"); +// role = role.replace("999,", "").replace(",1049", "").replace(",1011", ""); + // 规则:第一位客服，第二位主店铺 + String shopname = role.substring(role.indexOf(",") + 1); + if (shopname.indexOf(",") != -1) { + shopname = shopname.substring(0, shopname.indexOf(",")); + } + System.out.println(shopname); + quoteData.setShopname(shopname); + quoteData.setIsSelect("1"); + // 除去【客服】只有一个店铺，所属店铺就是剩下这个店铺 切 选择状态改为已选择 +// if (!role.contains(",")) { +// } + quoteData.setIsBuy("0"); + quoteData.setIsBuyToDay("0"); + quoteData.setRemark(remark_judge); + // 默认都是填写旺旺号 + quoteData.setIsFillIn("1"); + quoteDataMapper.addQuoteData(quoteData); + } + return null; + } } diff --git a/src/main/webapp/views/copyResult.jsp b/src/main/webapp/views/copyResult.jsp index 57d2bdf..8766f12 100644 --- a/src/main/webapp/views/copyResult.jsp +++ b/src/main/webapp/views/copyResult.jsp @@ -1,27 +1,34 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> + pageEncoding="UTF-8" %> \ No newline at end of file diff --git a/src/main/webapp/views/priceView/angingCloth.jsp b/src/main/webapp/views/priceView/angingCloth.jsp index 280d91f..b57e267 100644 --- a/src/main/webapp/views/priceView/angingCloth.jsp +++ b/src/main/webapp/views/priceView/angingCloth.jsp @@ -243,6 +243,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark($("#proTypeValue").val(), size, count, kind, number, arr, ""); diff --git a/src/main/webapp/views/priceView/banqi.jsp b/src/main/webapp/views/priceView/banqi.jsp index 6ad800d..1a352a0 100644 --- a/src/main/webapp/views/priceView/banqi.jsp +++ b/src/main/webapp/views/priceView/banqi.jsp @@ -235,6 +235,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/priceView/canvas.jsp b/src/main/webapp/views/priceView/canvas.jsp index 3a4f95c..43c2a2c 100644 --- a/src/main/webapp/views/priceView/canvas.jsp +++ b/src/main/webapp/views/priceView/canvas.jsp @@ -300,6 +300,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/priceView/coupon.jsp b/src/main/webapp/views/priceView/coupon.jsp index 596656f..9be1440 100644 --- a/src/main/webapp/views/priceView/coupon.jsp +++ b/src/main/webapp/views/priceView/coupon.jsp @@ -3265,7 +3265,8 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var switchCount = []; $("input:checkbox[name='switchCount']:checked").each(function (i) { diff --git a/src/main/webapp/views/priceView/metal.jsp b/src/main/webapp/views/priceView/metal.jsp index 1c76e25..9beb8d4 100644 --- a/src/main/webapp/views/priceView/metal.jsp +++ b/src/main/webapp/views/priceView/metal.jsp @@ -405,6 +405,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); var craft = ""; diff --git a/src/main/webapp/views/priceView/poster.jsp b/src/main/webapp/views/priceView/poster.jsp index d7b1678..55b8791 100644 --- a/src/main/webapp/views/priceView/poster.jsp +++ b/src/main/webapp/views/priceView/poster.jsp @@ -1722,6 +1722,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); var count = $("input[name='count']").val(); diff --git a/src/main/webapp/views/priceView/slq.jsp b/src/main/webapp/views/priceView/slq.jsp index 5e14f24..d93016e 100644 --- a/src/main/webapp/views/priceView/slq.jsp +++ b/src/main/webapp/views/priceView/slq.jsp @@ -202,6 +202,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/priceView/stickers.jsp b/src/main/webapp/views/priceView/stickers.jsp index a00efb7..7b3d981 100644 --- a/src/main/webapp/views/priceView/stickers.jsp +++ b/src/main/webapp/views/priceView/stickers.jsp @@ -1738,6 +1738,7 @@ /*layer.msg("插旗（牙签）不是粘好出货哦！",{offset:['300px','300px']},function(){});*/ span_result += '包邮，免费设计呢~（偏远地区需补邮费)' + addLog(span_result); $("#span_result").val(span_result); if (stickerKind == "封口贴") { count = $("#selectCount option:selected").val(); diff --git a/src/main/webapp/views/product/acidTags.jsp b/src/main/webapp/views/product/acidTags.jsp index db9395f..c9419a3 100644 --- a/src/main/webapp/views/product/acidTags.jsp +++ b/src/main/webapp/views/product/acidTags.jsp @@ -149,7 +149,8 @@ } } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); getRemark($("#proTypeValue").val(), size, count+"套", "单色", number, craftQie, ""); //计算完自动复制文本 diff --git a/src/main/webapp/views/product/angingCloth.jsp b/src/main/webapp/views/product/angingCloth.jsp index 9e5c891..8f0fa4b 100644 --- a/src/main/webapp/views/product/angingCloth.jsp +++ b/src/main/webapp/views/product/angingCloth.jsp @@ -228,6 +228,7 @@ if (window.parent.system_isGai) { span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark($("#proTypeValue").val(), size, count, kind, number, arr, ""); diff --git a/src/main/webapp/views/product/antifake.jsp b/src/main/webapp/views/product/antifake.jsp index 74a93b3..7673ba0 100644 --- a/src/main/webapp/views/product/antifake.jsp +++ b/src/main/webapp/views/product/antifake.jsp @@ -231,6 +231,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark($("#proTypeValue").val(), size, count, kind, number, arr, ""); diff --git a/src/main/webapp/views/product/aromatherapyCard.jsp b/src/main/webapp/views/product/aromatherapyCard.jsp index 5c8549b..ca940be 100644 --- a/src/main/webapp/views/product/aromatherapyCard.jsp +++ b/src/main/webapp/views/product/aromatherapyCard.jsp @@ -390,6 +390,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/badge.jsp b/src/main/webapp/views/product/badge.jsp index 2ddbee3..d8eb96b 100644 --- a/src/main/webapp/views/product/badge.jsp +++ b/src/main/webapp/views/product/badge.jsp @@ -381,6 +381,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/banqi.jsp b/src/main/webapp/views/product/banqi.jsp index 85a845b..ea9b673 100644 --- a/src/main/webapp/views/product/banqi.jsp +++ b/src/main/webapp/views/product/banqi.jsp @@ -244,6 +244,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/blackCard.jsp b/src/main/webapp/views/product/blackCard.jsp index 7275b10..b0b2542 100644 --- a/src/main/webapp/views/product/blackCard.jsp +++ b/src/main/webapp/views/product/blackCard.jsp @@ -246,6 +246,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark($("#proTypeValue").val(), kind2, count, kind, number, arr, ""); diff --git a/src/main/webapp/views/product/canopy.jsp b/src/main/webapp/views/product/canopy.jsp index e834fff..860a6ca 100644 --- a/src/main/webapp/views/product/canopy.jsp +++ b/src/main/webapp/views/product/canopy.jsp @@ -322,6 +322,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark($("#proTypeValue").val(), size, count, kind, number, arr, ""); diff --git a/src/main/webapp/views/product/canvas.jsp b/src/main/webapp/views/product/canvas.jsp index 0ac6a99..9b440b0 100644 --- a/src/main/webapp/views/product/canvas.jsp +++ b/src/main/webapp/views/product/canvas.jsp @@ -309,6 +309,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/canvasBag.jsp b/src/main/webapp/views/product/canvasBag.jsp index 8a566ff..42567ea 100644 --- a/src/main/webapp/views/product/canvasBag.jsp +++ b/src/main/webapp/views/product/canvasBag.jsp @@ -338,6 +338,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/card.jsp b/src/main/webapp/views/product/card.jsp index 50d9bce..c821ae4 100644 --- a/src/main/webapp/views/product/card.jsp +++ b/src/main/webapp/views/product/card.jsp @@ -371,6 +371,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); var size = kind2Value.replace("MM", ""); diff --git a/src/main/webapp/views/product/chaqi.jsp b/src/main/webapp/views/product/chaqi.jsp index 32b393c..f57dfad 100644 --- a/src/main/webapp/views/product/chaqi.jsp +++ b/src/main/webapp/views/product/chaqi.jsp @@ -428,6 +428,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/chetie.jsp b/src/main/webapp/views/product/chetie.jsp index 464ec56..6edc916 100644 --- a/src/main/webapp/views/product/chetie.jsp +++ b/src/main/webapp/views/product/chetie.jsp @@ -251,6 +251,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/chuanqi.jsp b/src/main/webapp/views/product/chuanqi.jsp index dd0b6ff..95c4587 100644 --- a/src/main/webapp/views/product/chuanqi.jsp +++ b/src/main/webapp/views/product/chuanqi.jsp @@ -134,7 +134,8 @@ layui.use(['table','form'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); getRemark("串旗", size, count+"个", kind, number, "", ""); //计算完自动复制文本 diff --git a/src/main/webapp/views/product/clothes.jsp b/src/main/webapp/views/product/clothes.jsp index 0dde087..d4a43e4 100644 --- a/src/main/webapp/views/product/clothes.jsp +++ b/src/main/webapp/views/product/clothes.jsp @@ -644,6 +644,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark($("#proTypeValue").val(), size, count, kind, number, arr, ""); diff --git a/src/main/webapp/views/product/coaster.jsp b/src/main/webapp/views/product/coaster.jsp index 117ddfc..cc9605a 100644 --- a/src/main/webapp/views/product/coaster.jsp +++ b/src/main/webapp/views/product/coaster.jsp @@ -833,6 +833,7 @@ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); var craft = craftQie + arr; getRemark("杯垫", size, count + "张", kindValueData[kindValue], number, craft, ""); diff --git a/src/main/webapp/views/product/colorEnvelope.jsp b/src/main/webapp/views/product/colorEnvelope.jsp index 5292f1b..7776829 100644 --- a/src/main/webapp/views/product/colorEnvelope.jsp +++ b/src/main/webapp/views/product/colorEnvelope.jsp @@ -443,7 +443,8 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var count = ""; if ($("#otherCount").css("display") == "none") { diff --git a/src/main/webapp/views/product/copyPaper.jsp b/src/main/webapp/views/product/copyPaper.jsp index fc16aa6..fef63c6 100644 --- a/src/main/webapp/views/product/copyPaper.jsp +++ b/src/main/webapp/views/product/copyPaper.jsp @@ -219,7 +219,8 @@ layui.use(['table','form','carousel'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var count = $("#count").val() + "本"; var craft = $("input[name='kind3Value']:checked").val() + $("input[name='kindValue']:checked").val() + "印刷"; diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp index 4b9382d..3c7a1cd 100644 --- a/src/main/webapp/views/product/coupon.jsp +++ b/src/main/webapp/views/product/coupon.jsp @@ -4116,7 +4116,8 @@ span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var switchCount = []; $("input:checkbox[name='switchCount']:checked").each(function (i) { diff --git a/src/main/webapp/views/product/coupon1.jsp b/src/main/webapp/views/product/coupon1.jsp index 85c258e..2fe9db7 100644 --- a/src/main/webapp/views/product/coupon1.jsp +++ b/src/main/webapp/views/product/coupon1.jsp @@ -1502,7 +1502,8 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); //计算完自动复制文本 var e = document.getElementById("span_result");//对象是content diff --git a/src/main/webapp/views/product/credentials.jsp b/src/main/webapp/views/product/credentials.jsp index e7c1e4f..fa131da 100644 --- a/src/main/webapp/views/product/credentials.jsp +++ b/src/main/webapp/views/product/credentials.jsp @@ -276,6 +276,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark("PVC证件", size + "mm", count + "张", kindValue, number, craft, ""); diff --git a/src/main/webapp/views/product/cupHolder.jsp b/src/main/webapp/views/product/cupHolder.jsp index 4533627..6154aa0 100644 --- a/src/main/webapp/views/product/cupHolder.jsp +++ b/src/main/webapp/views/product/cupHolder.jsp @@ -271,6 +271,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/cupSet.jsp b/src/main/webapp/views/product/cupSet.jsp index b27a6f3..aba1e65 100644 --- a/src/main/webapp/views/product/cupSet.jsp +++ b/src/main/webapp/views/product/cupSet.jsp @@ -532,6 +532,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); var count = $("select[name='count'] option:selected").val(); diff --git a/src/main/webapp/views/product/deckChair.jsp b/src/main/webapp/views/product/deckChair.jsp index f0bdede..1b3616a 100644 --- a/src/main/webapp/views/product/deckChair.jsp +++ b/src/main/webapp/views/product/deckChair.jsp @@ -217,6 +217,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/deskSticker.jsp b/src/main/webapp/views/product/deskSticker.jsp index 9d1aa69..00be83c 100644 --- a/src/main/webapp/views/product/deskSticker.jsp +++ b/src/main/webapp/views/product/deskSticker.jsp @@ -294,6 +294,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); craftShua += craftJiao; diff --git a/src/main/webapp/views/product/diploma.jsp b/src/main/webapp/views/product/diploma.jsp index 34b3117..e47b732 100644 --- a/src/main/webapp/views/product/diploma.jsp +++ b/src/main/webapp/views/product/diploma.jsp @@ -118,7 +118,8 @@ layui.use(['table','form'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var count = $("#count").val(); size = size.replace("cm", ""); diff --git a/src/main/webapp/views/product/disu.jsp b/src/main/webapp/views/product/disu.jsp index 79c7e6b..c9b65c2 100644 --- a/src/main/webapp/views/product/disu.jsp +++ b/src/main/webapp/views/product/disu.jsp @@ -250,6 +250,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark("滴塑", size, count + "个", kind, number, "", ""); diff --git a/src/main/webapp/views/product/envelope.jsp b/src/main/webapp/views/product/envelope.jsp index b50afb0..efd13ea 100644 --- a/src/main/webapp/views/product/envelope.jsp +++ b/src/main/webapp/views/product/envelope.jsp @@ -243,7 +243,8 @@ layui.use(['table','form','carousel'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var size = ""; var count = ""; diff --git a/src/main/webapp/views/product/fan.jsp b/src/main/webapp/views/product/fan.jsp index 9b43f3a..94864d0 100644 --- a/src/main/webapp/views/product/fan.jsp +++ b/src/main/webapp/views/product/fan.jsp @@ -384,6 +384,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/fgq.jsp b/src/main/webapp/views/product/fgq.jsp index b8b897d..da78e16 100644 --- a/src/main/webapp/views/product/fgq.jsp +++ b/src/main/webapp/views/product/fgq.jsp @@ -174,7 +174,8 @@ layui.use(['table','form','carousel'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); //计算完自动复制文本 var e=document.getElementById("span_result");//对象是content diff --git a/src/main/webapp/views/product/fileCover.jsp b/src/main/webapp/views/product/fileCover.jsp index a76f8e1..c509cc8 100644 --- a/src/main/webapp/views/product/fileCover.jsp +++ b/src/main/webapp/views/product/fileCover.jsp @@ -210,7 +210,8 @@ layui.use(['table','form','carousel'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var size = kind2.replace("舌头50", ""); var count = $("#count option:selected").val(); diff --git a/src/main/webapp/views/product/flags.jsp b/src/main/webapp/views/product/flags.jsp index b2ddeb5..2623a61 100644 --- a/src/main/webapp/views/product/flags.jsp +++ b/src/main/webapp/views/product/flags.jsp @@ -274,7 +274,8 @@ layui.use(['table','form'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var count = $("#count option:selected").val(); getRemark("吊旗", size, count+"个", kind, number, arr, ""); diff --git a/src/main/webapp/views/product/flyer.jsp b/src/main/webapp/views/product/flyer.jsp index 46e82de..0409f68 100644 --- a/src/main/webapp/views/product/flyer.jsp +++ b/src/main/webapp/views/product/flyer.jsp @@ -320,6 +320,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); var count = $("#count option:selected").val(); diff --git a/src/main/webapp/views/product/freehand.jsp b/src/main/webapp/views/product/freehand.jsp index e66c446..d47273e 100644 --- a/src/main/webapp/views/product/freehand.jsp +++ b/src/main/webapp/views/product/freehand.jsp @@ -210,6 +210,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); getRemark("手绘", size, count + "个", kind, number, "", ""); diff --git a/src/main/webapp/views/product/fridgeMagnet.jsp b/src/main/webapp/views/product/fridgeMagnet.jsp index fba6ad3..4b70a5e 100644 --- a/src/main/webapp/views/product/fridgeMagnet.jsp +++ b/src/main/webapp/views/product/fridgeMagnet.jsp @@ -45,7 +45,7 @@

- 数量(套)备注： 一套只可以4个图 + 数量(套)

@@ -465,11 +465,11 @@ } span_result += '包邮，免费设计呢~（偏远地区需补邮费）' - if(window.parent.system_isGai){ - span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" - } + if (window.parent.system_isGai) { + span_result += "\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" + } + addLog(span_result); $("#span_result").val(span_result); - //计算完自动复制文本 var e = document.getElementById("span_result");//对象是content if (e.value != "") { diff --git a/src/main/webapp/views/product/handBag.jsp b/src/main/webapp/views/product/handBag.jsp index e60890f..fb6b90c 100644 --- a/src/main/webapp/views/product/handBag.jsp +++ b/src/main/webapp/views/product/handBag.jsp @@ -728,7 +728,8 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var size = ""; if (level == 0) { diff --git a/src/main/webapp/views/product/handkerchiefPaper.jsp b/src/main/webapp/views/product/handkerchiefPaper.jsp index e21e2d5..ddb7898 100644 --- a/src/main/webapp/views/product/handkerchiefPaper.jsp +++ b/src/main/webapp/views/product/handkerchiefPaper.jsp @@ -347,6 +347,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/hykkt.jsp b/src/main/webapp/views/product/hykkt.jsp index ab2e511..8bd60b6 100644 --- a/src/main/webapp/views/product/hykkt.jsp +++ b/src/main/webapp/views/product/hykkt.jsp @@ -232,6 +232,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/insertCard.jsp b/src/main/webapp/views/product/insertCard.jsp index b954e7d..cb1d8f4 100644 --- a/src/main/webapp/views/product/insertCard.jsp +++ b/src/main/webapp/views/product/insertCard.jsp @@ -398,6 +398,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); var count = $("#count option:selected").val(); diff --git a/src/main/webapp/views/product/katie.jsp b/src/main/webapp/views/product/katie.jsp index 5b359f8..ee9331e 100644 --- a/src/main/webapp/views/product/katie.jsp +++ b/src/main/webapp/views/product/katie.jsp @@ -275,6 +275,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/kzt.jsp b/src/main/webapp/views/product/kzt.jsp index 6ed99b7..0e26f67 100644 --- a/src/main/webapp/views/product/kzt.jsp +++ b/src/main/webapp/views/product/kzt.jsp @@ -134,7 +134,8 @@ layui.use(['table','form','carousel'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var count = $("#count option:selected").val(); getRemark("筷子套", size+"cm", count+"张", "157克铜版纸", number, "", ""); diff --git a/src/main/webapp/views/product/landa.jsp b/src/main/webapp/views/product/landa.jsp index d22b656..b10de4a 100644 --- a/src/main/webapp/views/product/landa.jsp +++ b/src/main/webapp/views/product/landa.jsp @@ -263,6 +263,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/leiTag.jsp b/src/main/webapp/views/product/leiTag.jsp index 7fb9409..f82d65c 100644 --- a/src/main/webapp/views/product/leiTag.jsp +++ b/src/main/webapp/views/product/leiTag.jsp @@ -315,6 +315,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/light.jsp b/src/main/webapp/views/product/light.jsp index 909c08d..c4da451 100644 --- a/src/main/webapp/views/product/light.jsp +++ b/src/main/webapp/views/product/light.jsp @@ -273,6 +273,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/lingmo.jsp b/src/main/webapp/views/product/lingmo.jsp index bc1b6a3..1a6f30c 100644 --- a/src/main/webapp/views/product/lingmo.jsp +++ b/src/main/webapp/views/product/lingmo.jsp @@ -283,6 +283,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/lsz.jsp b/src/main/webapp/views/product/lsz.jsp index 052e284..d085e3c 100644 --- a/src/main/webapp/views/product/lsz.jsp +++ b/src/main/webapp/views/product/lsz.jsp @@ -347,6 +347,7 @@ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } + addLog(span_result); $("#span_result").val(span_result); craft += tangjin; diff --git a/src/main/webapp/views/product/medal.jsp b/src/main/webapp/views/product/medal.jsp index 9b47a10..32a782d 100644 --- a/src/main/webapp/views/product/medal.jsp +++ b/src/main/webapp/views/product/medal.jsp @@ -534,6 +534,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/metal - 副本.jsp b/src/main/webapp/views/product/metal - 副本.jsp index d47d99c..426519a 100644 --- a/src/main/webapp/views/product/metal - 副本.jsp +++ b/src/main/webapp/views/product/metal - 副本.jsp @@ -334,7 +334,8 @@ layui.use(['table','form','carousel'], function(){ if(window.parent.system_isGai){ span_result +="\n\n亲 现在下单可以参加淘宝活动8.5折折扣哦!" } - $("#span_result").val(span_result); + addLog(span_result); + $("#span_result").val(span_result); var craft = ""; var count = ""; diff --git a/src/main/webapp/views/product/metal.jsp b/src/main/webapp/views/product/metal.jsp index 0c36da5..c01ce52 100644 --- a/src/main/webapp/views/product/metal.jsp +++ b/src/main/webapp/views/product/metal.jsp @@ -207,12 +207,10 @@ class="craftZhuan"> - - - - + +