Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2021-11-03 56ad423dfcce6ef06b91a42d650f04d48b0a5160

 pages/article/scrollMixins.js

@@ -199,7 +199,7 @@
                     this.videoList[this.index].flag = true
                     //加载视频
                     if(this.videoList.length - this.index - 1 <= this.playCount){
                        await this.pushVideoList()
                        // await this.pushVideoList()
                     }
                  }else if(Math.abs(Y)<=this.backDistance&&!quickMove){
                     this.videoList[this.index].flag = true
@@ -283,11 +283,10 @@
                     item.flag = false
                  }
                  this.videoList[this.index].flag = true

                  
                  //加载视频
                  if(this.videoList.length - this.index - 1 <= this.playCount){
                     await this.pushVideoList()
                     // await this.pushVideoList()
                  }