Merge remote-tracking branch 'origin/master'

src/main/java/com/yc/education/controller/admin/AuthenticationAdminController.java

@@ -69,7 +69,7 @@ public class AuthenticationAdminController extends BaseController {
             @RequestParam(defaultValue = "") String isPay,
             @RequestParam(defaultValue = "") String nickName,
             @RequestParam(defaultValue = "1") Integer pageNum,
-            @RequestParam(defaultValue = "15") Integer pageSize) {
+            @RequestParam(defaultValue = "10") Integer pageSize) {
 
         ModelAndView mav = new ModelAndView();
 

src/main/java/com/yc/education/controller/admin/ProviderAdminController.java

@@ -201,7 +201,7 @@ public class ProviderAdminController {
         }
 
         int row = iProviderService.updateNotNull(provider);
-        return ViewUtil.returnview(row,"supplierList.html","商家信息列表");
+        return ViewUtil.returnview(row,"providerList.html","商家信息列表");
     }
 
     /**

src/main/webapp/WEB-INF/jsp/admin/authenticationList.jsp

@@ -111,16 +111,16 @@
                         </c:if>
                     </td>
                     <td class="text-l">
-                        <div class="portfoliobox">
 
-                        <a href="${authentication.businessImg}" data-lightbox="gallery"><img src="${authentication.businessImg}" width="50" height="50"/></a>
-                        </div>
+
+                           <a href="${authentication.businessImg}" data-lightbox="gallery" data-title="营业执照"><img src="${authentication.businessImg}" width="50" height="50"/></a>
+
                     </td>
                     <td class="text-l">
-                        <a href="${authentication.idFrontImg}" data-lightbox="gallery">  <img src="${authentication.idFrontImg}" width="50" height="50"/></a>
+                        <a href="${authentication.idFrontImg}" data-lightbox="gallery"  data-title="身份证正面">  <img src="${authentication.idFrontImg}" width="50" height="50"/></a>
                     </td>
                     <td class="text-l">
-                        <a href="${authentication.idReverseImg}" data-lightbox="gallery"> <img src="${authentication.idReverseImg}" width="50" height="50"/></a>
+                        <a href="${authentication.idReverseImg}" data-lightbox="gallery"  data-title="身份证反面"> <img src="${authentication.idReverseImg}" width="50" height="50"/></a>
                     </td>
                     <td><fmt:formatDate value="${authentication.createDate}" pattern="yyyy-MM-dd"></fmt:formatDate></td>
 
@@ -193,6 +193,11 @@
     </div>
 </div>
 </div>
+<script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/layer/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/static/lib/lightbox2/2.8.1/js/lightbox.min.js"></script>
 <script type="text/javascript">
     //全选与反选
     $("#sltall").click(function () {

src/main/webapp/WEB-INF/jsp/admin/ownerServiceList.jsp

@@ -33,21 +33,21 @@
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
-    <%--<form action="ownerServiceList.html" method="post"   enctype="multipart/form-data">
+    <form action="ownerServiceList.html" method="post"   enctype="multipart/form-data">
         <div class="text-c">
-        <span class="select-box inline">
-            <select name="typeId" class="select">
-                <option value="">全部分类</option>
-                <c:forEach items="${ownerType}" var="item">
-                     <option value="${item.id}"
-                             <c:if test="${item.id == type}">selected</c:if> >${item.typeName}</option>
-                </c:forEach>
-            </select>
-		</span>
+            <%-- <span class="select-box inline">
+                 <select name="typeId" class="select">
+                     <option value="">全部分类</option>
+                     <c:forEach items="${ownerType}" var="item">
+                          <option value="${item.id}"
+                                  <c:if test="${item.id == type}">selected</c:if> >${item.typeName}</option>
+                     </c:forEach>
+                 </select>
+             </span>--%>
             <input type="text" name="title" id="title" value="${title}" placeholder="标题" style="width:250px" class="input-text">
             <button class="btn btn-success" type="submit"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </div>
-    </form>--%>
+    </form>
     <div class="cl pd-5 bg-1 bk-gray mt-20">
 			<span class="l">
                 <a class="btn btn-danger radius"  href="javascript:;"  id="delete"    ><i class="Hui-iconfont">&#xe6e2;</i>批量删除</a>