Aslee 4 éve
szülő
commit
dc2389fdce

+ 27 - 3
src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -215,7 +215,7 @@ public class NewPageFloorController extends BaseController {
      * 活动专题添加图片
      */
     @RequestMapping("/addActivityImage")
-    public String addActivityImage(Product product, String type, Model model, HttpServletRequest request, HttpServletResponse response) {
+    public String addActivityImage(Product product, String type, Integer templateType, Model model, HttpServletRequest request, HttpServletResponse response) {
         if ("productImage".equals(type)) {
             product.setValidFlag("2");
             Page<Product> page = productService.findProductImage(new Page<Product>(request, response), product);
@@ -223,12 +223,36 @@ public class NewPageFloorController extends BaseController {
             model.addAttribute("productCategory", product.getProductCategory());
             model.addAttribute("productIds", product.getProductIds());
             return "modules/newhome/addProductImage";
-        }else {
+        } else {
+            //图片建议尺寸
+            String imageSize = "";
+            if (templateType != null) {
+                if (templateType > 50) {
+                    //移动端模板序号处理
+                    templateType = templateType - 50;
+                }
+                if (templateType == 1) {
+                    imageSize = "224px*224px";
+                } else if (templateType == 2) {
+                    imageSize = "384px*268px";
+                } else if (templateType == 3) {
+                    imageSize = "168px*168px";
+                } else if (templateType == 4) {
+                    imageSize = "584px*300px";
+                } else if (templateType == 5 || templateType == 6 || templateType == 7 || templateType == 8) {
+                    imageSize = "384px*220px";
+                } else if (templateType == 9) {
+                    imageSize = "584px*360px";
+                } else if (templateType == 10) {
+                    imageSize = "1184px*360px";
+                }
+                imageSize = "建议图片尺寸" + imageSize;
+            }
+            model.addAttribute("imageSize", imageSize);
             model.addAttribute("type", type);
             model.addAttribute("floorImage", new NewPageFloorImage());
             return "modules/newhome/addActivityAdsImage";
         }
-
     }
 
     /**

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/cmpage/cmPageActivityCentreList.jsp

@@ -184,7 +184,7 @@
                 <a href="${ctx}/cmpage/cmPageCentre/form?pageId=${cmPageCentre.pageId}&type=${cmPageCentre.type}&id=${newPageFloor.id}">编辑</a>
                 <a href="${ctx}/cmpage/cmPageCentre/goContentPage?centreId=${newPageFloor.id}&pageId=${cmPageCentre.pageId}&type=${cmPageCentre.type}">内容</a>
                 <a href="${ctx}/cmpage/cmPageCentre/delete?id=${newPageFloor.id}"
-                   onclick="return confirmx('确定删除该楼层吗?', this.href)">删除</a>
+                   onclick="return confirmx('是否删除该数据,删除后,对应的楼层数据也将被全部删除,确认是否删除', this.href)">删除</a>
             </td>
         </tr>
     </c:forEach>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/cmpage/cmPageActivityForm.jsp

@@ -61,7 +61,7 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li class="active"><a href="${ctx}/cmpage/cmPage/form?flag=26&id=${cmPage.id}">活动专题页面<shiro:lacksPermission name="cmpage:cmPage:edit">查看</shiro:lacksPermission></a></li>
+    <li class="active"><a href="${ctx}/cmpage/cmPage/form?flag=26&id=${cmPage.id}">${empty cmPage.id?'新增':'编辑'}活动专题<shiro:lacksPermission name="cmpage:cmPage:edit">查看</shiro:lacksPermission></a></li>
 </ul><br/>
 <form:form id="inputForm" modelAttribute="cmPage" action="${ctx}/cmpage/cmPage/save?flag=2&type=6" method="post" class="form-horizontal">
     <form:hidden path="id"/>

+ 124 - 65
src/main/webapp/WEB-INF/views/modules/newhome/activityFloorContentForm.jsp

@@ -156,7 +156,7 @@
                         var stringify = JSON.stringify(productImageList);
                         $('#images').val(stringify);
                     } else {
-                        alertx("请添加商品");
+                        alertx("至少上传一张图片");
                         return;
                     }
                     var wwwIcon1 = $("#wwwIcon1").val();
@@ -214,8 +214,27 @@
                                         return;
                                     }
                                 }
+                                else {
+                                    $(".Image4 .cancel-upload").click();
+                                    $(".Image5 .cancel-upload").click();
+                                }
+                            }else {
+                                $(".Image3 .cancel-upload").click();
+                                $(".Image4 .cancel-upload").click();
+                                $(".Image5 .cancel-upload").click();
                             }
+                        } else {
+                            $(".Image2 .cancel-upload").click();
+                            $(".Image3 .cancel-upload").click();
+                            $(".Image4 .cancel-upload").click();
+                            $(".Image5 .cancel-upload").click();
                         }
+                    } else {
+                        $(".Image1 .cancel-upload").click();
+                        $(".Image2 .cancel-upload").click();
+                        $(".Image3 .cancel-upload").click();
+                        $(".Image4 .cancel-upload").click();
+                        $(".Image5 .cancel-upload").click();
                     }
                     loading('正在提交,请稍等...');
                     form.submit();
@@ -294,8 +313,7 @@
                                         <sys:ckfinder input="wwwIcon1" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/> <br>
-                                        <label class="resolution1">建议图片分辨率524px*268px</label>
-                                            <%--                                        <label class="resolution2">建议图片分辨率884px*120px</label>--%>
+                                        <label id="pcImageSize1">建议图片分辨率1184px*160px</label>
                                     </div>
                                 </div>
                             </div>
@@ -309,8 +327,7 @@
                                         <sys:ckfinder input="crmIcon1" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label class="resolution1">建议图片分辨率339px*516px</label>
-                                            <%--                                        <label class="resolution2">建议图片分辨率702px*240px</label>--%>
+                                        <label id="appletsImageSize1">建议图片分辨率702px*240px</label>
                                     </div>
                                 </div>
                             </div>
@@ -332,8 +349,7 @@
                                         <sys:ckfinder input="wwwIcon2" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label class="resolution1">建议图片分辨率344px*268px</label>
-                                            <%--                                        <label class="resolution2">建议图片分辨率524px*268px</label>--%>
+                                        <label id="pcImageSize2">建议图片分辨率344px*268px</label>
                                     </div>
                                 </div>
                             </div>
@@ -347,7 +363,7 @@
                                         <sys:ckfinder input="crmIcon2" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label>建议图片分辨率339px*516px</label>
+                                        <label id="appletsImageSize2">建议图片分辨率339px*516px</label>
                                     </div>
                                 </div>
                             </div>
@@ -369,7 +385,7 @@
                                         <sys:ckfinder input="wwwIcon3" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label>建议图片分辨率344px*268px</label>
+                                        <label id="pcImageSize3">建议图片分辨率344px*268px</label>
                                     </div>
                                 </div>
                             </div>
@@ -383,7 +399,7 @@
                                         <sys:ckfinder input="crmIcon3" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label>建议图片分辨率339px*516px</label>
+                                        <label id="appletsImageSize3">建议图片分辨率339px*516px</label>
                                     </div>
                                 </div>
                             </div>
@@ -405,7 +421,7 @@
                                         <sys:ckfinder input="wwwIcon4" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label>建议图片分辨率344px*268px</label>
+                                        <label id="pcImageSize4">建议图片分辨率344px*268px</label>
                                     </div>
                                 </div>
                             </div>
@@ -419,7 +435,7 @@
                                         <sys:ckfinder input="crmIcon4" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label>建议图片分辨率339px*516px</label>
+                                        <label id="appletsImageSize4">建议图片分辨率339px*516px</label>
                                     </div>
                                 </div>
                             </div>
@@ -441,7 +457,7 @@
                                         <sys:ckfinder input="wwwIcon5" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label>建议图片分辨率344px*268px</label>
+                                        <label id="pcImageSize5">建议图片分辨率344px*268px</label>
                                     </div>
                                 </div>
                             </div>
@@ -455,7 +471,7 @@
                                         <sys:ckfinder input="crmIcon5" type="images" uploadPath="/photo"
                                                       selectMultiple="false"
                                                       maxWidth="100" maxHeight="100"/><br>
-                                        <label>建议图片分辨率339px*516px</label>
+                                        <label id="appletsImageSize5">建议图片分辨率339px*516px</label>
                                     </div>
                                 </div>
                             </div>
@@ -905,21 +921,22 @@
             setTimeout(function () {
                 for (var i = 1; i <= 5; i++) {
                     $("#pcAdsImage" + i).find("input.input-xlarge").each(function (i, ele) {
-                        if ($(ele).val()) {
+                        debugger
+                        if ($(ele).val() && $(ele).val() != '') {
                             $(ele).next().find("li").css("z-index", "99");
                             $(ele).parents(".conList").find(".cancel-upload").show();
                             $(ele).parents(".conList").next().removeClass("hide-pic")
                         }
                     });
                     $("#appletsAdsImage" + i).find("input.input-xlarge").each(function (i, ele) {
-                        if ($(ele).val()) {
+                        if ($(ele).val() && $(ele).val() != '') {
                             $(ele).next().find("li").css("z-index", "99");
                             $(ele).parents(".conList").find(".cancel-upload").show();
                             $(ele).parents(".conList").next().removeClass("hide-pic")
                         }
                     });
                 }
-            }, 100);
+            }, 2000);
         });
 
         var templateType = $("input[type='radio']:checked").val();
@@ -976,7 +993,6 @@
 
     //展示选中模板对应的表单
     function showContent(templateClassify) {
-        debugger
         var list = [];
         var type;
         for (var i = 1; i < 22; i++) {
@@ -1054,6 +1070,45 @@
                 type = 'productImage';
             }
             $("#type").val(type);
+            //广告图建议尺寸
+            if (templateType == 11) {
+                $("#pcImageSize1").text("建议图片分辨率1184px*160px");
+                $("#appletsImageSize1").text("建议图片分辨率702px*240px");
+                $("#pcImageSize2").text("建议图片分辨率584px*240px");
+                $("#appletsImageSize2").text("建议图片分辨率339px*260px");
+                $("#pcImageSize3").text("建议图片分辨率584px*240px");
+                $("#appletsImageSize3").text("建议图片分辨率339px*260px");
+            }else if (templateType == 12) {
+                $("#pcImageSize1").text("建议图片分辨率704px*360px");
+                $("#appletsImageSize1").text("建议图片分辨率339px*516px");
+                $("#pcImageSize2").text("建议图片分辨率464px*172px");
+                $("#appletsImageSize2").text("建议图片分辨率339px*246px");
+                $("#pcImageSize3").text("建议图片分辨率464px*172px");
+                $("#appletsImageSize3").text("建议图片分辨率339px*246px");
+            }else if (templateType == 13) {
+                $("#pcImageSize1").text("建议图片分辨率704px*360px");
+                $("#appletsImageSize1").text("建议图片分辨率339px*516px");
+                $("#pcImageSize2").text("建议图片分辨率224px*172px");
+                $("#appletsImageSize2").text("建议图片分辨率339px*246px");
+                $("#pcImageSize3").text("建议图片分辨率224px*172px");
+                $("#appletsImageSize3").text("建议图片分辨率339px*246px");
+                $("#pcImageSize4").text("建议图片分辨率224px*172px");
+                $("#appletsImageSize4").text("建议图片分辨率339px*246px");
+                $("#pcImageSize5").text("建议图片分辨率224px*172px");
+                $("#appletsImageSize5").text("建议图片分辨率339px*246px");
+            }else if (templateType == 15 || templateType == 16 || templateType ==19 ||templateType == 20) {
+                $("#pcImageSize1").text("建议图片分辨率884px*120px");
+                $("#appletsImageSize1").text("建议图片分辨率702px*240px");
+                $("#pcImageSize2").text("建议图片分辨率524px*268px");
+                $("#appletsImageSize2").text("建议图片分辨率339px*516px");
+                $("#pcImageSize3").text("建议图片分辨率344px*268px");
+                $("#appletsImageSize3").text("建议图片分辨率339px*516px");
+            }else if (templateType == 17 || templateType == 18) {
+                $("#pcImageSize1").text("建议图片分辨率524px*268px");
+                $("#appletsImageSize1").text("建议图片分辨率339px*516px");
+                $("#pcImageSize2").text("建议图片分辨率344px*268px");
+                $("#appletsImageSize2").text("建议图片分辨率339px*516px");
+            }
             batchSaveSort();
         } else {
             $("#infoLabel").show();
@@ -1075,12 +1130,13 @@
         var width = $(top.document).width() - 800;
         var height = $(top.document).height() - 160;
         var type = $("#type").val();
+        var templateType = $("input[type=radio]:checked").val();
         if (type == 'adsImage') {
-            url = url + "?type=adsImage";
+            url = url + "?type=adsImage&templateType=" + templateType;
         } else if (type == 'infoImage') {
-            url = url + "?type=infoImage";
+            url = url + "?type=infoImage&templateType=" + templateType;
         } else {
-            url = url + "?type=productImage&productCategory=1&productIds=" + productIds;
+            url = url + "?type=productImage&productCategory=1&productIds=" + productIds + "&templateType=" + templateType;
             title = '商品图片';
             width = $(top.document).width() - 400;
             height = $(top.document).height() - 160;
@@ -1175,7 +1231,6 @@
 
     //相关图片列表数据
     function appendShopOrderHead(data, index) {
-
         var type = $("#type").val();
         var html = '<tr id ="ads' + index + '">' +
             '<td>' +
@@ -1280,7 +1335,7 @@
 
     //根据sort值 从小到大排序
     function sort(a, b) {
-        return a.sort - b.sort;
+        return ((a.sort - b.sort) == 0 ? (a.createDate > b.createDate ? -1 : 1) : (a.sort - b.sort));
     }
 
     /**
@@ -1363,53 +1418,58 @@
         var index = -1;
         var i = 1;
         var type = $("#type").val();
-        return confirmx("确定删除吗?", function () {
-            $('input[name="info"]:checked').each(function () {
-                var thisIndex = $(this).val();
-                if (index >= 0 && index < thisIndex) {
-                    thisIndex = thisIndex - i;
-                    i++;
-                } else {
-                    index = thisIndex;
-                }
-                var image = getImage(thisIndex);
+        var length = $('input[name="info"]:checked').length;
+        if (length > 0) {
+            return confirmx("确定删除吗?", function () {
+                $('input[name="info"]:checked').each(function () {
+                    var thisIndex = $(this).val();
+                    if (index >= 0 && index < thisIndex) {
+                        thisIndex = thisIndex - i;
+                        i++;
+                    } else {
+                        index = thisIndex;
+                    }
+                    var image = getImage(thisIndex);
+                    if (type == 'adsImage') {
+                        adsImageList.splice(thisIndex, 1);
+                    } else if (type == 'infoImage') {
+                        infoImageList.splice(thisIndex, 1);
+                    } else {
+                        if (image.productId != '') {
+                            productIds = productIds.replace(image.productId, "");
+                        }
+                        productImageList.splice(thisIndex, 1);
+                    }
+                });
                 if (type == 'adsImage') {
-                    adsImageList.splice(thisIndex, 1);
+                    insertHtml(adsImageList);
+                    if (adsImageList.length == 0) {
+                        $("#del").attr("disabled", "disabled");
+                        $('#adsImageTable').hide();
+                    } else {
+                        $("#del").removeAttr("disabled");
+                    }
                 } else if (type == 'infoImage') {
-                    infoImageList.splice(thisIndex, 1);
+                    insertHtml(infoImageList);
+                    if (infoImageList.length == 0) {
+                        $("#del").attr("disabled", "disabled");
+                        $('#infoImageTable').hide();
+                    } else {
+                        $("#del").removeAttr("disabled");
+                    }
                 } else {
-                    if (image.productId != '') {
-                        productIds = productIds.replace(image.productId, "");
+                    insertHtml(productImageList);
+                    if (productImageList.length == 0) {
+                        $('#productImageTable').hide();
+                        $("#del").attr("disabled", "disabled");
+                    } else {
+                        $("#del").removeAttr("disabled");
                     }
-                    productImageList.splice(thisIndex, 1);
                 }
             });
-            if (type == 'adsImage') {
-                insertHtml(adsImageList);
-                if (adsImageList.length == 0) {
-                    $("#del").attr("disabled", "disabled");
-                    $('#adsImageTable').hide();
-                } else {
-                    $("#del").removeAttr("disabled");
-                }
-            } else if (type == 'infoImage') {
-                insertHtml(infoImageList);
-                if (infoImageList.length == 0) {
-                    $("#del").attr("disabled", "disabled");
-                    $('#infoImageTable').hide();
-                } else {
-                    $("#del").removeAttr("disabled");
-                }
-            } else {
-                insertHtml(productImageList);
-                if (productImageList.length == 0) {
-                    $('#productImageTable').hide();
-                    $("#del").attr("disabled", "disabled");
-                } else {
-                    $("#del").removeAttr("disabled");
-                }
-            }
-        });
+        } else {
+            alertx("请先选中要删除的数据")
+        }
     }
 
     function getImage(index) {
@@ -1477,7 +1537,6 @@
 
     //修改偏pc/移动端筛选项
     function changeSourceSelect() {
-        debugger
         let source = $("#sourceSelect").val();
         var templateType = parseInt($("input[type='radio']:checked").val());
         if (1 == source) {

+ 6 - 2
src/main/webapp/WEB-INF/views/modules/newhome/addActivityAdsImage.jsp

@@ -122,6 +122,8 @@
                 <form:hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
                 <sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
                               maxHeight="100"/>
+                <br>
+                <label>${imageSize}</label>
             </div>
         </div>
     </div>
@@ -150,13 +152,15 @@
                 <form:hidden id="adsImage" path="adsImage" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
                 <sys:ckfinder input="adsImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
                               maxHeight="100"/>
+                <br>
+                <label>建议图片尺寸宽度750px</label>
             </div>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label"><span class="help-inline"><font color="red">*</font> 排序:</label>
+        <label class="control-label"><span class="help-inline"><font color="red">*</font> 排序:</span></label>
         <div class="controls">
-            <form:input path="sort" id="sort" htmlEscape="false" maxlength="11" class="input-xlarge required"/>
+            <form:input path="sort" id="sort" htmlEscape="false" maxlength="11" onkeyup="onlynum(this)" class="input-xlarge required"/>
         </div>
     </div>
     <div class="control-group">

+ 3 - 1
src/main/webapp/WEB-INF/views/modules/newhome/addOtherImage.jsp

@@ -127,6 +127,8 @@
                 <form:hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
                 <sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
                               maxHeight="100"/>
+                <br>
+                <label>建议图片尺寸224px*224px</label>
             </div>
         </div>
     </div>
@@ -145,7 +147,7 @@
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>排序:</label>
         <div class="controls">
-            <form:input path="sort" id="sort" htmlEscape="false" maxlength="11" class="input-xlarge required"/>
+            <form:input path="sort" id="sort" htmlEscape="false" maxlength="11" onkeyup="onlynum(this)" class="input-xlarge required"/>
         </div>
     </div>
     <div class="control-group">

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/newhome/addProductImage.jsp

@@ -43,7 +43,7 @@
     <li class="${productCategory eq 2 ? 'active':''}"><a
             href="${ctx}/newhome/newPageFloor/addProductImage?productCategory=2&productIds=${productIds}">添加二手商品</a>
     </li>
-    <li><a href="${ctx}/newhome/newPageFloor/addOtherImage">添加其他图片</a></li>
+    <li><a href="${ctx}/newhome/newPageFloor/addOtherImage&templateType=${templateType}">添加其他图片</a></li>
 </ul>
 <br/>
 <form:form id="searchForm" modelAttribute="product" action="" method="post" class="breadcrumb form-search">