修改楼层保存

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageCentreForm.jsp

@@ -81,36 +81,46 @@
                     //确定
                     var $jboxFrame = top.$('#jbox-iframe');
                     var $mainFrame = top.$('#mainFrame');
-                    if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-                        var items = $jboxFrame[0].contentWindow.getCheckedItems();
-                        console.log(items);
-                        if (items.productId == "") {
-                            if (items.image == '') {
-                                alertx("请上传图片");
-                                return false;
-                            }
-                            if (items.name == '') {
-                                alertx("请输入名称");
-                                return false;
-                            }
-                            if (items.link == '') {
-                                alertx("请输入跳转链接");
-                                return false;
-                            }
-                            if (items.sort == '') {
-                                alertx("请输入排序值");
-                                return false;
-                            }
-                            if (items.label == '') {
-                                alertx("请输入标签");
-                                return false;
-                            }
-                        }
-                        imageList.push(items);
+                    var $isCheckedAll = $jboxFrame[0].contentWindow.handleCheckedAll();
+                    if($isCheckedAll){
+                        var checkedAllList = $jboxFrame[0].contentWindow.handleClickAllSelect();
+                        imageList = imageList.concat(checkedAllList);
                         $('#contentTable').show();
                         $("#del").removeAttr("disabled");
                         batchSaveSort();
-                    }
+                    }else{
+                        if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
+                            var items = $jboxFrame[0].contentWindow.getCheckedItems();
+                            for (var i = 0; i < items.length; i++) {
+                                if (items[i].productId == "") {
+                                    if (items[i].image == '') {
+                                        alertx("请上传图片");
+                                        return false;
+                                    }
+                                    if (items[i].name == '') {
+                                        alertx("请输入名称");
+                                        return false;
+                                    }
+                                    if (items[i].link == '') {
+                                        alertx("请输入跳转链接");
+                                        return false;
+                                    }
+                                    if (items[i].sort == '') {
+                                        alertx("请输入排序值");
+                                        return false;
+                                    }
+                                    if (items[i].label == '') {
+                                        alertx("请输入标签");
+                                        return false;
+                                    }
+                                }
+                            }
+                            imageList = imageList.concat(items);
+                            $('#contentTable').show();
+                            $("#del").removeAttr("disabled");
+                            batchSaveSort();
+                        }
+                    };
                     return true;
                 }
             });
@@ -391,4 +401,4 @@
     </div>
 </form:form>
 </body>
-</html>
+</html>

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

@@ -1319,29 +1319,31 @@
                         $('#productImageTable').hide();
                     } else {
                         //商品图片活动
-                        if (items.productId == "") {
-                            if (items.image == '') {
-                                alertx("请上传图片");
-                                return false;
-                            }
-                            if (items.name == '') {
-                                alertx("请输入名称");
-                                return false;
-                            }
-                            if (items.link == '') {
-                                alertx("请输入跳转链接");
-                                return false;
-                            }
-                            if (items.sort == '') {
-                                alertx("请输入排序值");
-                                return false;
-                            }
-                            if (items.label == '') {
-                                alertx("请输入标签");
-                                return false;
+                        for (var i = 0; i < items.length; i++) {
+                            if (items.productId == "") {
+                                if (items.image == '') {
+                                    alertx("请上传图片");
+                                    return false;
+                                }
+                                if (items.name == '') {
+                                    alertx("请输入名称");
+                                    return false;
+                                }
+                                if (items.link == '') {
+                                    alertx("请输入跳转链接");
+                                    return false;
+                                }
+                                if (items.sort == '') {
+                                    alertx("请输入排序值");
+                                    return false;
+                                }
+                                if (items.label == '') {
+                                    alertx("请输入标签");
+                                    return false;
+                                }
                             }
                         }
-                        productImageList.push(items);
+                        productImageList = productImageList.concat(items);
                         $('#adsImageTable').hide();
                         $('#infoImageTable').hide();
                         $('#productImageTable').show();
@@ -1795,4 +1797,4 @@
     }
 </script>
 </body>
-</html>
+</html>

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

@@ -67,7 +67,7 @@
 <sys:message content="${message}"/>
 <table class="table table-striped table-bordered table-condensed table-hover">
     <tr>
-        <th style="width:20px;"></th>
+        <th style="width:20px;"><input class="check-all" type="checkbox" onclick="handleClickAllSelect()"/> 全选 </th>
         <th>商品ID</th>
         <th>商品图片</th>
         <th>商品名称</th>
@@ -80,7 +80,7 @@
         <c:forEach items="${page.list}" var="item">
             <tr id="${item.productID}" class="itemtr">
                 <th>
-                    <input class="check-item" type="radio" name="info" value='${fns:toJson(item)}'/>
+                    <input class="check-item" type="checkbox" name="info" value='${fns:toJson(item)}'/>
                 </th>
                 <td>${item.productID}</td>
                 <td><img src="${item.mainImage}" width="50px" height="50px"></td>
@@ -98,6 +98,7 @@
 </c:if>
 <div class="pagination">${page}</div>
 <script type="text/javascript">
+    var isCheckedAll = false;
     $(document).ready(function () {
         //弹出框去滚动条
         top.$('#jbox-content').css("overflow-y", "hidden");
@@ -113,35 +114,79 @@
 
     function getCheckedItems() {
         var item = $('.check-item:checked').val();
-        var product = JSON.parse(item);
-        var link = '';
-        if (${productCategory eq 1}) {
-            link = "${fns:getConfig('wwwServer')}product-" + product.productID + ".html";
-        } else {
-            link = "${fns:getConfig('wwwServer')}flea-market-" + product.productID + ".html";
+        if(!item){
+            alertx("请勾选商品~");
+            return;
         }
+        var imageArray = [];
+        $(".check-item:checked").each(function (index,el) {
+            var item = $(this).val();
+            var product = JSON.parse(item);
+            var link = '';
+            if (${productCategory eq 1}) {
+                link = "${fns:getConfig('wwwServer')}product-" + product.productID + ".html";
+            } else {
+                link = "${fns:getConfig('wwwServer')}flea-market-" + product.productID + ".html";
+            }
 
-        var items = {
-            "id": "",
-            "productId": product.productID,
-            "validFlag": product.validFlag,
-            "image": product.mainImage,
-            "name": product.name,
-            "link": link,
-            "sort": 1,
-            "pcStatus": "1",
-            "appletsStatus": "1",
-            "label": "",
-            "createDate": ""
-        };
-        return items;
+            var items = {
+                "id": "",
+                "productId": product.productID,
+                "validFlag": product.validFlag,
+                "image": product.mainImage,
+                "name": product.name,
+                "link": link,
+                "sort": 1,
+                "pcStatus": "1",
+                "appletsStatus": "1",
+                "label": "",
+                "createDate": ""
+            };
+            imageArray.push(items);
+        })
+        return imageArray;
     }
-
-    function clickAllSelect(ckb) {
-        var isChecked = ckb.checked;
-        $(".check-item").attr('checked', isChecked);
+    function handleClickAllSelect() {
+        var inputIsCheckedAll = $('.check-all').attr('checked');
+        var imageArray = [];
+        if(inputIsCheckedAll){
+            isCheckedAll = true;
+            $(".check-item").attr('checked', true);
+            $(".check-item").each(function (index,el) {
+                var item = $(this).val();
+                var product = JSON.parse(item);
+                var link ='';
+                if (${productCategory eq 1}) {
+                    link = "${fns:getConfig('wwwServer')}product-" + product.productID + ".html";
+                } else {
+                    link = "${fns:getConfig('wwwServer')}flea-market-" + product.productID + ".html";
+                }
+                var items = {
+                    "id": "",
+                    "productId": product.productID,
+                    "validFlag": product.validFlag,
+                    "image": product.mainImage,
+                    "name": product.name,
+                    "link": link,
+                    "sort": 1,
+                    "pcStatus": "1",
+                    "appletsStatus": "1",
+                    "label": "",
+                    "createDate": ""
+                };
+                imageArray.push(items);
+            })
+        }else{
+            isCheckedAll = false;
+            $(".check-item").attr('checked', false);
+            imageArray = [];
+        }
+        return imageArray;
     }
-
+    function handleCheckedAll() {
+        return isCheckedAll;
+    }
+    /**
     /**
      * @param obj
      * jquery控制input只能输入数字

src/main/webapp/WEB-INF/views/modules/newhome/beautyFloorContentForm.jsp

@@ -1646,29 +1646,32 @@
                         $('#productImageTable').hide();
                     } else {
                         //商品图片活动
-                        if (items.productId == "") {
-                            if (items.image == '') {
-                                alertx("请上传图片");
-                                return false;
-                            }
-                            if (items.name == '') {
-                                alertx("请输入名称");
-                                return false;
-                            }
-                            if (items.link == '') {
-                                alertx("请输入跳转链接");
-                                return false;
-                            }
-                            if (items.sort == '') {
-                                alertx("请输入排序值");
-                                return false;
-                            }
-                            if (items.label == '') {
-                                alertx("请输入标签");
-                                return false;
+                        for (var i = 0; i < items.length; i++) {
+                            console.log('**-*-**'+items)
+                            if (items.productId == "") {
+                                if (items.image == '') {
+                                    alertx("请上传图片");
+                                    return false;
+                                }
+                                if (items.name == '') {
+                                    alertx("请输入名称");
+                                    return false;
+                                }
+                                if (items.link == '') {
+                                    alertx("请输入跳转链接");
+                                    return false;
+                                }
+                                if (items.sort == '') {
+                                    alertx("请输入排序值");
+                                    return false;
+                                }
+                                if (items.label == '') {
+                                    alertx("请输入标签");
+                                    return false;
+                                }
                             }
                         }
-                        productImageList.push(items);
+                        productImageList = productImageList.concat(items);
                         $('#adsImageTable').hide();
                         $('#infoImageTable').hide();
                         $('#productImageTable').show();
@@ -2162,4 +2165,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorContentForm.jsp

@@ -504,7 +504,7 @@
         top.$.jBox("iframe:" + url + "&productIds=" + productIds, {
             iframeScrolling: 'yes',
             width: $(top.document).width() - 400,
-            height: $(top.document).height() - 160,
+            height: $(top.document).height() - 100,
             persistent: true,
             title: title,
             buttons: {"确定": '1', "取消": '-1'},
@@ -512,36 +512,46 @@
                 //确定
                 var $jboxFrame = top.$('#jbox-iframe');
                 var $mainFrame = top.$('#mainFrame');
-                if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-                    var items = $jboxFrame[0].contentWindow.getCheckedItems();
-                    console.log(items);
-                    if (items.productId == "") {
-                        if (items.image == '') {
-                            alertx("请上传图片");
-                            return false;
-                        }
-                        if (items.name == '') {
-                            alertx("请输入名称");
-                            return false;
-                        }
-                        if (items.link == '') {
-                            alertx("请输入跳转链接");
-                            return false;
-                        }
-                        if (items.sort == '') {
-                            alertx("请输入排序值");
-                            return false;
-                        }
-                        if (items.label == '') {
-                            alertx("请输入标签");
-                            return false;
-                        }
-                    }
-                    imageList.push(items);
+                var $isCheckedAll = $jboxFrame[0].contentWindow.handleCheckedAll();
+                if($isCheckedAll){
+                    var checkedAllList = $jboxFrame[0].contentWindow.handleClickAllSelect();
+                    imageList = imageList.concat(checkedAllList);
                     $('#contentTable').show();
                     $("#del").removeAttr("disabled");
                     batchSaveSort();
-                }
+                }else{
+                    if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
+                        var items = $jboxFrame[0].contentWindow.getCheckedItems();
+                        for (var i = 0; i < items.length; i++) {
+                            if (items[i].productId == "") {
+                                if (items[i].image == '') {
+                                    alertx("请上传图片");
+                                    return false;
+                                }
+                                if (items[i].name == '') {
+                                    alertx("请输入名称");
+                                    return false;
+                                }
+                                if (items[i].link == '') {
+                                    alertx("请输入跳转链接");
+                                    return false;
+                                }
+                                if (items[i].sort == '') {
+                                    alertx("请输入排序值");
+                                    return false;
+                                }
+                                if (items[i].label == '') {
+                                    alertx("请输入标签");
+                                    return false;
+                                }
+                            }
+                        }
+                        imageList = imageList.concat(items);
+                        $('#contentTable').show();
+                        $("#del").removeAttr("disabled");
+                        batchSaveSort();
+                    }
+                };
                 return true;
             }
         });
@@ -756,4 +766,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

@@ -106,6 +106,7 @@
 <body>
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/order/cmDiscernReceipt/">收款列表</a></li>
+<%--    <li class="active tab-li"><a href="${ctx}/order/cmCollectionConfigureList">线下收款账号配置</a></li>--%>
 </ul>
 <form:form id="searchForm" modelAttribute="cmDiscernReceipt" action="${ctx}/order/cmDiscernReceipt/" method="post"
            class="breadcrumb form-search">