T

apps/course/Tpl/default/Video/index_w3g.html

@@ -396,8 +396,8 @@
 								count: on ? r.video_order_count_mark : r.video_order_count
 								count: on ? r.video_order_count_mark : r.video_order_count
 							}
 							}
 						}))
 						}))
-						that.page = data.nowPage
-						that.finished = data.nowPage == data.totalPages
+						that.page = res.nowPage
+						that.finished = res.nowPage >= res.totalPages
 					}
 					}
 				})
 				})
 			}
 			}

apps/mall/Tpl/default/Goods/index_w3g.html

@@ -215,9 +215,8 @@
 								price: r.price
 								price: r.price
 							}}))
 							}}))
 							opt.page = res.nowPage
 							opt.page = res.nowPage
-							opt.finished = res.nowPage == res.totalPages
-							that.finished = res.nowPage == res.totalPages
-							console.log(that.finished)
+							opt.finished = res.nowPage >= res.totalPages
+							that.finished = res.nowPage >= res.totalPages
 					    }
 					    }
 					})
 					})
 				}
 				}