|
|
@@ -40,13 +40,13 @@
|
|
|
|
|
|
<!-- 常规教研 -->
|
|
|
<swiper-item>
|
|
|
- <scroll-view scroll-y="true" :refresher-enabled='refevent' :refresher-triggered="putrigger"
|
|
|
+ <scroll-view scroll-y="true" :refresher-enabled='true' :refresher-triggered="putrigger"
|
|
|
@refresherrefresh='purepulling' @scrolltolower="pulower" style="height: 100%;">
|
|
|
- <view class="searchPagedata" v-if="!pulist.length">暂无数据</view>
|
|
|
+ <view class="searchPagedata" v-if="!pulist.length">加载中...</view>
|
|
|
<view>
|
|
|
<listBlock1 ref="listBlock2" :classList="pulist"></listBlock1>
|
|
|
</view>
|
|
|
- <view class="loading">
|
|
|
+ <view class="loading" v-show="!searchText">
|
|
|
<view v-if="puLoading==1">数据加载中...</view>
|
|
|
<view v-if="puLoading==2">没有更多了~~</view>
|
|
|
</view>
|
|
|
@@ -56,15 +56,15 @@
|
|
|
|
|
|
<!-- 专题教研 -->
|
|
|
<swiper-item>
|
|
|
- <scroll-view scroll-y="true" :refresher-enabled='refevent' :refresher-triggered="trigger"
|
|
|
+ <scroll-view scroll-y="true" :refresher-enabled='true' :refresher-triggered="trigger"
|
|
|
@refresherrefresh='repulling' @scrolltolower="aclower" style="height: 100%;">
|
|
|
|
|
|
- <view class="searchPagedata" v-if="!teclist.length">暂无数据</view>
|
|
|
+ <view class="searchPagedata" v-if="!teclist.length">加载中...</view>
|
|
|
|
|
|
<view class="">
|
|
|
<listBlock1 ref="listBlock1" :classList="teclist"></listBlock1>
|
|
|
</view>
|
|
|
- <view class="loading">
|
|
|
+ <view class="loading" v-show="!searchText">
|
|
|
<view v-if="acLoading==1">数据加载中...</view>
|
|
|
<view v-if="acLoading==2">没有更多了~~</view>
|
|
|
</view>
|
|
|
@@ -96,7 +96,6 @@
|
|
|
title: "活动",
|
|
|
btn: 0,
|
|
|
},
|
|
|
- refevent: true,
|
|
|
indexId: 1,
|
|
|
current: 0, //控制展示哪一个
|
|
|
info1: "info1", //类名
|
|
|
@@ -104,10 +103,6 @@
|
|
|
// swiper: 0,
|
|
|
searchText: "", // 搜索文本
|
|
|
|
|
|
- // 必须要两个，因为常规与专题的是分两次进行的
|
|
|
- isone1: true, // 常规判断是否第一次进入页面
|
|
|
- isone2: true, // 教研判断是否第一次进入页面
|
|
|
-
|
|
|
acLoading: 0, //0默认值 1加载中 2没有更多了
|
|
|
accurrentPage: 1, //页数
|
|
|
|
|
|
@@ -122,11 +117,6 @@
|
|
|
trigger: false, //专题
|
|
|
putrigger: false, //常规
|
|
|
|
|
|
- // 触底
|
|
|
- // SearchLoading: 0, //0默认值 1加载中 2没有更多了
|
|
|
- // 搜索页数
|
|
|
- Searchpage: 1,
|
|
|
-
|
|
|
// 在搜索框有文字的时候下拉刷新禁止触发watch,防止数据叠加
|
|
|
bansearchData: false
|
|
|
};
|
|
|
@@ -187,24 +177,17 @@
|
|
|
this.selectSearchdata()
|
|
|
}
|
|
|
},
|
|
|
- // onUnload() {
|
|
|
- // this.$store.dispatch('asyncDelAll')
|
|
|
- // },
|
|
|
+
|
|
|
methods: {
|
|
|
- ani() {
|
|
|
- this.refevent = true
|
|
|
- },
|
|
|
- cutS(event) {
|
|
|
- // console.log(event.detail);
|
|
|
- this.refevent = false
|
|
|
- },
|
|
|
// 搜索
|
|
|
selectSearchdata() {
|
|
|
+
|
|
|
if (this.current === 2) return
|
|
|
let type = null
|
|
|
if (this.current == 0) {
|
|
|
type = 2
|
|
|
} else if (this.current == 1) {
|
|
|
+
|
|
|
type = 1
|
|
|
} else {
|
|
|
return
|
|
|
@@ -214,23 +197,14 @@
|
|
|
openid: uni.getStorageSync('oId'),
|
|
|
txt: this.searchText,
|
|
|
ty: type,
|
|
|
- // page: this.Searchpage,
|
|
|
- // lim: 15
|
|
|
}
|
|
|
- // return console.log(data);
|
|
|
this.$request('/selectSearchdata', "get", data).then(res => {
|
|
|
- // console.log('常规', res);
|
|
|
+
|
|
|
if (this.current == 0) {
|
|
|
this.pulist = res[0]
|
|
|
} else if (this.current == 1) {
|
|
|
this.teclist = res[0]
|
|
|
}
|
|
|
- // if (!res[0].length) {
|
|
|
- // this.puLoading = 2
|
|
|
- // } else {
|
|
|
- // this.puLoading = 0
|
|
|
- // }
|
|
|
- // this.pulist = [...this.pulist, ...res[0]]
|
|
|
})
|
|
|
},
|
|
|
// 专题教研下拉刷新
|
|
|
@@ -238,13 +212,13 @@
|
|
|
this.bansearchData = true
|
|
|
this.trigger = true
|
|
|
// this.isrepulling = true
|
|
|
- setTimeout(() => {
|
|
|
- this.trigger = false;
|
|
|
- }, 1000);
|
|
|
+ // setTimeout(() => {
|
|
|
+ // this.trigger = false;
|
|
|
+ // }, 1000);
|
|
|
|
|
|
this.acLoading = 0 //0默认值 1加载中 2没有更多了
|
|
|
this.accurrentPage = 1 //页数
|
|
|
- this.teclist = [] // 教研
|
|
|
+ // this.teclist = [] // 教研
|
|
|
|
|
|
if (this.searchText !== '') {
|
|
|
this.puLoading = 0 //0默认值 1加载中 2没有更多了
|
|
|
@@ -262,13 +236,13 @@
|
|
|
this.bansearchData = true
|
|
|
this.putrigger = true
|
|
|
// this.isrepulling = true
|
|
|
- setTimeout(() => {
|
|
|
- this.putrigger = false;
|
|
|
- }, 1000);
|
|
|
+ // setTimeout(() => {
|
|
|
+ // this.putrigger = false;
|
|
|
+ // }, 1000);
|
|
|
|
|
|
this.puLoading = 0 //0默认值 1加载中 2没有更多了
|
|
|
this.pucurrentPage = 1
|
|
|
- this.pulist = [] // 常规
|
|
|
+ // this.pulist = [] // 常规
|
|
|
if (this.searchText !== '') {
|
|
|
this.acLoading = 0 //0默认值 1加载中 2没有更多了
|
|
|
this.accurrentPage = 1 //页数
|
|
|
@@ -287,7 +261,9 @@
|
|
|
if (this.acLoading == 2) return
|
|
|
this.acLoading = 1
|
|
|
this.accurrentPage++
|
|
|
- setTimeout(this.getTecData, 1000)
|
|
|
+ setTimeout(() => {
|
|
|
+ this.getTecData()
|
|
|
+ }, 1000)
|
|
|
},
|
|
|
// 常规教研触底
|
|
|
pulower() {
|
|
|
@@ -296,7 +272,9 @@
|
|
|
if (this.puLoading == 2) return
|
|
|
this.puLoading = 1
|
|
|
this.pucurrentPage++
|
|
|
- setTimeout(this.getpuData(), 1000)
|
|
|
+ setTimeout(() => {
|
|
|
+ this.getpuData()
|
|
|
+ }, 1000)
|
|
|
},
|
|
|
// 获取专题
|
|
|
getTecData() {
|
|
|
@@ -309,17 +287,21 @@
|
|
|
this.$request('/selectActivity', "POST", data).then(res => {
|
|
|
// console.log('专题', res[0]);
|
|
|
// this.teclist = res[0]
|
|
|
- if (this.isone1) {
|
|
|
- this.teclist = []
|
|
|
- this.isone1 = false
|
|
|
- }
|
|
|
+
|
|
|
if (!res[0].length) {
|
|
|
this.acLoading = 2
|
|
|
} else {
|
|
|
this.acLoading = 0
|
|
|
}
|
|
|
+ if (this.accurrentPage == 1) {
|
|
|
+ this.teclist = []
|
|
|
+ }
|
|
|
+ setTimeout(() => {
|
|
|
+ this.trigger = false;
|
|
|
+ }, 1000);
|
|
|
this.teclist = [...this.teclist, ...res[0]]
|
|
|
this.bansearchData = false
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
secherData() {
|
|
|
@@ -338,24 +320,26 @@
|
|
|
this.$request('/selectActivity', "POST", data).then(res => {
|
|
|
// console.log('常规', res[0]);
|
|
|
// this.pulist = res[0]
|
|
|
- if (this.isone2) {
|
|
|
+ console.log('this.pucurrentPag', this.pucurrentPage);
|
|
|
+ if (this.pucurrentPage == 1) {
|
|
|
this.pulist = []
|
|
|
- this.isone2 = false
|
|
|
}
|
|
|
if (!res[0].length) {
|
|
|
this.puLoading = 2
|
|
|
} else {
|
|
|
this.puLoading = 0
|
|
|
}
|
|
|
+ setTimeout(() => {
|
|
|
+ this.putrigger = false;
|
|
|
+ }, 1000);
|
|
|
this.pulist = [...this.pulist, ...res[0]]
|
|
|
this.bansearchData = false
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
|
|
|
// 区域滑动变换头部
|
|
|
swipeIndex(index) {
|
|
|
- // console.log(111);
|
|
|
-
|
|
|
this.current = index.detail.current;
|
|
|
if (this.searchText !== '') {
|
|
|
this.selectSearchdata()
|
|
|
@@ -383,11 +367,16 @@
|
|
|
},
|
|
|
onShow() {
|
|
|
// 必须要两个，因为常规与专题的是分两次进行的
|
|
|
- this.isone1 = true
|
|
|
- this.isone2 = true
|
|
|
- this.getpuData() //获取常规列表
|
|
|
- this.getTecData() //获取专题列表
|
|
|
+ this.accurrentPage = 1
|
|
|
+ this.pucurrentPage = 1
|
|
|
|
|
|
+ if (this.searchText !== '') {
|
|
|
+ this.selectSearchdata()
|
|
|
+ } else {
|
|
|
+ this.getpuData() //获取常规列表
|
|
|
+ this.getTecData() //获取专题列表
|
|
|
+ }
|
|
|
+ // console.log('this.pucurrentPage',this.pucurrentPage);
|
|
|
this.getAllMessage() // 调用app.js中的方法
|
|
|
// 获取收藏事件
|
|
|
this.$refs.listBlock1.getdata() //专题
|
11wqe1