bugfix

src/main/java/com/caimei/modules/newhome/service/NewPageFloorService.java

@@ -99,7 +99,12 @@ public class NewPageFloorService extends CrudService<NewPageFloorDao, NewPageFlo
         if (StringUtils.isNotBlank(floorContent.getImages())) {
             List<NewPageFloorImage> floorImageList = JSON.parseArray(floorContent.getImages(), NewPageFloorImage.class);
             for (NewPageFloorImage floorImage : floorImageList) {
+                //图片处理
                 floorImage.setImage(UploadPicUtils.saveImageToServer(floorImage.getImage(), null));
+                //换行符处理
+                if (StringUtils.isNotBlank(floorImage.getContent())) {
+                    floorImage.setContent(floorImage.getContent().replace("\n", ""));
+                }
                 if (StringUtils.isNotBlank(floorImage.getAdsImage())) {
                     floorImage.setAdsImage(UploadPicUtils.saveImageToServer(floorImage.getAdsImage(), null));
                 }

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

@@ -183,7 +183,7 @@
             <td>
                 <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}"
+                <a href="${ctx}/cmpage/cmPageCentre/delete?id=${newPageFloor.id}&type=${cmPageCentre.type}"
                    onclick="return confirmx('是否删除该数据，删除后，对应的楼层数据也将被全部删除，确认是否删除', this.href)">删除</a>
             </td>
         </tr>

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

@@ -59,7 +59,7 @@
                 return true;// close
             };
             // 自定义按钮
-            $.jBox.confirm("请选择需要新增的页面！！！", "新增网页", submit, { buttons: { '项目详情页面': 1, '二级列表页面': 2,'自由页面':4,'分类详情':5,'活动详情':6} });
+            $.jBox.confirm("请选择需要新增的页面！！！", "新增网页", submit, { buttons: { '项目详情页面': 1, '二级列表页面': 2,'自由页面':4,'分类详情':5,'活动专题':6} });
         }
         //更新单个索引
         function updateIndex(id){
@@ -115,7 +115,8 @@
                     <label>【项目详情】适用于：仪器分期/项目合作等 详情页</label></br>
                     <label>【二级列表】适用于：大项目/正品联盟/仪器分期等 二级列表页面</label></br>
                     <label>【自由页面】适用于：自由页面</label></br>
-                    <label>【分类详情】适用于：产品和仪器两个大分类的详情页</label>
+                    <label>【分类详情】适用于：产品和仪器两个大分类的详情页</label></br>
+                    <label>【活动专题】适用于：展会/商城详情页</label>
                     &nbsp&nbsp&nbsp&nbsp&nbsp<input type="button" class="btn btn-primary" value="新增页面" onclick="openwin()" />
                 </table>
                 <br>

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

@@ -84,6 +84,19 @@
             border-width: 1px 0px 0px 1px;
         }
 
+        .table-striped{
+            margin-right: 10px;
+        }
+        .table-striped td {
+            border-collapse: inherit;
+            border: 1px solid #ddd;
+            border-width: 1px 0px 0px 1px;
+        }
+
+        .table-striped th,.table-striped td {
+            text-align: center !important;
+        }
+
         select {
             width: 85px;
             line-height: 25px;
@@ -283,7 +296,7 @@
         楼层名称：<a style="text-decoration:none;">${floorContent.floorTitle}</a>
     </div>
     <div class="control-group">
-        <table style="overflow:scroll;height: 400px !important;">
+        <table style="overflow:scroll;height: 400px !important;" class="templateTable">
             <tr>
                 <td style="width: 380px !important;height: 50px">
                     <label style="font-weight: bold;font-size: 16px" class="tbMargin">模板库</label>
@@ -302,8 +315,8 @@
                 <td rowspan="2" style=" width: 2800px;">
                     <div style="height: 100%;overflow-y:scroll;">
                         <label id="infoLabel"
-                               style="position: relative;left: 200px;top: 200px; font-weight: bolder;font-size: 30px">请先选择左边模板后，再编辑模板相关内容</label>
-                        <div class="control-group clear Image1">
+                               style="display: none; position: relative;left: 200px;top: 200px; font-weight: bolder;font-size: 30px">请先选择左边模板后，再编辑模板相关内容</label>
+                        <div class="control-group clear Image1" style="display: none">
                             <div style="float: left">
                                 <span class="help-inline"><font color="red">*</font> </span>网站端广告图1：
                                 <div class="controls upload-content iconBox" id="pcAdsImage1">
@@ -339,7 +352,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="control-group clear Image2">
+                        <div class="control-group clear Image2"  style="display: none">
                             <div style="float: left">
                                 <span class="help-inline"><font color="red">*</font> </span>网站端广告图2：
                                 <div class="controls upload-content iconBox" id="pcAdsImage2">
@@ -375,7 +388,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="control-group clear Image3">
+                        <div class="control-group clear Image3"  style="display: none">
                             <div style="float: left">
                                 <span class="help-inline"><font color="red">*</font> </span>网站端广告图3：
                                 <div class="controls upload-content iconBox" id="pcAdsImage3">
@@ -411,7 +424,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="control-group clear Image4">
+                        <div class="control-group clear Image4"  style="display: none">
                             <div style="float: left">
                                 <span class="help-inline"><font color="red">*</font> </span>网站端广告图4：
                                 <div class="controls upload-content iconBox" id="pcAdsImage4">
@@ -447,7 +460,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="control-group clear Image5">
+                        <div class="control-group clear Image5"  style="display: none">
                             <div style="float: left">
                                 <span class="help-inline"><font color="red">*</font> </span>网站端广告图5：
                                 <div class="controls upload-content iconBox" id="pcAdsImage5">
@@ -1427,7 +1440,6 @@
 
     //根据sort值 从小到大排序
     function sort(a, b) {
-        debugger
         return ((a.sort - b.sort) == 0 ? (a.createDate > b.createDate ? -1 : 1) : (a.sort - b.sort));
     }
 

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

@@ -158,7 +158,7 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label"><span class="help-inline"><font color="red">*</font> 排序：</span></label>
+        <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>