Merge remote-tracking branch 'origin/dev_20230831_problem' into dev_20230831_problem
This commit is contained in:
@@ -411,12 +411,12 @@ export default {
|
|||||||
this.loading = true
|
this.loading = true
|
||||||
getAction(this.url.page, query).then((res) => {
|
getAction(this.url.page, query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
if (res.result.current > 1 && res.result.length == 0) {
|
if (res.result.current > 1 && res.result.records.length == 0) {
|
||||||
this.pageNo = 1
|
this.pageNo = 1
|
||||||
this.getList()
|
this.getList()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.dataSource = res.result || []
|
this.dataSource = res.result.records || []
|
||||||
this.total = res.result.total
|
this.total = res.result.total
|
||||||
this.loading = false
|
this.loading = false
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user