Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1201,7 +1201,12 @@ define([ 'app/app' ], function(app) {
 		//输入框监听Enter事件
 		$scope.listenEnter = function () {
 			if(event.keyCode == 13) {
-				$scope.setPage("page", $scope.params.currentPage);
+				var rnum = /^\d*$/;
+				if (rnum.test($scope.params.currentPage)) {
+					$scope.setPage("page", $scope.params.currentPage);
+				} else {
+					toaster.pop('info', '请输入合法数字');
+				}
 			}
 		};
 
@@ -1245,8 +1250,13 @@ define([ 'app/app' ], function(app) {
 				$scope.params.currentPage = $scope.params.page;
 				return ;
 			}
-			$scope.params.page = page;
-			loadData();
+			var rnum = /^\d*$/;
+			if (rnum.test(page)) {
+				$scope.params.page = page;
+				loadData();
+			} else {
+				toaster.pop('info', '请输入合法数字');
+			}
 		};
 
 		//计算页数的方式。

src/main/webapp/resources/view/common/modal/messageBoard.html

@@ -92,15 +92,12 @@
 		color: #333;
 	}
     .messageBoard .modal-body .ng-table-pager{
+        padding: 0 85px;
         position: absolute;
         bottom: 0;
-        text-align: center;
-        left: 55%;
-        margin-left: -279px;
-    }
-    .messageBoard .modal-body .page-go-block{
-        margin-left: 140px;
-        margin-right: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
     }
     .messageBoard .modal-body p.radioCheck{
         padding-left: 65px;
@@ -210,9 +207,11 @@
         border-bottom: 1px dashed #c5c5c5;
 	}
     .messageBoard .modal-body .msg-table{
+        position: relative;
         overflow: auto;
         height: 372px;
-        width: 670px;
+        /* width: 670px; */
+        width: 100%;
         margin-top: 10px;
     }
     .messageBoard .modal-body .msg-table .form-group{
@@ -396,11 +395,10 @@
     }
 
     .messageBoard div.ng-table-pager  input.page-number {
-        vertical-align: inherit;
         display: inline-block;
+        margin-bottom: 10px;
         width: 37px;
-        height: 28px;
-        padding: 6px 6px;
+        height: 30px;
         font-size: 12px;
         line-height: 1.42857143;
         color: #9B9792;
@@ -419,22 +417,20 @@
         cursor: pointer;
         background-color: #4574E8;
         border-color: #4574E8;
-        padding: 5.55px 6px;
         font-size: 12px;
         border-top-right-radius: 4px;
         border-bottom-right-radius: 4px;
         text-decoration: none;
-        height: 31px;
     }
 
     .messageBoard div.ng-table-pager div.page-go-block {
         float: right;
-        font-size: 0px;
+        font-size: 0;
         height: 31px;
-        margin-top: 20px;
         line-height: 31px;
     }
     .messageBoard .ng-table-pager .ng-table-pagination{
+        float: left;
         text-align: center;
         max-width: 460px;
     }
@@ -454,6 +450,12 @@
     .messageBoard .modal-body .history:nth-of-type(3){
         border-bottom: none;
     }
+    .modal.in .modal-dialog{
+        width: 680px;
+    }
+    .modal.in .modal-dialog .modal-content{
+        width: 100%;
+    }
 </style>
 <!--游客状态-->
 <div class="messageBoard">
@@ -559,24 +561,25 @@
             <div ng-if="messageBoardCurrent.length == 0" class="text-center">
                 <div>无留言记录</div>
             </div>
+        </div>
 
-            <div class="ng-cloak ng-table-pager text-center" ng-if="pages.length">
-                <ul class="pagination ng-table-pagination">
-                    <li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">
-                        <a ng-switch-when="prev" ng-click="setPage(page.type, -1)">&laquo;</a>
-                        <a ng-switch-when="first" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
-                        <a ng-switch-when="page" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
-                        <a ng-switch-when="more" ng-click="setPage(page.type, -1)">&#8230;</a>
-                        <a ng-switch-when="last" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
-                        <a ng-switch-when="next" ng-click="setPage(page.type, -1)">&raquo;</a>
-                    </li>
-                </ul>
-                <div class="page-go-block">
-                    <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
-                    <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
-                </div>
+        <div class="ng-cloak ng-table-pager text-center" ng-show="user.userUU && showHistory" ng-if="pages.length">
+            <ul class="pagination ng-table-pagination">
+                <li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">
+                    <a ng-switch-when="prev" ng-click="setPage(page.type, -1)">&laquo;</a>
+                    <a ng-switch-when="first" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
+                    <a ng-switch-when="page" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
+                    <a ng-switch-when="more" ng-click="setPage(page.type, -1)">&#8230;</a>
+                    <a ng-switch-when="last" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
+                    <a ng-switch-when="next" ng-click="setPage(page.type, -1)">&raquo;</a>
+                </li>
+            </ul>
+            <div class="page-go-block">
+                <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
+                <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
             </div>
         </div>
+
         <div ng-if="user.userUU && !showHistory" class="msg-slide1" ng-click="openHistory()">
             <i class="fa fa-angle-left"></i><span>留言记录</span>
         </div>