bugfix

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

@@ -159,10 +159,8 @@ public class NewPageFloorController extends BaseController {
 
     @RequestMapping(value = "ContentPage")
     public String ContentPage(NewPageFloor newPageFloor,Product product, Model model, HttpServletRequest request, HttpServletResponse response) {
-         List<Product> list =productService.newfindProductImage(product);
-        Page<NewPageFloor> page = newPageFloorService.floorFindList(new Page<NewPageFloor>(request, response), newPageFloor);
-        model.addAttribute("page", page);
-        model.addAttribute("list", list);
+        Page<Product> list =productService.newfindProductImage(new Page<Product>(request, response),product);
+        model.addAttribute("page", list);
         return "modules/newhome/newFloorcontentForm";
     }
 

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -550,8 +550,10 @@ public class ProductService extends CrudService<ProductDao, Product> {
         return productPage;
     }
 
-   public List<Product> newfindProductImage(Product product){
-        return productDao.newfindProductImage(product);
+    public Page<Product> newfindProductImage(Page<Product> Page, Product product) {
+        List<Product> productList = productDao.newfindProductImage(product);
+        Page.setList(productList);
+        return Page;
    }
 
     public String findProductDetail(Integer productID) {

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

@@ -129,10 +129,11 @@
 		<li><a href="${ctx}/newhome/newPageFloor/lists">固定楼层管理列表</a></li>
 		<li class="active"><a href="${ctx}/newhome/newPageFloor/ContentPage">内容</a></li>
 	</ul>
-	<form:form id="searchForm" action="${ctx}/newhome/newPageFloor/ContentPage" class="breadcrumb form-search">
+	<form:form id="searchForm" modelAttribute="" action="${ctx}/newhome/newPageFloor/ContentPage" class="breadcrumb form-search">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 		<div class="ul-form">
+
 			<label>商品ID：</label>
 			<input name="productID" path="productID" maxlength="50" class="input-medium"/>
 			<label>商品名称：</label>
@@ -166,7 +167,7 @@
 			</tr>
 		</thead>
 		<tbody>
-		<c:forEach items="${list}" var="list">
+		<c:forEach items="${page.list}" var="list">
 			<tr>
 
 				<td>${list.productID}</td>
@@ -183,10 +184,9 @@
 						<font color="red">已下线</font>
 					</c:if></td>
 				<td><fmt:formatDate value="${list.showTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-				</c:forEach>
-<c:forEach items="${page.list}" var="newPageFloor">
-	<input class="check-item" type="hidden" id="preferredProductSort${newPageFloor.id}" value='${newPageFloor.id}-${newPageFloor.sort}'/>
-				<td><input  id="sort" name="sort" style="width:50px;" value="${newPageFloor.sort}"  onkeyup="onlynum(this)"  onchange="changeSort(${newPageFloor.id},this)"></td><%----%>
+	           <input class="check-item" type="hidden" id="preferredProductSort${newPageFloor.id}" value='${newPageFloor.id}-${list.sortIndex}'/>
+				<td><input  id="sort" name="sort" style="width:50px;" value="${list.sortIndex}"  onkeyup="onlynum(this)"  onchange="changeSort(${newPageFloor.id},this)"></td>
+				<td>${list.recommend}</td>
 				<td>
 		          <a class="red" href="javascript:void(0);" onclick="offoce()">更改展示时间</a>
                </td>

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

@@ -497,13 +497,13 @@
                     </td>
                     <td>
                         <c:if test="${s.refundType == 1}">
-                            <font color="#ff8c00">部分退款</font>
+                            <font>部分退款</font>
                         </c:if>
                         <c:if test="${s.refundType == 2}">
-                            <font color="green">已退款</font>
+                            <font>已退款</font>
                         </c:if>
                         <c:if test="${s.refundType != 1 && s.refundType != 2}">
-                            <font color="red">无退款</font>
+                            <font>无退款</font>
                         </c:if>
                     </td>
                     <td><fmt:formatNumber value="${s.returnValue}" type="number" pattern="#,##0.00"/></td>