判断各个页面是否可以展开

compontents/ranking/ranking.js

@@ -24,9 +24,9 @@ Component({
       type: String,
       value: ''
     },
-    num: {
-      type: Number,
-      value: 0
+    heigth: {
+      type: String,
+      value: ''
     }
   },
 

compontents/ranking/ranking.wxml

@@ -18,7 +18,7 @@
             </view>
         </block>
     </view>
-    <view class="rank-list" animation="{{animationData}}">
+    <view class="rank-list" animation="{{animationData}}" style="height: {{heigth}}rpx">
         <view class="rank-friend" wx:for="{{friendsData}}" wx:key="{{index}}">
             <view class="rank-head">
                 <text class="rank-text">{{item.rank}}</text>

compontents/ranking/ranking.wxss

@@ -117,7 +117,6 @@
 
 /* 勋章列表*/
 .rank-list {
-    height: 560rpx;
     overflow: hidden;
     margin-top: 20rpx;  
 }

pages/accuracy_rank/accuracy_rank.js

@@ -12,7 +12,8 @@ Page({
   data: {
     friendsData: {},
     friendsThreeData: {},
-    myData: {}
+    myData: {},
+    height: ''
   },
 
   /**
@@ -46,6 +47,12 @@ Page({
           friendsData: res.data.data.rankVoList.slice(3,),
           myData: res.data.data
         })
+        const length = this.data.friendsData.length;
+        if(length > 7){
+          this.setData({
+            height: 560
+          })
+        }
       })
     }, function() {
       wx.showModal({

pages/accuracy_rank/accuracy_rank.wxml

@@ -11,7 +11,8 @@
             friendsThreeData="{{friendsThreeData}}"
             myData="{{myData}}"
             str="%"
-            title="准确率"/>
+            title="准确率"
+            height="{{height}}"/>
         </view>
       </scroll-view>
   </view>

pages/art/art.js

@@ -14,7 +14,9 @@ Page({
     num2: 0,
     position: '',
     questionsdian: '',
-    list: ''
+    list: [],
+    lessonListHeight: '',
+    previewHeight: ''
   },
 
   /* 区分答疑和分享 */
@@ -135,6 +137,19 @@ Page({
       }, {
         "category": 6
       }).success((res) => {
+        const lessonListLength = res.data.data.lessonPage.list.length;
+        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        console.log(res)
+        if(lessonListLength > 4) {
+          this.setData({
+            lessonListHeight: 280
+          })
+        }
+        if(previewLength > 4){
+          this.setData({
+            previewHeight: 280
+          })
+        } 
         this.setData({
           courseData: res.data.data,
           list: util.studyPageTime(res.data.data.lessonPage.list)

pages/art/art.wxml

@@ -9,9 +9,13 @@
           <view class="art">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{list}}"/>
+            <lessonList 
+            lessonData="{{list}}"
+            height="{{lessonListHeight}}"/>
 
-            <preview materialData="{{courseData.lessonPage.list}}"/>
+            <preview 
+            materialData="{{courseData.lessonPage.list}}"
+            height="{{previewHeight}}"/>
 
             <chat id="upload"
                 productionData="{{productionData}}" 

pages/chinese/chinese.js

@@ -12,7 +12,7 @@ Page({
     num1: 0,
     position: '',
     questionsdian: '',
-    list: '',
+    list: [],
     lessonListHeight: '',
     previewHeight: ''
   },

pages/competition/competition.js

@@ -12,7 +12,8 @@ Page({
   data: {
     friendsData: {},
     friendsThreeData: {},
-    myData: {}
+    myData: {},
+    height: ''
   },
 
 
@@ -47,6 +48,12 @@ Page({
           friendsData: res.data.data.friendsRankVoList.slice(3,),
           myData: res.data.data
         })
+        const length = this.data.friendsData.length;
+        if(length > 7){
+          this.setData({
+            height: 560
+          })
+        }
       })
     }, function() {
       wx.showModal({

pages/competition/competition.wxml

@@ -12,7 +12,7 @@
             myData="{{myData}}"
             str="位好友"
             title="好友数排名"
-            num="0"/>
+            height="{{height}}"/>
         </view>
       </scroll-view>
   </view>

pages/english/english.js

@@ -12,7 +12,9 @@ Page({
     num1: 0,
     position: '',
     questionsdian: '',
-    list: ''
+    list: [],
+    lessonListHeight: '',
+    previewHeight: ''
   },
 
   /* 区分答疑和分享 */
@@ -104,6 +106,19 @@ Page({
         "category": 4
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
+        const lessonListLength = res.data.data.lessonPage.list.length;
+        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        console.log(res)
+        if(lessonListLength > 4) {
+          this.setData({
+            lessonListHeight: 280
+          })
+        }
+        if(previewLength > 4){
+          this.setData({
+            previewHeight: 280
+          })
+        } 
         this.setData({
           courseData: res.data.data,
           list: util.studyPageTime(res.data.data.lessonPage.list)

pages/english/english.wxml

@@ -9,9 +9,13 @@
           <view class="english">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{list}}"/>
+            <lessonList 
+            lessonData="{{list}}"
+            height="{{lessonListHeight}}"/>
 
-            <preview materialData="{{courseData.lessonPage.list}}"/>
+            <preview 
+            materialData="{{courseData.lessonPage.list}}"
+            height="{{previewHeight}}"/>
 
             <chat id="questions"
                 productionData="{{questionsData}}" 

pages/grade_rank/grade_rank.js

@@ -12,7 +12,8 @@ Page({
   data: {
     friendsData: {},
     friendsThreeData: {},
-    myData: {}
+    myData: {},
+    height: ''
   },
 
   /**
@@ -46,6 +47,12 @@ Page({
           friendsData: res.data.data.expRankVoList.slice(3,),
           myData: res.data.data
         })
+        const length = this.data.friendsData.length;
+        if(length > 7){
+          this.setData({
+            height: 560
+          })
+        }
       })
     }, function() {
       wx.showModal({

pages/grade_rank/grade_rank.wxml

@@ -10,7 +10,8 @@
             friendsData="{{friendsData}}"
             friendsThreeData="{{friendsThreeData}}"
             myData="{{myData}}"
-            title="等级排名"/>
+            title="等级排名"
+            height="{{height}}"/>
         </view>
       </scroll-view>
   </view>

pages/language/language.js

@@ -12,7 +12,9 @@ Page({
     num1: 0,
     position: '',
     questionsdian: '',
-    list: []
+    list: [],
+    lessonListHeight: '',
+    previewHeight: ''
   },
 
   /* 区分答疑和分享 */
@@ -100,7 +102,19 @@ Page({
       }, {
         "category": 1
       }).success((res) => {
+        const lessonListLength = res.data.data.lessonPage.list.length;
+        const previewLength = util.preview(res.data.data.lessonPage.list).length;
         console.log(res)
+        if(lessonListLength > 4) {
+          this.setData({
+            lessonListHeight: 280
+          })
+        }
+        if(previewLength > 4){
+          this.setData({
+            previewHeight: 280
+          })
+        } 
         this.setData({
           courseData: res.data.data,
           list: util.studyPageTime(res.data.data.lessonPage.list)

pages/language/language.wxml

@@ -9,9 +9,13 @@
           <view class="language">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{list}}"/>
+            <lessonList 
+            lessonData="{{list}}"
+            height="{{lessonListHeight}}"/>
 
-            <preview materialData="{{courseData.lessonPage.list}}"/>
+            <preview 
+            materialData="{{courseData.lessonPage.list}}"
+            height="{{previewHeight}}"/>
 
             <chat id="questions"
                 productionData="{{questionsData}}" 

pages/mathematics/mathematics.js

@@ -12,7 +12,9 @@ Page({
     num1: 0,
     position: '',
     questionsdian: '',
-    list: ''
+    list: [],
+    lessonListHeight: '',
+    previewHeight: ''
   },
 
   /* 区分答疑和分享 */
@@ -103,6 +105,19 @@ Page({
         "category": 2
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
+        const lessonListLength = res.data.data.lessonPage.list.length;
+        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        console.log(res)
+        if(lessonListLength > 4) {
+          this.setData({
+            lessonListHeight: 280
+          })
+        }
+        if(previewLength > 4){
+          this.setData({
+            previewHeight: 280
+          })
+        } 
         this.setData({
           courseData: res.data.data,
           list: util.studyPageTime(res.data.data.lessonPage.list)

pages/mathematics/mathematics.wxml

@@ -9,9 +9,13 @@
           <view class="mathematics">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{list}}"/>
+            <lessonList 
+            lessonData="{{list}}"
+            height="{{lessonListHeight}}"/>
 
-            <preview materialData="{{courseData.lessonPage.list}}"/>
+            <preview 
+            materialData="{{courseData.lessonPage.list}}"
+            height="{{previewHeight}}"/>
 
             <chat id="questions"
                 productionData="{{questionsData}}" 

pages/medal_rank/medal_rank.js

@@ -12,7 +12,8 @@ Page({
   data: {
     friendsData: {},
     friendsThreeData: {},
-    myData: {}
+    myData: {},
+    height: ''
   },
 
   /**
@@ -46,6 +47,12 @@ Page({
           friendsData: res.data.data.userMetalRankVoList.slice(3,),
           myData: res.data.data
         })
+        const length = this.data.friendsData.length;
+        if(length > 7){
+          this.setData({
+            height: 560
+          })
+        }
       })
     }, function() {
       wx.showModal({

pages/medal_rank/medal_rank.wxml

@@ -11,7 +11,8 @@
             friendsThreeData="{{friendsThreeData}}"
             myData="{{myData}}"
             str="个勋章"
-            title="勋章数排名"/>
+            title="勋章数排名"
+            height="{{height}}"/>
         </view>
       </scroll-view>
   </view>

pages/quantity_rank/quantity_rank.js

@@ -12,7 +12,8 @@ Page({
   data: {
     friendsData: {},
     friendsThreeData: {},
-    myData: {}
+    myData: {},
+    height: ''
   },
 
   /**
@@ -46,6 +47,12 @@ Page({
           friendsData: res.data.data.rankVoList.slice(3,),
           myData: res.data.data
         })
+        const length = this.data.friendsData.length;
+        if(length > 7){
+          this.setData({
+            height: 560
+          })
+        }
       })
     }, function() {
       wx.showModal({

pages/quantity_rank/quantity_rank.wxml

@@ -11,7 +11,8 @@
             friendsThreeData="{{friendsThreeData}}"
             myData="{{myData}}"
             str="题"
-            title="答题量排名"/>
+            title="答题量排名"
+            height="{{height}}"/>
         </view>
       </scroll-view>
   </view>

pages/science/science.js

@@ -14,7 +14,9 @@ Page({
     num2: 0,
     position: '',
     questionsdian: '',
-    list: ''
+    list: [],
+    lessonListHeight: '',
+    previewHeight: ''
   },
   /* 区分答疑和分享 */
   distinction: function(type, columnId, pageNo, pageSize, success) {
@@ -132,6 +134,19 @@ Page({
         "category": 5
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
+        const lessonListLength = res.data.data.lessonPage.list.length;
+        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        console.log(res)
+        if(lessonListLength > 4) {
+          this.setData({
+            lessonListHeight: 280
+          })
+        }
+        if(previewLength > 4){
+          this.setData({
+            previewHeight: 280
+          })
+        } 
         this.setData({
           courseData: res.data.data,
           list: util.studyPageTime(res.data.data.lessonPage.list)

pages/science/science.wxml

@@ -9,9 +9,13 @@
           <view class="science">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{list}}"/>
+            <lessonList 
+            lessonData="{{list}}"
+            height="{{lessonListHeight}}"/>
 
-            <preview materialData="{{courseData.lessonPage.list}}"/>
+            <preview 
+            materialData="{{courseData.lessonPage.list}}"
+            height="{{previewHeight}}"/>
 
             <chat id="upload"
                 productionData="{{productionData}}"