webfront / tangyuanjiproject · 提交

转到一个项目

作者 lihongjuan
提交 d9c71ab4d9c703ebe82359581b4194d9200878d6 1 个父辈 e43729da

提交

内嵌 并排对比
正在显示 9 个修改的文件 包含 35 行增加 和 18 行删除
@@ -42,10 +42,10 @@ export default { @@ -42,10 +42,10 @@ export default {
42 }; 42 };
43 }, 43 },
44 created() { 44 created() {
45 - document.title = "唐元集公众号"; 45 + document.title = "唐元集";
46 this.id = this.$route.query.id; 46 this.id = this.$route.query.id;
47 console.log(this.id); 47 console.log(this.id);
48 - document.title = "唐元集公众号"; 48 + document.title = "唐元集";
49 let that = this; 49 let that = this;
50 let date = new Date(); 50 let date = new Date();
51 let year = date.getFullYear(); 51 let year = date.getFullYear();
@@ -329,8 +329,7 @@ export default { @@ -329,8 +329,7 @@ export default {
329 // 异步更新数据 329 // 异步更新数据
330 // setTimeout 仅做示例，真实场景中一般为 ajax 请求 330 // setTimeout 仅做示例，真实场景中一般为 ajax 请求
331 setTimeout(() => { 331 setTimeout(() => {
332 - console.log(3434);  
333 - 332 + console.log(3434,'分页加载');
334 let newvideopage = that.videopage; 333 let newvideopage = that.videopage;
335 newvideopage++; 334 newvideopage++;
336 that.videopage = newvideopage; 335 that.videopage = newvideopage;
@@ -340,8 +339,7 @@ export default { @@ -340,8 +339,7 @@ export default {
340 // 加载状态结束 339 // 加载状态结束
341 this.loading = false; 340 this.loading = false;
342 // 数据全部加载完成 341 // 数据全部加载完成
343 - console.log(that.this_page)  
344 - console.log(that.total_page) 342 +
345 if (that.this_page == that.total_page) { 343 if (that.this_page == that.total_page) {
346 this.finished = true; 344 this.finished = true;
347 } 345 }
@@ -104,7 +104,7 @@ export default { @@ -104,7 +104,7 @@ export default {
104 }; 104 };
105 }, 105 },
106 created() { 106 created() {
107 - document.title = "唐元集公众号"; 107 + document.title = "唐元集";
108 this.selnav = this.$route.query.selnav; 108 this.selnav = this.$route.query.selnav;
109 if (this.selnav == 0) { 109 if (this.selnav == 0) {
110 this.getvideolist(); 110 this.getvideolist();
@@ -107,7 +107,7 @@ export default { @@ -107,7 +107,7 @@ export default {
107 } 107 }
108 }, 108 },
109 created() { 109 created() {
110 - document.title = '唐元集公众号' 110 + document.title = '唐元集'
111 }, 111 },
112 methods: { 112 methods: {
113 overvideo() { 113 overvideo() {
@@ -55,7 +55,6 @@ @@ -55,7 +55,6 @@
55 </div> 55 </div>
56 </div> 56 </div>
57 </template> 57 </template>
58 -  
59 <script> 58 <script>
60 export default { 59 export default {
61 data() { 60 data() {
@@ -38,12 +38,15 @@ @@ -38,12 +38,15 @@
38 </template> 38 </template>
39 39
40 <script> 40 <script>
  41 +import Vue from 'vue';
  42 +import { List } from 'vant';
  43 +Vue.use(List);
41 export default { 44 export default {
42 data() { 45 data() {
43 return { 46 return {
44 sucailist: [], 47 sucailist: [],
45 - finished: "",  
46 - loading: false, 48 + loading: false,
  49 + finished: false,
47 page: 1, 50 page: 1,
48 this_page: "", 51 this_page: "",
49 total_page: "", 52 total_page: "",
@@ -94,6 +97,7 @@ export default { @@ -94,6 +97,7 @@ export default {
94 // 视频上拉加载 97 // 视频上拉加载
95 onLoad() { 98 onLoad() {
96 let that = this; 99 let that = this;
  100 + console.log(349348989)
97 // 异步更新数据 101 // 异步更新数据
98 // setTimeout 仅做示例，真实场景中一般为 ajax 请求 102 // setTimeout 仅做示例，真实场景中一般为 ajax 请求
99 setTimeout(() => { 103 setTimeout(() => {
@@ -37,11 +37,15 @@ @@ -37,11 +37,15 @@
37 </template> 37 </template>
38 38
39 <script> 39 <script>
  40 +import Vue from 'vue';
  41 +import { List } from 'vant';
  42 +
  43 +Vue.use(List);
40 export default { 44 export default {
41 data() { 45 data() {
42 return { 46 return {
43 sucailist: [], 47 sucailist: [],
44 - finished: "", 48 + finished: false,
45 loading: false, 49 loading: false,
46 page: 1, 50 page: 1,
47 this_page: "", 51 this_page: "",
@@ -76,6 +80,8 @@ export default { @@ -76,6 +80,8 @@ export default {
76 .then(function (res) { 80 .then(function (res) {
77 console.log(res); 81 console.log(res);
78 that.sucailist = that.sucailist.concat(res.data.material); 82 that.sucailist = that.sucailist.concat(res.data.material);
  83 + that.this_page=res.data.this_page;
  84 + that.total_page=res.data.total_page;
79 }) 85 })
80 .catch(function (err) { 86 .catch(function (err) {
81 console.log(err); 87 console.log(err);
@@ -100,13 +106,11 @@ export default { @@ -100,13 +106,11 @@ export default {
100 // setTimeout 仅做示例，真实场景中一般为 ajax 请求 106 // setTimeout 仅做示例，真实场景中一般为 ajax 请求
101 setTimeout(() => { 107 setTimeout(() => {
102 console.log(3434); 108 console.log(3434);
103 -  
104 let newpage = that.page; 109 let newpage = that.page;
105 newpage++; 110 newpage++;
106 that.page = newpage; 111 that.page = newpage;
107 console.log(that.videopage); 112 console.log(that.videopage);
108 that.getsucai(); 113 that.getsucai();
109 -  
110 // 加载状态结束 114 // 加载状态结束
111 this.loading = false; 115 this.loading = false;
112 // 数据全部加载完成 116 // 数据全部加载完成
@@ -99,6 +99,10 @@ @@ -99,6 +99,10 @@
99 </template> 99 </template>
100 100
101 <script> 101 <script>
  102 +import Vue from 'vue';
  103 +import { List } from 'vant';
  104 +
  105 +Vue.use(List);
102 export default { 106 export default {
103 data() { 107 data() {
104 return { 108 return {
@@ -106,8 +110,8 @@ export default { @@ -106,8 +110,8 @@ export default {
106 keyword: '', 110 keyword: '',
107 showkeyword: false, 111 showkeyword: false,
108 type: 1, 112 type: 1,
109 - finished: "",  
110 - loading: false, 113 + loading: false,
  114 + finished: false,
111 page: 1, 115 page: 1,
112 this_page: "", 116 this_page: "",
113 total_page: "", 117 total_page: "",
@@ -225,6 +229,7 @@ export default { @@ -225,6 +229,7 @@ export default {
225 }, 229 },
226 // 视频上拉加载 230 // 视频上拉加载
227 onLoad() { 231 onLoad() {
  232 + console.log(437349)
228 let that = this; 233 let that = this;
229 // 异步更新数据 234 // 异步更新数据
230 // setTimeout 仅做示例，真实场景中一般为 ajax 请求 235 // setTimeout 仅做示例，真实场景中一般为 ajax 请求
@@ -259,6 +264,8 @@ export default { @@ -259,6 +264,8 @@ export default {
259 .then(function (res) { 264 .then(function (res) {
260 console.log(res); 265 console.log(res);
261 that.sucailist = that.sucailist.concat(res.data.sort); 266 that.sucailist = that.sucailist.concat(res.data.sort);
  267 + that.this_page=res.data.this_page;
  268 + that.total_page=res.data.total_page
262 console.log(that.sucailist) 269 console.log(that.sucailist)
263 }) 270 })
264 .catch(function (err) { 271 .catch(function (err) {
@@ -35,12 +35,15 @@ @@ -35,12 +35,15 @@
35 </template> 35 </template>
36 36
37 <script> 37 <script>
  38 +import Vue from 'vue';
  39 +import { List } from 'vant';
  40 +Vue.use(List);
38 export default { 41 export default {
39 data() { 42 data() {
40 return { 43 return {
41 sucailist: [], 44 sucailist: [],
42 - finished: "",  
43 - loading: false, 45 + loading: false,
  46 + finished: false,
44 page: 1, 47 page: 1,
45 this_page: "", 48 this_page: "",
46 total_page: "", 49 total_page: "",
@@ -73,6 +76,8 @@ export default { @@ -73,6 +76,8 @@ export default {
73 .then(function (res) { 76 .then(function (res) {
74 console.log(res); 77 console.log(res);
75 that.sucailist = that.sucailist.concat(res.data.material); 78 that.sucailist = that.sucailist.concat(res.data.material);
  79 + that.this_page=res.data.this_page;
  80 + that.total_page=res.data.total_page
76 }) 81 })
77 .catch(function (err) { 82 .catch(function (err) {
78 console.log(err); 83 console.log(err);