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

src/main/webapp/resources/css/common.css

@@ -932,4 +932,11 @@ input:required:invalid, input:focus:invalid, textarea:required:invalid, textarea
 .edit-icon button.up:hover{
 	background: #5078cb;
 	color: #fff;
+}
+
+/* 去除数字输入框的上下箭头 */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+	-webkit-appearance: none !important;
+	margin: 0;
 }

src/main/webapp/resources/css/common/common.css

@@ -99,4 +99,11 @@ img {
 }
 .ng-table-pagination .page-a:hover{
     background: #5078cb !important;
+}
+
+/* 去除数字输入框的上下箭头 */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none !important;
+    margin: 0;
 }

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

@@ -828,7 +828,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_order.html

@@ -1247,7 +1247,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>