Merge remote-tracking branch 'origin/developerF' into developerF

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1656,7 +1656,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             NewShopOrder shopOrder = newShopOrderDao.get(entry.getKey() + "");
             Integer outStoreNum = shopOrder.getOutStoreNum();
             if (null == outStoreNum) {
-                outStoreNum = 0;
+                outStoreNum = shopOrder.getItemCount();
             }
             int num = entry.getValue().stream().mapToInt(NewOrderProduct::getThisTimePostNum).sum();
             if (outStoreNum + num > (shopOrder.getItemCount() + shopOrder.getPresentNum())) {

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -224,14 +224,6 @@ public class Product extends DataEntity<Product> {
      */
     private Integer searchType;
 
-    public String getBeautyActFlag() {
-        return beautyActFlag;
-    }
-
-    public void setBeautyActFlag(String beautyActFlag) {
-        this.beautyActFlag = beautyActFlag;
-    }
-
     public Double getSqlCostProportional() {
         return sqlCostProportional;
     }
@@ -465,22 +457,6 @@ public class Product extends DataEntity<Product> {
         this.displayOnCRMFlag = displayOnCRMFlag;
     }
 
-//    public Integer getCrmBigTypeId() {
-//        return crmBigTypeId;
-//    }
-//
-//    public void setCrmBigTypeId(Integer crmBigTypeId) {
-//        this.crmBigTypeId = crmBigTypeId;
-//    }
-//
-//    public Integer getCrmSmallTypeId() {
-//        return crmSmallTypeId;
-//    }
-//
-//    public void setCrmSmallTypeId(Integer crmSmallTypeId) {
-//        this.crmSmallTypeId = crmSmallTypeId;
-//    }
-
     public Integer getProductID() {
         return productID;
     }
@@ -529,54 +505,6 @@ public class Product extends DataEntity<Product> {
         this.searchKey = searchKey;
     }
 
-//    public String getLowestUserLevelID() {
-//        return lowestUserLevelID;
-//    }
-//
-//    public void setLowestUserLevelID(String lowestUserLevelID) {
-//        this.lowestUserLevelID = lowestUserLevelID;
-//    }
-//
-//    public BigDecimal getPrice0() {
-//        return price0;
-//    }
-//
-//    public void setPrice0(BigDecimal price0) {
-//        this.price0 = price0;
-//    }
-//
-//    public String getPrice0Text() {
-//        return price0Text;
-//    }
-//
-//    public void setPrice0Text(String price0Text) {
-//        this.price0Text = price0Text;
-//    }
-//
-//    public String getPrice0TextFlag() {
-//        return price0TextFlag;
-//    }
-//
-//    public void setPrice0TextFlag(String price0TextFlag) {
-//        this.price0TextFlag = price0TextFlag;
-//    }
-//
-//    public BigDecimal getPrice1() {
-//        return price1;
-//    }
-//
-//    public void setPrice1(BigDecimal price1) {
-//        this.price1 = price1;
-//    }
-//
-//    public String getPrice1Text() {
-//        return price1Text;
-//    }
-//
-//    public void setPrice1Text(String price1Text) {
-//        this.price1Text = price1Text;
-//    }
-
     public String getPriceFlag() {
         return priceFlag;
     }
@@ -585,14 +513,6 @@ public class Product extends DataEntity<Product> {
         this.priceFlag = priceFlag;
     }
 
-//    public BigDecimal getPrice8() {
-//        return price8;
-//    }
-//
-//    public void setPrice8(BigDecimal price8) {
-//        this.price8 = price8;
-//    }
-
     public String getbeautyActFlag() {
         return beautyActFlag;
     }
@@ -601,14 +521,6 @@ public class Product extends DataEntity<Product> {
         this.beautyActFlag = beautyActFlag;
     }
 
-//    public String getbeautyActFlagFlag() {
-//        return beautyActFlagFlag;
-//    }
-//
-//    public void setbeautyActFlagFlag(String beautyActFlagFlag) {
-//        this.beautyActFlagFlag = beautyActFlagFlag;
-//    }
-
     public String getLadderPriceFlag() {
         return ladderPriceFlag;
     }
@@ -617,62 +529,6 @@ public class Product extends DataEntity<Product> {
         this.ladderPriceFlag = ladderPriceFlag;
     }
 
-//    public BigDecimal getPrice2() {
-//        return price2;
-//    }
-//
-//    public void setPrice2(BigDecimal price2) {
-//        this.price2 = price2;
-//    }
-//
-//    public BigDecimal getPrice3() {
-//        return price3;
-//    }
-//
-//    public void setPrice3(BigDecimal price3) {
-//        this.price3 = price3;
-//    }
-//
-//    public BigDecimal getPrice4() {
-//        return price4;
-//    }
-//
-//    public void setPrice4(BigDecimal price4) {
-//        this.price4 = price4;
-//    }
-//
-//    public BigDecimal getPrice5() {
-//        return price5;
-//    }
-//
-//    public void setPrice5(BigDecimal price5) {
-//        this.price5 = price5;
-//    }
-//
-//    public BigDecimal getPrice6() {
-//        return price6;
-//    }
-//
-//    public void setPrice6(BigDecimal price6) {
-//        this.price6 = price6;
-//    }
-//
-//    public BigDecimal getPrice7() {
-//        return price7;
-//    }
-//
-//    public void setPrice7(BigDecimal price7) {
-//        this.price7 = price7;
-//    }
-//
-//    public String getFee() {
-//        return fee;
-//    }
-//
-//    public void setFee(String fee) {
-//        this.fee = fee;
-//    }
-
     public String getStock() {
         return stock;
     }
@@ -817,22 +673,6 @@ public class Product extends DataEntity<Product> {
         this.productCode = productCode;
     }
 
-//    public String getRate1() {
-//        return rate1;
-//    }
-//
-//    public void setRate1(String rate1) {
-//        this.rate1 = rate1;
-//    }
-//
-//    public String getRate2() {
-//        return rate2;
-//    }
-//
-//    public void setRate2(String rate2) {
-//        this.rate2 = rate2;
-//    }
-
     public String getUnit() {
         return unit;
     }
@@ -881,14 +721,6 @@ public class Product extends DataEntity<Product> {
         this.maxBuyNumber = maxBuyNumber;
     }
 
-//    public String getVirtualFlag() {
-//        return virtualFlag;
-//    }
-//
-//    public void setVirtualFlag(String virtualFlag) {
-//        this.virtualFlag = virtualFlag;
-//    }
-
     public String getMinBuyNumber() {
         return minBuyNumber;
     }
@@ -953,127 +785,6 @@ public class Product extends DataEntity<Product> {
         this.step = step;
     }
 
-//    public String getSpeCommisionFlag() {
-//        return speCommisionFlag;
-//    }
-//
-//    public void setSpeCommisionFlag(String speCommisionFlag) {
-//        this.speCommisionFlag = speCommisionFlag;
-//    }
-//
-//    public String getSpeCommision() {
-//        return speCommision;
-//    }
-//
-//    public void setSpeCommision(String speCommision) {
-//        this.speCommision = speCommision;
-//    }
-//
-//    public String getVideourl() {
-//        return videourl;
-//    }
-//
-//    public void setVideourl(String videourl) {
-//        this.videourl = videourl;
-//    }
-//
-//    public String getProps() {
-//        return props;
-//    }
-//
-//    public void setProps(String props) {
-//        this.props = props;
-//    }
-//
-//    public String getProviders() {
-//        return providers;
-//    }
-//
-//    public void setProviders(String providers) {
-//        this.providers = providers;
-//    }
-//
-//    public String getServiceCommissionRatio() {
-//        return serviceCommissionRatio;
-//    }
-//
-//    public void setServiceCommissionRatio(String serviceCommissionRatio) {
-//        this.serviceCommissionRatio = serviceCommissionRatio;
-//    }
-//
-//    public String getReCommissionRatio() {
-//        return reCommissionRatio;
-//    }
-//
-//    public void setReCommissionRatio(String reCommissionRatio) {
-//        this.reCommissionRatio = reCommissionRatio;
-//    }
-//
-//    public String getPushToERPName() {
-//        return pushToERPName;
-//    }
-//
-//    public void setPushToERPName(String pushToERPName) {
-//        this.pushToERPName = pushToERPName;
-//    }
-//
-//    public String getProdBeans() {
-//        return prodBeans;
-//    }
-//
-//    public void setProdBeans(String prodBeans) {
-//        this.prodBeans = prodBeans;
-//    }
-//
-//    public String getUseBeansFlag() {
-//        return useBeansFlag;
-//    }
-//
-//    public void setUseBeansFlag(String useBeansFlag) {
-//        this.useBeansFlag = useBeansFlag;
-//    }
-//
-//    public String getPrivateFlag() {
-//        return privateFlag;
-//    }
-//
-//    public void setPrivateFlag(String privateFlag) {
-//        this.privateFlag = privateFlag;
-//    }
-//
-//    public String getInvisibleServiceProviderIDs() {
-//        return invisibleServiceProviderIDs;
-//    }
-//
-//    public void setInvisibleServiceProviderIDs(String invisibleServiceProviderIDs) {
-//        this.invisibleServiceProviderIDs = invisibleServiceProviderIDs;
-//    }
-//
-//    public String getNeedServiceFlag() {
-//        return needServiceFlag;
-//    }
-//
-//    public void setNeedServiceFlag(String needServiceFlag) {
-//        this.needServiceFlag = needServiceFlag;
-//    }
-//
-//
-//    public Date getBeginTime() {
-//        return beginTime;
-//    }
-//
-//    public void setBeginTime(Date beginTime) {
-//        this.beginTime = beginTime;
-//    }
-//
-//    public Date getEndTime() {
-//        return endTime;
-//    }
-//
-//    public void setEndTime(Date endTime) {
-//        this.endTime = endTime;
-//    }
-
     public String getActFlag() {
         return actFlag;
     }
@@ -1106,14 +817,6 @@ public class Product extends DataEntity<Product> {
         this.downlineTime = downlineTime;
     }
 
-//    public String getShopIndexModuleID() {
-//        return shopIndexModuleID;
-//    }
-//
-//    public void setShopIndexModuleID(String shopIndexModuleID) {
-//        this.shopIndexModuleID = shopIndexModuleID;
-//    }
-
     public String getFreePostFlag() {
         return freePostFlag;
     }
@@ -1154,39 +857,6 @@ public class Product extends DataEntity<Product> {
         this.precisehKey = precisehKey;
     }
 
-//    public String getDocBoost() {
-//        return docBoost;
-//    }
-//
-//    public void setDocBoost(String docBoost) {
-//        this.docBoost = docBoost;
-//    }
-//
-//    public String getCmbeanFlag() {
-//        return cmbeanFlag;
-//    }
-//
-//    public void setCmbeanFlag(String cmbeanFlag) {
-//        this.cmbeanFlag = cmbeanFlag;
-//    }
-//
-//    public String getCmbeanPrice() {
-//        return cmbeanPrice;
-//    }
-//
-//    public void setCmbeanPrice(String cmbeanPrice) {
-//        this.cmbeanPrice = cmbeanPrice;
-//    }
-//
-//    public String getCmbeanSort() {
-//        return cmbeanSort;
-//    }
-//
-//    public void setCmbeanSort(String cmbeanSort) {
-//        this.cmbeanSort = cmbeanSort;
-//    }
-
-
     public String getShopName() {
         return shopName;
     }
@@ -1203,102 +873,6 @@ public class Product extends DataEntity<Product> {
         this.giftFlag = giftFlag;
     }
 
-//    public Float getActFullReduceAmount() {
-//        return actFullReduceAmount;
-//    }
-//
-//    public void setActFullReduceAmount(Float actFullReduceAmount) {
-//        this.actFullReduceAmount = actFullReduceAmount;
-//    }
-//
-//    public Float getActReduceAmount() {
-//        return actReduceAmount;
-//    }
-//
-//    public void setActReduceAmount(Float actReduceAmount) {
-//        this.actReduceAmount = actReduceAmount;
-//    }
-//
-//    public Float getActFullGiftAmount() {
-//        return actFullGiftAmount;
-//    }
-//
-//    public void setActFullGiftAmount(Float actFullGiftAmount) {
-//        this.actFullGiftAmount = actFullGiftAmount;
-//    }
-//
-//    public Integer getActBuyGiftNum() {
-//        return actBuyGiftNum;
-//    }
-//
-//    public void setActBuyGiftNum(Integer actBuyGiftNum) {
-//        this.actBuyGiftNum = actBuyGiftNum;
-//    }
-//
-//    public Float getActPrice0() {
-//        return actPrice0;
-//    }
-//
-//    public void setActPrice0(Float actPrice0) {
-//        this.actPrice0 = actPrice0;
-//    }
-//
-//    public Float getActPrice1() {
-//        return actPrice1;
-//    }
-//
-//    public void setActPrice1(Float actPrice1) {
-//        this.actPrice1 = actPrice1;
-//    }
-//
-//    public Float getActPrice2() {
-//        return actPrice2;
-//    }
-//
-//    public void setActPrice2(Float actPrice2) {
-//        this.actPrice2 = actPrice2;
-//    }
-//
-//    public Float getActPrice3() {
-//        return actPrice3;
-//    }
-//
-//    public void setActPrice3(Float actPrice3) {
-//        this.actPrice3 = actPrice3;
-//    }
-//
-//    public Float getActPrice4() {
-//        return actPrice4;
-//    }
-//
-//    public void setActPrice4(Float actPrice4) {
-//        this.actPrice4 = actPrice4;
-//    }
-//
-//    public Float getActPrice5() {
-//        return actPrice5;
-//    }
-//
-//    public void setActPrice5(Float actPrice5) {
-//        this.actPrice5 = actPrice5;
-//    }
-//
-//    public Float getActPrice6() {
-//        return actPrice6;
-//    }
-//
-//    public void setActPrice6(Float actPrice6) {
-//        this.actPrice6 = actPrice6;
-//    }
-//
-//    public Float getActPrice7() {
-//        return actPrice7;
-//    }
-//
-//    public void setActPrice7(Float actPrice7) {
-//        this.actPrice7 = actPrice7;
-//    }
-
     public Double getNormalPrice() {
         return normalPrice;
     }
@@ -1315,22 +889,6 @@ public class Product extends DataEntity<Product> {
         this.price = price;
     }
 
-//    public Float getHighestUserLevelPrice() {
-//        return highestUserLevelPrice;
-//    }
-//
-//    public void setHighestUserLevelPrice(Float highestUserLevelPrice) {
-//        this.highestUserLevelPrice = highestUserLevelPrice;
-//    }
-//
-//    public Float getLowestUserLevelPrice() {
-//        return lowestUserLevelPrice;
-//    }
-//
-//    public void setLowestUserLevelPrice(Float lowestUserLevelPrice) {
-//        this.lowestUserLevelPrice = lowestUserLevelPrice;
-//    }
-
     public String getBeginTimeStr() {
         return beginTimeStr;
     }
@@ -1496,30 +1054,6 @@ public class Product extends DataEntity<Product> {
         this.aliasName = aliasName;
     }
 
-//    public String getPrice0Grade() {
-//        return price0Grade;
-//    }
-//
-//    public void setPrice0Grade(String price0Grade) {
-//        this.price0Grade = price0Grade;
-//    }
-//
-//    public String getPrice1Grade() {
-//        return price1Grade;
-//    }
-//
-//    public void setPrice1Grade(String price1Grade) {
-//        this.price1Grade = price1Grade;
-//    }
-//
-//    public String getPrice8Grade() {
-//        return price8Grade;
-//    }
-//
-//    public void setPrice8Grade(String price8Grade) {
-//        this.price8Grade = price8Grade;
-//    }
-
     public String getVisibility() {
         return visibility;
     }
@@ -1528,22 +1062,6 @@ public class Product extends DataEntity<Product> {
         this.visibility = visibility;
     }
 
-//    public String getSurplusTime() {
-//        return surplusTime;
-//    }
-//
-//    public void setSurplusTime(String surplusTime) {
-//        this.surplusTime = surplusTime;
-//    }
-//
-//    public String getPriceType() {
-//        return priceType;
-//    }
-//
-//    public void setPriceType(String priceType) {
-//        this.priceType = priceType;
-//    }
-
     public String getTags() {
         return tags;
     }
@@ -1560,22 +1078,6 @@ public class Product extends DataEntity<Product> {
         this.machineType = machineType;
     }
 
-//    public Integer getClassifyId() {
-//        return classifyId;
-//    }
-//
-//    public void setClassifyId(Integer classifyId) {
-//        this.classifyId = classifyId;
-//    }
-//
-//    public Date getClassifyAddTime() {
-//        return classifyAddTime;
-//    }
-//
-//    public void setClassifyAddTime(Date classifyAddTime) {
-//        this.classifyAddTime = classifyAddTime;
-//    }
-
     public Integer getCombinationID() {
         return combinationID;
     }

src/main/java/com/caimei/modules/user/entity/CmRemaks.java

@@ -1,44 +0,0 @@
-package com.caimei.modules.user.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2022/5/7
- */
-public class CmRemaks extends DataEntity<CmRemaks> {
-
-    private Integer remarksId;
-
-    private String remarks;
-
-    private String addTime;
-
-    public Integer getRemarksId() {
-        return remarksId;
-    }
-
-    public void setRemarksId(Integer remarksId) {
-        this.remarksId = remarksId;
-    }
-
-    @Override
-    public String getRemarks() {
-        return remarks;
-    }
-
-    @Override
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public String getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(String addTime) {
-        this.addTime = addTime;
-    }
-}

src/main/resources/mappings/modules/order/CmReturnedPurchaseMapper.xml

@@ -406,4 +406,7 @@
 		  AND crp.returnedWay =1
 		  AND crp.delflag=0
 	</select>
+    <select id="findSplitCode" resultType="java.lang.String">
+		select splitCode from cm_shop_order where shopOrderID = #{shopOrderId}
+	</select>
 </mapper>

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -144,6 +144,122 @@
             outline: none;
             border: none;
         }
+        .upload-content {
+            margin-top: -70px;
+            display: inline-block;
+        }
+        .conList{
+            float: left;
+        }
+        .upload-content .conList .btn:nth-of-type(1) {
+            width: 90px;
+            height: 113px;
+            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: -53px;
+            left: -25px;
+            cursor: pointer;
+            z-index: 100;
+        }
+        .upload-content .conList ol{
+            list-style-type: none;
+        }
+        .upload-content .conList ol li {
+            width: 114px;
+            height: 114px;
+            text-align: center;
+            background: #fff;
+            position: relative;
+            top: 130px;
+            margin-left: 2px;
+            left: -25px;
+            overflow: hidden;
+        }
+
+        .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: 136px;
+            margin-left: 2px;
+            left: -25px;
+        }
+
+        .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;
+        }
+        .form-horizontal .controls:first-child{
+            padding-left: 0 !important;
+            margin-left: 0 !important;
+        }
     </style>
 </head>
 <body>
@@ -251,43 +367,45 @@
         </tr>
         <tr>
             <th>商品图片：</th>
-            <td class="controls upload-content" id="secondHandImage">
-                <div class="conList">
-                    <form:hidden value="${product.image1}" id="image1" path="image1" htmlEscape="false"
-                                 maxlength="255" class="input-xlarge required"/>
-                    <sys:ckfinder input="image1" type="images" uploadPath="/photo" selectMultiple="false"
-                                  maxWidth="100"
-                                  maxHeight="100"/>
-                </div>
-                <div class="conList hide-pic">
-                    <form:hidden value="${product.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="${product.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="${product.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="${product.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"/>
+            <td>
+                <div class="controls upload-content" id="secondHandImage" style="width: 800px;">
+                    <div class="conList">
+                        <form:hidden value="${product.image1}" id="image1" path="image1" htmlEscape="false"
+                                     maxlength="255" class="input-xlarge required"/>
+                        <sys:ckfinder input="image1" type="images" uploadPath="/photo" selectMultiple="false"
+                                      maxWidth="100"
+                                      maxHeight="100"/>
+                    </div>
+                    <div class="conList hide-pic">
+                        <form:hidden value="${product.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="${product.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="${product.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="${product.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">
+                <div class="conList upload-tips" style="margin-top: 20px;">
                     <font color="red">第一张图作为商品主图必传；最多上传5张商品图片，请尽量全部上传，单张图片不能超过5M</font>
                 </div>
             </td>
@@ -991,7 +1109,7 @@
             wrapper.find('li').css('z-index', '-1');
             wrapper.find('input').val('');
             $(this).hide();
-            if ($('.cancel-upload:visible').length < 9) {
+            if ($('.cancel-upload:visible').length < 5) {
                 wrapper.addClass("hide-pic");
             } else {
                 wrapper.removeClass("hide-pic");

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

@@ -66,7 +66,7 @@
     <li class="active"><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
     <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
     <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
-    <li><a href="${ctx}/new/user/agency/cmrenaks">关键词库</a></li>
+<%--    <li><a href="${ctx}/new/user/agency/cmrenaks">关键词库</a></li>--%>
 </ul>
 <br/>
 <form:form id="searchForm" modelAttribute="cmClubRemarks" action="${ctx}/new/user/agency/regist" method="post"