Bläddra i källkod

Merge remote-tracking branch 'origin/developer' into developerB

zhijiezhao 2 år sedan
förälder
incheckning
7c16f43665

+ 16 - 0
src/main/java/com/caimei/modules/newhome/service/NewPageFloorService.java

@@ -168,12 +168,28 @@ public class NewPageFloorService extends CrudService<NewPageFloorDao, NewPageFlo
             }
         }
         if (floorImageList1 != null) {
+            //去除视频地址?后面的字符便于前端播放
+            for (NewPageFloorImage floor:floorImageList1) {
+                if(floor.getLink().contains("?Expires")){
+                    floor.setLink(floor.getLink().substring(0,floor.getLink().indexOf("?")));
+                }
+            }
             floorImageList.addAll(floorImageList1);
         }
         if (floorImageList2 != null) {
+            for (NewPageFloorImage floor:floorImageList2) {
+                if(floor.getLink().contains("?Expires")){
+                    floor.setLink(floor.getLink().substring(0,floor.getLink().indexOf("?")));
+                }
+            }
             floorImageList.addAll(floorImageList2);
         }
         if (floorImageList3 != null) {
+            for (NewPageFloorImage floor:floorImageList3) {
+                if(floor.getLink().contains("?Expires")){
+                    floor.setLink(floor.getLink().substring(0,floor.getLink().indexOf("?")));
+                }
+            }
             floorImageList.addAll(floorImageList3);
         }
         if (floorImageList.size() > 0) {

+ 8 - 1
src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -283,7 +283,7 @@ public class NewPageFloorController extends BaseController {
      * 活动专题添加图片
      */
     @RequestMapping("/addActivityImage")
-    public String addActivityImage(Product product, String type, Integer templateType, NewPageFloorImage newPageFloorImage, Model model, HttpServletRequest request, HttpServletResponse response) {
+    public String addActivityImage(Product product, String type, Integer templateType,String pageId, NewPageFloorImage newPageFloorImage, Model model, HttpServletRequest request, HttpServletResponse response) {
         if ("productImage".equals(type)) {
             product.setValidFlag("2");
             Page<Product> page = productService.findProductImage(new Page<Product>(request, response), product);
@@ -356,6 +356,9 @@ public class NewPageFloorController extends BaseController {
                 } else if (templateType == 29) {
                     pcImageSize = "588px*360px";
                     appletsImageSize = "702px*360px";
+                }else if(templateType>29&&templateType<=33){
+                    pcImageSize = "218px*160px";
+                    appletsImageSize = "218px*160px";
                 }
                 pcImageSize = "建议图片尺寸" + pcImageSize;
                 appletsImageSize = "建议图片尺寸" + appletsImageSize;
@@ -364,6 +367,10 @@ public class NewPageFloorController extends BaseController {
             model.addAttribute("appletsImageSize", appletsImageSize);
             model.addAttribute("type", type);
             model.addAttribute("floorImage", newPageFloorImage);
+            model.addAttribute("pageId",pageId);
+            if(templateType>29&&templateType<=33){
+                return "modules/newhome/addActivityAdsVideo";
+            }
             return "modules/newhome/addActivityAdsImage";
         }
     }

+ 530 - 0
src/main/webapp/WEB-INF/views/modules/newhome/addActivityAdsVideo.jsp

@@ -0,0 +1,530 @@
+<%@ page import="com.caimei.modules.baike.entity.CmBaikeProductFile" %><%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2020/4/9
+  Time: 19:54
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>选择其他图片</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table td i {
+            margin: 0 2px;
+        }
+
+        .iconBox {
+            font-size: 0;
+        }
+
+        .controls .conList {
+            display: inline-block;
+            margin-right: 15px;
+        }
+
+        .conList .btn:nth-of-type(1) {
+            margin-left: 25px;
+        }
+
+        .upload-content {
+            margin-top: -70px;
+        }
+
+        .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;
+        }
+
+        .hide-pic {
+            display: none !important;
+        }
+        .upload {
+            position: relative;
+            display: inline-block;
+            background: #D0EEFF;
+            border: 1px solid #99D3F5;
+            border-radius: 4px;
+            padding: 4px 12px;
+            color: #1E88C7;
+            text-decoration: none;
+            text-indent: 0;
+            line-height: 20px;
+            margin-left: 20px;
+            cursor: pointer;
+            width: 52px;
+            height: 20px;
+        }
+
+        .upload input {
+            position: absolute;
+            width: 170px;
+            font-size: 20px;
+            right: 0;
+            top: 0;
+            opacity: 0;
+            cursor: pointer;
+        }
+
+        .upload:hover {
+            background: #AADFFD;
+            border-color: #78C3F3;
+            color: #004974;
+            text-decoration: none;
+        }
+        .add-submit {
+            position: relative;
+            display: inline;
+            background: #D0EEFF;
+            border: 1px solid #99D3F5;
+            border-radius: 4px;
+            padding: 4px 12px;
+            color: #1E88C7;
+            text-decoration: none;
+            text-indent: 0;
+            line-height: 20px;
+            margin-left: 20px;
+            cursor: pointer;
+            width: 52px;
+            height: 30px;
+        }
+
+        .add-submit input {
+            position: absolute;
+            width: 50px;
+            font-size: 20px;
+            right: 0;
+            top: 0;
+            opacity: 0;
+            cursor: pointer;
+        }
+
+        .add-submit:hover {
+            background: #AADFFD;
+            border-color: #78C3F3;
+            color: #004974;
+            text-decoration: none;
+        }
+         .aaa {
+            color: #2fa4e7;
+            font-size: 12px;
+            cursor: pointer;
+            margin-left: 20px;
+        }
+
+    </style>
+
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#inputForm").validate({
+                submitHandler: function (form) {
+                    var beginTime = $("#beginTime").val();
+                    var endTime = $("#endTime").val();
+                    if (beginTime > endTime) {
+                        alertx("开始时间不能晚于结束时间!");
+                        return;
+                    } else {
+                        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>
+</head>
+<body>
+<br/>
+<form:form id="inputForm" modelAttribute="floorImage" action="" method="post" class="form-horizontal">
+    <form:hidden path="id" id="id"/>
+    <sys:message content="${message}"/>
+    <div class="control-group iconBox">
+        <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>视频封面</label>
+        <div class="controls upload-content" id="imageBox">
+            <div class="conList">
+                <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>${pcImageSize}</label>
+            </div>
+            <div hidden><input id="proId" value=${pageId}></div>
+
+        </div>
+    </div>
+<%--    <div class="control-group iconBox">--%>
+<%--        <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>小程序图片:</label>--%>
+<%--        <div class="controls upload-content" id="appletsImageBox">--%>
+<%--            <div class="conList">--%>
+<%--                <form:hidden id="appletsImage" path="appletsImage" htmlEscape="false" maxlength="255" class="input-xlarge required"/>--%>
+<%--                <sys:ckfinder input="appletsImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"--%>
+<%--                              maxHeight="100"/>--%>
+<%--                <br>--%>
+<%--                <label>${appletsImageSize}</label>--%>
+<%--            </div>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+    <div class="control-group" style="display: ${type eq 'adsImage'?'none':''}">
+        <label class="control-label"><font color="red">*</font>标题:</label>
+        <div class="controls">
+            <form:input path="name" id="name" htmlEscape="false" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group" style="display: ${type eq 'adsImage'?'none':''}">
+        <label class="control-label"><font color="red">*</font>内容:</label>
+        <div class="controls">
+            <form:textarea path="content" id="content" htmlEscape="false" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <div class="control-group">
+            <label class="control-label" style="margin-top:10px"><font color="red">*</font>视频路径:</label>
+            <div class="controls" style="margin-top:10px">
+                <input id="uploadFileName" type="text" style="display: inline;" placeholder="支持mp4" disabled="true" class="input-xlarge required" />
+                <div class="upload">
+                    <input type="file" name="file" id="productFile" accept=".mp4" >选择文件
+                </div>
+                <div class="add-submit">
+                    <input id="addSubmit" type="button" value="上传"/>上传
+                </div>
+                <div class="upload-loading" hidden>
+                    <img alt="gif" src="/static/images/upload.gif" width="32px" border="none">
+                </div>
+            </div>
+        </div>
+        <div class="control-group">
+            <div id='file-list-display' style="margin-left:180px" hidden>
+<%--                <c:if test="${not empty cmBaikeProduct.videoList}">--%>
+<%--                    <c:forEach items="${cmBaikeProduct.videoList}" var="videoFile" varStatus="statusIndex">--%>
+<%--                        <p>${videoFile.fileTitle}--%>
+                                <input type="text" id="videoName" disabled>
+                             <div hidden> <input type="text" id="link" disabled/></div>
+                            <span class="aaa"><a id="bf">预览</a></span> <%--      ${floorImage.id}          </c:if>--%>
+
+                            <span class="aaa" id="sc">删除</span>
+<%--                        </p>--%>
+<%--                    </c:forEach>--%>
+<%--                </c:if>--%>
+            </div>
+        </div>
+    </div>
+<%--    <div class="control-group">--%>
+<%--        <label class="control-label">跳转链接:</label>--%>
+<%--        <div class="controls">--%>
+<%--            <form:input path="link" id="link" htmlEscape="false" cssStyle="position: relative" class="input-xlarge required"/>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+<%--    <div class="control-group iconBox">--%>
+<%--        <label class="control-label">小程序内容宣传图:</label>--%>
+<%--        <div class="controls upload-content" id="adsImageBox">--%>
+<%--            <div class="conList">--%>
+<%--                <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"><font color="red">*</font> 排序:</label>
+        <div class="controls">
+            <form:input path="sort" id="sort" htmlEscape="false" maxlength="11" onkeyup="onlynum(this)" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">网站状态:</label>
+        <div class="controls">
+            <form:select path="pcStatus" id="pcStatus" class="input-medium required">
+                <form:option value="1" label="启动"/>
+                <form:option value="0" label="停用"/>
+            </form:select>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">小程序状态:</label>
+        <div class="controls">
+            <form:select path="appletsStatus" id="appletsStatus" class="input-medium required">
+                <form:option value="1" label="启动"/>
+                <form:option value="0" label="停用"/>
+            </form:select>
+        </div>
+    </div>
+</form:form>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        //弹出框去滚动条
+        top.$('#jbox-content').css("overflow-y", "hidden");
+        show_title(30);
+    });
+
+    $(function () {
+        $('.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 observeEle1 = document.getElementsByClassName('upload-content')[1];
+        var observeEle2 = document.getElementsByClassName('upload-content')[2];
+        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);
+        observer.observe(observeEle1, MutationObserverConfig);
+        observer.observe(observeEle2, MutationObserverConfig);
+
+        $('body').on('click', '.upload-content li', function () {
+            var index = $(this).closest('.conList').index() + 1,
+                str = 'remarkImage' + index + 'FinderOpen';
+            eval(str + '()');
+        });
+        $('body').on('click', '.cancel-upload', function () {
+            var wrapper = $(this).closest('.conList');
+            wrapper.find('li').css('z-index', '-1');
+            wrapper.find('input').val('');
+            $(this).hide();
+            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 () {
+                $("#imageBox").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")
+                    }
+                })
+                $("#appletsImageBox").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")
+                    }
+                })
+                $("#adsImageBox").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);
+        });
+    });
+
+    function getCheckedItems() {
+        var items = {
+            "id": $('#id').val(),
+            "productId": "",
+            "image": $('#image').val(),
+            "appletsImage": $('#appletsImage').val(),
+            "adsImage": $('#adsImage').val(),
+            "name": $('#name').val(),
+            "content": $('#content').val(),
+            "link": $('#link').val(),
+            "sort": $('#sort').val(),
+            "pcStatus": $('#pcStatus').val(),
+            "appletsStatus": $('#appletsStatus').val(),
+            "label": $('#label').val(),
+            "createDate": ""
+        };
+        return items;
+    }
+
+    /**
+     * @param obj
+     * jquery控制input只能输入数字
+     */
+    function onlynum(obj) {
+        obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+    }
+
+    //删除文件
+    function dataDelete(that, id) {
+        console.log($(that).text());
+        $(that).parent().remove();
+        var fileIds = $("#fileIds").val();
+        // if (fileIds.indexOf(id)) {
+        //     fileIds = fileIds.replace(id + ',', '');
+        //     $("#fileIds").val(fileIds);
+        // }
+        $.ajax({
+            url: "${ctx}/baike/cmBaikeProduct/deleteFile",
+            data: {"fileId": id},
+            async: false,
+            type: "POST"
+        });
+    }
+
+    function previewVideo(url) {
+        var url = "${ctx}/archive/cmProductArchiveContent/preview?url=" + encodeURIComponent(url);
+        var title = "视频播放";
+        top.$.jBox("iframe:" + url, {
+            iframeScrolling: 'yes',
+            width: 1000,
+            height: 750,
+            persistent: true,
+            title: title,
+            buttons: {"关闭": '-1'}
+        });
+    }
+
+    var fileIds=$('#id').val()
+    //点击上传按钮后上传文件
+    $('#addSubmit').click(function () {
+        // var fileIdArr = fileIds.split(',');
+        // if (fileIdArr.length >= 7) {
+        //     alertx('最多上传6个视频');
+        //     return;
+        // }
+        var filesById = document.getElementById('productFile');
+        var files = $('#productFile');
+        var filevalue = document.getElementById('productFile').value;
+
+        var fileList = files.prop('files');
+        var fileTitle = $('#fileTitle').val();
+        // var fileName = $('#addSubmit').val();
+        var fileName = $('#uploadFileName').val();
+
+        // if (fileTitle == '') {
+        //     alertx('请输入视频标题')
+        //     return;
+        // }
+        // if (files === '' || files.length == 0 || fileName == '') {
+        //     alertx('请选择上传文件');
+        //     return;
+        // }
+        if (filevalue === '') {
+            alertx('请选择上传文件');
+            return;
+        }
+        $("#fileTitle").val("");
+        $("#uploadFileName").val("");
+        var data = new FormData();
+        var productId = $("#proId").val();
+        data.append('file', fileList[0]);
+        data.append('fileTitle', fileTitle);
+        data.append('fileName', fileName);
+        data.append('productId', productId);
+        data.append('fileIds', fileIds);
+        $('.upload-loading').css("display", "inline");
+        $.ajax({
+            url: "${ctx}/baike/cmBaikeProduct/upload",
+            data: data,
+            type: "POST",
+            processData: false,
+            contentType: false,
+            dataType: "json",
+            success: function (res) {
+                if (res.success) {
+                    filesById.value = '';
+                     var ossUrl=res.productFile.ossUrl;
+                    var fileid=res.productFile.id;
+                    var videoname=res.productFile.fileName;
+                    console.log(res);
+                    console.log(res.productFile);
+                    document.getElementById('bf').setAttribute("onclick", "previewVideo('" + ossUrl + "')");
+                    document.getElementById('sc').setAttribute("onclick", "dataDelete(this,'"+fileid+"')");
+                    // console.log(ss.ossUrl);
+                    // renderFileList(res.productFile);
+                    document.getElementById('videoName').setAttribute("value",videoname);
+                    document.getElementById('link').setAttribute("value",ossUrl);
+                    $('.upload-loading').hide();
+                    $('#file-list-display').show();
+                } else {
+                    $.jBox.tip(res.msg, 'error');
+                    $("#uploadFileName").val(fileName);
+                    $('.upload-loading').hide();
+                }
+
+            },
+            error: function (json) {
+
+            }
+        });
+    })
+    var files = document.getElementById("productFile");
+    //选择上传文件后显示文件名称
+    files.addEventListener("change", function (event) {
+        var name = event.target.files[0].name;
+        console.log(name)
+        $('#uploadFileName').val(name);
+    });
+</script>
+</body>
+</html>

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

@@ -196,6 +196,9 @@
                             var stringify = JSON.stringify(adsImageList1);
                             $('#images').val(stringify);
                         }
+                    }else if ((type == 'videoImage' && videoImageList.length > 0)) {
+                        var stringify = JSON.stringify(videoImageList);
+                        $('#images').val(stringify);
                     } else if ((type == 'infoImage' && infoImageList.length > 0)) {
                         var stringify = JSON.stringify(infoImageList);
                         $('#images').val(stringify);
@@ -587,6 +590,25 @@
                                 </thead>
                                 <tbody id="adsImageTbody"></tbody>
                             </table>
+                            <table id="videoImageTable" class="table table-striped table-bordered table-condensed"
+                                   style="display: none">
+                                <thead>
+                                <tr>
+                                    <th style="width:20px;"><input class="check-all" type="checkbox"
+                                                                   onclick="clickAllSelect(this)"/> 全选
+                                    </th>
+                                    <th>视频封面</th>
+                                    <th hidden>视频链接</th>
+                                    <th>网站状态</th>
+                                    <th>小程序状态</th>
+                                    <th>排序</th>
+                                    <th>创建时间</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody id="videoImageTbody"></tbody>
+                            </table>
+
                             <table id="infoImageTable" class="table table-striped table-bordered table-condensed"
                                    style="display: none">
                                 <thead>
@@ -1323,6 +1345,7 @@
     var adsImageList2 = [];
     var adsImageList3 = [];
     var infoImageList = [];
+    var videoImageList= [];
     var productImageList = [];
     var productIds = '';
     $(function () {
@@ -1377,7 +1400,7 @@
         var templateType = $("input[name='templateType']:checked").val();
         if (templateType != undefined) {
             //数据填充
-            if (templateType == 1 || templateType == 2 || (templateType >= 7 && templateType <= 10) || (templateType >= 26 && templateType <= 33)) {
+            if (templateType == 1 || templateType == 2 || (templateType >= 7 && templateType <= 10) || (templateType >= 26 && templateType <= 29)) {
                 <c:forEach items="${floorContent.floorImageList}" var="floorImage" varStatus="index">
                 adsImageList1.push({
                     id: "${floorImage.id}",
@@ -1391,7 +1414,21 @@
                     createDate: "${floorImage.createDate}"
                 });
                 </c:forEach>
-            } else if (templateType >= 3 && templateType <=6) {
+            }
+            else if (templateType >= 30 && templateType <=33) {
+                <c:forEach items="${floorContent.floorImageList}" var="floorImage" varStatus="index">
+                videoImageList.push({
+                    id: "${floorImage.id}",
+                    image: "${floorImage.image}",
+                    link: "${floorImage.link}",
+                    sort: "${floorImage.sort}",
+                    pcStatus: "${floorImage.pcStatus}",
+                    appletsStatus: "${floorImage.appletsStatus}",
+                    createDate: "${floorImage.createDate}"
+                });
+                </c:forEach>
+            }
+            else if (templateType >= 3 && templateType <=6) {
                 <c:forEach items="${floorContent.floorImageList}" var="floorImage" varStatus="index">
                 infoImageList.push({
                     id: "${floorImage.id}",
@@ -1502,6 +1539,7 @@
             $(".templateImageTable").show();
             $("#displayDateDiv").css('display', 'none');
             $("#adsImageTable").hide();
+            $("#videoImageTable").hide();
             $("#infoImageTable").hide();
             $("#productImageTable").hide();
             //广告图
@@ -1522,7 +1560,7 @@
                 $('.Image1').show();
             }
             //删除按钮和表格展示
-            if (templateType == 1 || templateType == 2 || (templateType >= 7 && templateType <= 10) || (templateType >= 26 && templateType <= 33)) {
+            if (templateType == 1 || templateType == 2 || (templateType >= 7 && templateType <= 10) || (templateType >= 26 && templateType <= 29)) {
                 if (adsImageList1.length == 0) {
                     $("#del").attr("disabled", "disabled");
                 } else {
@@ -1530,6 +1568,15 @@
                     $("#del").removeAttr("disabled");
                 }
                 type = 'adsImage';
+
+            }else if (templateType >= 30 && templateType <=33) {
+                if (videoImageList.length == 0) {
+                    $("#del").attr("disabled", "disabled");
+                } else {
+                    $("#videoImageTable").show();
+                    $("#del").removeAttr("disabled");
+                }
+                type = 'videoImage';
             } else if (templateType >= 3 && templateType <=6) {
                 if (infoImageList.length == 0) {
                     $("#del").attr("disabled", "disabled");
@@ -1553,11 +1600,15 @@
                 var imageList = displayDateNo == 1 ? adsImageList1 : (displayDateNo == 2 ? adsImageList2 : adsImageList3);
                 if (imageList.length == 0) {
                     $("#del").attr("disabled", "disabled");
-                } else {
+                } else if(templateType >= 26 && templateType <= 29){
                     $("#adsImageTable").show();
                     $("#del").removeAttr("disabled");
+                    type = 'adsImage';
+                }else{
+                    $("#videoImageTable").show();
+                    $("#del").removeAttr("disabled");
                 }
-                type = 'adsImage';
+                type = 'videoImage';
             }
             $("#type").val(type);
             //广告图建议尺寸
@@ -1645,12 +1696,18 @@
         var width = $(top.document).width() - 800;
         var height = $(top.document).height() - 160;
         var type = $("#type").val();
+        var pageId= $("#pageId").val();
         var templateType = $("input[name='templateType']:checked").val();
+        console.log(type);
         if (type == 'adsImage') {
-            url = url + "?type=adsImage&templateType=" + templateType;
-        } else if (type == 'infoImage') {
+            url = url + "?pageId="+pageId+"&type=adsImage&templateType=" + templateType;
+        } else if(type == 'videoImage'){
+            url = url + "?pageId="+pageId+"&type=adsImage&templateType=" + templateType;
+        }
+        else if (type == 'infoImage') {
             url = url + "?type=infoImage&templateType=" + templateType;
-        } else {
+        }
+        else {
             url = url + "?type=productImage&productCategory=1&productIds=" + productIds + "&templateType=" + templateType;
             title = '商品图片';
             width = $(top.document).width() - 400;
@@ -1698,7 +1755,26 @@
                         $('#adsImageTable').show();
                         $('#infoImageTable').hide();
                         $('#productImageTable').hide();
-
+                        $('#videoImageTable').hide();
+                    } else if (type == 'videoImage') {
+                        //信息宣传图活动
+                        if (items.image == '') {
+                            alertx("请上传视频封面图片");
+                            return false;
+                        }
+                        if (items.sort == '') {
+                            alertx("请输入排序值");
+                            return false;
+                        }
+                        if(items.link ==''){
+                            alertx("请上传视频");
+                            return false;
+                        }
+                        videoImageList.push(items);
+                        $('#adsImageTable').hide();
+                        $('#infoImageTable').hide();
+                        $('#productImageTable').hide();
+                        $('#videoImageTable').show();
                     } else if (type == 'infoImage') {
                         //信息宣传图活动
                         if (items.image == '') {
@@ -1725,6 +1801,8 @@
                         $('#adsImageTable').hide();
                         $('#infoImageTable').show();
                         $('#productImageTable').hide();
+                        $('#videoImageTable').hide();
+
                     } else {
                         //商品图片活动
                         for (var i = 0; i < items.length; i++) {
@@ -1756,6 +1834,7 @@
                         $('#adsImageTable').hide();
                         $('#infoImageTable').hide();
                         $('#productImageTable').show();
+                        $('#videoImageTable').hide();
                     }
                     $("#del").removeAttr("disabled");
                     batchSaveSort();
@@ -1826,7 +1905,59 @@
             )) +
             '</td>' +
             '<td>' +
-            (type == 'adsImage' || type == 'infoImage' ? (
+            (type == 'adsImage' || type == 'infoImage' || type == 'videoImage' ? (
+                '<a href="javascript:;" onclick="update(' + index + ')">编辑</a>'
+            ) : '') +
+            '   <a href="javascript:;" onclick="delect(' + index + ')">删除</a>' +
+            '</td>' +
+            '</tr>';
+        return html;
+    }
+    //相关图片列表数据
+    function appendVideoHead(data, index) {
+        var type = $("#type").val();
+        var html = '<tr id ="ads' + index + '">' +
+            '<td>' +
+            '<input class="check-item" type="checkbox" name="info" value="' + index + '"/>' + (index + 1) +
+            '</td>' +
+            '<td>' +
+            '<img src="' + data.image + '" width="60px" border="none" title="启用">' +
+            '</td>' +
+            ('<td hidden>' +  data.link  + '</td>') +
+            '<td>' +
+            (data.pcStatus == 1 ? (
+                '<font color="green">已启用</font>&nbsp;&nbsp;&nbsp;' +
+                '<a href="javascript:void(0);" onclick="updatePcStatus(0,' + index + ');" >' +
+                '停用</a>'
+            ) : (
+                '<font color="red">已停用</font>&nbsp;&nbsp;&nbsp;' +
+                '<a href="javascript:void(0)" onclick="updatePcStatus(1,' + index + ');">' +
+                '启用</a>'
+            )) +
+            '</td>' +
+            '<td>' +
+            (data.appletsStatus == 1 ? (
+                '<font color="green">已启用</font>&nbsp;&nbsp;&nbsp;' +
+                '<a href="javascript:void(0);" onclick="updateAppletsStatus(0,' + index + ');" >' +
+                '停用</a>'
+            ) : (
+                '<font color="red">已停用</font>&nbsp;&nbsp;&nbsp;' +
+                '<a href="javascript:void(0)" onclick="updateAppletsStatus(1,' + index + ');">' +
+                '启用</a>'
+            )) +
+            '</td>' +
+            '<td>' +
+            '<input name="sort" style="width:50px;" value="' + data.sort + '"  onkeyup="onlynum(this)"  onchange="changeSort(' + index + ',this)"></td>' +
+            '</td>' +
+            '<td>' +
+            (data.createDate == '' ? (
+                '<fmt:formatDate value="<%=new Date()%>" pattern="yyyy-MM-dd HH:mm:ss"/>'
+            ) : (
+                data.createDate
+            )) +
+            '</td>' +
+            '<td>' +
+            (type == 'adsImage' || type == 'infoImage' || type == 'videoImage' ? (
                 '<a href="javascript:;" onclick="update(' + index + ')">编辑</a>'
             ) : '') +
             '   <a href="javascript:;" onclick="delect(' + index + ')">删除</a>' +
@@ -1843,6 +1974,11 @@
                 html += appendShopOrderHead(item, index);
             })
             $("#adsImageTbody").html(html);
+        } else if (type == 'videoImage') {
+            list.forEach(function (item, index) {
+                html += appendVideoHead(item, index);
+            })
+            $("#videoImageTbody").html(html);
         } else if (type == 'infoImage') {
             list.forEach(function (item, index) {
                 html += appendShopOrderHead(item, index);
@@ -1875,6 +2011,9 @@
             } else if (displayDateNo == 3) {
                 adsImageList3 = imageList;
             }
+        } else if (type == 'videoImage') {
+            videoImageList.sort(sort);
+            insertHtml(videoImageList);
         } else if (type == 'infoImage') {
             infoImageList.sort(sort);
             insertHtml(infoImageList);
@@ -1950,6 +2089,13 @@
                 } else if (displayDateNo == 3) {
                     adsImageList3 = imageList;
                 }
+            }else if (type == 'videoImage') {
+                videoImageList.splice(index, 1);
+                insertHtml(videoImageList);
+                if (videoImageList.length == 0) {
+                    $("#del").attr("disabled", "disabled");
+                    $('#videoImageTable').hide();
+                }
             } else if (type == 'infoImage') {
                 infoImageList.splice(index, 1);
                 insertHtml(infoImageList);
@@ -1994,6 +2140,8 @@
                     var image = getImage(thisIndex);
                     if (type == 'adsImage') {
                         imageList.splice(thisIndex, 1);
+                    } else if (type == 'videoImage') {
+                        videoImageList.splice(thisIndex, 1);
                     } else if (type == 'infoImage') {
                         infoImageList.splice(thisIndex, 1);
                     } else {
@@ -2018,6 +2166,14 @@
                     } else if (displayDateNo == 3) {
                         adsImageList3 = imageList;
                     }
+                } else if (type == 'videoImage') {
+                    insertHtml(videoImageList);
+                    if (videoImageList.length == 0) {
+                        $("#del").attr("disabled", "disabled");
+                        $('#videoImageTable').hide();
+                    } else {
+                        $("#del").removeAttr("disabled");
+                    }
                 } else if (type == 'infoImage') {
                     insertHtml(infoImageList);
                     if (infoImageList.length == 0) {
@@ -2062,6 +2218,12 @@
             url = url + "?type=adsImage&templateType=" + templateType + "&image=" + image.image + "&appletsImage=" + image.appletsImage +
                 "&link=" + image.link + "&adsImage=" + image.adsImage + "&pcStatus=" + image.pcStatus +
                 "&appletsStatus=" + image.appletsStatus + "&sort=" + image.sort + "&createDate=" + image.createDate;
+        } else if (type == 'videoImage') {
+            image = videoImageList[index];
+            url = url + "?type=infoImage&templateType=" + templateType + "&image=" + image.image +
+                  "&link=" + image.link  + "&pcStatus=" + image.pcStatus +
+                "&appletsStatus=" + image.appletsStatus + "&sort=" + image.sort + "&createDate=" + image.createDate;
+
         } else if (type == 'infoImage') {
             image = infoImageList[index];
             url = url + "?type=infoImage&templateType=" + templateType + "&image=" + image.image + "&appletsImage=" + image.appletsImage +
@@ -2111,7 +2273,25 @@
                         $('#adsImageTable').show();
                         $('#infoImageTable').hide();
                         $('#productImageTable').hide();
+                        $('#videoImageTable').hide();
 
+                    } else if (type == 'videoImage') {
+                        //信息宣传图活动
+                        if (items.image == '') {
+                            alertx("请上传PC图片");
+                            return false;
+                        }
+                        if (items.sort == '') {
+                            alertx("请输入排序值");
+                            return false;
+                        }
+                        // 编辑成功,先删除原来的数据,再重新添加
+                        videoImageList.splice(index, 1);
+                        videoImageList.push(items);
+                        $('#adsImageTable').hide();
+                        $('#infoImageTable').hide();
+                        $('#productImageTable').hide();
+                        $('#videoImageTable').show();
                     } else if (type == 'infoImage') {
                         //信息宣传图活动
                         if (items.image == '') {
@@ -2140,7 +2320,8 @@
                         $('#adsImageTable').hide();
                         $('#infoImageTable').show();
                         $('#productImageTable').hide();
-                    }
+                        $('#videoImageTable').hide();
+                }
                     $("#del").removeAttr("disabled");
                     batchSaveSort();
                 }
@@ -2156,6 +2337,8 @@
             var displayDateNo = $("input[name='displayDateRadio']:checked").val();
             var imageList = displayDateNo == 1 ? adsImageList1 : (displayDateNo == 2 ? adsImageList2 : adsImageList3);
             image = imageList[index];
+        }  else if (type == 'videoImage') {
+            image = videoImageList[index];
         } else if (type == 'infoImage') {
             image = infoImageList[index];
         } else {