Commit c885d4536083616c9f3a53a16b58083c54cbf7c0
Merge branch 'fix/DEFECT-1958' into 'main_dev'
fix: 修复当设备下拉刷新，下拉到底，点击设备，然后返回后设备显示不全 See merge request yunteng/thingskit-app!155
Showing
1 changed file
with
6 additions
and
4 deletions
| @@ -69,15 +69,17 @@ | @@ -69,15 +69,17 @@ | ||
| 69 | this.conditions = { | 69 | this.conditions = { |
| 70 | deviceState: params | 70 | deviceState: params |
| 71 | } | 71 | } |
| 72 | - this.loadData(1, { | ||
| 73 | - deviceState: params | ||
| 74 | - }); | 72 | + // this.loadData(1, { |
| 73 | + // deviceState: params | ||
| 74 | + // }); | ||
| 75 | } | 75 | } |
| 76 | }, | 76 | }, |
| 77 | onShow() { | 77 | onShow() { |
| 78 | + console.log(2) | ||
| 78 | if (getApp().getBindNot()) { | 79 | if (getApp().getBindNot()) { |
| 79 | return | 80 | return |
| 80 | } | 81 | } |
| 82 | + this.page.num=1 | ||
| 81 | if (this.ordId) { | 83 | if (this.ordId) { |
| 82 | this.loadData(1, { | 84 | this.loadData(1, { |
| 83 | organizationId: this.ordId | 85 | organizationId: this.ordId |
| @@ -87,7 +89,7 @@ | @@ -87,7 +89,7 @@ | ||
| 87 | } | 89 | } |
| 88 | return | 90 | return |
| 89 | } | 91 | } |
| 90 | - this.loadData(1); | 92 | + this.loadData(this.page.num,this.conditions); |
| 91 | }, | 93 | }, |
| 92 | methods: { | 94 | methods: { |
| 93 | inputChanged(e) { | 95 | inputChanged(e) { |