Merge remote-tracking branch 'origin/dev' into dev
						commit
						2d32483388
					
				|  | @ -100,7 +100,7 @@ export default { | |||
|       ).then((data) => { | ||||
|         this.listLoading = false | ||||
|         this.varList = data.varList | ||||
|         this.total = data.page.totalResult | ||||
|         this.total = data.total | ||||
|         this.hasButton() | ||||
|       }).catch((e) => { | ||||
|         this.listLoading = false | ||||
|  |  | |||
|  | @ -107,7 +107,7 @@ export default { | |||
|       ).then((data) => { | ||||
|         this.listLoading = false | ||||
|         this.varList = data.varList | ||||
|         this.total = data.page.totalResult | ||||
|         this.total = data.total | ||||
|         this.hasButton() | ||||
|       }).catch((e) => { | ||||
|         this.listLoading = false | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue