diff --git a/components/page/pageComponents/goodsStyle.vue b/components/page/pageComponents/goodsStyle.vue index b0bc041..cbdd78e 100644 --- a/components/page/pageComponents/goodsStyle.vue +++ b/components/page/pageComponents/goodsStyle.vue @@ -5,12 +5,12 @@ - + { + if(_this.page===1){ + if(res.data.list.length>0){ + _this.setData({ + dataList: res.data.list + }) + }else{ + _this.setData({ + dataList: [] + }) + } + }else{ + if(res.data.list.length>0){ + let dataList = _this.dataList.concat(res.data.list); + _this.setData({ + dataList + }) + } + } + }, false, err=>{ + + }); + }, + } }; diff --git a/components/page/pageComponents/tabContro.vue b/components/page/pageComponents/tabContro.vue index 2a51b64..1ed5898 100644 --- a/components/page/pageComponents/tabContro.vue +++ b/components/page/pageComponents/tabContro.vue @@ -143,7 +143,7 @@ - + @@ -392,7 +392,7 @@ // let tabItem = Object.keys(newData)[0]; let tabItem = 0;//还给除了抢购首页其余模块一个this.selectTabBar_two(newData[tabItem],0) let arr112 = Object.keys(newData); - console.log(this.newCC_id, 'this.newCC_id-------', arr112) + // console.log(this.newCC_id, 'this.newCC_id-------', arr112) for(let j = 0;j { if (isPage) { diff --git a/components/template/diypages.vue b/components/template/diypages.vue index e8b59bb..139e25b 100644 --- a/components/template/diypages.vue +++ b/components/template/diypages.vue @@ -523,9 +523,9 @@ {{!!switchCity?switchCity:currentaidCity }} --> - + diff --git a/components/template/pic_text/pic_text.vue b/components/template/pic_text/pic_text.vue index 3a72b7c..6194434 100644 --- a/components/template/pic_text/pic_text.vue +++ b/components/template/pic_text/pic_text.vue @@ -175,12 +175,21 @@ export default { // 滚动页面 this.query.select('.video-wrapper').boundingClientRect(data=>{ if(data){ - console.log(data.top,'视频在屏幕的高度'); + // console.log(data.top,'视频在屏幕的高度',data); if(this.isDetail && (data.top==0 || data.top<0) && this.index==this.currentPlay){// 详情页 - console.log('视频暂停'); + // console.log('视频暂停'); this.videoContext.stop(); }else if(!this.isDetail && (data.top==90 || data.top<90) && this.index==this.currentPlay){// 首页 - console.log('视频暂停'); + // console.log('视频暂停'); + this.videoContext.stop(); + } + let winH = uni.getSystemInfoSync().windowHeight; + console.log(winH); + if(!this.isDetail &&(data.bottom + 85 == winH || data.bottom + 85 > winH)){// 首页 + // console.log('视频暂停'); + this.videoContext.stop(); + }else if(this.isDetail && (data.bottom == winH || data.bottom > winH)){// 详情页 + // console.log('视频暂停'); this.videoContext.stop(); } } diff --git a/components/template/postListTwo.vue b/components/template/postListTwo.vue index 86ad5ed..816df8c 100644 --- a/components/template/postListTwo.vue +++ b/components/template/postListTwo.vue @@ -2,7 +2,7 @@ - @@ -119,13 +119,18 @@ this.videoContext.stop(); }else{ // 滚动页面 - this.query.select('.postListTwo').boundingClientRect(data=>{ + this.query.select('.pagevideo').boundingClientRect(data=>{ if(data){ // console.log(data.top,'视频在屏幕的高度'); if(data.top<80||data.top==80){ // console.log('视频暂停'); this.videoContext.stop(); } + let winH = uni.getSystemInfoSync().windowHeight; + if(data.bottom + 85 == winH || data.bottom + 85 > winH){ + // console.log('视频暂停'); + this.videoContext.stop(); + } } }).exec(); } diff --git a/components/template/tabs/tabs-copy.vue b/components/template/tabs/tabs-copy.vue index 41fcbbd..7f816f7 100644 --- a/components/template/tabs/tabs-copy.vue +++ b/components/template/tabs/tabs-copy.vue @@ -1,14 +1,16 @@