Merge branch 'newRender' into donut

components/worksList/index.js

@@ -1,112 +1,116 @@
 import behavior from '~/mixins/video'
 import {
-  submitPlayLog
+    submitPlayLog
 } from '~/api/video'
 let _observer
+let timer;
 let preId = ''
 Component({
-  behaviors: [behavior],
-  properties: {
-    worksList: {
-      type: Array,
-      value: [],
-      observer(newVal) {
-        this.setData({
-          worksListCopy: newVal
-        })
-        if (this.properties.autoPlay) {
-          // 自动播放
-          this._observer = this.createIntersectionObserver({
-            observeAll: true
-          })
-          this._observer.relativeTo('.playLine')
-            .observe('.videoPreview', (res) => {
-              let intersectionRatio = res.intersectionRatio
-              if (intersectionRatio > 0 && preId != res.dataset.id) {
-                preId = res.dataset.id
-                submitPlayLog({
-                  userReadId: res.dataset.id,
-                  playStopTime: 1000
+    behaviors: [behavior],
+    properties: {
+        worksList: {
+            type: Array,
+            value: [],
+            observer(newVal) {
+                this.setData({
+                    worksListCopy: newVal
                 })
-                // 0视频1音频
-                if (res.dataset.type == 0) {
-                  this.resetAudio();
-                  this.setData({
-                    currentId: res.dataset.id,
-                  })
-                } else {
-                  this.playAudio({
-                    currentTarget: {
-                      dataset: res.dataset
-                    }
-                  })
+                if (this.properties.autoPlay) {
+                    // 自动播放
+                    this._observer = this.createIntersectionObserver({
+                        observeAll: true
+                    })
+                    this._observer.relativeTo('.playLine')
+                        .observe('.videoPreview', (res) => {
+                            let intersectionRatio = res.intersectionRatio
+                            if (intersectionRatio > 0 && preId != res.dataset.id) {
+                                clearTimeout(timer);
+                                timer = setTimeout(() => {
+                                    preId = res.dataset.id
+                                submitPlayLog({
+                                    userReadId: res.dataset.id,
+                                    playStopTime: 1000
+                                })
+                                // 0视频1音频
+                                if (res.dataset.type == 0) {
+                                    this.resetAudio();
+                                    this.setData({
+                                        currentId: res.dataset.id,
+                                    })
+                                } else {
+                                    this.playAudio({
+                                        currentTarget: {
+                                            dataset: res.dataset
+                                        }
+                                    })
+                                }
+                                }, 600);
+                            }
+                        })
                 }
-              }
-            })
+            }
+        },
+        // 是否自动播放
+        autoPlay: {
+            type: Boolean,
+            value: true
+        },
+        videoType: {
+            type: String,
+            // value 为public时是默认公共样式，为my时为“我的”样式，展示下载删除是否公开,pk为pk的样式文案,collection为收藏时的样式,
+            value: 'public',
+        },
+        // 是否在tabbar页面使用
+        tabBarPadding: {
+            type: Boolean,
+            value: false,
         }
-      }
-    },
-    // 是否自动播放
-    autoPlay: {
-      type: Boolean,
-      value: true
-    },
-    videoType: {
-      type: String,
-      // value 为public时是默认公共样式，为my时为“我的”样式，展示下载删除是否公开,pk为pk的样式文案,collection为收藏时的样式,
-      value: 'public',
     },
-    // 是否在tabbar页面使用
-    tabBarPadding: {
-      type: Boolean,
-      value: false,
-    }
-  },
-  data: {
-    worksListCopy: {}
-  },
-  lifetimes: {
-    detached: function () {
-      // 在组件实例被从页面节点树移除时执行
-      this.resetAudio()
+    data: {
+        worksListCopy: {}
     },
-  },
-  methods: {
-    setListFans({
-      detail
-    }) {
-      let worksListCopy = JSON.parse(JSON.stringify(this.data.worksListCopy))
-      worksListCopy.forEach(item => {
-        if (item.user.uid == detail) {
-          item.isFans = true
-        }
-      })
-      this.setData({
-        worksListCopy
-      })
+    lifetimes: {
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+            this.resetAudio()
+        },
     },
-    addCommentNum({
-      detail
-    }) {
-      let worksListCopy = this.data.worksListCopy
-      let index = worksListCopy.findIndex(item => {
-        return item.userRead.id == detail
-      })
-      if (index != -1) {
-        this.setData({
-          [`worksListCopy[${index}].userRead.commentAmount`]: ++worksListCopy[index].userRead.commentAmount
-        })
-      }
+    methods: {
+        setListFans({
+            detail
+        }) {
+            let worksListCopy = JSON.parse(JSON.stringify(this.data.worksListCopy))
+            worksListCopy.forEach(item => {
+                if (item.user.uid == detail) {
+                    item.isFans = true
+                }
+            })
+            this.setData({
+                worksListCopy
+            })
+        },
+        addCommentNum({
+            detail
+        }) {
+            let worksListCopy = this.data.worksListCopy
+            let index = worksListCopy.findIndex(item => {
+                return item.userRead.id == detail
+            })
+            if (index != -1) {
+                this.setData({
+                    [`worksListCopy[${index}].userRead.commentAmount`]: ++worksListCopy[index].userRead.commentAmount
+                })
+            }
+        },
+        deleteVideo({
+            detail
+        }) {
+            let worksListCopy = this.properties.worksListCopy.filter(item => {
+                return item.userRead.id != detail
+            })
+            this.setData({
+                worksListCopy
+            })
+        },
     },
-    deleteVideo({
-      detail
-    }) {
-      let worksListCopy = this.properties.worksListCopy.filter(item => {
-        return item.userRead.id != detail
-      })
-      this.setData({
-        worksListCopy
-      })
-    }
-  },
 })

pages/index/index.js

@@ -47,6 +47,7 @@ Page({
                 })
             }, 6000)
         }
+        this.requestMessage()
     },
     onShow() {
         if (typeof this.getTabBar === 'function') {
@@ -125,6 +126,12 @@ Page({
             url: '/pages/childClassify/index?type=search',
         })
     },
+    requestMessage() {
+       /*  wx.requestSubscribeMessage({
+            tmplIds: [''],
+            success(res) {}
+        }) */
+    },
     onUnload() {
         this.storeBindings.destroyStoreBindings()
     },

pages/ranking copy/index.js

@@ -1,85 +0,0 @@
-import {
-    getRankingData
-} from '~/api/global'
-import event from '~/mixins/event'
-Page({
-    behaviors: [event],
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        ranking: '',
-        userList: [],
-        currentWeek: 0,
-        weekBegin: '',
-        weekEnd: '',
-        //2：邀新榜，3：热播榜，4：挑战pk榜
-        rankingType: '',
-        icon: '',
-        podiumBoxBg: '',
-        color: '',
-        explain: ''
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-        this.setData({
-            rankingType: options.type,
-            icon: options.type == '2' ? '/static/yx.png' : options.type == '3' ? '/static/play.png' : '/static/win.png',
-            podiumBoxBg: options.type == '2' ? 'invitation' : options.type == '3' ? 'hot' : 'pk',
-            color: options.type == '2' ? '#2DCE66' : options.type == '3' ? '#FF7E6C' : '#967DFF',
-        })
-
-        wx.setNavigationBarColor({
-            frontColor: '#ffffff',
-            backgroundColor: options.type == '2' ? '#2DCE66' : options.type == '3' ? '#FF7E6C' : '#967DFF',
-        })
-        this.getRankingData(options.id)
-    },
-    async getRankingData(id) {
-        let {
-            ranking,
-            userList,
-            currentWeek,
-            weekBegin,
-            weekEnd,
-            title,
-            explain
-        } = await getRankingData(id)
-        wx.setNavigationBarTitle({
-            title
-        })
-        this.setData({
-            ranking,
-            userList,
-            currentWeek,
-            weekBegin,
-            weekEnd,
-            explain
-        })
-    },
-    jumpIndex() {
-        wx.switchTab({
-            url: '/pages/index/index',
-        })
-    },
-    jumpUserInfo({
-        currentTarget
-    }) {
-        if (!currentTarget.dataset.uid) {
-            return
-        }
-        wx.navigateTo({
-            url: `/pages/personal/index?uid=${currentTarget.dataset.uid}&type=${this.data.rankingType==4?'pk':'user'}`,
-        })
-    },
-    onShareAppMessage() {
-        return {
-            title: this.data.rankingType == 3 ? '我要上热门，就差你的一个赞，快来帮帮我吧！' : '这个小程序太赞了！孩子朗读能力蹭蹭上涨，推荐你试试！',
-            path: `/pages/index/index?uid=${wx.getStorageSync('uid')}`,
-            imageUrl: this.data.rankingType == 3 ? 'http://reader-wx.ai160.com/images/reader/v3/375-300-3.jpg' : 'http://reader-wx.ai160.com/images/reader/v3/375-300-2.jpg'
-        }
-    }
-})

pages/ranking copy/index.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "排行榜"
-}

pages/ranking copy/index.less

@@ -1,222 +0,0 @@
-.rankingBox {
-  width: 100vw;
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-
-  .podiumBox {
-    position: relative;
-    height: 510rpx;
-    background-size: cover;
-
-    .dateBox {
-      position: relative;
-      margin-top: 56rpx;
-      font-size: 28rpx;
-      text-align: center;
-      color: white;
-
-      .dataTitle {
-        position: absolute;
-        left: 194rpx;
-      }
-
-      .interval {
-        position: absolute;
-        left: 314rpx;
-      }
-    }
-
-    .podiumContent {
-      position: absolute;
-      top: 222rpx;
-      width: 100%;
-
-      .user {
-        position: absolute;
-        width: 150rpx;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-
-        .avatar {
-          width: 92rpx;
-          height: 92rpx;
-          border-radius: 50%;
-        }
-
-        .iconBox {
-          margin: 8rpx 0rpx 4rpx;
-          display: flex;
-          align-items: center;
-
-          .icon {
-            width: 30rpx;
-            height: 30rpx;
-          }
-
-          .num {
-            margin-left: 6rpx;
-            color: white;
-            font-size: 28rpx;
-          }
-        }
-
-        .nickName {
-          text-align: center;
-          font-size: 24rpx;
-          color: white;
-          width: 100%;
-        }
-      }
-
-      .first {
-        top: 0rpx;
-        left: 304rpx;
-      }
-
-      .second {
-        top: 53rpx;
-        left: 114rpx;
-
-        .avatar {
-          width: 84rpx;
-          height: 84rpx;
-        }
-      }
-
-      .third {
-        top: 72rpx;
-        right: 112rpx;
-
-        .avatar {
-          width: 84rpx;
-          height: 84rpx;
-        }
-      }
-    }
-  }
-
-  .podiumList {
-    flex: 1;
-    overflow: hidden;
-
-    .scrollBox {
-      height: 100%;
-      padding: 0rpx 30rpx;
-      box-sizing: border-box;
-
-      .row {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 23rpx 0rpx;
-        border-bottom: 1rpx solid #ddd;
-
-        .left {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-
-          .num {
-            font-size: 37rpx;
-            width: 28rpx;
-          }
-
-          .avatar {
-            margin: 0rpx 28rpx 0rpx 44rpx;
-            width: 78rpx;
-            height: 78rpx;
-            background-color: #EBEBEB;
-            border-radius: 50%;
-          }
-
-          .nickName {
-            font-size: 34rpx;
-            width: 240rpx;
-          }
-        }
-
-        .right {
-          text-align: center;
-
-          .icon {
-            width: 30rpx;
-            height: 30rpx;
-          }
-
-          .num {
-            font-size: 32rpx;
-            color: #666;
-          }
-        }
-      }
-    }
-  }
-
-  .footer {
-    width: 100%;
-    padding: 26rpx 60rpx 30rpx 90rpx;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: white;
-    box-shadow: 0 2rpx 24rpx 0 rgba(0, 0, 0, 0.50);
-
-    .left {
-      font-size: 26rpx;
-      font-weight: bold;
-
-      text {
-        color: #4AC4FF;
-        font-size: 38rpx;
-        margin-left: 10rpx;
-      }
-    }
-
-    .rigth {
-      padding: 12rpx 34rpx;
-      padding-left: 26rpx;
-      border-radius: 50rpx;
-      background-image: linear-gradient(270deg, #33C3FF 0%, #81C7FF 100%, #14C962 100%);
-      box-shadow: 0 4rpx 10rpx 0 rgba(50, 197, 255, 0.46);
-      color: white;
-      font-size: 26rpx;
-
-      .share {
-        width: 26rpx;
-        height: 24rpx;
-        margin-right: 14rpx;
-      }
-    }
-  }
-}
-
-.invitation {
-  background: url('http://reader-wx.ai160.com/images/reader/v3/podium-5.jpg')no-repeat;
-
-  .tips2 {
-    color: #2DCE66;
-  }
-}
-
-.hot {
-  background: url('http://reader-wx.ai160.com/images/reader/v3/podium-4.jpg')no-repeat;
-
-  .tips2 {
-    color: #FF7F6C;
-  }
-}
-
-.pk {
-  background: url('http://reader-wx.ai160.com/images/reader/v3/podium-6.jpg')no-repeat;
-
-  .tips2 {
-    color: #967DFF;
-  }
-}
-
-.iconPk {
-  width: 42rpx !important;
-}

pages/ranking copy/index.wxml

@@ -1,67 +0,0 @@
-<view class="rankingBox">
-  <view class="podiumBox {{podiumBoxBg}}">
-    <view class="dateBox">
-      <text class="dataTitle" style="color:{{color}}">第{{currentWeek}}期</text>
-      <text class="interval">{{weekBegin+'-'+weekEnd}}</text>
-    </view>
-    <view class="podiumContent">
-      <view class="user first">
-        <image src="{{userList[0].avatar}}" class="avatar" bindtap="jumpUserInfo" data-uid='{{userList[0].uid}}' />
-        <view class="iconBox">
-          <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
-          <view class="num">{{userList[0].count}}</view>
-        </view>
-        <view class="nickName textOver">
-          {{userList[0].nickName||userList[0].eid}}
-        </view>
-      </view>
-      <view class="user second">
-        <image src="{{userList[1].avatar}}" class="avatar" bindtap="jumpUserInfo" data-uid='{{userList[1].uid}}' />
-        <view class="iconBox">
-          <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
-          <view class="num">{{userList[1].count}}</view>
-        </view>
-        <view class="nickName textOver">
-          {{userList[1].nickName||userList[1].eid}}
-        </view>
-      </view>
-      <view class="user third">
-        <image src="{{userList[2].avatar}}" class="avatar" bindtap="jumpUserInfo" data-uid='{{userList[2].uid}}' />
-        <view class="iconBox">
-          <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
-          <view class="num">{{userList[2].count}}</view>
-        </view>
-        <view class="nickName textOver">
-          {{userList[2].nickName||userList[2].eid}}
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="podiumList">
-    <scroll-view scroll-y="true" enhanced="true" show-scrollbar="{{false}}" class="scrollBox">
-      <view class="row" wx:for="{{userList.length-3}}" wx:key="index">
-        <view class="left">
-          <view class="num">{{index+4}}</view>
-          <image src="{{userList[index+3].avatar}}" class="avatar" bindtap="jumpUserInfo"
-            data-uid='{{userList[index+3].uid}}' />
-          <view class="nickName textOver">
-            {{userList[index+3].nickName||userList[index+3].eid}}
-          </view>
-        </view>
-        <view class="right">
-          <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
-          <view class="num"> {{userList[index+3].count}}</view>
-        </view>
-      </view>
-    </scroll-view>
-  </view>
-  <view class="footer">
-    <view class="left">我的排名<text>{{ranking?ranking:'100+'}}</text></view>
-    <button class="resetBtn rigth" open-type="share" wx:if="{{rankingType!=4}}">
-      <image src="/static/forward.png" class="share" />呼朋唤友来加热
-    </button>
-    <button class="resetBtn rigth" wx:else bindtap="jumpIndex">
-      我要冲榜
-    </button>
-  </view>
-</view>

pages/ranking copy/index.wxss

@@ -1,184 +0,0 @@
-.rankingBox {
-  width: 100vw;
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-}
-.rankingBox .podiumBox {
-  position: relative;
-  height: 510rpx;
-  background-size: cover;
-}
-.rankingBox .podiumBox .dateBox {
-  position: relative;
-  margin-top: 56rpx;
-  font-size: 28rpx;
-  text-align: center;
-  color: white;
-}
-.rankingBox .podiumBox .dateBox .dataTitle {
-  position: absolute;
-  left: 194rpx;
-}
-.rankingBox .podiumBox .dateBox .interval {
-  position: absolute;
-  left: 314rpx;
-}
-.rankingBox .podiumBox .podiumContent {
-  position: absolute;
-  top: 222rpx;
-  width: 100%;
-}
-.rankingBox .podiumBox .podiumContent .user {
-  position: absolute;
-  width: 150rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-.rankingBox .podiumBox .podiumContent .user .avatar {
-  width: 92rpx;
-  height: 92rpx;
-  border-radius: 50%;
-}
-.rankingBox .podiumBox .podiumContent .user .iconBox {
-  margin: 8rpx 0rpx 4rpx;
-  display: flex;
-  align-items: center;
-}
-.rankingBox .podiumBox .podiumContent .user .iconBox .icon {
-  width: 30rpx;
-  height: 30rpx;
-}
-.rankingBox .podiumBox .podiumContent .user .iconBox .num {
-  margin-left: 6rpx;
-  color: white;
-  font-size: 28rpx;
-}
-.rankingBox .podiumBox .podiumContent .user .nickName {
-  text-align: center;
-  font-size: 24rpx;
-  color: white;
-  width: 100%;
-}
-.rankingBox .podiumBox .podiumContent .first {
-  top: 0rpx;
-  left: 304rpx;
-}
-.rankingBox .podiumBox .podiumContent .second {
-  top: 53rpx;
-  left: 114rpx;
-}
-.rankingBox .podiumBox .podiumContent .second .avatar {
-  width: 84rpx;
-  height: 84rpx;
-}
-.rankingBox .podiumBox .podiumContent .third {
-  top: 72rpx;
-  right: 112rpx;
-}
-.rankingBox .podiumBox .podiumContent .third .avatar {
-  width: 84rpx;
-  height: 84rpx;
-}
-.rankingBox .podiumList {
-  flex: 1;
-  overflow: hidden;
-}
-.rankingBox .podiumList .scrollBox {
-  height: 100%;
-  padding: 0rpx 30rpx;
-  box-sizing: border-box;
-}
-.rankingBox .podiumList .scrollBox .row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 23rpx 0rpx;
-  border-bottom: 1rpx solid #ddd;
-}
-.rankingBox .podiumList .scrollBox .row .left {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.rankingBox .podiumList .scrollBox .row .left .num {
-  font-size: 37rpx;
-  width: 28rpx;
-}
-.rankingBox .podiumList .scrollBox .row .left .avatar {
-  margin: 0rpx 28rpx 0rpx 44rpx;
-  width: 78rpx;
-  height: 78rpx;
-  background-color: #EBEBEB;
-  border-radius: 50%;
-}
-.rankingBox .podiumList .scrollBox .row .left .nickName {
-  font-size: 34rpx;
-  width: 240rpx;
-}
-.rankingBox .podiumList .scrollBox .row .right {
-  text-align: center;
-}
-.rankingBox .podiumList .scrollBox .row .right .icon {
-  width: 30rpx;
-  height: 30rpx;
-}
-.rankingBox .podiumList .scrollBox .row .right .num {
-  font-size: 32rpx;
-  color: #666;
-}
-.rankingBox .footer {
-  width: 100%;
-  padding: 26rpx 60rpx 30rpx 90rpx;
-  box-sizing: border-box;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background-color: white;
-  box-shadow: 0 2rpx 24rpx 0 rgba(0, 0, 0, 0.5);
-}
-.rankingBox .footer .left {
-  font-size: 26rpx;
-  font-weight: bold;
-}
-.rankingBox .footer .left text {
-  color: #4AC4FF;
-  font-size: 38rpx;
-  margin-left: 10rpx;
-}
-.rankingBox .footer .rigth {
-  padding: 12rpx 34rpx;
-  padding-left: 26rpx;
-  border-radius: 50rpx;
-  background-image: linear-gradient(270deg, #33C3FF 0%, #81C7FF 100%, #14C962 100%);
-  box-shadow: 0 4rpx 10rpx 0 rgba(50, 197, 255, 0.46);
-  color: white;
-  font-size: 26rpx;
-}
-.rankingBox .footer .rigth .share {
-  width: 26rpx;
-  height: 24rpx;
-  margin-right: 14rpx;
-}
-.invitation {
-  background: url('http://reader-wx.ai160.com/images/reader/v3/podium-5.jpg') no-repeat;
-}
-.invitation .tips2 {
-  color: #2DCE66;
-}
-.hot {
-  background: url('http://reader-wx.ai160.com/images/reader/v3/podium-4.jpg') no-repeat;
-}
-.hot .tips2 {
-  color: #FF7F6C;
-}
-.pk {
-  background: url('http://reader-wx.ai160.com/images/reader/v3/podium-6.jpg') no-repeat;
-}
-.pk .tips2 {
-  color: #967DFF;
-}
-.iconPk {
-  width: 42rpx !important;
-}

pages/reading/index.js

@@ -80,7 +80,7 @@ Page({
         tempFilePath: ""
     },
     onLoad(options) {
-        let videoId = null
+            let videoId = null
         let params = decodeURIComponent(options.scene).split('&')
         videoId = !options.scene ? options.videoId : params[0]
         wx.setNavigationBarTitle({