Browse Source

线上支付逻辑优化

Duan_xu 2 years ago
parent
commit
95224fd539
28 changed files with 2236 additions and 472 deletions
  1. 2 0
      src/main/java/com/caimei/modules/order/dao/NewOrderDao.java
  2. 2 0
      src/main/java/com/caimei/modules/order/dao/NewOrderProductDao.java
  3. 3 0
      src/main/java/com/caimei/modules/order/dao/NewShopOrderDao.java
  4. 16 0
      src/main/java/com/caimei/modules/order/entity/ChangePayShopDifference.java
  5. 10 0
      src/main/java/com/caimei/modules/order/entity/NewShopOrder.java
  6. 21 0
      src/main/java/com/caimei/modules/order/service/CmPayShopService.java
  7. 4 0
      src/main/java/com/caimei/modules/order/service/NewShopOrderService.java
  8. 32 2
      src/main/java/com/caimei/modules/order/web/CmPayShopController.java
  9. 4 0
      src/main/java/com/caimei/modules/order/web/CmShopOrderController.java
  10. 1 0
      src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java
  11. 7 0
      src/main/resources/mappings/modules/order/OrderMapper.xml
  12. 15 1
      src/main/resources/mappings/modules/order/ShopOrderMapper.xml
  13. 515 258
      src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp
  14. 229 132
      src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp
  15. 32 4
      src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp
  16. 3 3
      src/main/webapp/WEB-INF/views/modules/order/checkPaymentOrder.jsp
  17. 1 1
      src/main/webapp/WEB-INF/views/modules/order/cmPayShopDetail.jsp
  18. 3 1
      src/main/webapp/WEB-INF/views/modules/order/cmPayShopForm.jsp
  19. 21 7
      src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp
  20. 6 2
      src/main/webapp/WEB-INF/views/modules/order/differencePriceForm.jsp
  21. 9 9
      src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp
  22. 3 3
      src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp
  23. 3 3
      src/main/webapp/WEB-INF/views/modules/order/refundRecord.jsp
  24. 1 0
      src/main/webapp/WEB-INF/views/modules/product-new/secondHand.jsp
  25. 1247 0
      src/main/webapp/WEB-INF/views/modules/product/cmSecondDetailForm.jsp
  26. 14 14
      src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyRemarksList.jsp
  27. 14 14
      src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp
  28. 18 18
      src/main/webapp/WEB-INF/views/modules/userNew/cmUnRegistRemarksList.jsp

+ 2 - 0
src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -221,6 +221,8 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
 
     void updateOnlinePayFlag(@Param("onlinePayFlag") Integer onlinePayFlag,@Param("orderId") Integer orderId);
 
+    void updateBrokerage(@Param("shopOrderID")Integer shopOrderID ,@Param("brokerage")Double brokerage);
+
     Integer findSupport(Integer shopOrderId);
 
     List<OrderProductVo> getOrderProductByShopOrderId(Integer shopOrderId);

+ 2 - 0
src/main/java/com/caimei/modules/order/dao/NewOrderProductDao.java

@@ -103,4 +103,6 @@ public interface NewOrderProductDao extends CrudDao<NewOrderProduct> {
      * @param shopOrderID
      */
     Integer countReturnedFreightProduct(Integer shopOrderID);
+
+
 }

+ 3 - 0
src/main/java/com/caimei/modules/order/dao/NewShopOrderDao.java

@@ -82,4 +82,7 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
     Double findIncome(Integer orderID);
 
     List<NewShopOrder> findSplitList(NewShopOrder shopOrder);
+
+    //查询子订单是 线上 还是 线上
+    Integer payWay(Integer shopOrderID);
 }

+ 16 - 0
src/main/java/com/caimei/modules/order/entity/ChangePayShopDifference.java

@@ -144,6 +144,14 @@ public class ChangePayShopDifference implements Serializable {
      */
     private CmRefundShop refundShop;
 
+    /**
+     * 子订单收款状态  1待收款、2部分收款、3已收款
+     * @return
+     */
+    private  Integer shopReceiptStatus;
+
+
+
     public Integer getId() {
         return id;
     }
@@ -367,4 +375,12 @@ public class ChangePayShopDifference implements Serializable {
     public void setPayStatus(String payStatus) {
         this.payStatus = payStatus;
     }
+
+    public Integer getShopReceiptStatus() {
+        return shopReceiptStatus;
+    }
+
+    public void setShopReceiptStatus(Integer shopReceiptStatus) {
+        this.shopReceiptStatus = shopReceiptStatus;
+    }
 }

+ 10 - 0
src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -95,6 +95,7 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private BigDecimal differencePrice;  //补差价金额
     private Integer userBeans; //订单采美豆数量
     private Double svipShopReduction;   //超级会员优惠
+    private Integer payWay; //线上支付状态 1线上 2线下 3余额抵扣
     //-------------        虚拟字段   ----------------------------
     private Double income;       //主订单总佣金
     private List<String> shopOrderNos;      //主订单下所有子订单
@@ -152,6 +153,15 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
 
     private boolean payShopOtherFee = true; //是否可以付第三方申请
 
+
+    public Integer getPayWay() {
+        return payWay;
+    }
+
+    public void setPayWay(Integer payWay) {
+        this.payWay = payWay;
+    }
+
     public Double getIncome() {
         return income;
     }

+ 21 - 0
src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -11,6 +11,7 @@ import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.NewCmShop;
 import com.caimei.utils.MathUtil;
 import com.caimei.utils.StringUtil;
+import com.opensymphony.module.sitemesh.html.CustomTag;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
@@ -265,6 +266,21 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 //主订单总佣金
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
                 so.setIncome(income);
+               //若成本下降太多导致部分收款的钱,已经大于成本重新计算佣金
+                if("0".equals(newOrder.getOnlinePayFlag()) && so.getShopReceiptStatus()==2){
+                    double mum= so.getProductAmount();
+                    System.out.println(so.getReceiptTotalFee());
+                    System.out.println(so.getShouldPayShopAmount());
+                    BigDecimal getShouldPayShopAmount = MathUtil.sub(so.getShouldPayShopAmount(), so.getDifferencePrice());
+                    if(so.getReceiptTotalFee()>Double.valueOf(getShouldPayShopAmount.toString())){
+                        //子订单佣金
+
+                        mum-= so.getShopOtherFee()+Double.valueOf(getShouldPayShopAmount.toString());
+                        so.setBrokerage(mum);
+                    }else { so.setBrokerage(null);}
+                }else { so.setBrokerage(null);}
+                //要是不大于成本默认显示
+
             }
             cmPayShop.setTotalAmount(totalAmount);
             cmPayShop.setBalancePayFee(0D);
@@ -352,6 +368,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
                 so.setIncome(income);
             }
+
             cmPayShop.setShopOrders(csos);
         }
     }
@@ -929,6 +946,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
             payShopDifference.setRebateAmount(BigDecimal.valueOf(rebateAmount));
             payShopDifference.setType(shopOrder.getDifferenceType());
             payShopDifference.setDifferencePrice(shopOrder.getDifferencePrice());
+            payShopDifference.setShopReceiptStatus( shopOrder.getShopReceiptStatus());
         }
         payShopDifference.setWaitPayShop(waitPayShop);
         return payShopDifference;
@@ -1075,6 +1093,9 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         if (!("3".equals(shopOrder.getPayStatus()) && 1 == payShopDifference.getType())) {
             newShopOrderDao.updateByDifferencePrice(payShopDifference.getType(), differencePrice, shopOrderId);
         }
+
+
+
     }
 
     public ChangePayShopOther shopOtherApplyEdit(Integer payShopId) {

+ 4 - 0
src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -668,4 +668,8 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
         page.setList(payOrderList);
         return page;
     }
+
+    public Integer payWay(Integer shoprderID){
+        return newShopOrderDao.payWay(shoprderID);
+    }
 }

+ 32 - 2
src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -4,6 +4,7 @@ import com.caimei.dfs.image.beens.ImageUploadInfo;
 import com.caimei.modules.common.utils.ExcelUtil;
 import com.caimei.modules.common.utils.UploadUtils;
 import com.caimei.modules.order.dao.CmPayShopRecordDao;
+import com.caimei.modules.order.dao.NewOrderDao;
 import com.caimei.modules.order.dao.NewOrderProductDao;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.*;
@@ -67,6 +68,8 @@ public class CmPayShopController extends BaseController {
     private CmPayShopRecordDao cmPayShopRecordDao;
     @Resource
     private NewOrderProductDao newOrderProductDao;
+    @Resource
+    private NewOrderDao newOrderDao;
 
     @ModelAttribute
     public CmPayShop get(@RequestParam(required = false) String id) {
@@ -385,8 +388,9 @@ public class CmPayShopController extends BaseController {
         shopOrder.setPayStatus(soZeroCostFlag ? "3" : "1");
         shopOrder.setZeroCostFlag(soZeroCostFlag ? 1 : 0);
         //当子订单0成本时,若主订单中其他子订单(除了运费子订单)都为0成本,设主订单为已付款,否则设为部分付款
+         NewOrder newOrder = newOrderService.get(shopOrder.getOrderID().toString());
         if (soZeroCostFlag) {
-            NewOrder newOrder = newOrderService.get(shopOrder.getOrderID().toString());
+
             AtomicReference<Boolean> zeroCostFlag = new AtomicReference<>(true);
             AtomicReference<Boolean> freightFlag = new AtomicReference<>(false);
 
@@ -418,19 +422,45 @@ public class CmPayShopController extends BaseController {
             }
             newOrderService.updatePayStatus(newOrder);
         }
+
+
+
         shopOrder.setShopPostFee(freight); //运费
         shopOrder.setShopOtherFee(thirdPartyFee); //付第三方
         shopOrder.setCostType(costType);
         shopOrder.setModifyShouldPayNote(modifyShouldPayNote);  //备注
         shopOrder.setModifyShouldPayUserID(UserUtils.getUser().getId());  //修改人的用户id
         shopOrder.setModifyShouldPayDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));  //修改时间
-
         double shouldPayShopAmount = shopOrder.getShopProductAmount() + shopOrder.getShopPostFee() + shopOrder.getShopTaxFee();
         if (shopOrder.getPayedShopAmount() != null && shouldPayShopAmount == shopOrder.getPayedShopAmount())
             shopOrder.setPayStatus("3");
         shopOrder.setShouldPayShopAmount(shouldPayShopAmount);
         newShopOrderService.modifyPayShopAmount(shopOrder, orderProducts);
 
+        if(shopOrder.getShopReceiptStatus()==1){
+            System.out.println(shopOrder.getShopReceiptStatus());
+            logger.info("未付款子订单进了成本修改"+shopOrder.getShouldPayShopAmount()+"-----"+shopOrder.getShopOtherFee());
+            double mum= newShopOrder.getProductAmount();
+            mum-= shopOrder.getShopOtherFee()+shopOrder.getShouldPayShopAmount();   //因为成本上升,子订单佣金下降。当成本上升到子订单佣金不大于线上支付最大手续费时不能进行线上支付所以减了第三方
+            System.out.println(">>>>>>>>子订单佣金"+mum+"----"+shopOrder.getBrokerage());
+            double fee=0.0;
+            if(shopOrder.getShopOtherFee()>=1000.01){
+                //手续费 =子订单金额*默认代理费率
+                 fee=shopOrder.getProductAmount()*0.0065;
+                if(mum<fee){
+                    newOrderDao.updateOnlinePayFlag(1,shopOrder.getOrderID());
+                }
+            }else if(shopOrder.getShopOtherFee()<=1000.01){
+                 fee=shopOrder.getProductAmount()*0.0025;
+                if(mum<fee){
+                    newOrderDao.updateOnlinePayFlag(1,shopOrder.getOrderID());
+                }
+            }
+            if(mum>fee){
+                newOrderDao.updateOnlinePayFlag(0,shopOrder.getOrderID());
+            }
+        }
+
         return "redirect:" + Global.getAdminPath() + "/shopOrder/payOrderList";
     }
 

+ 4 - 0
src/main/java/com/caimei/modules/order/web/CmShopOrderController.java

@@ -7,6 +7,7 @@ import com.caimei.modules.order.service.CmChangePayShopRecondService;
 import com.caimei.modules.order.service.NewShopOrderService;
 import com.caimei.modules.user.entity.CmUserOrganize;
 import com.caimei.modules.user.service.CmUserOrganizeService;
+import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
@@ -72,11 +73,13 @@ public class CmShopOrderController extends BaseController {
             newShopOrder.setEndTime(newShopOrder.getEndTime().trim() + " 23:59:59");
         }
         Page<NewShopOrder> page = newShopOrderService.findPayOrderList(new Page<>(request, response), newShopOrder);
+
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();
         model.addAttribute("cmUserOrganizeList", cmUserOrganizeList);
         model.addAttribute("page", page);
         model.addAttribute("operatingMode", newShopOrder.getOperatingMode());
+
         if ("3".equals(newShopOrder.getOperatingMode())) {
             //已付款子订单页面
             return "modules/order/paidShopOrderList";
@@ -109,6 +112,7 @@ public class CmShopOrderController extends BaseController {
     public String SplitAccount(NewShopOrder newShopOrder, HttpServletRequest request, HttpServletResponse response, Model model){
         //1. 展示付款状态为待付款和部分付款状态的线上支付的子订单;
         //2. 子订单按下单时间降序排列
+        //3. 手动分账页面需要只控制显示已收款的子订单
         Page<NewShopOrder> page = newShopOrderService.findSplitList(new Page<>(request, response),newShopOrder);
         model.addAttribute("page", page);
         return "modules/order/cmSplitAccountList";

+ 1 - 0
src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -193,6 +193,7 @@ public class CmSecondHandDetailController extends BaseController {
         model.addAttribute("cmSecondHandDetail", cmSecondHandDetail);
         return "modules/product/cmSecondHandDetailForm";
     }
+//   http://192.168.2.101/api/2022%E5%B9%B4/2022%E5%B9%B4%E5%B0%8F%E9%9C%80%E6%B1%82
 
     @RequiresPermissions("product:cmSecondHandDetail:edit")
     @RequestMapping(value = "save")

+ 7 - 0
src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1345,4 +1345,11 @@
         INSERT INTO cm_pay_shop_record (shopID, shopOrderID, shopOrderNo, payAmount, wipePayment, payType, payTime, payShopID, status, delFlag)
         VALUES (#{shopId}, #{shopOrderId}, #{shopOrderNo}, #{payAmount}, #{wipePayment}, #{payType}, #{payTime}, #{payShopId}, #{status}, #{delFlag})
     </insert>
+
+    <update id="updateBrokerage">
+        UPDATE cm_shop_order SET
+            brokerage = #{brokerage}
+        WHERE shopOrderID = #{shopOrderID}
+    </update>
+
 </mapper>

+ 15 - 1
src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -765,11 +765,14 @@
         co.status AS status,
         bou.name AS buyer,
         s.name AS shopName,
-        c.name AS clubName
+        c.name AS clubName,
+        cdr.payWay AS payWay
         from cm_shop_order a
         left join cm_pay_shop_record cpsr on a.shopOrderID = cpsr.shopOrderID
         left join bp_order_userinfo bou on bou.orderId = a.orderID
         left join cm_order co on co.orderID = a.orderID
+        LEFT JOIN cm_receipt_order_relation cror ON cror.orderId = co.orderId
+        LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         left join shop s on s.shopID = a.shopID
         LEFT JOIN club c ON c.userID = a.userID
         <where>
@@ -1133,6 +1136,7 @@
           AND cror.delFlag = 0
           AND cror.mbOrderId IS NOT NULL
           AND cror.splitStatus = 0
+          AND a.receiptStatus=3
           AND co.orderID NOT IN (
             SELECT orderID
             FROM cm_order_product
@@ -1158,4 +1162,14 @@
         WHERE orderID = #{orderid}
     </select>
 
+    <select id="payWay" resultType="java.lang.Integer">
+        SELECT  cdr.payWay
+        FROM cm_shop_order a
+                 LEFT JOIN cm_order co ON co.orderID = a.orderID
+                 LEFT JOIN cm_receipt_order_relation cror ON cror.orderId = co.orderId
+                 LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
+        WHERE a.shopOrderID =  #{shopOrderID}
+    </select>
+
+
 </mapper>

File diff suppressed because it is too large
+ 515 - 258
src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp


+ 229 - 132
src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -7,7 +7,10 @@
     <title>退款退货记录</title>
     <meta name="decorator" content="default"/>
     <style media="print">
-        @page { size: landscape; }
+        @page {
+            size: landscape;
+        }
+
         .refund-btn-top, .nav {
             display: none;
         }
@@ -43,47 +46,64 @@
             text-align: center;
             white-space: nowrap;
         }
-        .controls{
+
+        .controls {
             font-size: 0;
         }
-        .controls .conList{
+
+        .controls .conList {
             display: inline-block;
             margin-right: 15px;
         }
-        .conList .btn:nth-of-type(1){
+
+        .conList .btn:nth-of-type(1) {
             margin-left: 25px;
         }
+
         .refund-btn-top {
             float: right;
             margin-top: -18px;
             margin-right: 10px;
             height: 40px;
         }
+
         #enlarge-box {
             position: fixed;
             /*width: 325px;*/
             top: 50%;
             left: 50%;
-            transform: translate(-50%,-50%);
+            transform: translate(-50%, -50%);
             border: 2px solid #eee;
             background: #fff;
             display: none;
         }
-        .zeroCost .message{
-            display:none;
-            position:absolute;
-            background:#FFF;
-            white-space:nowrap;
-            border:1px solid black;
+
+        .zeroCost .message {
+            display: none;
+            position: absolute;
+            background: #FFF;
+            white-space: nowrap;
+            border: 1px solid black;
 
         }
-        .zeroCost:hover .message{
+
+        .zeroCost:hover .message {
             display: inline-block;
             color: black;
             padding: 5px;
             margin-left: 10px;
         }
-        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -107,18 +127,16 @@
         });
 
 
-
-
         function openClauseInfo(index) {
-            var content=$("#clauseContent"+index).val();
+            var content = $("#clauseContent" + index).val();
             if (content == '') {
                 return false;
             }
             $.jBox(content, {
-                title: $("#clauseName"+index).val(),
+                title: $("#clauseName" + index).val(),
                 width: $(top.document).width() - 440,
-                height: $(top.document).height()-240,
-                buttons: { '关闭': true }
+                height: $(top.document).height() - 240,
+                buttons: {'关闭': true}
             });
         }
     </script>
@@ -130,19 +148,24 @@
     <c:if test="${from eq '3'}">
         <li><a href="${ctx}/shopOrder/checkPaymentOrder">订单财务信息</a></li>
     </c:if>
-    <li class="active"><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款退货详情</a></li>
+    <li class="active"><a
+            href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款退货详情</a>
+    </li>
 </ul>
 <br/>
 <div class="refund-btn-top">
     <c:if test="${from ne '3'}">
-    <input type="button" class="btn btn-primary" onclick="window.location.href='${ctx}${cmReturnedPurchase.orderType eq 2?'/hehe/new/order/orderList':'/order/orderList'}'"  value="返回">
+        <input type="button" class="btn btn-primary"
+               onclick="window.location.href='${ctx}${cmReturnedPurchase.orderType eq 2?'/hehe/new/order/orderList':'/order/orderList'}'"
+               value="返回">
     </c:if>
 </div>
 <c:forEach items="${cmReturnedPurchaseList}" var="cmReturnedPurchase" varStatus="cmReturnedPurchaseStatus">
-    <form:form id="inputForm${cmReturnedPurchaseStatus.index}" modelAttribute="cmReturnedPurchase" action="${ctx}/bulkpurchase/cmRefundsProduct/saveRefound" method="post"
+    <form:form id="inputForm${cmReturnedPurchaseStatus.index}" modelAttribute="cmReturnedPurchase"
+               action="${ctx}/bulkpurchase/cmRefundsProduct/saveRefound" method="post"
                class="form-horizontal">
         <c:if test="${cmReturnedPurchaseStatus.index ne 0}">
-            <hr style="height:5px;border:none;border-top:5px ridge green;" />
+            <hr style="height:5px;border:none;border-top:5px ridge green;"/>
         </c:if>
         <%--审核模块--%>
         <c:if test="${not empty cmReturnedPurchase.confirmReturnTime}">
@@ -168,19 +191,24 @@
                         <c:if test="${not empty cmReturnedPurchase.reviewImage1 || not empty cmReturnedPurchase.reviewImage2  || not empty cmReturnedPurchase.reviewImage3  || not empty cmReturnedPurchase.reviewImage4  || not empty cmReturnedPurchase.reviewImage5}">
                             审核凭证:
                             <c:if test="${not empty cmReturnedPurchase.reviewImage1}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage1}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                     src="${cmReturnedPurchase.reviewImage1}">
                             </c:if>
                             <c:if test="${not empty cmReturnedPurchase.reviewImage2}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage2}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                     src="${cmReturnedPurchase.reviewImage2}">
                             </c:if>
                             <c:if test="${not empty cmReturnedPurchase.reviewImage3}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage3}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                     src="${cmReturnedPurchase.reviewImage3}">
                             </c:if>
                             <c:if test="${not empty cmReturnedPurchase.reviewImage4}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage4}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                     src="${cmReturnedPurchase.reviewImage4}">
                             </c:if>
                             <c:if test="${not empty cmReturnedPurchase.reviewImage5}">
-                                <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage5}">
+                                <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                     src="${cmReturnedPurchase.reviewImage5}">
                             </c:if>
                         </c:if>
                     </td>
@@ -211,22 +239,28 @@
                     <c:if test="${not empty cmReturnedPurchase.image1 || not empty cmReturnedPurchase.image2 || not empty cmReturnedPurchase.image3 || not empty cmReturnedPurchase.image4 || not empty cmReturnedPurchase.image5}">
                         申请凭证:
                         <c:if test="${not empty cmReturnedPurchase.image1}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image1}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                 src="${cmReturnedPurchase.image1}">
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.image2}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image2}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                 src="${cmReturnedPurchase.image2}">
                         </c:if>
                         <c:if test="${empty cmReturnedPurchase.image3}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image3}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                 src="${cmReturnedPurchase.image3}">
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.image3}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image3}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                 src="${cmReturnedPurchase.image3}">
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.image4}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image4}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                 src="${cmReturnedPurchase.image4}">
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.image5}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image5}">
+                            <img class="enlarge-pic" style="height: 70px;width: 65px"
+                                 src="${cmReturnedPurchase.image5}">
                         </c:if>
                     </c:if>
                 </td>
@@ -246,7 +280,9 @@
                         ${cmReturnedPurchase.returnTime}
                 </td>
                 <td><b>申请金额:</b>
-                    <span class="refundFee"><fmt:formatNumber value="${empty cmReturnedPurchase.refundFee?'0.00':(cmReturnedPurchase.refundFee)}" pattern="#0.00"/></span>元&nbsp;&nbsp;&nbsp;(账户余额抵扣:${order.balancePayFee})
+                    <span class="refundFee"><fmt:formatNumber
+                            value="${empty cmReturnedPurchase.refundFee?'0.00':(cmReturnedPurchase.refundFee)}"
+                            pattern="#0.00"/></span>元&nbsp;&nbsp;&nbsp;(账户余额抵扣:${order.balancePayFee})
                 </td>
                 <td><b>退款审核状态:</b>
                     <c:if test="${empty cmReturnedPurchase.status}">
@@ -266,7 +302,7 @@
                 </td>
             </tr>
             <tr>
-                <td  colspan="4" >
+                <td colspan="4">
                     <b>退款方式:</b>
                     <c:if test="${cmReturnedPurchase.returnedWay eq 4}">
                         未支付无退款
@@ -274,20 +310,20 @@
                     <c:if test="${cmReturnedPurchase.returnedWay eq 1}">
                         <c:if test="${not empty cmReturnedPurchase.refundBalanceFee && cmReturnedPurchase.refundBalanceFee ne 0 }">
                             余额账户:<fmt:formatNumber type="number" pattern="#,##0.00"
-                                                   value="${cmReturnedPurchase.refundBalanceFee}" />元&nbsp;&nbsp;&nbsp;&nbsp;
+                                                   value="${cmReturnedPurchase.refundBalanceFee}"/>元&nbsp;&nbsp;&nbsp;&nbsp;
                         </c:if>
                         <c:if test="${not empty cmReturnedPurchase.refundOnlineFee && cmReturnedPurchase.refundOnlineFee ne 0 }">
                             线上退回:<fmt:formatNumber type="number" pattern="#,##0.00"
-                                                   value="${cmReturnedPurchase.refundOnlineFee}" />元&nbsp;&nbsp;&nbsp;&nbsp;
+                                                   value="${cmReturnedPurchase.refundOnlineFee}"/>元&nbsp;&nbsp;&nbsp;&nbsp;
                         </c:if>
                         <br>
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <c:if test="${not empty cmReturnedPurchase.refundOfflineFee && cmReturnedPurchase.refundOfflineFee ne 0 }">
                             线下转账:<fmt:formatNumber type="number" pattern="#,##0.00"
-                                                   value="${cmReturnedPurchase.refundOfflineFee}" />元&nbsp;&nbsp;&nbsp;&nbsp;
+                                                   value="${cmReturnedPurchase.refundOfflineFee}"/>元&nbsp;&nbsp;&nbsp;&nbsp;
                             采美退款银行:
                             <c:if test="${cmReturnedPurchase.payType == '1'}">
-                               建设银行7297
+                                建设银行7297
                             </c:if>
                             <c:if test="${cmReturnedPurchase.payType == '2'}">
                                 中信银行0897
@@ -359,7 +395,8 @@
             </tr>
             <tr>
                 <td>
-                    订单金额:¥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00" maxFractionDigits="2" />
+                    订单金额:¥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00"
+                                            maxFractionDigits="2"/>
                     <c:if test="${not empty order.couponOrderRecord}">
                         <c:if test="${order.couponOrderRecord.couponType eq 0}">
                             <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">(活动券抵扣¥${order.couponOrderRecord.couponAmount},满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount})</font></a>
@@ -389,11 +426,14 @@
                     </c:if>
                 </td>
                 <td>
-                    应收总额:¥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2" />(账户余额抵扣:${order.balancePayFee})
-                    <a href="${ctx}/order/cmDiscernReceipt/detail?id=${lastReceiptDetailId}" style="text-decoration: underline;margin-left: 20px">查看订单收款情况</a>
+                    应收总额:¥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00"
+                                            maxFractionDigits="2"/>(账户余额抵扣:${order.balancePayFee})
+                    <a href="${ctx}/order/cmDiscernReceipt/detail?id=${lastReceiptDetailId}"
+                       style="text-decoration: underline;margin-left: 20px">查看订单收款情况</a>
                 </td>
                 <td>
-                    经理折扣:¥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00" maxFractionDigits="2" />
+                    经理折扣:¥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00"
+                                            maxFractionDigits="2"/>
                 </td>
                 <td>
                     机构运费:
@@ -466,7 +506,8 @@
                     <c:if test="${order.payStatus == 3}">
                         <font color="green">已付款</font>
                         <c:if test="${order.zeroCostFlag eq 1}">
-                            <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg" style="width: 15px;margin-bottom: 4px"></span>
+                            <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg"
+                                                                               style="width: 15px;margin-bottom: 4px"></span>
                                 <div class="message">
                                     <span>商品成本为0,直接置为已付款,无需付款供应商</span>
                                 </div>
@@ -477,7 +518,7 @@
                 <td>
                     退款状态:
                     <c:if test="${empty order.refundType}">
-                        <font>无退款</font>
+                        <font color="red">无退款</font>
                     </c:if>
                     <c:if test="${order.refundType == 1}">
                         <font color="#ff8c00">部分退款</font>
@@ -489,12 +530,13 @@
             </tr>
             <tr>
                 <td>
-                    机构:${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
+                    机构:${order.buyer}
+                    <c:if test="${order.organizeID == 3}"></c:if>
                 </td>
                 <td>
                     收货人:${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})
                 </td>
-                <td  colspan="2">
+                <td colspan="2">
                     地址:${order.bpOrderUserinfo.province}${order.bpOrderUserinfo.city}${order.bpOrderUserinfo.town}${order.bpOrderUserinfo.address}
                 </td>
             </tr>
@@ -503,88 +545,140 @@
         <%--单次退款商品信息汇总--%>
 
         <table id="cmReturnedPurchaseTable" class="table table-striped table-bordered table-condensed">
-                <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturneds" varStatus="shopOrderReturnedStatus">
-                    <tr>
-                        <td colspan="7">
-                            <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}" class="table table-striped table-bordered table-condensed">
+            <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturneds"
+                       varStatus="shopOrderReturnedStatus">
+                <tr>
+                    <td colspan="7">
+                        <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}"
+                               class="table table-striped table-bordered table-condensed">
+                            <tr>
+                                <td style="width: 300px;">
+                                    子订单编号(ID):${shopOrderReturneds.shopOrderNo}(${shopOrderReturneds.shopOrderID})
+                                </td>
+                                <td style="width: 250px;">子订单金额:${shopOrderReturneds.productAmount}</td>
+                                <td>
+                                        <%--                                        收款状态:${fns:getDictLabel(shopOrderReturneds.shopReceiptStatus,'receiptStatus' ,'' )}--%>
+                                    <c:if test="${shopOrderReturneds.shopReceiptStatus == 1}">
+                                        <font color="red">待收款</font>
+                                    </c:if>
+                                    <c:if test="${shopOrderReturneds.shopReceiptStatus == 2}">
+                                        <font color="#ff8c00">部分收款</font>
+                                    </c:if>
+                                    <c:if test="${shopOrderReturneds.shopReceiptStatus == 3}">
+                                        <font color="green">已收款</font>
+                                    </c:if>
+                                </td>
+                                <td>发货状态:
+                                        <%--                                            ${fns:getDictLabel(shopOrderReturneds.sendOutStatus,'sendOutStatus' ,'' )}--%>
+                                    <c:if test="${shopOrderReturneds.sendOutStatus == 1}">
+                                        <font color="red">待发货</font>
+                                    </c:if>
+                                    <c:if test="${shopOrderReturneds.sendOutStatus == 2}">
+                                        <font color="#ff8c00">部分发货</font>
+                                    </c:if>
+                                    <c:if test="${shopOrderReturneds.sendOutStatus == 3}">
+                                        <font color="green">已发货</font>
+                                    </c:if>
+                                </td>
+                                <td>付款状态:
+                                        <%--                                            ${fns:getDictLabel(shopOrderReturneds.payStatus,'payStatus' ,'' )}--%>
+                                    <c:if test="${shopOrderReturneds.payStatus == 1}">
+                                        <font color="red">待付款</font>
+                                    </c:if>
+                                    <c:if test="${shopOrderReturneds.payStatus == 2}">
+                                        <font color="#ff8c00">部分付款</font>
+                                    </c:if>
+                                    <c:if test="${shopOrderReturneds.payStatus == 3}">
+                                        <font color="green">已付款</font>
+                                    </c:if>
+                                </td>
+                                <td>供应商:${shopOrderReturneds.shopName}</td>
+                            </tr>
+                            <c:if test="${order.onlinePayFlag eq 0}">
                                 <tr>
-                                    <td style="width: 300px;">子订单编号(ID):${shopOrderReturneds.shopOrderNo}(${shopOrderReturneds.shopOrderID})</td>
-                                    <td  style="width: 250px;">子订单金额:${shopOrderReturneds.productAmount}</td>
                                     <td>
-                                        收款状态:${fns:getDictLabel(shopOrderReturneds.shopReceiptStatus,'receiptStatus' ,'' )}
+                                        商品总额:¥<fmt:formatNumber type="number"
+                                                                value="${shopOrderReturneds.needPayAmount}"
+                                                                pattern="0.00" maxFractionDigits="2"/>
+                                    </td>
+                                    <td>
+                                        优惠:¥<fmt:formatNumber type="number" value="${shopOrderReturneds.eachDiscount}"
+                                                              pattern="0.00" maxFractionDigits="2"/>
                                     </td>
-                                    <td>发货状态:
-                                            ${fns:getDictLabel(shopOrderReturneds.sendOutStatus,'sendOutStatus' ,'' )}
+                                    <td>
+                                        应付金额:¥<fmt:formatNumber type="number" value="${shopOrderReturneds.realPay}"
+                                                                pattern="0.00" maxFractionDigits="2"/>
                                     </td>
-                                    <td>付款状态:
-                                            ${fns:getDictLabel(shopOrderReturneds.payStatus,'payStatus' ,'' )}
+                                    <td>
+                                        已付金额:¥<fmt:formatNumber type="number"
+                                                                value="${shopOrderReturneds.receiptAmount}"
+                                                                pattern="0.00" maxFractionDigits="2"/>
                                     </td>
-                                    <td>供应商:${shopOrderReturneds.shopName}</td>
+                                    <td>
+                                        待付金额:¥<fmt:formatNumber type="number" value="${shopOrderReturneds.restAmount}"
+                                                                pattern="0.00" maxFractionDigits="2"/>
+                                    </td>
+                                </tr>
+                            </c:if>
+                            <c:forEach items="${shopOrderReturneds.cmReturnedPurchaseProductList}"
+                                       var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
+                                <tr>
+                                    <td rowspan="4" style="width: 295px;height: 125px">
+                                        <img style="width: 100px;height: 100px"
+                                             src="${cmReturnedPurchaseProduct.mainImage}">
+                                        <font title="${cmReturnedPurchaseProduct.name}">${fns:abbr(cmReturnedPurchaseProduct.name,30)}</font>
+                                    </td>
+                                    <td>单价:¥${cmReturnedPurchaseProduct.price}<c:if
+                                            test="${order.collageFlag eq 1}"><font color="red">(拼团价)</font></c:if></td>
+                                    <c:if test="${order.collageFlag eq 1}"><font color="red">(拼团价)</font></c:if>
+                                    <td>折扣:${cmReturnedPurchaseProduct.discount}</td>
+                                    <td>折后单价:¥${cmReturnedPurchaseProduct.discountPrice}</td>
+                                    <td>
+                                        购买数量(赠品数)X${cmReturnedPurchaseProduct.num}(${cmReturnedPurchaseProduct.presentNum})
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>税率:${cmReturnedPurchaseProduct.taxRate}</td>
+                                    <td>税费:¥${cmReturnedPurchaseProduct.totalAddedValueTax}</td>
+                                    <td colspan="2">总额:¥${cmReturnedPurchaseProduct.totalFee}</td>
                                 </tr>
-                                <c:if test="${order.onlinePayFlag eq 0}">
-                                    <tr>
-                                        <td>
-                                            商品总额:¥<fmt:formatNumber type="number" value="${shopOrderReturneds.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
-                                        </td>
-                                        <td>
-                                            优惠:¥<fmt:formatNumber type="number" value="${shopOrderReturneds.eachDiscount}" pattern="0.00" maxFractionDigits="2" />
-                                        </td>
-                                        <td>
-                                            应付金额:¥<fmt:formatNumber type="number" value="${shopOrderReturneds.realPay}" pattern="0.00" maxFractionDigits="2" />
-                                        </td>
-                                        <td>
-                                            已付金额:¥<fmt:formatNumber type="number" value="${shopOrderReturneds.receiptAmount}" pattern="0.00" maxFractionDigits="2" />
-                                        </td>
-                                        <td>
-                                            待付金额:¥<fmt:formatNumber type="number" value="${shopOrderReturneds.restAmount}" pattern="0.00" maxFractionDigits="2" />
-                                        </td>
-                                    </tr>
-                                </c:if>
-                                <c:forEach items="${shopOrderReturneds.cmReturnedPurchaseProductList}" var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
-                                    <tr>
-                                        <td  rowspan="4" style="width: 295px;height: 125px">
-                                            <img style="width: 100px;height: 100px"  src="${cmReturnedPurchaseProduct.mainImage}">
-                                            <font title="${cmReturnedPurchaseProduct.name}">${fns:abbr(cmReturnedPurchaseProduct.name,30)}</font>
-                                        </td>
-                                        <td>单价:¥${cmReturnedPurchaseProduct.price}<c:if test="${order.collageFlag eq 1}"><font color="red">(拼团价)</font></c:if></td>                                            <c:if test="${order.collageFlag eq 1}"><font color="red">(拼团价)</font></c:if>
-                                        <td>折扣:${cmReturnedPurchaseProduct.discount}</td>
-                                        <td>折后单价:¥${cmReturnedPurchaseProduct.discountPrice}</td>
-                                        <td>购买数量(赠品数)X${cmReturnedPurchaseProduct.num}(${cmReturnedPurchaseProduct.presentNum})</td>
-                                    </tr>
-                                    <tr>
-                                        <td>税率:${cmReturnedPurchaseProduct.taxRate}</td>
-                                        <td>税费:¥${cmReturnedPurchaseProduct.totalAddedValueTax}</td>
-                                        <td colspan="2">总额:¥${cmReturnedPurchaseProduct.totalFee}</td>
-                                    </tr>
-                                    <tr>
-                                        <td><font color="red">已发货:${cmReturnedPurchaseProduct.num+cmReturnedPurchaseProduct.presentNum - cmReturnedPurchaseProduct.notOutStore}</font></td>
-                                        <td><font color="red">已退货:<span id="applicationReturnedNum${shopOrderReturnedStatus.index}${cmReturnedPurchaseProductStatus.index}">${cmReturnedPurchaseProduct.returnedPurchaseProductNum}</span></font></td>
-                                        <td colspan="2"><font color="red">本次退货:
-                                                ${empty cmReturnedPurchaseProduct.actualReturnedNum ? 0 : cmReturnedPurchaseProduct.actualReturnedNum}
-                                        </font>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><font color="red">待发货:${cmReturnedPurchaseProduct.notOutStore - cmReturnedPurchaseProduct.cancelProductNum}</font></td>
-                                        <td><font color="red">已取消:<span id="applicationCancelNum${shopOrderReturnedStatus.index}${cmReturnedPurchaseProductStatus.index}">${cmReturnedPurchaseProduct.cancelProductNum}</span></font></td>
-                                        <td colspan="2"><font color="red">本次取消:
-                                                ${empty cmReturnedPurchaseProduct.actualCancelNum ? 0 : cmReturnedPurchaseProduct.actualCancelNum}
-                                        </font>
-                                        </td>
-                                    </tr>
-                                    <%--<form:hidden path="cmReturnedPurchaseProductList[${shopOrderReturnedStatus.index}][${cmReturnedPurchaseProductStatus.index}].returnedReceiver" value="${cmReturnedPurchaseProduct.returnedReceiver}"/>--%>
-                                </c:forEach>
-                            </table>
-                        </td>
-                    </tr>
-                </c:forEach>
+                                <tr>
+                                    <td><font
+                                            color="red">已发货:${cmReturnedPurchaseProduct.num+cmReturnedPurchaseProduct.presentNum - cmReturnedPurchaseProduct.notOutStore}</font>
+                                    </td>
+                                    <td><font color="red">已退货:<span
+                                            id="applicationReturnedNum${shopOrderReturnedStatus.index}${cmReturnedPurchaseProductStatus.index}">${cmReturnedPurchaseProduct.returnedPurchaseProductNum}</span></font>
+                                    </td>
+                                    <td colspan="2"><font color="red">本次退货:
+                                            ${empty cmReturnedPurchaseProduct.actualReturnedNum ? 0 : cmReturnedPurchaseProduct.actualReturnedNum}
+                                    </font>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td><font
+                                            color="red">待发货:${cmReturnedPurchaseProduct.notOutStore - cmReturnedPurchaseProduct.cancelProductNum}</font>
+                                    </td>
+                                    <td><font color="red">已取消:<span
+                                            id="applicationCancelNum${shopOrderReturnedStatus.index}${cmReturnedPurchaseProductStatus.index}">${cmReturnedPurchaseProduct.cancelProductNum}</span></font>
+                                    </td>
+                                    <td colspan="2"><font color="red">本次取消:
+                                            ${empty cmReturnedPurchaseProduct.actualCancelNum ? 0 : cmReturnedPurchaseProduct.actualCancelNum}
+                                    </font>
+                                    </td>
+                                </tr>
+                                <%--<form:hidden path="cmReturnedPurchaseProductList[${shopOrderReturnedStatus.index}][${cmReturnedPurchaseProductStatus.index}].returnedReceiver" value="${cmReturnedPurchaseProduct.returnedReceiver}"/>--%>
+                            </c:forEach>
+                        </table>
+                    </td>
+                </tr>
+            </c:forEach>
 
         </table>
     </form:form>
 </c:forEach>
 
 <c:if test="${empty cmReturnedPurchaseList}">
-    <p style="text-align: center;"><font  color="#1e90ff">暂无退货退款详情记录.....</font></p>
+    <p style="text-align: center;"><font color="#1e90ff">暂无退货退款详情记录.....</font></p>
 </c:if>
 <c:if test="${not empty cmReturnedPurchaseList}">
     <table id="orderTable" class="table table-striped table-bordered table-condensed">
@@ -592,11 +686,14 @@
             <td>
                 <div class="order-rows">
                     <label>发票信息:</label>
-                    <input id="invoice1" class="invoice1" name="invoice" type="radio" ${order.orderInvoice.type == 0 ? 'checked="checked"':''} disabled="disabled">
+                    <input id="invoice1" class="invoice1" name="invoice"
+                           type="radio" ${order.orderInvoice.type == 0 ? 'checked="checked"':''} disabled="disabled">
                     <label for="invoice1">不需要发票</label>
-                    <input id="invoice2" name="invoice" type="radio" ${order.orderInvoice.type == 1 ? 'checked="checked"':''} disabled="disabled">
+                    <input id="invoice2" name="invoice"
+                           type="radio" ${order.orderInvoice.type == 1 ? 'checked="checked"':''} disabled="disabled">
                     <label for="invoice2">普通发票</label>
-                    <input id="invoice3" name="invoice" type="radio" ${order.orderInvoice.type == 2 ? 'checked="checked"':''} disabled="disabled">
+                    <input id="invoice3" name="invoice"
+                           type="radio" ${order.orderInvoice.type == 2 ? 'checked="checked"':''} disabled="disabled">
                     <label for="invoice3">增值税发票</label>
                     <c:if test="${order.orderInvoice.type == 1}">
                         <br>
@@ -669,28 +766,28 @@
 <script type="text/javascript" src="${ctxStatic}/modules/bulkpurchase/stages.js"></script>
 <script>
     $(function () {
-        $('.print-now').on('click',function() {
+        $('.print-now').on('click', function () {
             window.print();
         })
     });
 
-    (function(){
-        $('body').click(function(e) {
+    (function () {
+        $('body').click(function (e) {
             var target = $(e.target),
                 $block = $('.operation-block');
-            if(target.is('.operation-btn')) {
-                if($block.css('display') === 'none') {
+            if (target.is('.operation-btn')) {
+                if ($block.css('display') === 'none') {
                     $block.show();
                 } else {
                     $block.hide();
                 }
             }
-            if(!target.is('.operation-block') && !target.is('.operation-btn')) {
+            if (!target.is('.operation-block') && !target.is('.operation-btn')) {
                 $block.hide();
             }
         });
 
-        $('.clauseId').each(function() {
+        $('.clauseId').each(function () {
             var self = $(this);
             if (!self.prop("checked")) {
                 self.parent().hide();
@@ -709,16 +806,16 @@
             }
         })
 
-        $('body').on('mouseover', '.enlarge-pic', function() {
+        $('body').on('mouseover', '.enlarge-pic', function () {
             var thisSrc = $(this).attr('src'),
                 enlargeBox = $('#enlarge-box');
-            if(thisSrc) {
+            if (thisSrc) {
                 enlargeBox.show(50);
-                $('#enlarge-box').find('img').attr('src',thisSrc);
+                $('#enlarge-box').find('img').attr('src', thisSrc);
             }
         })
 
-        $('body').on('mouseout', '.enlarge-pic', function() {
+        $('body').on('mouseout', '.enlarge-pic', function () {
             var enlargeBox = $('#enlarge-box');
             enlargeBox.hide();
         })

+ 32 - 4
src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp

@@ -144,7 +144,16 @@
             </c:if>
         </td>
         <td>
-            收款状态:${fns:getDictLabel(order.receiptStatus,'receiptStatus' ,'' )}
+            收款状态:<%--${fns:getDictLabel(order.receiptStatus,'receiptStatus' ,'' )}--%>
+            <c:if test="${order.receiptStatus == 1}">
+                <font color="red">待收款</font>
+            </c:if>
+            <c:if test="${order.receiptStatus == 2}">
+                <font color="#ff8c00">部分收款</font>
+            </c:if>
+            <c:if test="${order.receiptStatus == 3}">
+                <font color="green">已收款</font>
+            </c:if>
         </td>
         <c:if test="${order.orderType eq 2}">
             <td>
@@ -162,7 +171,17 @@
             </td>
         </c:if>
         <td>
-            付款状态:${fns:getDictLabel(order.payStatus,'payStatus' ,'' )}
+            付款状态:<%--${fns:getDictLabel(order.payStatus,'payStatus' ,'' )}--%>
+            <c:if test="${order.payStatus == 1}">
+                <font color="red">待付款</font>
+            </c:if>
+            <c:if test="${order.payStatus == 2}">
+                <font color="#ff8c00">部分付款</font>
+            </c:if>
+            <c:if test="${order.payStatus == 3}">
+                <font color="green">已付款</font>
+            </c:if>
+
             <c:if test="${order.zeroCostFlag eq 1}">
                 <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg" style="width: 15px;margin-bottom: 4px"></span>
                     <div class="message">
@@ -172,7 +191,16 @@
             </c:if>
         </td>
         <td>
-            退款(退货)状态:${fns:getDictLabel(order.refundType,'refundType' ,'' )}
+<%--            退款(退货)状态:${fns:getDictLabel(order.refundType,'refundType' ,'' )}--%>
+    <c:if test="${order.refundType == 1}">
+        <font color="red">待发货</font>
+    </c:if>
+    <c:if test="${order.refundType == 2}">
+        <font color="#ff8c00">部分发货</font>
+    </c:if>
+    <c:if test="${order.refundType == 3}">
+        <font color="green">已发货</font>
+    </c:if>
         </td>
     </tr>
     <tr>
@@ -337,4 +365,4 @@
 
 </script>
 </body>
-</html>
+</html>

+ 3 - 3
src/main/webapp/WEB-INF/views/modules/order/checkPaymentOrder.jsp

@@ -490,13 +490,13 @@
                     </td>
                     <td>
                         <c:if test="${s.refundType == 1}">
-                            部分退款
+                            <font color="#ff8c00">部分退款</font>
                         </c:if>
                         <c:if test="${s.refundType == 2}">
-                            已退款
+                            <font color="green">已退款</font>
                         </c:if>
                         <c:if test="${s.refundType != 1 && s.refundType != 2}">
-                            无退款
+                            <font color="red">无退款</font>
                         </c:if>
                     </td>
                     <td><fmt:formatNumber value="${s.returnValue}" type="number" pattern="#,##0.00"/></td>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/order/cmPayShopDetail.jsp

@@ -460,7 +460,7 @@
 					resVal = '';
 				totalComissionEle = thisEle.find('.payCm'),
 				comissionEle = thisEle.find('.payCm-t'),
-				thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',',''),
+				thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',',''),//付第三方
 				freightVal = thisEle.find('.freight').text().replace(',',''),
 				clubFreight = Number(thisEle.find('.clubFreight').text().replace(',','')),
 				discountFee = Number(thisEle.find('.discountFee').text().replace(',','')),

+ 3 - 1
src/main/webapp/WEB-INF/views/modules/order/cmPayShopForm.jsp

@@ -528,7 +528,9 @@
                     <tr>
                         <td>${s.shopOrderNo}(${s.shopOrderID})</td>
                         <td colspan="3">${s.shopName}</td>
-                        <td colspan="3" class="payCm-t"></td> <%-- 子订单佣金=商品总佣金+机构运费-付第三方-供应商运费-分摊优惠--%>
+                        <c:if test="${empty s.brokerage}"><td colspan="3" class="payCm-t"></td></c:if>
+                        <c:if test="${not empty s.brokerage}"><td colspan="3" class="">${s.brokerage}</td></c:if>
+                         <%-- 子订单佣金=商品总佣金+机构运费-付第三方-供应商运费-分摊优惠--%>
                         <td colspan="3" class="product-fee">${s.shopProductAmount}</td>
 
                         <td class="taxes">

+ 21 - 7
src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp

@@ -308,6 +308,7 @@
 <form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newShopOrder"
            action="${ctx}/shopOrder/payOrderList?operatingMode=${operatingMode
 }" method="post" class="breadcrumb form-search">
+
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
@@ -357,12 +358,14 @@
     <button id="select-all" style="color:white;background-color:#2F6FAB">全选</button>
     <c:if test="${operatingMode == '1'}">
         <button id="apply" class="t-btn" style="color:white;background-color:#2F6FAB">付款申请</button>
-        <button id="applyShopOtherFee" class="t-btn" style="color:white;background-color:#2F6FAB">付第三方申请</button>
+<%--        <button id="applyShopOtherFee" class="t-btn" style="color:white;background-color:#2F6FAB">付第三方申请</button>--%>
     </c:if>
     <c:if test="${operatingMode == '2'}">
         <button id="refund" class="t-btn">已付退款</button>
     </c:if>
     <c:forEach items="${page.list}" var="s" varStatus="sIndex">
+        <input id="shopReceiptStatus" type="hidden" value="${s.shopReceiptStatus}">
+        <input id="payWay" type="hidden" value="${s.payWay}">
         <div class="pay-list-item">
             <table class="table table-striped table-bordered table-condensed pay-table">
                 <tr>
@@ -585,9 +588,10 @@
                 </c:forEach>
             </table>
             <div class="pay-more-func">
+                <a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}">付第三方申请</a>
                 <c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">
                     <shiro:hasPermission name="order:cmPayShop:modifyPay">
-                        <a href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
+                        <a id="applypayWay"  href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
                     </shiro:hasPermission>
                 </c:if>
                 <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">
@@ -895,12 +899,22 @@
         });
 
         //付第三方
-        $('#applyShopOtherFee').on('click', function () {
-            var checked = $('.pay-wrapper input[type=checkbox]:checked');
-            if (checked.length < 1) {
-                alertx('请选择一个子订单');
+
+        $('#applypayWay').on('click', function () {
+
+            var shopReceiptStatus=$('#shopReceiptStatus').val();
+            var payWay=$('#payWay').val();
+            console.log(payWay)
+            debugger
+            console.log(shopReceiptStatus)
+
+             if (payWay == 1 && shopReceiptStatus==2) {
+                alertx('线上支付的子订单不能直接修改成本!');
                 return false;
-            }
+             }
+            });
+
+            $('#applyShopOtherFee').on('click', function () {
             if (checked.length > 1) {
                 alertx('每次只能选择一个子订单进行付第三方申请');
                 return false;

+ 6 - 2
src/main/webapp/WEB-INF/views/modules/order/differencePriceForm.jsp

@@ -259,6 +259,7 @@
     <li class="active"><a href="${ctx}/order/cmPayShop/differencePriceForm?shopOrderId=${payShopDifference.shopOrderId}">供应商差价</a></li>
 </ul>
 <form:form id="inputForm" modelAttribute="payShopDifference" action="${ctx}/order/cmPayShop/saveDifferencePrice" method="post" class="form-horizontal">
+    <input type="hidden" id="ShopReceiptStatus" value="${payShopDifference.shopReceiptStatus}">
     <form:hidden path="shopOrderId"/>
     <br>
     <div class="control-group">
@@ -500,11 +501,14 @@
     }
 
     function showInfo() {
+        debugger
         var type = $("input[name='type']:checked").val();
+        var ShopReceiptStatus=$('#ShopReceiptStatus').val();
+        console.log(ShopReceiptStatus)
         if (type == 1){
             $("#refundShow").hide();
             $("#payShopShow").show();
-        } else {
+        } else if(ShopReceiptStatus!=2){
             $("#payShopShow").hide();
             var differencePrice = $("#differencePrice").val();
             var waitPayShop = ${payShopDifference.waitPayShop};
@@ -517,4 +521,4 @@
     }
 </script>
 </body>
-</html>
+</html>

+ 9 - 9
src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -331,35 +331,35 @@
             </li>
             <li>
                 <c:if test="${order.payStatus == 1}">
-                    待付款
+                     <font color="red">待付款</font>
                 </c:if>
                 <c:if test="${order.payStatus == 2}">
-                    部分付款
+                     <font color="#ff8c00">部分付款</font>
                 </c:if>
                 <c:if test="${order.payStatus == 3}">
-                    已付款
+                    <font color="green">已付款</font>
                 </c:if>
             </li>
             <li>
                 <c:if test="${order.sendOutStatus == 1}">
-                    待发货
+                      <font color="red">待发货</font>
                 </c:if>
                 <c:if test="${order.sendOutStatus == 2}">
-                    部分发货
+                       <font color="#ff8c00">部分发货</font>
                 </c:if>
                 <c:if test="${order.sendOutStatus == 3}">
-                    已发货
+                     <font color="green">已发货</font>
                 </c:if>
             </li>
             <li>
                 <c:if test="${order.refundType == 1}">
-                    部分退款
+                      <font color="#ff8c00">部分退款</font>
                 </c:if>
                 <c:if test="${order.refundType == 2}">
-                    已退款
+                      <font color="green">已退款</font>
                 </c:if>
                 <c:if test="${order.refundType ne 1 and order.refundType ne 2 }">
-                    无退款
+                     <font color="red">无退款</font>
                 </c:if>
             </li>
             <li>

+ 3 - 3
src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -491,13 +491,13 @@
             <td>
                 退款状态:
                 <c:if test="${order.refundType == 0}">
-                    无退款
+                     <font color="red">无退款</font>
                 </c:if>
                 <c:if test="${order.refundType == 1}">
-                    部分退款
+                     <font color="#ff8c00">部分退款</font>
                 </c:if>
                 <c:if test="${order.refundType == 2}">
-                    已退款
+                    <font color="green">已退款</font>
                 </c:if>
             </td>
         </c:if>

+ 3 - 3
src/main/webapp/WEB-INF/views/modules/order/refundRecord.jsp

@@ -178,13 +178,13 @@
                 </td>
                 <td>
                     <c:if test="${order.refundType == 1}">
-                        部分退款
+                          <font color="#ff8c00">部分退款</font>
                     </c:if>
                     <c:if test="${order.refundType == 2}">
-                        已退款
+                         <font color="green">已退款</font>
                     </c:if>
                     <c:if test="${order.refundType != 1 && order.refundType != 2}">
-                        无退款
+                         <font color="red">无退款</font>
                     </c:if>
                 </td>
                 <td><fmt:formatNumber value="${order.returnValue}" type="number" pattern="#,##0.00"/></td>

+ 1 - 0
src/main/webapp/WEB-INF/views/modules/product-new/secondHand.jsp

@@ -20,6 +20,7 @@
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/product/new/list?searchProductCategory=2">二手商品列表</a></li>
     <li><a href="${ctx}/product/cmSecondHandDetail/form?searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&fileTypes=999">添加二手商品</a></li>
+    <li><a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm">二手估价商品添加 / 编辑</a></li>
 </ul>
 <form:form id="searchForm" modelAttribute="product" action="${ctx}/product/new/list" method="post" class="breadcrumb form-search">
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

+ 1247 - 0
src/main/webapp/WEB-INF/views/modules/product/cmSecondDetailForm.jsp

@@ -0,0 +1,1247 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>二手估价商品添加 / 编辑</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            //$("#name").focus();订单来源
+            $("#inputForm").validate({
+                submitHandler: function (form) {
+                    var costCheckFlag = $("input[name='costCheckFlag']:checked").val();
+                    var find = $("input[name='ids']:checked").val();
+                    if (!find >= 1) {
+                        alertx("请选择商品包含的文件!");
+                        return false;
+                    }
+                    var publishIdentity = $("input[name='publishIdentity']:checked").val();
+                    console.log(publishIdentity);
+                    if (!publishIdentity > 0) {
+                        alertx("请选择用户身份");
+                        return false;
+                    }
+                    if (publishIdentity * 1 === 2) {
+                        if ($("#companyName").val() == '') {
+                            alertx("公司名称不能为空!");
+                            return false;
+                        }
+                    }
+                    if (costCheckFlag * 1 === 1) {
+                        if ($("#costPrice").val() == '') {
+                            alertx("请输入成本价");
+                            return false;
+                        }
+                        var costPrice = $("#costPrice").val();
+                        if (0 == costPrice) {
+                            alertx('成本价不能为0');
+                            return false;
+                        }
+                    } else {
+                        if ($("#costProportional").val() == '') {
+                            alertx("请输入成本比例");
+                            return false;
+                        }
+                    }
+
+                    // 验证填写参数
+                    var payStatus = $('#payStatus').val();
+                    if (payStatus == 2) {
+                        var payAmount = $("#payAmount").val();
+                        // (验证付款金额)
+                        if (payAmount == "" || payAmount == null) {
+                            alertx('请填写付款金额');
+                            return false;
+                        }
+                        if (0 == payAmount) {
+                            alertx('付款金额不能为0');
+                            return false;
+                        }
+                    }
+
+                    var price = $("#price").val();
+                    if (0 == price) {
+                        alertx('交易价不能为0');
+                        return false;
+                    }
+
+                    var secondHandType = $("input[name ='secondHandType']:checked").val();
+                    if (secondHandType == 2) {
+                        var maturityYears = $("#maturityYears").val();
+                        // (验证到期时期)
+                        if (maturityYears == null || maturityYears == "") {
+                            alertx('请输入产品到期日');
+                            return false;
+                        }
+                        //(验证临期价格信息)
+                        var normalPrice = $("#normalPrice").val();
+                        if (null == normalPrice || normalPrice == "") {
+                            alertx('请输入市场价');
+                            return false;
+                        }
+                        if (0 == normalPrice) {
+                            alertx('市场价不能为0');
+                            return false;
+                        }
+                        //
+                        var originalPrice = $("#originalPrice").val();
+                        if (null == originalPrice || originalPrice == "") {
+                            alertx('请输入采购价/原价');
+                            return false;
+                        }
+                        if (0 == originalPrice) {
+                            alertx('采购价/原价不能为0');
+                            return false;
+                        }
+
+                        var stock = $("#stock").val();
+                        if (null == stock || stock == "") {
+                            alertx('请输入数量');
+                            return false;
+                        }
+                    }
+                    //获取选中townID给Form标签
+                    var townId = $("#town option:selected").attr("townId");
+                    $("#townId").val(townId);
+
+                    var peopleMobile = $("#dockingPeopleMobile").val();
+                    if (peopleMobile != '' && peopleMobile != undefined) {
+                        var reg = new RegExp('^1[0-9]{10}$');
+                        if (!reg.test(peopleMobile)) {
+                            alertx('请填写正确的采美对接人联系方式');
+                            return false;
+                        }
+                    }
+                    loading('正在提交,请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function (error, element) {
+                    $("#messageBox").text("输入有误,请先更正。");
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+        });
+
+    </script>
+    <style>
+        .form-horizontal .controls {
+            margin-left: 0;
+        }
+
+        .form-horizontal .control-label {
+            float: left;
+            width: 181px;
+            padding-top: 5px;
+            text-align: right;
+        }
+
+        #increase, #decrease, .lineNum {
+            width: 30px;
+            height: 30px;
+        }
+
+        .lineNum {
+            text-align: center;
+        }
+
+        .dateInput input {
+            width: 150px;
+        }
+
+        .clause span {
+            margin-left: 30px;
+        }
+
+        #productTable th {
+            text-align: center;
+            white-space: nowrap;
+        }
+
+        #productTable td {
+            text-align: center;
+            white-space: nowrap;
+        }
+
+        .iconBox {
+            font-size: 0;
+        }
+
+        .controls .conList {
+            display: inline-block;
+            margin-right: 15px;
+        }
+
+        .conList .btn:nth-of-type(1) {
+            margin-left: 25px;
+        }
+
+        .select2-choice {
+            width: 100px;
+        }
+
+        .upload-content {
+            margin-top: -70px;
+            display: inline-block;
+        }
+
+        .upload-content .conList .btn:nth-of-type(1) {
+            width: 90px;
+            height: 100px;
+            border: 2px solid #eee;
+            background: #fff;
+            position: relative;
+        }
+
+        .upload-content .conList .btn:nth-of-type(1) > div {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            color: #666;
+        }
+
+        .upload-content .conList .btn:nth-of-type(1) span {
+            font-size: 35px;
+        }
+
+        .upload-content .conList .btn:nth-of-type(1) h5 {
+            color: #666;
+        }
+
+        .cancel-upload {
+            background: transparent;
+            border: none;
+            box-shadow: none;
+            position: relative;
+            top: -38px;
+            left: -25px;
+            cursor: pointer;
+            z-index: 100;
+        }
+
+        .upload-content .conList ol li {
+            width: 114px;
+            min-height: 80px;
+            text-align: center;
+            background: #fff;
+            position: relative;
+            top: 120px;
+            margin-left: 2px;
+        }
+
+        .upload-content-image {
+            margin-top: -70px;
+        }
+
+        .upload-content-image .conList .btn:nth-of-type(1) {
+            width: 90px;
+            height: 100px;
+            border: 2px solid #eee;
+            background: #fff;
+            position: relative;
+        }
+
+        .upload-content-image .conList .btn:nth-of-type(1) > div {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            color: #666;
+        }
+
+        .upload-content-image .conList .btn:nth-of-type(1) span {
+            font-size: 35px;
+        }
+
+        .upload-content-image .conList .btn:nth-of-type(1) h5 {
+            color: #666;
+        }
+
+        .upload-content-image .conList ol li {
+            width: 114px;
+            min-height: 80px;
+            text-align: center;
+            background: #fff;
+            position: relative;
+            top: 120px;
+            margin-left: 2px;
+        }
+
+        .cancel-upload-image {
+            background: transparent;
+            border: none;
+            box-shadow: none;
+            position: relative;
+            top: -38px;
+            left: -25px;
+            cursor: pointer;
+            z-index: 100;
+        }
+
+        .hide-pic {
+            display: none !important;
+        }
+
+        .hide-pic-image {
+            display: none !important;
+        }
+
+        .upload-tips {
+            margin: 10px 0;
+        }
+    </style>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/product/new/list?searchProductCategory=2">二手商品列表</a></li>
+    <li class="active"><a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm">二手估价商品添加 / 编辑</a></li>
+</ul>
+<br/>
+<form:form id="inputForm" modelAttribute="cmSecondHandDetail"
+           action="${ctx}/product/cmSecondHandDetail/save?searchName=${cmSecondHandDetail.searchName}&searchShopID=${cmSecondHandDetail.searchShopID}&searchShopName=${cmSecondHandDetail.searchShopName}&searchBigTypeID=${cmSecondHandDetail.searchBigTypeID}&searchSmallTypeID=${cmSecondHandDetail.searchSmallTypeID}&searchTinyTypeID=${cmSecondHandDetail.searchTinyTypeID}&searchValidFlag=${cmSecondHandDetail.searchValidFlag}&searchActStatus=${cmSecondHandDetail.searchActStatus}&searchProductType=${cmSecondHandDetail.searchProductType}&searchBrandID=${cmSecondHandDetail.searchBrandID}&searchPreferredFlag=${cmSecondHandDetail.searchPreferredFlag}&searchProductCategory=${cmSecondHandDetail.searchProductCategory}&editFlag=${cmSecondHandDetail.editFlag}"
+           method="post" class="form-horizontal">
+    <form:hidden path="id"/>
+    <form:hidden path="validFlag"/>
+    <form:hidden path="payType"/>
+    <sys:message content="${message}"/>
+    <%--		新增加不需要显示--%>
+    <c:if test="${ not empty cmSecondHandDetail.id}">
+        <div class="control-group">
+            <label class="control-label">商品状态:</label>
+            <div class="controls" style="margin-top: 5px">
+                <c:if test="${cmSecondHandDetail.validFlag eq 1}">待审核</c:if>
+                <c:if test="${cmSecondHandDetail.validFlag eq 2}">已上架</c:if>
+                <c:if test="${cmSecondHandDetail.validFlag eq 3}">已下架</c:if>
+                <c:if test="${cmSecondHandDetail.validFlag eq 4}">审核未通过</c:if>
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label">来源:</label>
+            <div class="controls" style="margin-top: 5px">
+                <c:if test="${cmSecondHandDetail.source eq '1'}">
+                    网站
+                </c:if>
+                <c:if test="${cmSecondHandDetail.source eq '2'}">
+                    小程序
+                </c:if>
+                <c:if test="${cmSecondHandDetail.source eq '3'}">
+                    后台
+                </c:if>
+                </span>
+            </div>
+        </div>
+    </c:if>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>发布者:</label>
+        <div class="controls" style="margin-top: 5px">
+            <form:input path="publisher" htmlEscape="false" maxlength="45" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>交易状态:</label>
+        <div class="controls" style="margin-top: 5px">
+            <form:radiobutton path="sold" value="0" label="未售" checked="true"/>
+            <form:radiobutton path="sold" value="1" label="已售"/>
+        </div>
+    </div>
+    <%--	<div class="control-group">--%>
+    <%--		<label class="control-label"><font color="red">*</font>付款状态:</label>--%>
+    <%--		<div class="controls">--%>
+    <%--			<form:select path="payStatus" class="input-mini required">--%>
+    <%--				<form:option value="3" checked="true">无需付款</form:option>--%>
+    <%--				<form:option value="1">待付款</form:option>--%>
+    <%--				<form:option value="2">已付款</form:option>--%>
+    <%--			</form:select>--%>
+    <%--		</div>--%>
+    <%--	</div>--%>
+    <%--	<div class="control-group payAmount">--%>
+    <%--		<label class="control-label"><font color="red">*</font>付款金额:¥ </label>--%>
+    <%--		<div class="controls">--%>
+    <%--			<input id="payAmount" name="payAmount"  maxlength="11" style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px" onkeyup="num(this)" value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.payAmount}' pattern='0.00'/>"  class="input-xlarge required"/>--%>
+    <%--		</div>--%>
+    <%--	</div>--%>
+    <div class="control-group">
+        <label class="control-label">浏览量:</label>
+        <div class="controls">
+            <form:input path="viewingNum" htmlEscape="false" onkeyup="onlynum(this)" maxlength="9"
+                        class="input-xlarge "/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>发布者身份:</label>
+        <div class="controls">
+            <form:radiobutton path="publishIdentity" checked="true" value="1" label="个人身份" onchange="Idcheck(1)"/>
+            <form:radiobutton path="publishIdentity" value="2" label="公司身份" onchange="Idcheck(2)"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>分类:</label>
+        <div class="controls c-s" style="margin-top: 5px">
+            <form:radiobutton path="secondHandType" value="1" label="二手仪器"/>
+            <form:radiobutton path="secondHandType" value="3" label="其他"/>
+        </div>
+        <div class="controls c-s bigTypeList" style="margin-left: 181px">
+<%--            <form:checkboxes path="bigTypeList" items="" itemLabel="name" itemValue="id" htmlEscape="false"--%>
+<%--                             class="input-small  stylema required"/>--%>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>商品可见度:</label>
+        <div class="controls">
+            <form:select path="visibility" class="input-large required" id="visibility">
+                <form:option value="1" label="仅会员机构可见"/>
+                <form:option value="3" label="所有人可见"/>
+                <form:option value="2" label="所有机构可见"/>
+                <form:option value="4" label="仅医美机构可见"/>
+            </form:select>
+        </div>
+    </div>
+    <c:if test="${not empty cmSecondHandDetail.id}">
+    <div class="control-group">
+        <label class="control-label">线上分账账号:</label>
+        <div class="controls">
+            <form:select path="splitCode" class="select-ele input-medium">
+                <form:option value="" label="请选择"/>
+                <c:forEach items="${splitCodeList}" var="splitCodeList" varStatus="index">
+                    <form:option value="${splitCodeList.splitCode}" label="${splitCodeList.codeRemark}"/>
+                </c:forEach>
+            </form:select>
+        </div>
+    </div>
+    </c:if>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>商品品牌:</label>
+        <div class="controls">
+            <form:select path="brandID" class="input-medium required">
+                <form:option value="">请选择</form:option>
+                <c:forEach items="${brandList}" var="brand">
+                    <form:option value="${brand.id}">${brand.name}</form:option>
+                </c:forEach>
+                <form:option value="161">
+                    其他
+                </form:option>
+            </form:select>
+            <form:input path="brandName" value="${cmSecondHandDetail.brandName}" maxlength="20" class="input-medium"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>商品名称:</label>
+        <div class="controls">
+            <form:input path="name" htmlEscape="false" maxlength="40" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">出厂日期:</label>
+        <div class="controls">
+            <form:input path="fixedYears" htmlEscape="false" maxlength="50" class="input-xlarge"/>
+        </div>
+    </div>
+<%--    <div class="control-group maturityYears showClassDiv">--%>
+<%--        <label class="control-label"><font color="red">*</font>产品到期日期:</label>--%>
+<%--        <div class="controls">--%>
+<%--            <form:input path="maturityYears" htmlEscape="false" maxlength="50" class="input-xlarge"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+    <div class="control-group" id="gsmc">
+        <label class="control-label"><font color="red">*</font>公司名称:</label>
+        <div class="controls">
+            <form:input path="companyName" htmlEscape="false" maxlength="20" class="input-xlarge "/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>交易价:</label>
+        <div class="controls">
+            <form:input path="price" htmlEscape="false" maxlength="11" onkeyup="num(this)"
+                        class="input-xlarge required"/>
+            <label>
+                <input id="detailTalkFlag" name="detailTalkFlag" type="hidden"/>
+                <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"
+                       id="detailTalk" name="detailTalk" type="checkbox" onclick="detailTalkFlagCheckd()"
+                       <c:if test="${cmSecondHandDetail.detailTalkFlag eq 2}">checked="checked"</c:if> /><font
+                    color="red">价格详聊</font>(勾选代表同意不显示交易价)
+            </label>
+        </div>
+    </div>
+<%--    <div class="control-group showClassDiv">--%>
+<%--        <label class="control-label"><font color="red">*</font>市场价:</label>--%>
+<%--        <div class="controls">--%>
+<%--            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"--%>
+<%--                   id="normalPrice" name="normalPrice"--%>
+<%--                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.normalPrice}' pattern='0.00'/>"--%>
+<%--                   onkeyup="num(this)" class="input-xlarge"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+<%--    <div class="control-group showClassDiv">--%>
+<%--        <label class="control-label"><font color="red">*</font>采购价/原价:</label>--%>
+<%--        <div class="controls">--%>
+<%--            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"--%>
+<%--                   id="originalPrice" name="originalPrice"--%>
+<%--                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.originalPrice}' pattern='0.00'/>"--%>
+<%--                   onkeyup="num(this)" class="input-xlarge"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+<%--    <div class="control-group showClassDiv">--%>
+<%--        <label class="control-label"><font color="red">*</font>数量:</label>--%>
+<%--        <div class="controls">--%>
+<%--            <form:input path="stock" htmlEscape="false" class="input-xlarge  number"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>成本:</label>
+        <div class="controls">
+            <label><input type="radio" name="costCheckFlag" value="1"
+                          onchange="changeCostPriceShow()" ${cmSecondHandDetail.costCheckFlag eq "1" ? "checked" : ""} />固定成本</label>
+            <label><input type="radio" name="costCheckFlag" value="2"
+                          onchange="changeCostPriceShow()" ${cmSecondHandDetail.costCheckFlag eq "1" ? "" : "checked"} />比例成本</label>
+        </div>
+    </div>
+    <div class="control-group costPriceShow">
+        <label class="control-label"><font color="red">*</font>成本价:</label>
+        <div class="controls">
+            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"
+                   id="costPrice" name="costPrice"
+                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.costPrice}' pattern='0.00'/>"
+                   onkeyup="num(this)" class="input-xlarge"/>
+        </div>
+    </div>
+    <div class="control-group costPropShow">
+        <label class="control-label"><font color="red">*</font>比例成本百分比:</label>
+        <div class="controls">
+            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"
+                   id="costProportional" name="costProportional"
+                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.costProportional}' pattern='0.00'/>"
+                   onkeyup="num(this)" class="input-xlarge"/> %
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>商品成色:</label>
+        <div class="controls">
+            <form:input path="productQuality" htmlEscape="false" maxlength="30" class="input-xlarge required"/>
+        </div>
+    </div>
+
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>联系人:</label>
+        <div class="controls">
+            <form:input path="contactName" htmlEscape="false" maxlength="15" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>联系方式:</label>
+        <div class="controls">
+            <form:input path="contactMobile" htmlEscape="false" maxlength="11" class="input-xlarge required"/>
+        </div>
+    </div>
+
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>是否显示联系人和联系方式:</label>
+        <div class="controls" style="margin-top: 5px">
+            <form:radiobutton cssStyle="position: relative" path="showContactFlag" value="1" checked="true"
+                              label="不显示"/>
+            <form:radiobutton cssStyle="position: relative" path="showContactFlag" value="2" label="显示"/>
+        </div>
+    </div>
+
+    <div class="control-group" id="yyzz" hidden>
+        <label class="control-label">营业执照照片:</label>
+        <div class="controls upload-content-image iconBox">
+            <div class="conList">
+                <form:hidden id="licenseImage" path="licenseImage" value="${cmSecondHandDetail.licenseImage}"
+                             htmlEscape="false" maxlength="255" class="input-xlarge"/>
+                <sys:ckfinder input="licenseImage" type="images" uploadPath="/photo" selectMultiple="false"
+                              maxWidth="100"
+                              maxHeight="100"/>
+                <br>
+            </div>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">采美对接人:</label>
+        <div class="controls">
+            <form:input path="dockingPeopleName" htmlEscape="false" maxlength="15" class="input-xlarge"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">采美对接人联系方式:</label>
+        <div class="controls">
+            <form:input path="dockingPeopleMobile" id="dockingPeopleMobile" htmlEscape="false" maxlength="11"
+                        class="input-xlarge"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">商品类型:</label>
+        <div class="controls" style="margin-top: 5px">
+            <form:radiobutton path="secondProductType" value="1" label="医美"/>
+            <form:radiobutton path="secondProductType" value="2" label="非医美"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <input type="hidden" id="curProvince" name="curProvince" value="${cmSecondHandDetail.province }">
+        <input type="hidden" id="curCity" name="curCity" value="${cmSecondHandDetail.city }">
+        <input type="hidden" id="curTown" name="curTown" value="${cmSecondHandDetail.town }">
+        <form:input path="townId" Id="townId" type="hidden" value="${cmSecondHandDetail.townId}"/>
+        <label class="control-label"><font color="red">*</font>联系地址:</label>
+        <div>
+            <form:select path="province" class="input-xlarge required" id="province"
+                         onchange="loadCity()" style="width:100px;">
+                <form:option value="" label="省" provinceId=""/>
+            </form:select>&nbsp;&nbsp;
+            <form:select path="city" class="input-xlarge required" id="city" onchange="loadTown()"
+                         style="width:100px;">
+                <form:option value="" label="市" cityId=""/>
+            </form:select>&nbsp;&nbsp;
+            <form:select path="town" class="input-xlarge required" id="town" style="width:100px;">
+                <form:option value="" label="区"/>
+            </form:select>&nbsp;&nbsp;
+            <form:input path="address" htmlEscape="false" maxlength="100" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label" style="margin-top: 17px">图片:</label>
+        <div class="controls upload-content" id="secondHandImage">
+            <div class="conList">
+                <form:hidden value="${cmSecondHandDetail.image1}" id="image1" path="image1" htmlEscape="false"
+                             maxlength="255" class="input-xlarge"/>
+                <sys:ckfinder input="image1" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+                              maxHeight="100"/>
+            </div>
+            <div class="conList hide-pic">
+                <form:hidden value="${cmSecondHandDetail.image2}" id="image2" path="image2" htmlEscape="false"
+                             maxlength="255" class="input-xlarge"/>
+                <sys:ckfinder input="image2" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+                              maxHeight="100"/>
+            </div>
+            <div class="conList hide-pic">
+                <form:hidden value="${cmSecondHandDetail.image3}" id="image3" path="image3" htmlEscape="false"
+                             maxlength="255" class="input-xlarge"/>
+                <sys:ckfinder input="image3" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+                              maxHeight="100"/>
+            </div>
+            <div class="conList hide-pic">
+                <form:hidden value="${cmSecondHandDetail.image4}" id="image4" path="image4" htmlEscape="false"
+                             maxlength="255" class="input-xlarge"/>
+                <sys:ckfinder input="image4" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+                              maxHeight="100"/>
+            </div>
+            <div class="conList hide-pic">
+                <form:hidden value="${cmSecondHandDetail.image5}" id="image5" path="image5" htmlEscape="false"
+                             maxlength="255" class="input-xlarge"/>
+                <sys:ckfinder input="image5" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+                              maxHeight="100"/>
+            </div>
+        </div>
+        <div class="conList upload-tips" style="margin-left: 205px">
+            <font color="red">最多上传5张二手商品图片,请尽量全部上传,单张图片不能超过5M</font>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">商品详细信息:</label>
+        <div class="controls">
+            <form:textarea path="productDetails" style="width: 500px;height: 180px;"
+                           placeholder="请填写商品详细信息,对商品进行更详细的描述,不超过200字" htmlEscape="false" maxlength="250"
+                           class="input-xlarge "/>
+        </div>
+    </div>
+
+    <c:if test="${not empty cmSecondHandDetail.productID}">
+        <div class="control-group">
+            <label class="control-label">提交时间:</label>
+            <div class="controls" style="margin-top: 5px">
+                <fmt:formatDate value="${cmSecondHandDetail.submitDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+            </div>
+        </div>
+        <c:if test="${ not empty cmSecondHandDetail.reviewedDate}">
+            <div class="control-group">
+                <label class="control-label">审核时间:</label>
+                <div class="controls" style="margin-top: 5px">
+                    <fmt:formatDate value="${cmSecondHandDetail.reviewedDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                </div>
+            </div>
+        </c:if>
+        <c:if test="${ not empty cmSecondHandDetail.onLineDate && cmSecondHandDetail.validFlag ne 4}">
+            <div class="control-group">
+                <label class="control-label">到期时间:</label>
+                <div class="controls" style="margin-top: 5px">
+                    <fmt:formatDate value="${cmSecondHandDetail.onLineDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                </div>
+            </div>
+        </c:if>
+    </c:if>
+    <div class="form-actions">
+        <c:if test="${empty cmSecondHandDetail.id}">
+            <shiro:hasPermission name="product:cmSecondHandDetail:edit"><input id="btnSubmit" class="btn btn-primary"
+                                                                               type="submit" onclick="onLine()"
+                                                                               value="直接上架"/>&nbsp;</shiro:hasPermission>
+        </c:if>
+        <shiro:hasPermission name="product:cmSecondHandDetail:edit"><input id="btnSubmit" class="btn btn-primary"
+                                                                           type="submit"
+                                                                           value="保 存"/>&nbsp;</shiro:hasPermission>
+        <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+    </div>
+</form:form>
+<script>
+
+    //图片初始化
+    $(function () {
+        var ids = [];
+        if (999 !=${cmSecondHandDetail.fileTypes}) {
+            ids =${cmSecondHandDetail.fileTypes};
+            for (let i = 0; i < ids.length; i++) {
+                if (1 == ids[i]) {
+                    $("#yqht").attr("checked", true);
+                }
+                if (2 == ids[i]) {
+                    $("#yqzc").attr("checked", true);
+                }
+                if (3 == ids[i]) {
+                    $("#yqfp").attr("checked", true);
+                }
+                if (4 == ids[i]) {
+                    $("#yqbg").attr("checked", true);
+                }
+                if (5 == ids[i]) {
+                    $("#wrh").attr("checked", true);
+                }
+            }
+        }
+
+        var publishIdentity = $("input[name='publishIdentity']:checked").val();
+        if (publishIdentity * 1 === 1) {
+            $("#gsmc").hide();
+            $("#yyzz").hide();
+            $("#sfz").show();
+        } else {
+            $("#gsmc").show();
+            $("#sfz").hide();
+            $("#yyzz").show();
+        }
+
+        $('.upload-content .conList .btn:nth-of-type(1)').html('<div><span>+</span><h5>选择图片</h5></div>');
+        $('.upload-content .conList .btn:nth-of-type(2)').after('<img class="cancel-upload" src="/static/images/close-btn1.png">').remove();
+        $('.upload-content .conList').find('.cancel-upload').hide();
+        var observeEle = document.getElementsByClassName('upload-content')[0];
+
+        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
+        var MutationObserverConfig = {
+            childList: true,
+            subtree: true,
+            characterData: true
+        };
+        var observer = new MutationObserver(function (mutations) {
+            $.each(mutations, function (index, item) {
+                if (item.type === 'childList') {
+                    // 在创建新的 element 时调用
+                    var target = $(item.target),
+                        thisWrapper = target.closest('.conList'),
+                        nextEle = thisWrapper.next();
+                    thisWrapper.find('li').css('z-index', 99);
+                    thisWrapper.find('.cancel-upload').show();
+                    if (nextEle.hasClass('hide-pic')) {
+                        nextEle.removeClass('hide-pic');
+                    }
+                }
+            })
+        });
+        observer.observe(observeEle, MutationObserverConfig);
+
+
+        $('body').on('click', '.upload-content li', function () {
+            var index = $(this).closest('.conList').index() + 1,
+                str = 'image' + index + 'FinderOpen';
+            eval(str + '()');
+        });
+        $('body').on('click', '.cancel-upload', function () {
+            debugger
+            var wrapper = $(this).closest('.conList');
+            wrapper.find('li').css('z-index', '-1');
+            wrapper.find('input').val('');
+            $(this).hide();
+            if ($('.cancel-upload:visible').length < 9) {
+                wrapper.addClass("hide-pic");
+            } else {
+                wrapper.removeClass("hide-pic");
+            }
+            wrapper.parent().append(wrapper.clone());
+            wrapper.remove();
+            $(".conList").each(function (i, ele) {
+                if ($(ele).find("input.input-xlarge").val()) {
+                    $(ele).next().removeClass("hide-pic")
+                }
+            })
+        });
+        $(window).on("load", function () {
+            setTimeout(function () {
+                $("#secondHandImage").find("input.input-xlarge").each(function (i, ele) {
+                    if ($(ele).val()) {
+                        $(ele).next().find("li").css("z-index", "99");
+                        $(ele).parents(".conList").find(".cancel-upload").show();
+                        $(ele).parents(".conList").next().removeClass("hide-pic")
+                    }
+                })
+            }, 500);
+        });
+
+
+        $('.upload-content-image .conList .btn:nth-of-type(1)').html('<div><span>+</span><h5>选择图片</h5></div>');
+        $('.upload-content-image .conList .btn:nth-of-type(2)').after('<img class="cancel-upload-image" src="/static/images/close-btn1.png">').remove();
+        $('.upload-content-image .conList').find('.cancel-upload-image').hide();
+        var observeEleImage = document.getElementsByClassName('upload-content-image')[0];
+        var observeEleImage1 = document.getElementsByClassName('upload-content-image')[1];
+        var MutationObserverImage = window.MutationObserver || window.WebKitMutationObserver;
+        var MutationObserverConfigImage = {
+            childList: true,
+            subtree: true,
+            characterData: true
+        };
+        var observerImage = new MutationObserverImage(function (mutations) {
+            $.each(mutations, function (index, item) {
+                if (item.type === 'childList') {
+                    // 在创建新的 element 时调用
+                    var target = $(item.target),
+                        thisWrapper = target.closest('.conList'),
+                        nextEle = thisWrapper.next();
+                    thisWrapper.find('li').css('z-index', 99);
+                    thisWrapper.find('.cancel-upload-image').show();
+                    if (nextEle.hasClass('hide-pic-image')) {
+                        nextEle.removeClass('hide-pic-image');
+                    }
+                }
+            })
+        });
+        observerImage.observe(observeEleImage, MutationObserverConfigImage);
+        observerImage.observe(observeEleImage1, MutationObserverConfigImage);
+
+        $('body').on('click', '.upload-content-image li', function () {
+            var index = $(this).closest('.conList').index() + 1,
+                str = 'remarkImage' + index + 'FinderOpen';
+            eval(str + '()');
+        });
+        $('body').on('click', '.cancel-upload-image', function () {
+            var wrapper = $(this).closest('.conList');
+            wrapper.find('li').css('z-index', '-1');
+            wrapper.find('input').val('');
+            $(this).hide();
+            wrapper.removeClass("hide-pic-image");
+            wrapper.parent().append(wrapper.clone());
+            wrapper.remove();
+            $(".conList").each(function (i, ele) {
+                if ($(ele).find("input.input-xlarge").val()) {
+                    $(ele).next().removeClass("hide-pic-image")
+                }
+            })
+        });
+        $(window).on("load", function () {
+            setTimeout(function () {
+                var input = $("#authenticationImage");
+                if (input.val()) {
+                    input.next().find("li").css("z-index", "99");
+                    input.parents(".conList").find(".cancel-upload-image").show();
+                    input.parents(".conList").next().removeClass("hide-pic-image")
+                }
+                var input = $("#authenticationBackImage");
+                if (input.val()) {
+                    input.next().find("li").css("z-index", "99");
+                    input.parents(".conList").find(".cancel-upload-image").show();
+                    input.parents(".conList").next().removeClass("hide-pic-image")
+                }
+                var input = $("#licenseImage");
+                if (input.val()) {
+                    input.next().find("li").css("z-index", "99");
+                    input.parents(".conList").find(".cancel-upload-image").show();
+                    input.parents(".conList").next().removeClass("hide-pic-image")
+                }
+                input = $("#commitmentImage");
+                if (input.val()) {
+                    input.next().find("li").css("z-index", "99");
+                    input.parents(".conList").find(".cancel-upload-image").show();
+                    input.parents(".conList").next().removeClass("hide-pic-image")
+                }
+            }, 500);
+        });
+
+        var controlsFiles = document.getElementById("controlsFiles");
+        controlsFiles.addEventListener("change", function () {
+            $('#uploadFileName').val(name.substring(0, name.indexOf('.')));
+            var files = $('#controlsFiles').prop('files');
+            var data = new FormData();
+            var url = "${ctx}/oss/cmOssArchive/fileUpload";
+            data.append('file', files[0]);
+            $.ajax({
+                url: url,
+                data: data,
+                type: "POST",
+                processData: false,
+                contentType: false,
+                dataType: "json",
+                success: function (res) {
+                    var html = "<span>" + res.fileName + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href=" + res.url + " style='position: relative' target='_blank'>预览</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href='${ctx}/oss/cmOssArchive/fileDownload?ossName=" + res.ossName + "&fileName=" + res.fileName + "' style='position: relative'>下载</a></span>";
+                    $("#file-list-display").html(html);
+                    $("#controlsFiles").val("");
+                    $("#ossName").val(res.ossName);
+                    $("#fileName").val(res.fileName);
+                },
+                error: function (error) {
+                    alertx(error);
+                }
+            });
+        })
+    });
+    $(function () {
+        // 加载地址
+        loadProvince();
+
+        // 初始化付款状态
+        if ($('#payStatus').val() == '1' || $('#payStatus').val() == '3') {
+            //待支付情况下不能填写付款金额
+            $('.payAmount').hide();
+            $('#payAmount').removeClass('required');
+        }
+
+        if ($('#payStatus').val() == '2') {
+            //已支付情况下需要填写付款金额, 而且必填
+            $('.payAmount').show();
+            $('#payAmount').addClass('required');
+        }
+
+        // 初始化分类
+        var val = $("input[name ='secondHandType']:checked").val();
+        // 分类控制
+        if (val == 2 || val == 3 || val == undefined) {
+            $('.bigTypeList').hide();
+        }
+        if (val == 1) {
+            $('.bigTypeList').show();
+        }
+
+
+        // 价格控制
+        if (val == 1 || val == 3) {
+            $('.showClassDiv').hide();
+        }
+        if (val == 2) {
+            $('.showClassDiv').show();
+        }
+
+
+        $('#brandID').change(function () {
+            var val = $(this).val();
+            if (val == '161') {
+                //显示输入框
+                $("#brandName").show();
+            }
+            if (val != '161') {
+                //隐藏输入框
+                $("#brandName").hide();
+            }
+        });
+
+        //初始化
+        var val = $("#brandID option:selected").val();
+        if (val == '161') {
+            //显示输入框
+            $("#brandName").show();
+        }
+        if (val != '161') {
+            //隐藏输入框
+            $("#brandName").hide();
+        }
+
+        //	修改支付状态
+        $('#payStatus').change(function () {
+                var val = $("#payStatus").val();
+                if (val == 1 || val == 3) {
+                    //待支付情况下不能填写付款金额
+                    $('.payAmount').hide();
+                    $('#payAmount').removeClass('required');
+                }
+                if (val == 2) {
+                    //待支付情况下不能填写付款金额
+                    $('.payAmount').show();
+                    $('#payAmount').addClass('required');
+                }
+            }
+        );
+        // 修改分类
+        $("input[name='secondHandType']").change(function () {
+            var val = $(this).val();
+            // 分类控制
+            if (val == 2 || val == 3) {
+                $('.bigTypeList').hide();
+            }
+            if (val == 1) {
+                $('.bigTypeList').show();
+            }
+
+            // 价格控制
+            if (val == 1 || val == 3) {
+                $('.showClassDiv').hide();
+            }
+            if (val == 2) {
+                $('.showClassDiv').show();
+            }
+
+        });
+
+    });
+
+    /**
+     * 加载省份
+     * @param curProvince
+     */
+    function loadProvince() {
+        var curProvince = $("#curProvince").val();
+        $.ajax({
+            type: 'POST',
+            dataType: 'json',
+            url: '/area/loadProvince',
+            success: function (data) {
+                $("#s2id_province .select2-chosen").html("市");
+                $("#province").html("");
+                $("#province").append("<option value=''>省</option>");
+                for (var i = 0; i < data.length; i++) {
+                    if (curProvince != '' && curProvince != null && typeof (curProvince) != "undefined" && curProvince == data[i].name) {
+                        $("#province").append("<option value='" + data[i].name + "' provinceId=" + data[i].id + " selected>" + data[i].name + "</option>");
+                        $("#s2id_province .select2-chosen").html(curProvince);
+                        loadCity($("#curCity").val());
+                    } else {
+                        $("#province").append("<option value='" + data[i].name + "' provinceId=" + data[i].id + ">" + data[i].name + "</option>");
+                    }
+                }
+            }
+
+        });
+    }
+
+    /**
+     * 加载城市
+     */
+    function loadCity(curCity) {
+        var provinceId = $("#province option:selected").attr("provinceId");
+        if (typeof (provinceId) != "undefined" && provinceId * 1 > 0) {
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                data: {'provinceId': provinceId},
+                url: '/area/loadCity',
+                success: function (data) {
+                    $("#s2id_city .select2-chosen").html("市");
+                    $("#city").html("");
+                    $("#city").append("<option value=''>市</option>");
+                    for (var i = 0; i < data.length; i++) {
+                        if (curCity != null && typeof (curCity) != "undefined" && curCity == data[i].name) {
+                            $("#city").append("<option value='" + data[i].name + "' selected cityId=" + data[i].id + ">" + data[i].name + "</option>");
+                            $("#s2id_city .select2-chosen").html(curCity);
+                            loadTown($("#curTown").val());
+                        } else {
+                            $("#city").append("<option value='" + data[i].name + "' cityId=" + data[i].id + ">" + data[i].name + "</option>");
+                        }
+
+
+                    }
+                }
+
+            });
+        } else {
+            $("#city").html("");
+            $(".select2-chosen").eq(3).html("市");
+            $("#city").append("<option value=''>市</option>");
+
+            $("#town").html("");
+            $(".select2-chosen").eq(4).html("区");
+            $("#town").append("<option value=''>区</option>");
+        }
+    }
+
+    /**
+     * 加载县区
+     * @param curTown
+     */
+    function loadTown(curTown) {
+        var cityId = $("#city option:selected").attr("cityId");
+        if (typeof (cityId) != "undefined" && cityId * 1 > 0) {
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                data: {'cityId': cityId},
+                url: '/area/loadTown',
+                success: function (data) {
+                    $("#s2id_town .select2-chosen").html("区");
+                    $("#town").html("");
+                    $("#town").append("<option value='' >区</option>");
+                    for (var i = 0; i < data.length; i++) {
+                        if (curTown != null && typeof (curTown) != "undefined" && curTown == data[i].name) {
+                            $("#town").append("<option value='" + data[i].name + "' selected townId=" + data[i].id + ">" + data[i].name + "</option>");
+                            $("#s2id_town .select2-chosen").html(curTown);
+                        } else {
+                            $("#town").append("<option value='" + data[i].name + "' townId=" + data[i].id + ">" + data[i].name + "</option>");
+                        }
+                    }
+                }
+
+            });
+        } else {
+            $("#town").html("");
+            $(".select2-chosen").eq(4).html("区");
+            $("#town").append("<option value=''>区</option>");
+        }
+
+    }
+
+    /**
+     * @param obj
+     * jquery控制input只能输入数字和两位小数
+     */
+    function num(obj) {
+        obj.value = obj.value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符
+        obj.value = obj.value.replace(/^\./g, ""); //验证第一个字符是数字
+        obj.value = obj.value.replace(/\.{2,}/g, "."); //只保留第一个, 清除多余的
+        obj.value = obj.value.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+        obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
+    }
+
+    function Idcheck(val) {
+        var c = val;
+        console.log(c);
+        if (1 === c) {
+            $("#yyzz").hide();
+            $("#sfz").show();
+            $("#gsmc").hide();
+        } else {
+            $("#gsmc").show();
+            $("#sfz").hide();
+            $("#yyzz").show();
+        }
+    }
+
+</script>
+</body>
+<head>
+    <title>二手商品管理</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            //$("#name").focus();订单来源
+
+            //获取是否是选中状态
+            var check = $("#detailTalk").is(':checked');
+            if (check) {
+                $("#detailTalkFlag").val(2);
+            } else {
+                $("#detailTalkFlag").val(1);
+            }
+
+            $("#inputForm").validate({
+                submitHandler: function (form) {
+
+                    // 验证填写参数
+                    var payStatus = $('#payStatus').val();
+                    if (payStatus == 2) {
+                        var payAmount = $("#payAmount").val();
+                        // (验证付款金额)
+                        if (payAmount == "" || payAmount == null) {
+                            alertx('请填写付款金额');
+                            return false;
+                        }
+                    }
+
+                    var secondHandType = $("input[name ='secondHandType']:checked").val();
+                    if (secondHandType == 2) {
+                        var maturityYears = $("#maturityYears").val();
+                        // (验证到期时期)
+                        if (maturityYears == null || maturityYears == "") {
+                            alertx('请输入产品到期日');
+                            return false;
+                        }
+                        //(验证临期价格信息)
+                        var normalPrice = $("#normalPrice").val();
+                        if (null == normalPrice || normalPrice == "") {
+                            alertx('请输入市场价');
+                            return false;
+                        }
+                        //
+                        var originalPrice = $("#originalPrice").val();
+                        if (null == originalPrice || originalPrice == "") {
+                            alertx('请输入采购价/原价');
+                            return false;
+                        }
+
+                        var stock = $("#stock").val();
+                        if (null == stock || stock == "") {
+                            alertx('请输入采购价/原价');
+                            return false;
+                        }
+
+
+                    }
+
+
+                    loading('正在提交,请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function (error, element) {
+                    $("#messageBox").text("输入有误,请先更正。");
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+        });
+
+        $(document).ready(function () {
+            changeCostPriceShow();
+        });
+
+        function detailTalkFlagCheckd() {
+            //获取是否是选中状态
+            var check = $("#detailTalk").is(':checked');
+            if (check) {
+                $("#detailTalkFlag").val(2);
+            } else {
+                $("#detailTalkFlag").val(1);
+            }
+        }
+
+        /**
+         * @param obj
+         * jquery控制input只能输入数字
+         */
+        function onlynum(obj) {
+            obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+//            alertx("排序值只能填写大于等于1的整数!");
+        }
+
+        function onLine() {
+            // 设置已上架
+            $("#validFlag").val("2")
+        }
+
+        // 是否固定成本
+        function changeCostPriceShow() {
+            var costCheckFlag = $("input[name='costCheckFlag']:checked").val();
+            if (costCheckFlag * 1 === 1) {
+                $(".costPriceShow").show();
+                $(".costPropShow").hide();
+            } else {
+                $(".costPriceShow").hide();
+                $(".costPropShow").show();
+            }
+        }
+
+
+    </script>
+    <style>
+
+    </style>
+</head>
+</html>
+

+ 14 - 14
src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyRemarksList.jsp

@@ -66,9 +66,9 @@
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>
-					<div style="width: 800px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
+					<div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
 					<c:if test="${not empty clubRemarks.clubType}">
-						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
+						<div style="width: 350px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
 							机构类型:
 						</div>
 						<div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubType}</div>
@@ -76,7 +76,7 @@
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询类别:</div>
-					<div style="width: 800px;float: left;margin: 10px 0;">${clubRemarks.consultType}</div>
+					<div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.consultType}</div>
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<c:if test="${not empty clubRemarks.pinceSensitve}">
@@ -84,16 +84,16 @@
 							价格敏感度 :
 						</div>
 						<c:if test="${clubRemarks.pinceSensitve eq 1}">
-							<div style="width: 300px;float: left;margin: 10px 0;">敏感</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
 						</c:if>
 						<c:if test="${clubRemarks.pinceSensitve eq 2}">
-							<div style="width: 300px;float: left;margin: 10px 0;">适中</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">适中</div>
 						</c:if>
 						<c:if test="${clubRemarks.pinceSensitve eq 3}">
-							<div style="width: 300px;float: left;margin: 10px 0;">不敏感</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
 						</c:if>
 						<c:if test="${clubRemarks.pinceSensitve eq 4}">
-							<div style="width: 300px;float: left;margin: 10px 0;">不明确</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
 						</c:if>
 
 					</c:if>
@@ -102,16 +102,16 @@
 							意向程度:
 						</div>
 						<c:if test="${clubRemarks.satisfied eq 1}">
-							<div style="width: 300px;float: left;margin: 10px 0;">意向强烈</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
 						</c:if>
 						<c:if test="${clubRemarks.satisfied eq 2}">
-							<div style="width: 300px;float: left;margin: 10px 0;">意向一般</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
 						</c:if>
 						<c:if test="${clubRemarks.satisfied eq 3}">
-							<div style="width: 300px;float: left;margin: 10px 0;">意向平淡</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
 						</c:if>
 						<c:if test="${clubRemarks.satisfied eq 4}">
-							<div style="width: 300px;float: left;margin: 10px 0;">随便看看</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
 						</c:if>
 
 					</c:if>
@@ -120,13 +120,13 @@
 							跟进状态:
 						</div>
 						<c:if test="${clubRemarks.followup eq 1}">
-							<div style="width: 300px;float: left;margin: 10px 0;">跟进中</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
 						</c:if>
 						<c:if test="${clubRemarks.followup eq 2}">
-							<div style="width: 300px;float: left;margin: 10px 0;">跟进完成</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
 						</c:if>
 						<c:if test="${clubRemarks.followup eq 3}">
-							<div style="width: 300px;float: left;margin: 10px 0;">已放弃</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">已放弃</div>
 						</c:if>
 
 					</c:if>

+ 14 - 14
src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp

@@ -143,16 +143,16 @@
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             咨询人 :
                         </div>
-                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
+                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             机构名称:
                         </div>
-                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubName}</div>
+                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.clubName}</div>
                         <c:if test="${not empty clubRemarks.clubType}">
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             机构类型:
                         </div>
-                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubType}</div>
+                        <div style=" width: 150px;float: left;margin: 10px 0;position: relative;">${clubRemarks.clubType}</div>
                         </c:if>
                     </div>
                     <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
@@ -167,16 +167,16 @@
                             价格敏感度 :
                         </div>
                             <c:if test="${clubRemarks.pinceSensitve eq 1}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">敏感</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
                             </c:if>
                             <c:if test="${clubRemarks.pinceSensitve eq 2}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">适中</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">适中</div>
                             </c:if>
                             <c:if test="${clubRemarks.pinceSensitve eq 3}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">不敏感</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
                             </c:if>
                             <c:if test="${clubRemarks.pinceSensitve eq 4}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">不明确</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
                             </c:if>
 
                         </c:if>
@@ -185,16 +185,16 @@
                             意向程度:
                         </div>
                             <c:if test="${clubRemarks.satisfied eq 1}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">意向强烈</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
                             </c:if>
                             <c:if test="${clubRemarks.satisfied eq 2}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">意向一般</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
                             </c:if>
                             <c:if test="${clubRemarks.satisfied eq 3}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">意向平淡</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
                             </c:if>
                             <c:if test="${clubRemarks.satisfied eq 4}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">随便看看</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
                             </c:if>
 
                         </c:if>
@@ -203,13 +203,13 @@
                             跟进状态:
                         </div>
                             <c:if test="${clubRemarks.followup eq 1}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">跟进中</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
                             </c:if>
                             <c:if test="${clubRemarks.followup eq 2}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">跟进完成</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
                             </c:if>
                             <c:if test="${clubRemarks.followup eq 3}">
-                                <div style="width: 300px;float: left;margin: 10px 0;">已放弃</div>
+                                <div style="width: 150px;float: left;margin: 10px 0;">已放弃</div>
                             </c:if>
 
                         </c:if>

+ 18 - 18
src/main/webapp/WEB-INF/views/modules/userNew/cmUnRegistRemarksList.jsp

@@ -112,35 +112,35 @@
                     <span style="float: left;margin-left:120px;">管理员:${visitRemarks.leaderName}</span>
                 </div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>
-					<div style="width: 800px;float: left;margin: 10px 0;">${visitRemarks.questionMan}</div>
+					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>
+					<div style="width: 150px;float: left;margin: 10px 0;">${visitRemarks.questionMan}</div>
 					<c:if test="${not empty visitRemarks.clubType}">
-						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
+						<div style="width: 350px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
 							机构类型:
 						</div>
 						<div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.clubType}</div>
 					</c:if>
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询类别:</div>
+					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询类别:</div>
 					<div style="width: 800px;float: left;margin: 10px 0;">${visitRemarks.consultType}</div>
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<c:if test="${not empty visitRemarks.pinceSensitve}">
-						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+						<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 							价格敏感度 :
 						</div>
 						<c:if test="${visitRemarks.pinceSensitve eq 1}">
-							<div style="width: 300px;float: left;margin: 10px 0;">敏感</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
 						</c:if>
 						<c:if test="${visitRemarks.pinceSensitve eq 2}">
-							<div style="width: 300px;float: left;margin: 10px 0;">适中</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">适中</div>
 						</c:if>
 						<c:if test="${visitRemarks.pinceSensitve eq 3}">
-							<div style="width: 300px;float: left;margin: 10px 0;">不敏感</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
 						</c:if>
 						<c:if test="${visitRemarks.pinceSensitve eq 4}">
-							<div style="width: 300px;float: left;margin: 10px 0;">不明确</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
 						</c:if>
 
 					</c:if>
@@ -149,16 +149,16 @@
 							意向程度:
 						</div>
 						<c:if test="${visitRemarks.satisfied eq 1}">
-							<div style="width: 300px;float: left;margin: 10px 0;">意向强烈</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
 						</c:if>
 						<c:if test="${visitRemarks.satisfied eq 2}">
-							<div style="width: 300px;float: left;margin: 10px 0;">意向一般</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
 						</c:if>
 						<c:if test="${visitRemarks.satisfied eq 3}">
-							<div style="width: 300px;float: left;margin: 10px 0;">意向平淡</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
 						</c:if>
 						<c:if test="${visitRemarks.satisfied eq 4}">
-							<div style="width: 300px;float: left;margin: 10px 0;">随便看看</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
 						</c:if>
 
 					</c:if>
@@ -167,26 +167,26 @@
 							跟进状态:
 						</div>
 						<c:if test="${visitRemarks.followup eq 1}">
-							<div style="width: 300px;float: left;margin: 10px 0;">跟进中</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
 						</c:if>
 						<c:if test="${visitRemarks.followup eq 2}">
-							<div style="width: 300px;float: left;margin: 10px 0;">跟进完成</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
 						</c:if>
 						<c:if test="${visitRemarks.followup eq 3}">
-							<div style="width: 300px;float: left;margin: 10px 0;">已放弃</div>
+							<div style="width: 150px;float: left;margin: 10px 0;">已放弃</div>
 						</c:if>
 
 					</c:if>
 				</div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">关键词记录:</div>
+					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">关键词记录:</div>
 					<div style="width: 800px;float: left;margin: 10px 0;">
 						${visitRemarks.remarks}
 					</div>
 				</div>
 				<c:if test="${not empty visitRemarks.extra}">
 					<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+						<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 							额外说明:
 						</div>
 						<div style="width: 800px;float: left;margin: 10px 0;">

Some files were not shown because too many files changed in this diff