Merge branch 'master' of http://114.55.54.52:3000/zmm/GBRSWN

CZKJ.GBRS2.WebMVC/Views/PriceAnnouncement/Index.cshtml

@@ -3,6 +3,8 @@
     <link rel="stylesheet" href="@ConfigHelper.GetCDNPrefix()/assets/css/info.css">
     <link href="@ConfigHelper.GetCDNPrefix()/assets/css/rate.css" rel="stylesheet" />
     <link rel="stylesheet" href="@ConfigHelper.GetCDNPrefix()/assets/css/pikaday.css">
+    <link rel="stylesheet" href="@ConfigHelper.GetCDNPrefix()/assets/plugins/page/paging.css">
+
     <style>
         .filterInp .d-close {
             position: absolute;
@@ -103,6 +105,7 @@
                         </tr>
                     }
                 </table>
+                <div class="pageDiv"></div>
             </div>
         </div>
     </div>
@@ -110,6 +113,7 @@
 @section script{
     <script src="/assets/plugins/date/pikaday.js"></script>
     <script src="/assets/plugins/date/moment.js"></script>
+    <script src="/assets/plugins/page/jquery.page.js"></script>
     <script>
         $('.filSelect').click(function () {
             if ($('.filOption').css('display') === "none") {
@@ -262,4 +266,20 @@
 
         })
     </script>
+    @*分页*@
+    <script>
+         //分页
+            var pageSize =10;
+            var rowsCount = @(Model.RowsCount);
+            var pageIndex = @(Model.PageIndex);
+            $(".pageDiv").createPage({
+                pageCount: Math.ceil(rowsCount / pageSize), //总页数
+                current: pageIndex, //当前页
+                turndown: 'false',
+                backFn: function (p) {
+                    pageIndex = p;
+                    location.href = "@Url.Action("Index", "publicInfo", new {TypeId= Model.TypeId})&pageIndex=" + pageIndex + "&pageSize=" + pageSize;
+                }
+            });
+    </script>
 }

CZKJ.GBRS2.WebMVC/Views/PublicInfo/Index.cshtml

@@ -164,7 +164,7 @@
             });
             $("a.active").parents("ul").show().siblings("a").addClass("active cur");
             //分页
-            var pageSize =10;
+            var pageSize =1;
             var rowsCount = @(Model.RowsCount);
             var pageIndex = @(Model.PageIndex);
             $(".pageDiv").createPage({
@@ -173,7 +173,7 @@
                 turndown: 'false',
                 backFn: function (p) {
                     pageIndex = p;
-                    location.href = "@Url.Action("Index", "publicInfo", new {TypeId= Model.TypeId})&pageIndex=" + pageIndex + "&pageSize=" + pageSize;
+                    location.href = "@Url.Action("Index", "PriceAnnouncement", new {TypeId= Model.TypeId})&pageIndex=" + pageIndex + "&pageSize=" + pageSize;
                 }
             });
         })

CZKJ.GBRS2.WebMVC/wwwroot/assets/css/pikaday.css

@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "UTF-8";
 
 /*!
  * Pikaday
@@ -6,7 +6,7 @@
  */
 
 .pika-single {
-    z-index: 9999;
+    z-index: 99;
     display: block;
     position: relative;
     color: #333;