fe / mars-static · Commits

Go to a project

Authored by 李靖
Commit ce8c664fcda0f2ccfe3a3dc0df8c7a88b510c852 2 parents e2d56fd6 564c5ca6

Merge branch 'hotfix/areaOnline' into feature/mip

Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
1 { 1 {
2 "name": "mars-static", 2 "name": "mars-static",
3 "private": true, 3 "private": true,
4 - "version": "1.0.10", 4 + "version": "1.0.11",
5 "description": "mars-static", 5 "description": "mars-static",
6 "main": "build.js", 6 "main": "build.js",
7 "scripts": { 7 "scripts": {
@@ -11,7 +11,7 @@ let moreObj = { @@ -11,7 +11,7 @@ let moreObj = {
11 }, 11 },
12 init: function() { 12 init: function() {
13 this.domInit(); 13 this.domInit();
14 - this.page = 1; 14 + this.page = $('#currentPage').val() || 1;
15 this.loading = false; 15 this.loading = false;
16 this.end = false; 16 this.end = false;
17 this.scroll(); 17 this.scroll();
@@ -11,7 +11,7 @@ let moreObj = { @@ -11,7 +11,7 @@ let moreObj = {
11 }, 11 },
12 init: function() { 12 init: function() {
13 this.domInit(); 13 this.domInit();
14 - this.page = 1; 14 + this.page = $('#currentPage').val() || 1;
15 this.loading = false; 15 this.loading = false;
16 this.end = false; 16 this.end = false;
17 this.scroll(); 17 this.scroll();