解决提出的各种问题

compontents/chat/chat.wxml

@@ -18,6 +18,7 @@
                         <text class="content-data" style="height: 100%">{{item.title}}</text>
                     </view>
                     <view wx:if="{{type == 1 && (item.currentReplyCount > 0)}}" class="message"></view>
+                    <view wx:if="{{item.isTop > 0}}" class="Stick">置顶</view>
                 </view>
                 <view class="picture" wx:if="{{type == 2}}">
                     <block wx:for="{{item.imagesList}}" wx:for-item="items" wx:key="{{items}}">

compontents/chat/chat.wxss

@@ -58,6 +58,7 @@
 
 .share-con .head {
     padding:20rpx 0;
+
 }
 
 .head-img {
@@ -134,6 +135,14 @@
     border-radius: 50%;    
 }
 
+.Stick {
+    position: absolute;
+    left:136px;
+    top:32rpx;
+    font-size: 32rpx;
+    color: skyblue;
+} 
+
 .icon {
     display: flex;
     align-items: center;

compontents/lesson_list/lessonList.wxss

@@ -59,6 +59,13 @@
     color: #303030;
 }
 
+.art-con text:nth-child(1) {
+    width: 70%;
+    overflow:hidden;
+    white-space:nowrap;
+    text-overflow:ellipsis;
+}
+
 .art-con-color {
     display: flex;
     justify-content: space-between;

compontents/preview/preview.wxml

@@ -12,9 +12,8 @@
 
     <view class="material-con" animation="{{animationData}}" style="height: {{height}}rpx">
         <view class="art-img" wx:for="{{materialData}}" wx:key="{{index}}">
-            <text>{{item.fileName == '' ? item.title : item.fileName}}</text>
+            <text wx:if="{{ item.warePath && item.fileName}}">{{item.fileName}}</text>
             <text wx:if="{{ item.warePath && item.fileName}}" data-warePath="{{item.warePath}}" bindtap="preview">点击预览</text>
-            <text wx:else>暂无资料</text>
         </view>
     </view>
     

compontents/preview/preview.wxss

@@ -56,6 +56,13 @@
     margin-top: 24rpx;
 }
 
+.art-img text:nth-child(1) {
+    width: 70%;
+    overflow:hidden;
+    white-space:nowrap;
+    text-overflow:ellipsis;
+}
+
 .unfold {
     position: absolute;
     right: 28rpx;

pages/art/art.js

@@ -35,7 +35,8 @@ Page({
     questionsMore: '',
     wxObjectives: [],
     canvasHeight: '',
-    flag: true 
+    flag: true,
+    materialData: []
   },
 
   /* 区分答疑和分享 */
@@ -168,8 +169,8 @@ Page({
       }, {
         "category": 6
       }).success((res) => {
-        const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = res.data.data.lessonPage.list.length;
+        const lessonListLength = util.studyPageTime(res.data.data.lessonPage.list).length;
+        const previewLength = util.filter(res.data.data.lessonPage.list).length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
@@ -183,6 +184,7 @@ Page({
         } 
         this.setData({
           courseData: res.data.data,
+          materialData: util.filter(res.data.data.lessonPage.list),
           list: util.studyPageTime(res.data.data.lessonPage.list),
           wxObjectives: util.strategy(res.data.data.weekCourseConfig.wxObjectives)
         })

pages/art/art.wxml

@@ -14,7 +14,7 @@
             height="{{lessonListHeight}}"/>
 
             <preview 
-            materialData="{{courseData.lessonPage.list}}"
+            materialData="{{materialData}}"
             height="{{previewHeight}}"/>
 
             <chat id="upload"

pages/chinese/chinese.js

@@ -17,7 +17,8 @@ Page({
     previewHeight: '',
     questionsMore: '',
     wxObjectives: [],
-    flag: true
+    flag: true,
+    materialData: []
   },
 
   /* 区分答疑和分享 */
@@ -107,8 +108,8 @@ Page({
       }, {
         "category": 3
       }).success((res) => {
-        const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = res.data.data.lessonPage.list.length;
+        const lessonListLength = util.studyPageTime(res.data.data.lessonPage.list).length;
+        const previewLength = util.filter(res.data.data.lessonPage.list).length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
@@ -122,6 +123,7 @@ Page({
         } 
         this.setData({
           courseData: res.data.data,
+          materialData: util.filter(res.data.data.lessonPage.list),
           list: util.studyPageTime(res.data.data.lessonPage.list),
           wxObjectives: util.strategy(res.data.data.weekCourseConfig.wxObjectives)
         })

pages/chinese/chinese.wxml

@@ -14,7 +14,7 @@
             height="{{lessonListHeight}}"/>
 
             <preview 
-            materialData="{{courseData.lessonPage.list}}"
+            materialData="{{materialData}}"
             height="{{previewHeight}}"/>
 
             <chat id="questions"

pages/english/english.js

@@ -17,7 +17,8 @@ Page({
     previewHeight: '',
     questionsMore: '',
     wxObjectives: [],
-    flag: true    
+    flag: true,
+    materialData: []    
   },
 
   /* 区分答疑和分享 */
@@ -108,8 +109,8 @@ Page({
         "category": 4
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
-        const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = res.data.data.lessonPage.list.length;
+        const lessonListLength = util.studyPageTime(res.data.data.lessonPage.list).length;
+        const previewLength = util.filter(res.data.data.lessonPage.list).length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
@@ -123,6 +124,7 @@ Page({
         } 
         this.setData({
           courseData: res.data.data,
+          materialData: util.filter(res.data.data.lessonPage.list),
           list: util.studyPageTime(res.data.data.lessonPage.list),
           wxObjectives: util.strategy(res.data.data.weekCourseConfig.wxObjectives)
         })

pages/english/english.wxml

@@ -14,7 +14,7 @@
             height="{{lessonListHeight}}"/>
 
             <preview 
-            materialData="{{courseData.lessonPage.list}}"
+            materialData="{{materialData}}"
             height="{{previewHeight}}"/>
 
             <chat id="questions"

pages/language/language.js

@@ -17,7 +17,8 @@ Page({
     previewHeight: '',
     questionsMore: '',
     wxObjectives: [],
-    flag: true        
+    flag: true,
+    materialData: []        
   },
 
   /* 区分答疑和分享 */
@@ -105,8 +106,8 @@ Page({
       }, {
         "category": 1
       }).success((res) => {
-        const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = res.data.data.lessonPage.list.length;
+        const lessonListLength = util.studyPageTime(res.data.data.lessonPage.list).length;
+        const previewLength = util.filter(res.data.data.lessonPage.list).length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
@@ -120,6 +121,7 @@ Page({
         } 
         this.setData({
           courseData: res.data.data,
+          materialData: util.filter(res.data.data.lessonPage.list),
           list: util.studyPageTime(res.data.data.lessonPage.list),
           wxObjectives: util.strategy(res.data.data.weekCourseConfig.wxObjectives)
         })

pages/language/language.wxml

@@ -14,7 +14,7 @@
             height="{{lessonListHeight}}"/>
 
             <preview 
-            materialData="{{courseData.lessonPage.list}}"
+            materialData="{{materialData}}"
             height="{{previewHeight}}"/>
 
             <chat id="questions"

pages/mathematics/mathematics.js

@@ -17,7 +17,8 @@ Page({
     previewHeight: '',
     questionsMore: '',
     wxObjectives: [],
-    flag: true 
+    flag: true,
+    materialData: []
   },
 
   /* 区分答疑和分享 */
@@ -108,8 +109,8 @@ Page({
         "category": 2
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
-        const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = res.data.data.lessonPage.list.length;
+        const lessonListLength = util.studyPageTime(res.data.data.lessonPage.list).length;
+        const previewLength = util.filter(res.data.data.lessonPage.list).length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
@@ -123,6 +124,7 @@ Page({
         } 
         this.setData({
           courseData: res.data.data,
+          materialData: util.filter(res.data.data.lessonPage.list),
           list: util.studyPageTime(res.data.data.lessonPage.list),
           wxObjectives: util.strategy(res.data.data.weekCourseConfig.wxObjectives)
         })

pages/mathematics/mathematics.wxml

@@ -14,7 +14,7 @@
             height="{{lessonListHeight}}"/>
 
             <preview 
-            materialData="{{courseData.lessonPage.list}}"
+            materialData="{{materialData}}"
             height="{{previewHeight}}"/>
 
             <chat id="questions"

pages/mistakes/mistakes.js

@@ -10,31 +10,30 @@ Page({
   data: {
     mistakesData: [],
     animationData: {},
-    flag: [],
+    flags: [],
     exponentData: [],
     course: ['语文', '数学'],
     courseIndex: 0,
     flag: true,
     switchs: true,
     errorData: {},
-    errImgW: '',
-    errImgH: '',
+    errImgW: [],
+    errImgH: [],
   },
 
-  particulars: function (e) {
-    let flage = e.currentTarget.dataset.flag;
-    let index = e.currentTarget.dataset.index;
+  particulars: function ({ currentTarget }) {
+    //console.log(currentTarget.dataset.flag, currentTarget.dataset.index);
+    let flage = currentTarget.dataset.flag;
+    let index = currentTarget.dataset.index;
     if(flage){
-      this.util('60rpx');
-      this.data.flag[index] = false;
+      this.data.flags[index] = false;
       this.setData({
-        flag: this.data.flag,
+        flags: this.data.flags,
       })
     } else {
-      this.data.flag[index] = true;
-      this.util('164rpx');
+      this.data.flags[index] = true;
       this.setData({
-        flag: this.data.flag,
+        flags: this.data.flags,
       })
     }
   },
@@ -43,13 +42,16 @@ Page({
   imageLoad: function (e) {
     let height = e.detail.height;
     let width = e.detail.width;
+    this.data.errImgW.push(width);
+    this.data.errImgH.push(height);
+    //console.log(height, width)
     //设置图片宽度
     //const imgW = width * .9;
     //设置图片高度
     //const imgH = imgW * (height / width);
     this.setData({
-      errImgW: width + 'rpx',
-      errImgH: height + 'rpx'
+      errImgW: this.data.errImgW,
+      errImgH: this.data.errImgH
     })
   },
 
@@ -96,10 +98,10 @@ Page({
         })
 
         for(let item of  res.data.data.list) {
-          //this.data.flag.push(false);
+          this.data.flags.push(false);
         }
         this.setData({
-          flag: this.data.flag
+          flags: this.data.flags
         })
       })
       //用户答题指数

pages/mistakes/mistakes.wxml

@@ -27,16 +27,16 @@
                 </view>
             </view>
             <view class="course-content">
-                <view class="error answer-content" wx:for="{{mistakesData}}" wx:key="index">
+                <view class="error answer-content" wx:for="{{mistakesData}}" wx:key="index" style="height: {{ flags[index] ? 405 + errImgH[index] : '465'}}rpx">
                     <image class="questions" src="{{item.questions.img}}"></image>
-                    <view class="answer {{flag[index] ? 'unfold' : ''}}" animation="{{flag[index]? animationData : ''}}">
+                    <view class="answer" style="height: {{errImgH[index]}}rpx">
+                        <image class="analysis-box" src="{{item.wrongQuestionsAnalysis.analysis}}" bindload="imageLoad" style="width: {{errImgW[index]}}rpx; height: {{errImgH[index]}}rpx" hidden="{{!flags[index]}}"></image>
                         <view class="answer-txt">
                             <text>你的答案：{{item.userQuestionResult.answer === "0" ? '不知道' : item.userQuestionResult.answer}}</text>
                             <text>{{item.questions.answer == item.userQuestionResult.answer ? "" : "（错误）"}}</text>
                         </view>
-                        <!-- 错题点击事件 bindtap="particulars" 没有解析暂时去掉 -->
-                        <view class="analysis"  data-flag="{{flag[index]}}" data-index="{{index}}">
-                            <image class="analysis-img" src="../image/analysis_bottom.png" wx:if="{{!(flag[index])}}"></image>
+                        <view class="analysis"  data-flag="{{flags[index]}}" data-index="{{index}}" bindtap="particulars">
+                            <image class="analysis-img" src="../image/analysis_bottom.png" wx:if="{{!(flags[index])}}"></image>
                             <image class="analysis-img-top" src="../image/analysis_top.png" wx:else></image>
                         </view>
                     </view>
@@ -55,7 +55,7 @@
   <view class="mistakes-dialog" hidden='{{switchs}}'>
     <image class="error-questions" src="{{errorData.img}}"></image>
     <scroll-view scroll-y class='mistakes-dialog-scroll'>
-       <image class="error-analysis" src="{{errorData.analysis}}" bindload="imageLoad" style="width: {{errImgW}}; height: {{errImgH}}"></image>
+       <image class="error-analysis" src="{{errorData.analysis}}" bindload="imageLoad" style="width: {{errImgW[0]}}rpx; height: {{errImgH[0]}}rpx"></image>
     </scroll-view>
     <image class="close" src="../image/close.png" bindtap='closeDialog'></image>
   </view>   

pages/mistakes/mistakes.wxss

@@ -62,10 +62,15 @@
 }
 
 .answer-content {
-    margin-bottom: 20rpx;
+    position: relative;
+    padding-bottom: 20rpx;
 }
 
 .answer-content .questions {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 1; 
     width: 100%;
     height: 405rpx;
     border-radius: 20rpx;
@@ -73,21 +78,27 @@
 
 .answer {
     position: relative;
-    display: flex;
-    justify-content: space-evenly;
     margin:0 20rpx;
     border-radius: 10rpx;
 }
 
+.analysis-box {
+    position: absolute;
+    left: 2%;
+    top: 398rpx;
+}
+
 .answer-txt {
+    position: absolute;
+    left: 20%;
+    top: 416rpx;
+    z-index: 2;
     font-size: 28rpx;
     color: #858585;
 }
 
 .analysis {
-    position: absolute;
-    right: 0;
-    top: -10rpx;
+   
 }
 
 .unfold {
@@ -95,13 +106,16 @@
 }
 
 .analysis .analysis-img {
+    position: absolute;
+    right: 0;
+    top: 404rpx;
     width: 103rpx;
     height: 60rpx;
 }
 
 .analysis .analysis-img-top {
     position: absolute;
-    bottom: 0;
+    bottom: -402rpx;
     left: 50%;
     transform: translate(-50%, 0);
     width: 99rpx;

pages/my/my.wxss

@@ -130,13 +130,13 @@
   display: flex;
   justify-content: space-between;
   font-size: 28rpx;
-  margin-bottom: 30rpx;
+  margin-bottom: 16rpx;
 }
 
 .particular {
   position: absolute;
   right: 30rpx;
-  bottom: 30rpx;
+  bottom: 20rpx;
   color: #5984F7;
   font-size: 28rpx;
 }

pages/science/science.js

@@ -21,7 +21,8 @@ Page({
     questionsMore: '',
     wxObjectives: [],
     canvasHeight: '',
-    flag: true    
+    flag: true,
+    materialData: []   
   },
   /* 区分答疑和分享 */
   distinction: function(type, columnId, pageNo, pageSize, success) {
@@ -153,8 +154,8 @@ Page({
         "category": 5
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
-        const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = res.data.data.lessonPage.list.length;
+        const lessonListLength = util.studyPageTime(res.data.data.lessonPage.list).length;
+        const previewLength = util.filter(res.data.data.lessonPage.list).length;
         if(lessonListLength > 4) {
           this.setData({
             lessonListHeight: 280
@@ -167,6 +168,7 @@ Page({
         } 
         this.setData({
           courseData: res.data.data,
+          materialData: util.filter(res.data.data.lessonPage.list),
           list: util.studyPageTime(res.data.data.lessonPage.list),
           wxObjectives: util.strategy(res.data.data.weekCourseConfig.wxObjectives)
         })

pages/science/science.wxml

@@ -14,7 +14,7 @@
             height="{{lessonListHeight}}"/>
 
             <preview 
-            materialData="{{courseData.lessonPage.list}}"
+            materialData="{{materialData}}"
             height="{{previewHeight}}"/>
 
             <chat id="upload"

utils/util.js

@@ -59,7 +59,7 @@ function studyPageTime (arr) {
   const time = new Date();
   for(let item of arr) {
     if(!item.title) {
-      break;
+      continue;
     }
     let msd = (time - item.studyDate*1) / 1000;
     studyLog.push(
@@ -74,6 +74,24 @@ function studyPageTime (arr) {
   return studyLog;
 }
 
+//过滤暂无资料不显示
+function filter (arr) {
+  const studyLog = [];
+  for(let item of arr) {
+    if(!item.fileName) {
+      continue;
+    }
+    studyLog.push(
+      {
+      fileName: item.fileName, 
+      warePath: item.warePath,
+      }
+    )
+  }
+  console.log(studyLog)
+  return studyLog;
+}
+
 //本周推荐勋章攻略 取消<br>
 function strategy (str) {
   return str.split('<br/>');
@@ -271,6 +289,7 @@ function saveFile(tempFile, success) {
 module.exports = {
   studyTime,
   studyPageTime,
+  filter,
   strategy,
   gradeUpper,
   day,