Merge remote-tracking branch 'origin/master'

apps/home/Lib/Action/HomeAction.class.php

@@ -714,7 +714,7 @@ class HomeAction extends UserAction
 
 
     public function collect()
     public function collect()
     {
     {
-        $limit = 9;
+        $limit = 1000;
 
 
         $map['uid'] = $this->mid;
         $map['uid'] = $this->mid;
         if (!$_GET['tab']) {
         if (!$_GET['tab']) {

apps/home/Tpl/default/Home/collect_w3g.html

@@ -12,9 +12,7 @@
 		<van-list
 		<van-list
 		  v-model="loading"
 		  v-model="loading"
 		  :finished="finished"
 		  :finished="finished"
-		  finished-text="没有更多了"
 		  @load="onLoad">
 		  @load="onLoad">
-		  
 		  <template v-if="tab == 0">
 		  <template v-if="tab == 0">
 				<div v-for="(item, index) in options[0].items" :key="index" class="layout_h collect_video_item">
 				<div v-for="(item, index) in options[0].items" :key="index" class="layout_h collect_video_item">
 					<van-image height="68" width="120" fit="cover" src="https://img.yzcdn.cn/vant/cat.jpeg" ></van-image>
 					<van-image height="68" width="120" fit="cover" src="https://img.yzcdn.cn/vant/cat.jpeg" ></van-image>
@@ -48,18 +46,18 @@
 		data: function() {
 		data: function() {
 			return {
 			return {
 				tab: 0,
 				tab: 0,
-				loading: false,
-				finished: false,
+				loading: true,
+				finished: true,
 				options: [{
 				options: [{
 					title: "我的视频",
 					title: "我的视频",
 					items: [1],
 					items: [1],
 					page: 0,
 					page: 0,
-					finished: false
+					finished: true
 				},{
 				},{
 					title: "我的真题",
 					title: "我的真题",
 					items: [2],
 					items: [2],
 					page: 0,
 					page: 0,
-					finished: false
+					finished: true
 				}]
 				}]
 			}
 			}
 		},
 		},