Browse Source

课程显示多少天之前学的

Limengbo 6 năm trước cách đây
mục cha
commit
310da8e4d9

+ 3 - 0
compontents/curriculum/curriculum.js

@@ -25,5 +25,8 @@ Component({
    */
   methods: {
 
+  },
+  ready: function () {
+    //console.log(this.properties.studyLog)
   }
 })

+ 3 - 1
pages/index/index.js

@@ -17,6 +17,7 @@ Page({
     time: "",
     rankData: {},
     share: false,
+    studyLog: []
   },
   
   lower: function (e) {
@@ -62,7 +63,8 @@ Page({
         this.setData({
           data: res.data.data,
           grade: util.gradeUpper(res.data.data.users.grade),
-          time: util.day(res.data.data.timeSpend)
+          time: util.day(res.data.data.timeSpend),
+          studyLog: util.studyTime(res.data.data.studyLog)
         })
       })
       //获取排名

+ 3 - 3
pages/index/index.wxml

@@ -15,12 +15,12 @@
                   <view class='left'>
                     <view class="name">
                       {{data.users.wechatName}}
-                      <text class='LV'>{{grade}}</text>
                     </view>
                     <view class="student">
                       学号:
                       <text>{{data.users.eid}}</text>
                     </view>
+                    <view class='LV'>{{grade}}</view>
                   </view>
                 </view>
                 <view class='grade'>
@@ -69,7 +69,7 @@
                   <text>第{{rankData.userQuestionRank.rank}}名</text>
                 </view>
                 <view class="rank">
-                  <text>答题准确率:{{rankData.userQuestionCorrectRank.numberCorrect * 100}}%</text>
+                  <text>答题准确率:{{rankData.userQuestionCorrectRank.numberCorrect}}%</text>
                   <text>第{{rankData.userQuestionCorrectRank.rank}}名</text>
                 </view>
               </view>
@@ -92,7 +92,7 @@
             </view>
             <!-- 课模板 -->
             <view>
-              <curriculum studyLog="{{ data.studyLog }}"/>
+              <curriculum studyLog="{{ studyLog }}"/>
             </view>
           </view>
       </scroll-view>

+ 9 - 0
pages/index/index.wxss

@@ -38,6 +38,11 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
+  width: 340rpx;  
+  word-break:keep-all;/* 不换行 */   
+  white-space:nowrap;/* 不换行 */  
+  overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
+  text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ;需与overflow:hidden;一起使用。*/
   margin-left: 34rpx;
 }
 
@@ -54,6 +59,9 @@
 }
 
 .LV {
+  position: absolute;
+  right:100rpx;
+  top:110rpx;
   font-size: 24rpx;
 }
 
@@ -149,6 +157,7 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
+  margin-right: 15rpx;
 }
 
 .img image {

+ 22 - 2
utils/util.js

@@ -36,11 +36,30 @@ const day = msd => {
               time = day + "天" + hour + "小时";  
           }  
       }    
-  }  
-    
+  }   
   return time;          
 }
 
+//计算学过了多长时间
+function studyTime (arr) {
+  const studyLog = [];
+  const time = new Date();
+  for(let item of arr) {
+    if(!item.lessonTitle) {
+      break;
+    }
+    let msd = (time - item.gmtCreated*1) / 1000;
+    studyLog.push(
+      {
+      lessonTitle: item.lessonTitle, 
+      lessonId: item.lessonId,
+      gmtCreated:day(msd) + '之前'
+      }
+    )
+  }
+  return studyLog
+}
+
 //获取当前页面传的的值
 
 function getUrl() {
@@ -134,6 +153,7 @@ function topThree (arr) {
 
 module.exports = {
   formatTime: formatTime,
+  studyTime,
   gradeUpper,
   day,
   getUrl,