快捷运营bugfix

src/main/java/com/caimei/modules/newhome/entity/NewPageFirstNavigation.java

@@ -31,6 +31,13 @@ public class NewPageFirstNavigation extends DataEntity<NewPageFirstNavigation> {
      * 跳转链接
      */
     private String link;
+
+
+
+    /**
+     * 备注
+     */
+    private String remark;
     private String sort;        // 排序
     private String wwwEnabledStatus;        // Pc端状态 0停用 1启用
 
@@ -47,6 +54,14 @@ public class NewPageFirstNavigation extends DataEntity<NewPageFirstNavigation> {
         super(id);
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public String getNavigationName() {
         return navigationName;
     }
@@ -107,4 +122,4 @@ public class NewPageFirstNavigation extends DataEntity<NewPageFirstNavigation> {
     public void setCrmEnabledStatus(String crmEnabledStatus) {
         this.crmEnabledStatus = crmEnabledStatus;
     }
-}
+}

src/main/java/com/caimei/modules/newhome/web/NewPageFirstNavigationController.java

@@ -121,7 +121,7 @@ public class NewPageFirstNavigationController extends BaseController {
         newPageFirstNavigationService.delete(newPageFirstNavigation);
         addMessage(redirectAttributes, "删除成功");
         cleanRedisCache();// 清理redis缓存
-        return "redirect:" + Global.getAdminPath() + "/newhome/newPageFirstNavigation/?repage";
+        return "redirect:" + Global.getAdminPath() + "/newhome/newPageFirstNavigation/?repage&type="+newPageFirstNavigation.getType();
     }
 
     @RequiresPermissions("newhome:newPageFirstNavigation:edit")

src/main/resources/mappings/modules/newhome/NewPageFirstNavigationMapper.xml

@@ -8,6 +8,7 @@
 		a.type AS "type",
 		a.icon AS "icon",
 		a.link AS "link",
+		a.remark AS "remark",
 		a.sort AS "sort",
 		a.wwwEnabledStatus AS "wwwEnabledStatus",
 		a.crmEnabledStatus AS "crmEnabledStatus",
@@ -73,6 +74,7 @@
 			navigationName,
 			type,
 			link,
+			remark,
 			icon,
 			sort,
 			wwwEnabledStatus,
@@ -86,6 +88,7 @@
 			#{navigationName},
 			#{type},
 			#{link},
+			#{remark},
 			#{icon},
 			#{sort},
 			#{wwwEnabledStatus},
@@ -103,6 +106,7 @@
 			navigationName = #{navigationName},
 			type = #{type},
 			link = #{link},
+			remark = #{remark},
 			icon = #{icon},
 			sort = #{sort},
 			wwwEnabledStatus = #{wwwEnabledStatus},

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

@@ -73,7 +73,7 @@
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>小程序状态：</label>
         <div class="controls">
             <form:select path="crmEnabledStatus" class="input-xlarge required">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false"  />
             </form:select>
         </div>
     </div>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheCentreForm.jsp

@@ -65,7 +65,7 @@
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>状态：</label>
         <div class="controls">
             <form:select path="crmEnabledStatus" class="input-xlarge required">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false"  />
             </form:select>
         </div>
     </div>
@@ -75,4 +75,4 @@
     </div>
 </form:form>
 </body>
-</html>
+</html>

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

@@ -172,11 +172,19 @@
 		<form:hidden path="type"/>
 		<sys:message content="${message}"/>
 		<div class="control-group">
-			<label class="control-label"><font color="red">*</font>主菜单名称：</label>
+			<label class="control-label"><font color="red">*</font><c:if test="${newPageFirstNavigation.type==0}">主</c:if>菜单名称：</label>
 			<div class="controls">
-				<form:input path="navigationName" htmlEscape="false" cssStyle="position: relative" maxlength="6" class="required input-xlarge "/>
+				<form:input path="navigationName" htmlEscape="false" cssStyle="position: relative" maxlength="5" class="required input-xlarge "/>
 			</div>
 		</div>
+		<c:if test="${newPageFirstNavigation.type!=0}">
+		<div class="control-group">
+			<label class="control-label"><c:if test="${newPageFirstNavigation.type==0}">主</c:if>菜单备注：</label>
+			<div class="controls">
+				<form:input path="remark" htmlEscape="false" cssStyle="position: relative" maxlength="8" class=" input-xlarge "/>
+			</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">
@@ -203,7 +211,7 @@
 			<label class="control-label"><font color="red">*</font>网站状态：</label>
 			<div class="controls">
 				<form:select path="wwwEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 				</form:select>
 			</div>
 		</div>
@@ -211,7 +219,7 @@
 			<label class="control-label"><font color="red">*</font>小程序状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false"/><%--label="${fns:getDictList('enabled_status')[0]}"--%>
 				</form:select>
 			</div>
 		</div>

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

@@ -33,7 +33,7 @@
 						} else {
 							$.jBox.tip(data.msg,'error');
 						}
-						$("#searchForm").submit();
+						g();
 					},"JSON");//这里返回的类型有：json,html,xml,text
 				}
 				return;
@@ -54,7 +54,7 @@
 						} else {
 							$.jBox.tip(data.msg,'error');
 						}
-						$("#searchForm").submit();
+						g();
 					},"JSON");//这里返回的类型有：json,html,xml,text
 				}
 				return;
@@ -115,11 +115,11 @@
 	<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>
 </ul>
-<form:form id="searchForm" modelAttribute="newPageFirstNavigation" action="${ctx}/newhome/newPageFirstNavigation/" method="post" class="breadcrumb form-search">
+<form:form id="searchForm" modelAttribute="newPageFirstNavigation" action="${ctx}/newhome/newPageFirstNavigation?type${newPageFirstNavigation.type}" method="get" class="breadcrumb form-search">
 	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 	<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 	<input class="btn btn-primary" style="width:80px" onclick="batchSaveSort()" value="一键排序"/>&nbsp;&nbsp;&nbsp;&nbsp;
-	<input class="btn btn-primary" style="width:80px" onclick="window.location='${ctx}/newhome/newPageFirstNavigation/form?type=${newPageFirstNavigation.type}'" value="添加主菜单"/>
+	<input class="btn btn-primary" style="width:${newPageFirstNavigation.type==0?80:120}px" onclick="window.location='${ctx}/newhome/newPageFirstNavigation/form?type=${newPageFirstNavigation.type}'" value="添加${newPageFirstNavigation.type==0?"主":"快捷运营"}菜单"/>
 	<input class="btn btn-primary" style="width:100px" onclick="updateStaticHome()" value="生成静态首页"/>
 	<div style="margin-top: 10px">
 		<label><font color="#a9a9a9">注：排序值越小越靠前</font></label>
@@ -130,7 +130,7 @@
 	<thead>
 	<tr>
 		<th>ID</th>
-		<th>主菜单名称</th>
+		<th><c:if test="${newPageFirstNavigation.type==0}">主</c:if>菜单名称</th>
 		<th>图标</th>
 		<th>跳转链接</th>
 		<th>网站状态</th>
@@ -200,7 +200,7 @@
 					<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}" onclick="return confirmx('确定删除该菜单吗？', this.href)">删除</a>
+					<a href="${ctx}/newhome/newPageFirstNavigation/delete?id=${newPageFirstNavigation.id}&type=${newPageFirstNavigation.type}" onclick="return confirmx('确定删除该菜单吗？', this.href)">删除</a>
 				</shiro:hasPermission>
 			</td></shiro:hasPermission>
 		</tr>

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

@@ -66,7 +66,7 @@
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>网站状态：</label>
 			<div class="controls">
 				<form:select path="wwwEnabledStatus" class="input-xlarge required">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false"  />
 				</form:select>
 			</div>
 		</div>
@@ -74,7 +74,7 @@
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>小程序状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge required">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false"  />
 				</form:select>
 			</div>
 		</div>

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

@@ -38,10 +38,10 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-<%--		<li class="active"><a href="${ctx}/order/cmPayShop/">付款列表</a></li>--%>
-<%--		<shiro:hasPermission name="order:cmPayShop:view">--%>
-<%--            <li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>--%>
-<%--			<li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>--%>
+		<li class="active"><a href="${ctx}/order/cmPayShop/">付款列表</a></li>
+		<shiro:hasPermission name="order:cmPayShop:view">
+            <li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
+			<li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
 		<shiro:hasPermission name="order:cmPayShop:split">
 			<li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
 		</shiro:hasPermission>

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

@@ -292,9 +292,9 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-<%--    <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>--%>
-<%--    <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>--%>
-<%--    <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>--%>
+    <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>
+    <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
+    <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
     <shiro:hasPermission name="order:cmPayShop:split">
         <li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
     </shiro:hasPermission>

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

@@ -292,9 +292,9 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-<%--     <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>--%>
-<%--     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>--%>
-<%--     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>--%>
+     <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>
+     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
+     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
      <shiro:hasPermission name="order:cmPayShop:split">
          <li class="active tab-li"><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
      </shiro:hasPermission>