瀏覽代碼

用户行为优化1.0.4

huangzhiguo 1 年之前
父節點
當前提交
7d4fd14508

+ 2 - 2
src/main/java/com/caimei/modules/newhome/entity/NewPageFirstNavigation.java

@@ -22,7 +22,7 @@ public class NewPageFirstNavigation extends DataEntity<NewPageFirstNavigation> {
     private String navigationName;
 
     /**
-     * 一级导航栏类型 0启用二级导航跳转 1启用链接跳转(已废弃)
+     * 一级导航栏类型 0启用二级导航跳转 1启用链接跳转(已废弃) 2 快捷运营
      */
     private String type;
 
@@ -72,7 +72,7 @@ public class NewPageFirstNavigation extends DataEntity<NewPageFirstNavigation> {
     }
 
     public Date getEndPvCreateTime() {
-        
+
         return endPvCreateTime;
     }
 

+ 8 - 6
src/main/java/com/caimei/modules/newhome/web/NewPageFirstNavigationController.java

@@ -88,20 +88,22 @@ public class NewPageFirstNavigationController extends BaseController {
         if (!beanValidator(model, newPageFirstNavigation)) {
             return form(newPageFirstNavigation, model);
         }
-        //判断如果已经存在10条数据则不允许添加(产品控制数量显示)
+        // 判断如果已经存在10条数据则不允许添加(产品控制数量显示)
         NewPageFirstNavigation navigation = new NewPageFirstNavigation();
         navigation.setType(newPageFirstNavigation.getType());
-        List<NewPageFirstNavigation> list = newPageFirstNavigationService.findList(navigation);
+        /*List<NewPageFirstNavigation> list = newPageFirstNavigationService.findList(navigation);
         if (StringUtils.isEmpty(newPageFirstNavigation.getId())) {
             if (CollectionUtils.isNotEmpty(list) && list.size() >= 10) {
                 addMessage(model, "最多添加10个主菜单!删除旧菜单后才能继续添加");
                 return form(newPageFirstNavigation, model);
             }
+        }*/
+        // 上传图片
+        if ("2".equals(newPageFirstNavigation.getType())) {
+            String image = newPageFirstNavigation.getIcon();
+            image = UploadPicUtils.saveImageToServer(image);
+            newPageFirstNavigation.setIcon(image);
         }
-        //上传图片
-        String image = newPageFirstNavigation.getIcon();
-        image = UploadPicUtils.saveImageToServer(image);
-        newPageFirstNavigation.setIcon(image);
         if (StringUtils.isEmpty(newPageFirstNavigation.getId())) {
             newPageFirstNavigation.setCreateDate(new Date());
             newPageFirstNavigationService.insert(newPageFirstNavigation);

+ 12 - 10
src/main/webapp/WEB-INF/views/modules/newhome/newPageFirstNavigationForm.jsp

@@ -163,8 +163,8 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li class=${newPageFirstNavigation.type==0?"active":""}><a href="${ctx}/newhome/newPageFirstNavigation?type=${newPageFirstNavigation.type}">主菜单列表</a></li>
-		<li class=${newPageFirstNavigation.type==2?"active":""}><a href="${ctx}/newhome/newPageFirstNavigation?type=${newPageFirstNavigation.type}">快捷运营菜单</a></li>
+		<li class=${newPageFirstNavigation.type==0?"active":""}><a href="${ctx}/newhome/newPageFirstNavigation?type=0">主菜单列表</a></li>
+		<li class=${newPageFirstNavigation.type==2?"active":""}><a href="${ctx}/newhome/newPageFirstNavigation?type=2">快捷运营菜单</a></li>
 		<li class="active"><a href="${ctx}/newhome/newPageFirstNavigation/form?id=${newPageFirstNavigation.id}">${not empty newPageFirstNavigation.id?'编辑':'添加'}</a></li>
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="newPageFirstNavigation" action="${ctx}/newhome/newPageFirstNavigation/save" method="post" class="form-horizontal">
@@ -185,16 +185,18 @@
 			</div>
 		</div>
 		</c:if>
-		<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="iconBox">
-				<div class="conList">
-					<form:hidden id="icon" path="icon" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
-					<sys:ckfinder input="icon" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-					<br><label>建议图片分辨率110px*110px</label>
+		<c:if test="${newPageFirstNavigation.type != 0}">
+			<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="iconBox">
+					<div class="conList">
+						<form:hidden id="icon" path="icon" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
+						<sys:ckfinder input="icon" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+						<br><label>建议图片分辨率110px*110px</label>
+					</div>
 				</div>
 			</div>
-		</div>
+		</c:if>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>跳转链接:</label>
 			<div class="controls">

+ 24 - 23
src/main/webapp/WEB-INF/views/modules/newhome/newPageFirstNavigationList.jsp

@@ -141,7 +141,7 @@
 	<tr>
 		<th>ID</th>
 		<th><c:if test="${newPageFirstNavigation.type==0}">主</c:if>菜单名称</th>
-		<th>图标</th>
+		<c:if test="${newPageFirstNavigation.type != 0}"><th>图标</th></c:if>
 		<th>跳转链接</th>
 		<c:if test="${newPageFirstNavigation.type==2}">
 			<th>点击量</th>
@@ -154,36 +154,37 @@
 	</tr>
 	</thead>
 	<tbody>
-	<c:forEach items="${page.list}" var="newPageFirstNavigation">
+	<c:forEach items="${page.list}" var="list">
 		<tr>
-			<input class="check-item" type="hidden" id="preferredProductSort${newPageFirstNavigation.id}" value='${newPageFirstNavigation.id}-${newPageFirstNavigation.sort}'/>
+			<input class="check-item" type="hidden" id="preferredProductSort${list.id}" value='${list.id}-${list.sort}'/>
 			<td>
-					${newPageFirstNavigation.id}
+					${list.id}
 			</td>
 			<td>
-					${newPageFirstNavigation.navigationName}
+					${list.navigationName}
 			</td>
+			<c:if test="${newPageFirstNavigation.type != 0}">
+				<td>
+						<img src="${list.icon}" style="width: 50px;height: 50px;">
+				</td>
+			</c:if>
 			<td>
-					<img src="${newPageFirstNavigation.icon}" style="width: 50px;height: 50px;">
-			</td>
-
-			<td>
-					<a href="${newPageFirstNavigation.link}" target="_blank">${newPageFirstNavigation.link}</a>
+					<a href="${list.link}" target="_blank">${list.link}</a>
 			</td>
 			<c:if test="${newPageFirstNavigation.type==2}">
-				<td>${newPageFirstNavigation.pv}</td>
+				<td>${list.pv}</td>
 			</c:if>
 			<td>
 				<shiro:hasPermission name="newhome:newPageFirstNavigation:edit">
-					<c:if test="${newPageFirstNavigation.wwwEnabledStatus eq 1 }">
+					<c:if test="${list.wwwEnabledStatus eq 1 }">
 						<font color="green">已启用</font>
-						<a href="javascript:void(0);" onclick="updateEnabledStatus('0','${newPageFirstNavigation.id}','WWW');" >
+						<a href="javascript:void(0);" onclick="updateEnabledStatus('0','${list.id}','WWW');" >
 							停用
 						</a>
 					</c:if>
-					<c:if test="${newPageFirstNavigation.wwwEnabledStatus ne 1 }">
+					<c:if test="${list.wwwEnabledStatus ne 1 }">
 						<font color="red">已停用</font>
-						<a href="javascript:void(0)" onclick="updateEnabledStatus('1','${newPageFirstNavigation.id}','WWW');">
+						<a href="javascript:void(0)" onclick="updateEnabledStatus('1','${list.id}','WWW');">
 							启用
 						</a>
 					</c:if>
@@ -191,33 +192,33 @@
 			</td>
 			<td>
 				<shiro:hasPermission name="newhome:newPageFirstNavigation:edit">
-					<c:if test="${newPageFirstNavigation.crmEnabledStatus eq 1 }">
+					<c:if test="${list.crmEnabledStatus eq 1 }">
 						<font color="green">已启用</font>
-						<a href="javascript:void(0);" onclick="updateCrmEnabledStatusByIds('0','${newPageFirstNavigation.id}','CRM');" >
+						<a href="javascript:void(0);" onclick="updateCrmEnabledStatusByIds('0','${list.id}','CRM');" >
 							停用
 						</a>
 					</c:if>
-					<c:if test="${newPageFirstNavigation.crmEnabledStatus ne 1 }">
+					<c:if test="${list.crmEnabledStatus ne 1 }">
 						<font color="red">已停用</font>
-						<a href="javascript:void(0)" onclick="updateCrmEnabledStatusByIds('1','${newPageFirstNavigation.id}','CRM');">
+						<a href="javascript:void(0)" onclick="updateCrmEnabledStatusByIds('1','${list.id}','CRM');">
 							启用
 						</a>
 					</c:if>
 				</shiro:hasPermission>
 			</td>
 			<td>
-				<input  id="sort" name="sort" style="width:50px;" value="${newPageFirstNavigation.sort}"  onkeyup="onlynum(this)"  onchange="changeSort(${newPageFirstNavigation.id},this)"></td>
+				<input  id="sort" name="sort" style="width:50px;" value="${list.sort}"  onkeyup="onlynum(this)"  onchange="changeSort(${list.id},this)"></td>
 			</td>
 			<td>
-				<fmt:formatDate value="${newPageFirstNavigation.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				<fmt:formatDate value="${list.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 			</td>
 			<shiro:hasPermission name="newhome:newPageFirstNavigation:edit"><td>
-				<a href="${ctx}/newhome/newPageFirstNavigation/form?id=${newPageFirstNavigation.id}&type=${newPageFirstNavigation.type}">编辑</a>
+				<a href="${ctx}/newhome/newPageFirstNavigation/form?id=${list.id}&type=${list.type}">编辑</a>
 				<%--<c:if test="${newPageFirstNavigation.type eq 0}">
 					<a href="${ctx}/newhome/newPageSecondaryNavigation/?firstNavigationId=${newPageFirstNavigation.id}">二级分类设置</a>
 				</c:if>--%>
 				<shiro:hasPermission name="newhome:newPageFirstNavigation:delete">
-					<a href="${ctx}/newhome/newPageFirstNavigation/delete?id=${newPageFirstNavigation.id}&type=${newPageFirstNavigation.type}" onclick="return confirmx('确定删除该菜单吗?', this.href)">删除</a>
+					<a href="${ctx}/newhome/newPageFirstNavigation/delete?id=${list.id}&type=${list.type}" onclick="return confirmx('确定删除该菜单吗?', this.href)">删除</a>
 				</shiro:hasPermission>
 			</td></shiro:hasPermission>
 		</tr>