联调榜单

components/videoPreview/index.js

@@ -205,7 +205,7 @@ Component({
         })
       }
       let readId = videoInfo.userRead.id
-      let url = this.properties.videoType == 'excellent' ? `/pages/pkPage/index?videoId=${readId}` : `/pages/reading/index?videoId=${videoInfo.userRead.exampleId}&readingType=pk`
+      let url = this.properties.videoType == 'excellent' ? `/pages/pkPage/index?videoId=${readId}` : `/pages/reading/index?videoId=${videoInfo.userRead.exampleId}&readingType=${this.properties.videoType}`
       wx.navigateTo({
         url
       })

components/worksList/index.js

@@ -13,7 +13,7 @@ Component({
     },
     videoType: {
       type: String,
-      // value 为public时是默认公共样式，为my时为“我的”样式，展示下载删除是否公开,pk为pk的样式文案,collection为收藏时的样式
+      // value 为public时是默认公共样式，为my时为“我的”样式，展示下载删除是否公开,pk为pk的样式文案,collection为收藏时的样式,excellent优秀作品展播
       value: 'public'
     },
   },

pages/index/index.js

@@ -67,7 +67,7 @@ Page({
         this.setData({
           desktopTips: false
         })
-      }, 8000)
+      }, 6000)
     }
 
   },

pages/match/index.js

@@ -20,8 +20,9 @@ Page({
     list: [],
     // true是人气榜，false是参赛作品
     currentType: true,
-    rankingList: [],
-    bannerList: []
+    activityUserList: [],
+    bannerList: [],
+    myActivityUser: {},
   },
 
   /**
@@ -53,9 +54,13 @@ Page({
     })
   },
   async getReadRanking() {
-    let rankingList = await getReadRanking()
+    let {
+      activityUserList,
+      myActivityUser
+    } = await getReadRanking()
     this.setData({
-      rankingList
+      activityUserList,
+      myActivityUser
     })
   },
   async getSelfReadRanking() {

pages/match/index.wxml

@@ -25,7 +25,7 @@
         <view class="colTitle">排名</view>
         <view class="colTitle">人气值</view>
       </view>
-      <view class="contentBox" wx:for="{{rankingList}}" wx:key="id">
+      <view class="contentBox" wx:for="{{activityUserList}}" wx:key="id">
         <view class="firstCol">
           <image src="/static/{{index+1}}-1.png" class="rankingImg" wx:if="{{index<3}}" />
           <text wx:else>{{index+1}}</text>
@@ -56,33 +56,33 @@
           <view class="num">{{filters.numFilter(item.activityJoinUser.hotAmount)}}</view>
         </view>
       </view>
-      <view class="contentBox selfRank">
+      <view class="contentBox selfRank" wx:if="{{myActivityUser.activityJoinUser}}">
         <view class="firstCol">
-          <image src="/static/1-1.png" class="rankingImg" />
+          <text>{{index+1}}</text>
         </view>
         <view class="secondCol">
-          <image src="https://p3-passport.byteimg.com/img/mosaic-legacy/3793/3131589739~100x100.awebp" class="avatar" />
+          <image src="{{myActivityUser.user.avatar}}" class="avatar" />
           <view class="userInfo">
-            <view class="nickName">尼赫鲁吧唧布</view>
+            <view class="nickName">{{myActivityUser.user.nickName||myActivityUser.user.eid}}</view>
             <view class="date">
               <view>
                 <image src="/static/f.png" class="icon" />
-                <view class="num">333</view>
+                <view class="num">{{filters.numFilter(myActivityUser.activityJoinUser.shareAmount)}}</view>
               </view>
               <view>
                 <image src="/static/p.png" class="icon" />
-                <view class="num">999</view>
+                <view class="num">{{filters.numFilter(myActivityUser.activityJoinUser.commentAmount)}}</view>
               </view>
               <view>
                 <image src="/static/d.png" class="icon" />
-                <view class="num">666</view>
+                <view class="num">{{filters.numFilter(myActivityUser.activityJoinUser.likeAmount)}}</view>
               </view>
             </view>
           </view>
         </view>
         <view class="threeCol">
           <image src="/static/hot.png" class="icon" />
-          <view class="num">0</view>
+          <view class="num">{{filters.numFilter(myActivityUser.activityJoinUser.hotAmount)}}</view>
         </view>
       </view>
     </view>

pages/reading/index.js

@@ -90,6 +90,7 @@ Page({
       item.readTime = data[index + 1] ? data[index + 1].time - item.time : ''
       return item
     })
+    console.log(options,'options');
     this.setData({
       article: data,
       readingReset: options.reset || false,