调整

components/activityList/index.js

@@ -7,7 +7,7 @@ Component({
    * 组件的初始数据
    */
   data: {
-    //，2：邀新榜，3：热播榜，4：挑战pk榜，5，朗读赛
+      //1：图片，2：邀新榜，3：热播榜，4：挑战pk榜，5，朗读赛，6，领取勋章
     type: '4',
     activityList: [],
     dsqList: []

pages/index/index.wxml

@@ -31,7 +31,7 @@
   <view class="{{isFixed?'brace':''}}" />
   <!-- 优秀作品展播及官方推荐列表组件 -->
   <worksList id="worksList" wx:if="{{currentType!='3'}}" worksList="{{list}}"
-    videoType="{{currentType=='1'?'excellent':'public'}}" tabBarPadding='true' />
+    videoType="{{currentType=='2'?'excellent':'public'}}" tabBarPadding='true' />
   <activityList wx:if="{{currentType=='3'}}" />
 </view>
 <canvas id='share' type="2d"> </canvas>

pages/match/index.js

@@ -23,6 +23,7 @@ Page({
     activityUserList: [],
     bannerList: [],
     myActivityUser: {},
+    explain: ''
   },
 
   /**
@@ -56,11 +57,13 @@ Page({
   async getReadRanking() {
     let {
       activityUserList,
-      myActivityUser
+      myActivityUser,
+      explain
     } = await getReadRanking()
     this.setData({
       activityUserList,
-      myActivityUser
+      myActivityUser,
+      explain
     })
   },
   async getSelfReadRanking() {

pages/match/index.less

@@ -112,7 +112,7 @@
     }
 
     .table {
-      padding: 10rpx 32rpx 30rpx;
+      padding: 10rpx 32rpx 140rpx;
       box-sizing: border-box;
 
       .titleLine {

pages/match/index.wxss

@@ -98,7 +98,7 @@
   border-top-left-radius: 50rpx;
 }
 .matchBox .rankList .table {
-  padding: 10rpx 32rpx 30rpx;
+  padding: 10rpx 32rpx 140rpx;
   box-sizing: border-box;
 }
 .matchBox .rankList .table .titleLine {

pages/reading/index.js

@@ -171,7 +171,6 @@ Page({
       })
       this.innerAudioContext.onStop((res) => {
         console.log("143innerAudioContext触发的");
-
       });
     }
 
@@ -181,7 +180,7 @@ Page({
     let child = this.selectComponent('#readingTips').data
     // 判断是否有权限朗读 不是vip并且没有朗读机会
     const isVip = child.vipTime ? true : false
-    if (!isVip && child.userInfo.experienceAmount <= 0) {
+    if (!isVip && child.userInfo.experienceAmount <= 0 && this.data.readingType != 'readMatch') {
       return this.selectComponent('#readingTips').showModal();
     }
     if (this.data.state) {

pages/score/index.js

@@ -38,7 +38,7 @@ Page({
   },
   backReading() {
     wx.redirectTo({
-      url: `/pages/reading/index?videoId=${this.data.score.id}&reset=true&uploadHide=${this.data.uploadHide}`,
+      url: `/pages/reading/index?videoId=${this.data.score.id}&reset=true&uploadHide=${this.data.uploadHide}&readingType=${this.data.readingType}`,
     })
   },
   hideFooter() {