更新迭代

compontents/chat/chat.js

@@ -78,16 +78,16 @@ Component({
       })
     },
     listenerButtonPreviewImage: function(e) {
-      let imgUrl = [];
-      imgUrl.push(e.target.dataset.img);
+      const imgUrl = [...e.target.dataset.img];
+      const index = e.target.dataset.index;
       wx.previewImage({
-          current: '', // 当前显示图片的http链接
+          current: imgUrl[index], // 当前显示图片的http链接
           urls: imgUrl, // 需要预览的图片http链接列表
-          //这根本就不走
+          //成功时候调用
           success: function(res) {
               //console.log(res);
           },
-          //也根本不走
+          //失败时候调用
           fail: function() {
               //console.log('fail')
           }
@@ -179,6 +179,16 @@ Component({
                 isTop: top,
               }).success(res => {
                 this.data.productionData.list[ind].isTop = top;
+                if(top == '1') {
+                  this.data.productionData.list.unshift(this.data.productionData.list[ind]);
+                  this.data.productionData.list.splice(ind + 1, 1);
+                }else {
+                  let arr = [];
+                  //取消置顶排序 isTop 然后uid 然后时间
+                  this.data.productionData.list.sort(function(a,b){
+                    return b.gmtCreated - a.gmtCreated
+                  });
+                }
                 this.setData({
                   productionData: this.data.productionData
                 })

compontents/chat/chat.wxml

@@ -15,8 +15,8 @@
                     </view>   
                     <view class="lesson-name">
                         <text style="width: 40%; overflow: hidden; diaplay: inline-block; height: 50rpx; text-overflow: ellipsis;  white-space:nowrap;">{{item.featureMap.wechatName}}</text>
-                        <text class="content-data" style="display： block;">{{item.title}}</text>
                         <text style="height: 30rpx; display： block;">{{timeList[index]}}</text>
+                        <text class="content-data" style="display： block; color: #000; font-size: 36rpx;">{{item.title}}</text>
                     </view>
                     <view wx:if="{{type == 1 && (item.currentReplyCount > 0)}}" class="message"></view>
                 </view>
@@ -26,7 +26,7 @@
                 </view>
                 <view class="picture" wx:if="{{type == 2}}">
                     <block wx:for="{{item.imagesList}}" wx:for-item="items" wx:key="{{items}}">
-                        <image mode="aspectFill" src="{{items}}" catchtap="listenerButtonPreviewImage" data-img="{{items}}" bindload="imageLoad"></image>
+                        <image mode="aspectFill" src="{{items}}" catchtap="listenerButtonPreviewImage" data-img="{{item.imagesList}}" data-index="{{index}}" bindload="imageLoad"></image>
                     </block>
                 </view>
                 <view class="icon" wx:if="{{type == 2}}">

compontents/lesson_list/lessonList.js

@@ -31,7 +31,7 @@ Component({
   methods: {
     onTap (e) {
       let flage = e.target.dataset.flag;
-      const height = this.properties.lessonData.length * 64;
+      const height = this.properties.lessonData.length * 72;
       if(flage){
         this.util(flage, '144rpx');
         this.setData({

compontents/lesson_list/lessonList.wxml

@@ -9,7 +9,7 @@
         </view>
     </view>
     <view class=" timer-shaft " animation="{{animationData}}" style="height: {{height}}rpx">
-        <view class="art-lesson" wx:for="{{lessonData}}" wx:key="{{index}}" >
+        <view class="art-lesson" wx:for="{{lessonData}}" wx:key="{{index}}" style="border-bottom: 2rpx solid #ccc;padding-bottom: 6rpx;">
             <view class="graph">
                 <view class="yuan {{item.isStudy ? 'check' : 'no-check'}} "></view>
             </view>

compontents/lesson_list/lessonList.wxss

@@ -127,17 +127,18 @@
 .unfold {
     position: absolute;
     right: 28rpx;
-    bottom: 24rpx;
+    top: 60rpx;
     font-size: 28rpx;
     line-height: 28rpx;
     height: 28rpx;
     color: #93AAFA;
+    border: 2rpx solid #93AAFA;
+    border-radius: 28rpx;
+    padding: 10rpx 40rpx;    
 }
 .dirImg{
   width: 16rpx;
   height: 9rpx;
-  position: absolute;
-  top: 50%;
-  left: -20rpx;
-  margin-top: -5rpx;
+  vertical-align: middle;
+  margin-right: 10rpx;
 }

compontents/preview/preview.js

@@ -31,9 +31,8 @@ Component({
   methods: {
     onTap (e) {
       let flage = e.target.dataset.flag;
-      const height = this.properties.materialData.length * 64;
+      const height = this.properties.materialData.length * 72;
       if(flage){
-        
         this.util(flage, '144rpx');
         this.setData({
           'flag': false,

compontents/preview/preview.wxml

@@ -11,7 +11,7 @@
     </view>
 
     <view class="material-con" animation="{{animationData}}" style="height: {{height}}rpx">
-        <view class="art-img" wx:for="{{materialData}}" wx:key="{{index}}">
+        <view class="art-img" wx:for="{{materialData}}" wx:key="{{index}}" style="border-bottom: 2rpx solid #ccc;padding-bottom: 6rpx;">
             <text wx:if="{{ item.warePath && item.fileName}}">{{item.fileName}}</text>
             <text wx:if="{{ item.warePath && item.fileName}}" data-warePath="{{item.warePath}}" bindtap="preview">点击预览</text>
         </view>

compontents/preview/preview.wxss

@@ -65,17 +65,18 @@
 .unfold {
     position: absolute;
     right: 28rpx;
-    bottom: 24rpx;
+    top: 60rpx;
     font-size: 28rpx;
     line-height: 28rpx;
     height: 28rpx;
     color: #93AAFA;
+    border: 2rpx solid #93AAFA;
+    border-radius: 28rpx;
+    padding: 10rpx 40rpx;
 }
 .dirImg{
   width: 16rpx;
   height: 9rpx;
-  position: absolute;
-  top: 50%;
-  left: -20rpx;
-  margin-top: -5rpx;
+  vertical-align: middle;
+  margin-right: 10rpx;
 }

pages/art/art.js

@@ -146,6 +146,42 @@ Page({
         teacher: wx.getStorageSync('user').data.data.isTeacher
       })
     }
+    /*科目信息*/
+    login.getOpenidSessionKey((res) => {
+      APIClient.getEachSchedule({
+        uid: res.data.data.uid
+      }, {
+        "category": 6
+      }).success((res) => {
+        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({
+            lessonListHeight: 144
+          })
+        }
+        if(previewLength > 4){
+          this.setData({
+            previewHeight: 144
+          })
+        } 
+        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)
+        })
+      })
+    }, () => {
+      this.setData({
+        flag: !this.data.flag
+      })      
+    }, this.data.loginType);
+    
+  },
+
+  onShow: function () {
     const columnId = util.column('6').columnId;
     /* 分享 */
     this.distinction(2, columnId, 1, 2, res => {
@@ -192,42 +228,6 @@ Page({
         }
       }
     });
-    /*科目信息*/
-    login.getOpenidSessionKey((res) => {
-      APIClient.getEachSchedule({
-        uid: res.data.data.uid
-      }, {
-        "category": 6
-      }).success((res) => {
-        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({
-            lessonListHeight: 144
-          })
-        }
-        if(previewLength > 4){
-          this.setData({
-            previewHeight: 144
-          })
-        } 
-        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)
-        })
-      })
-    }, () => {
-      this.setData({
-        flag: !this.data.flag
-      })      
-    }, this.data.loginType);
-    
-  },
-
-  onShow: function () {
   },
   keep: function () {
 

pages/input_content/input_content.js

@@ -47,13 +47,23 @@ Page({
           var tempFilePaths = res.tempFilePaths; 
           //启动上传等待中...  
           wx.showToast({  
-            title: '正在上传...',  
+            title: '压缩中...',  
             icon: 'loading',  
             mask: true,  
             duration: 1000 
           }) 
           for(let item of tempFilePaths){
             that.data.tempFilePath.push(item);
+            // wx.compressImage({
+            //   src: item, // 图片路径
+            //   quality: 80, // 压缩质量
+            //   success: (res)=> {
+            //     console.log('=======', res.tempFilePath)
+            //   },
+            //   fail: (err)=> {
+            //     console.log('err=======', err)
+            //   }
+            // })
           }
           that.setData({
             tempFilePath:  that.data.tempFilePath

pages/particulars/particulars.js

@@ -16,7 +16,9 @@ Page({
     type: '',
     favors: '',
     like: false,
-    hike: false
+    hike: false,
+    time: '',
+    discussTime: []
   },
   /* 获取输入内容 */
   bindKeyInput (e) {
@@ -61,8 +63,10 @@ Page({
       }, data).success((res) => {
         if(res.data.success) {
           this.data.discussDatas.push(res.data.data);
+          this.data.discussTime.push(util.formatDate(res.data.data.gmtCreated, 4))
           this.setData({
             discussDatas: this.data.discussDatas,
+            discussTime: this.data.discussTime,
             messageLength: this.data.discussDatas.length
           });
         };
@@ -170,12 +174,17 @@ Page({
           postsId, 
         }).success(res => {
           console.log(res.data)
+          res.data.data.replyList.forEach(item => {
+            this.data.discussTime.push(util.formatDate(item.gmtCreated, 4))
+          });
           if(res.data.success) {
             this.setData({
               productionData: res.data.data,
               discussDatas: res.data.data.replyList,
               messageLength: res.data.data.replyList.length,
-              favors:res.data.data.postsAttributeInfo.favors
+              favors:res.data.data.postsAttributeInfo.favors,
+              time: util.formatDate(res.data.data.gmtCreated, 4),
+              discussTime: this.data.discussTime
             })
           }
         })

pages/particulars/particulars.wxml

@@ -10,7 +10,8 @@
                     </view>    
                     <view class="lesson-name">
                         <text>{{productionData.featureMap.wechatName}}</text>
-                        <text class='content-data'>{{productionData.title}}</text>
+                        <text style="height: 30rpx; display： block;">{{time}}</text>
+                        <text class='content-data' style="display： block; color: #000; font-size: 36rpx;">{{productionData.title}}</text>
                     </view>
                 </view>
                 <view class="picture" wx:if="{{type == 2}}">
@@ -36,9 +37,10 @@
             </view>
         </view>            
         <view class="comment" >
-            <view  wx:for="{{discussDatas}}" wx:key="{{item.id}}">
-                <text style="color: {{productionData.userId == item.userId ? '#000' : '#f7085e'}}">{{item.featureMap.wechatName}}：</text>
-                <text>{{item.content}}</text>
+            <view  wx:for="{{discussDatas}}" wx:key="{{item.id}}" style="border-bottom: 1rpx solid #ccc;padding-bottom: 10rpx;">
+                <view style="color: {{productionData.userId == item.userId ? '#000' : '#f7085e'}}">{{item.featureMap.wechatName ? item.featureMap.wechatName : '方老师'}}</view>
+                <view style="height: 30rpx; display： block;">{{discussTime[index]}}</view>
+                <view style="margin-top: 20rpx;">{{item.content}}</view>
             </view>  
         </view>
     </scroll-view>

pages/particulars/particulars.wxss

@@ -53,7 +53,6 @@
 }
 
 .lesson-name text:nth-child(2) {
-    height: 30rpx;
     margin-top: 10rpx;
     font-size: 28rpx;
     color: #C3C3C3;

pages/science/science.js

@@ -130,6 +130,43 @@ Page({
         teacher: wx.getStorageSync('user').data.data.isTeacher
       })
     }
+    /*科目信息*/
+    login.getOpenidSessionKey((res) => {
+      //console.log(res.data.data.uid);
+      APIClient.getEachSchedule({
+        uid: res.data.data.uid
+      }, {
+        "category": 5
+      }).success((res) => {
+        //console.log('科目信息' + JSON.stringify(res));
+        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: 144
+          })
+        }
+        if(previewLength > 4){
+          this.setData({
+            previewHeight: 144
+          })
+        } 
+        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)
+        })
+      })
+    }, () => {
+      this.setData({
+        flag: !this.data.flag
+      })     
+    }, this.data.loginType);
+   
+  },
+
+  onShow: function () {
     const columnId = util.column('5').columnId;
     /* 分享 */
     this.distinction(2, columnId, 1, 2, res => {
@@ -176,45 +213,7 @@ Page({
           }
         }  
       }
-    });
-    /*科目信息*/
-    login.getOpenidSessionKey((res) => {
-      //console.log(res.data.data.uid);
-      APIClient.getEachSchedule({
-        uid: res.data.data.uid
-      }, {
-        "category": 5
-      }).success((res) => {
-        //console.log('科目信息' + JSON.stringify(res));
-        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: 144
-          })
-        }
-        if(previewLength > 4){
-          this.setData({
-            previewHeight: 144
-          })
-        } 
-        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)
-        })
-      })
-    }, () => {
-      this.setData({
-        flag: !this.data.flag
-      })     
-    }, this.data.loginType);
-   
-  },
-
-  onShow: function () {
-    
+    });    
   },
   /* 转发*/
   onShareAppMessage: function (ops) {

project.config.json

@@ -8,7 +8,7 @@
 		"newFeature": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "1.6.6",
+	"libVersion": "2.4.3",
 	"appid": "wx7b5ea6422847ea64",
 	"projectname": "%E5%B0%8F%E5%AD%A6%E7%8E%8B%E8%80%85%E7%8F%AD",
 	"condition": {

utils/util.js

@@ -6,7 +6,7 @@ const gradeUpper = grade => {
 
 //时间戳转时间
 function formatDate(time, flag) {
-	console.log(time)
+  console.log(time)
 	const t = new Date(time); 
 	const tf = function(i){return (i < 10 ? '0' : '') + i};
 	const year = t.getFullYear();