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

src/main/webapp/resources/view/admin/common/message/internalMessageList.html

@@ -175,7 +175,7 @@
                     </li>
                 </ul>
                 <div class="page-go-block">
-                    <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
+                    <input class="page-number" type="number" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
                     <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
                 </div>
             </div>

src/main/webapp/resources/view/admin/common/message/modal/internalMessageLogList.html

@@ -135,7 +135,7 @@
                 </li>
             </ul>
             <div class="page-go-block">
-                <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
+                <input class="page-number" type="number" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
                 <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
             </div>
         </div>

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

@@ -413,6 +413,9 @@
     }
 
     .messageBoard div.ng-table-pager a.page-a {
+        display: inline-block;
+        width: 35px;
+        height: 30px;
         color: #fff;
         cursor: pointer;
         background-color: #4574E8;
@@ -424,12 +427,14 @@
     }
 
     .messageBoard div.ng-table-pager div.page-go-block {
+        /*padding-top: 20px;*/
         float: right;
         font-size: 0;
         height: 31px;
         line-height: 31px;
     }
     .messageBoard .ng-table-pager .ng-table-pagination{
+        margin-top: 0;
         float: left;
         text-align: center;
         max-width: 460px;
@@ -575,7 +580,7 @@
                 </li>
             </ul>
             <div class="page-go-block">
-                <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
+                <input class="page-number" type="number" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
                 <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
             </div>
         </div>

src/main/webapp/resources/view/usercenter/forstore/browsing_history.html

@@ -440,7 +440,7 @@
                 </li>
             </ul>
             <div class="page-go-block">
-                <input class="page-number" type="text" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
+                <input class="page-number" type="number" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
                 <a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
             </div>
         </div>

src/main/webapp/resources/view/usercenter/forstore/messagePersonal.html

@@ -152,7 +152,7 @@
             </li>
         </ul>
         <div class="page-go-block">
-            <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
+            <input class="page-number" type="number" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
             <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
         </div>
     </div>

src/main/webapp/resources/view/usercenter/forstore/messagePublic.html

@@ -131,7 +131,7 @@
             </li>
         </ul>
         <div class="page-go-block">
-            <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
+            <input class="page-number" type="number" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
             <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
         </div>
     </div>

src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -324,7 +324,7 @@
                             </li>
                         </ul>
                         <div class="page-go-block">
-                            <input class="page-number" type="text" ng-model="tradeRecordPage.number" ng-keydown="listenEnter()"/>
+                            <input class="page-number" type="number" ng-model="tradeRecordPage.number" ng-keydown="listenEnter()"/>
                             <a class="page-a" ng-click="setPage('page', tradeRecordPage.number)" href="">GO</a>
                         </div>
                     </div>

src/main/webapp/resources/view/usercenter/forstore/store_focus.html

@@ -404,7 +404,7 @@
 					</li>
 				</ul>
 				<div class="page-go-block">
-					<input class="page-number" type="text" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
+					<input class="page-number" type="number" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
 					<a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
 				</div>
 			</div>

src/main/webapp/resources/view/vendor/forstore/messagePersonal.html

@@ -152,7 +152,7 @@
             </li>
         </ul>
         <div class="page-go-block">
-            <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
+            <input class="page-number" type="number" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
             <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
         </div>
     </div>

src/main/webapp/resources/view/vendor/forstore/messagePublic.html

@@ -131,7 +131,7 @@
             </li>
         </ul>
         <div class="page-go-block">
-            <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
+            <input class="page-number" type="number" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
             <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
         </div>
     </div>

src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -556,7 +556,7 @@
                         </li>
                     </ul>
                     <div class="page-go-block">
-                        <input class="page-number" type="text" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
+                        <input class="page-number" type="number" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
                         <a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
                     </div>
                 </div>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -423,6 +423,13 @@
 	.pro_management .table tr td div span.switch button.active{
 		background: url("static/img/icon/check-ok.png") no-repeat center;
 	}
+	/*分页鼠标悬停效果*/
+	.device .wanted_list01 a:hover {
+		 border-bottom: 1px solid #ddd!important;
+	}
+	.device .wanted_list01 a.page-a:hover{
+		color: #fff!important;
+	}
 </style>
 <div class="user_right fr">
 	<!--货品管理-->
@@ -645,7 +652,7 @@
 						</li>
 					</ul>
 					<div class="page-go-block">
-						<input class="page-number" type="text" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
+						<input class="page-number" type="number" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
 						<a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
 					</div>
 				</div>

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -821,7 +821,7 @@
                         </li>
                     </ul>
                     <div class="page-go-block">
-                        <input class="page-number" type="text" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
+                        <input class="page-number" type="number" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
                         <a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
                     </div>
                 </div>

src/main/webapp/resources/view/vendor/forstore/vendor_undercarriage.html

@@ -533,6 +533,13 @@
     .text-more-80 span.text-more{
         width: 50px;
     }
+    /*分页鼠标悬停效果*/
+    .device .wanted_list01 a:hover {
+        border-bottom: 1px solid #ddd!important;
+    }
+    .device .wanted_list01 a.page-a:hover{
+        color: #fff!important;
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->
@@ -732,7 +739,7 @@
                         </li>
                     </ul>
                     <div class="page-go-block">
-                        <input class="page-number" type="text" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
+                        <input class="page-number" type="number" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
                         <a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
                     </div>
                 </div>