Commit 2b7b08d0 by 刘海龙

no message

parent 4313a9de
...@@ -459,6 +459,7 @@ ...@@ -459,6 +459,7 @@
url: "{:U('exams/Index/paper')}" + "&api=2&c=" + that.conditionId +"&p=" + this.page, url: "{:U('exams/Index/paper')}" + "&api=2&c=" + that.conditionId +"&p=" + this.page,
dataType: "json", dataType: "json",
success: function(res) { success: function(res) {
if(that.page<res.data.totalPages*1||that.page==res.data.totalPages*1){
if(res.status == 1) { if(res.status == 1) {
let array = res.data.data.length > 0 ? res.data.data : [] let array = res.data.data.length > 0 ? res.data.data : []
let download = [].concat(array.map( r => { let download = [].concat(array.map( r => {
...@@ -485,6 +486,9 @@ ...@@ -485,6 +486,9 @@
})) }))
} }
} }
}else{
console.log("数据已加载完")
}
} }
}) })
}, },
...@@ -496,6 +500,7 @@ ...@@ -496,6 +500,7 @@
url: "{:U('home/Home/exams')}" + "?api=1" +"&p=" + this.page, url: "{:U('home/Home/exams')}" + "?api=1" +"&p=" + this.page,
dataType: "json", dataType: "json",
success: function(res) { success: function(res) {
if(that.page<res.data.totalPages*1||that.page==res.data.totalPages*1){
if(res.status == 1) { if(res.status == 1) {
let array = res.data.data.length > 0 ? res.data.data : [] let array = res.data.data.length > 0 ? res.data.data : []
let myYiZuo = [].concat(array.map( r => { let myYiZuo = [].concat(array.map( r => {
...@@ -510,6 +515,9 @@ ...@@ -510,6 +515,9 @@
that.myYiZuo = that.myYiZuo.concat(myYiZuo) that.myYiZuo = that.myYiZuo.concat(myYiZuo)
that.page ++ that.page ++
} }
}else{
console.log("数据已加载完")
}
} }
}) })
}, },
...@@ -525,6 +533,7 @@ ...@@ -525,6 +533,7 @@
url: "{:U('home/Home/exams')}" + "?api=1&tab=4&p=" + this.page, url: "{:U('home/Home/exams')}" + "?api=1&tab=4&p=" + this.page,
dataType: "json", dataType: "json",
success: function(res) { success: function(res) {
if(that.page<res.data.totalPages*1||that.page==res.data.totalPages*1){
if(res.status == 1) { if(res.status == 1) {
let array = res.data.data.length > 0 ? res.data.data : [] let array = res.data.data.length > 0 ? res.data.data : []
let myCollect = [].concat(array.map( r => { let myCollect = [].concat(array.map( r => {
...@@ -537,6 +546,9 @@ ...@@ -537,6 +546,9 @@
that.myCollect = that.myCollect.concat(myCollect) that.myCollect = that.myCollect.concat(myCollect)
that.page ++ that.page ++
} }
}else{
console.log("数据已加载完")
}
} }
}) })
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment