前端代码合并提交

src/config/globle.js

@@ -1,4 +1,4 @@
-window.hostUrl = `http://127.0.0.1:18081/`;
+//window.hostUrl = `http://127.0.0.1:18081/`;
 //window.hostUrl = `http://192.168.50.4:18081/`;
-//window.hostUrl = `http://invoice.jkcredit.com:80/`;
+window.hostUrl = `http://invoice.jkcredit.com:80/`;
 window.tableHeight = (document.body.clientHeight * 0.6 - 20)

src/views/customer/custRecMoney.vue

@@ -62,7 +62,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/customer/customerComPanyDetail.vue

@@ -94,7 +94,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50 ,100]"
+        :page-sizes="[6, 8, 10, 20, 50 ,100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/customer/customerRecharge.vue

@@ -70,7 +70,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/customerRechargeMoney/customerRechargeMoney.vue

@@ -59,7 +59,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/manager/paramMagager.vue

@@ -58,7 +58,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50 ,100]"
+        :page-sizes="[6, 8, 10, 20, 50 ,100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/noCar/billway.vue

@@ -195,7 +195,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/noCar/billwayException.vue

@@ -178,7 +178,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/noCar/billwayHis.vue

@@ -197,7 +197,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/noCar/calculateInfo.vue

@@ -83,7 +83,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/noCar/invoice.vue

@@ -257,7 +257,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/noCar/invoiceHis.vue

@@ -257,7 +257,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/noCar/nocarRec.vue

@@ -118,7 +118,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/selfCar/calculateInfo.vue

@@ -73,7 +73,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/selfCar/invoice.vue

@@ -216,7 +216,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/selfCar/selfCarTrade.vue

@@ -129,7 +129,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/selfCar/selfCarTradeException.vue

@@ -111,7 +111,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">

src/views/selfCar/selfcarRec.vue

@@ -140,7 +140,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="current"
-        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-sizes="[6, 8, 10, 20, 50, 100,500,1000]"
         :page-size="pagesize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">