diff --git a/src/IndexFind.vue b/src/IndexFind.vue index 07f194c..af36314 100644 --- a/src/IndexFind.vue +++ b/src/IndexFind.vue @@ -21,7 +21,10 @@ > -
{{text}}
+
+ + {{text}} +
@@ -37,7 +40,10 @@ > -
{{text}}
+
+ + {{text}} +
@@ -75,6 +85,7 @@ import indexfindhead from "./components/indexfindhead"; import indexfindtab from "./components/indexfindtab"; import indexfindall from "./components/indexfindall"; +import login from "./assets/login.gif"; import pics from "./assets/ad.png"; import indedfinduser from "./components/indexfinduser"; export default { @@ -85,13 +96,13 @@ export default { indedfinduser }, mounted() { - document.title=this.$route.query.word + "-搜索" + document.title = this.$route.query.word + "-搜索"; - this.getlist1(); + this.getlist1(0); }, watch: { no() { - this.page = 0; + this.page = 1; this.dynamiclist = []; this.list = []; this.lock = false; @@ -103,13 +114,13 @@ export default { window.$(window).scroll(() => {}); c(); }, - computed:{ - keys(){ - return this.$route.query.word + computed: { + keys() { + return this.$route.query.word; } }, methods: { - getlist1() { + getlist1(e) { let t = this; t.list = []; t.axios @@ -120,7 +131,11 @@ export default { }) .then(res => { if (res.data.data) { + if(t.no == e){ t.list = res.data.data; + }else{ + return ; + } window.console.log(t.list.length, "hfihaifohog"); if (t.list.length < 5) { t.text = "暂无相关数据"; @@ -134,7 +149,7 @@ export default { // do something // alert(2); window.console.log(1); - t.getlist(); + t.getlist(e); } }); } else { @@ -143,7 +158,7 @@ export default { } }); }, - getlist() { + getlist(e) { if (this.lock) { return "lock"; } @@ -160,8 +175,14 @@ export default { window.console.log(res); if (res.data.code == 200) { if (res.data.data) { + if(t.no == e){ t.list = t.list.concat(res.data.data); + + }else{ + return ; } + } + t.lock = false; window.$(window).scroll(() => { var windowH = window.$(window).height(); //设备可见区域高度 @@ -185,7 +206,7 @@ export default { window.console.log(e); this.no = e; this.list = []; - this.getlist1(); + this.getlist1(e); window.console.log(this.list.length, "list"); }, todetail(e, type) { @@ -266,9 +287,10 @@ export default { list1: [], list2: [], list3: [], - page: 0, + page: 1, lock: false, text: "加载中", + login }; } }; diff --git a/src/components/indexfindall.vue b/src/components/indexfindall.vue index f853a54..ceadab0 100644 --- a/src/components/indexfindall.vue +++ b/src/components/indexfindall.vue @@ -4,7 +4,7 @@
-

+