Authored by 陈峰

Merge branch 'feature/pageSize' into 'master'

Feature/page size



See merge request !96
@@ -11,6 +11,7 @@ export default function() { @@ -11,6 +11,7 @@ export default function() {
11 useFilter: false, 11 useFilter: false,
12 isExporting: false, 12 isExporting: false,
13 showOutStock: false, 13 showOutStock: false,
  14 + showBackTop: false,
14 deliverRows: [], 15 deliverRows: [],
15 filters: { 16 filters: {
16 orderNo: { 17 orderNo: {
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <Table border :columns="table.cols" :data="table.list" 51 <Table border :columns="table.cols" :data="table.list"
52 :row-class-name="rowClassName" @on-selection-change="selectChange"></Table> 52 :row-class-name="rowClassName" @on-selection-change="selectChange"></Table>
53 <Page :total="page.total" :current="page.current" 53 <Page :total="page.total" :current="page.current"
54 - @on-change="pageChange" :page-size="20" show-total></Page> 54 + @on-change="pageChange" :page-size="100" show-total></Page>
55 </layout-list> 55 </layout-list>
56 56
57 <allot-deliver 57 <allot-deliver
@@ -62,6 +62,9 @@ @@ -62,6 +62,9 @@
62 ref="stockOutModal" 62 ref="stockOutModal"
63 @upload-success="uploadSuccess"> 63 @upload-success="uploadSuccess">
64 </modal-stock-out> 64 </modal-stock-out>
  65 + <div v-show="showBackTop" class="back-top" @click="backTop">
  66 + <Icon type="chevron-up" class="icon"></Icon>
  67 + </div>
65 </div> 68 </div>
66 </template> 69 </template>
67 70
@@ -86,13 +89,25 @@ @@ -86,13 +89,25 @@
86 this.useFilter = true; 89 this.useFilter = true;
87 } 90 }
88 this.productList(this.params()); 91 this.productList(this.params());
  92 +
  93 + },
  94 + mounted() {
  95 + const decide = _.throttle(e => {
  96 + const show = e.target.scrollTop > 500;
  97 +
  98 + if (this.showBackTop !== show) {
  99 + this.showBackTop = show;
  100 + }
  101 + }, 100);
  102 +
  103 + document.querySelector('.layout-content').addEventListener('scroll', decide);
89 }, 104 },
90 components: {AllotDeliver}, 105 components: {AllotDeliver},
91 methods: { 106 methods: {
92 params() { 107 params() {
93 let params = { 108 let params = {
94 pageNo: 1, 109 pageNo: 1,
95 - pageSize: 20, 110 + pageSize: 100,
96 statusList: [1] 111 statusList: [1]
97 }; 112 };
98 113
@@ -345,6 +360,9 @@ @@ -345,6 +360,9 @@
345 const href = `/Api/erp/allotExportList?${temp.join('&')}`; 360 const href = `/Api/erp/allotExportList?${temp.join('&')}`;
346 361
347 window.open(href, '_blank'); 362 window.open(href, '_blank');
  363 + },
  364 + backTop() {
  365 + document.querySelector('.layout-content').scrollTop = 0;
348 } 366 }
349 } 367 }
350 }; 368 };
@@ -361,4 +379,21 @@ @@ -361,4 +379,21 @@
361 font-weight: bold; 379 font-weight: bold;
362 } 380 }
363 } 381 }
  382 +
  383 +.back-top {
  384 + position: fixed;
  385 + z-index: 5;
  386 + padding: 8px 12px;
  387 + right: 30px;
  388 + bottom: 90px;
  389 + border-radius: 2px;
  390 + background-color: rgba(0, 0, 0, 0.6);
  391 + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
  392 + transition: all 0.2s ease-in-out;
  393 +
  394 + .icon {
  395 + color: #fff;
  396 + font-size: 24px;
  397 + }
  398 +}
364 </style> 399 </style>
1 { 1 {
2 "name": "yoho-shop-manage", 2 "name": "yoho-shop-manage",
3 - "version": "1.0.35", 3 + "version": "1.0.36",
4 "description": "", 4 "description": "",
5 "main": "app.js", 5 "main": "app.js",
6 "scripts": { 6 "scripts": {