更改勋章战士

README.md

@@ -6,7 +6,7 @@ AppSecret: adece358e0d933e39d87b68fbf700651
 
 [登录微信公共平台](https://mp.weixin.qq.com/);
 
-账号：sunzhilei@efunbox.cn， 密码：edu@3366;
+账号：sunzhilei@efunbox.cn， 密码：efunbox@3366;
 
 ## 关于代码
 刚开始是一个小程序，结束后提出新需求，把另一个小程序上的东西也给放这个小程序上，所以注释里说的另一个小程序就是两个小程序结合在一起的，

compontents/chat/chat.js

@@ -41,6 +41,18 @@ Component({
     ind: {
       type: String,
       value: ''
+    },
+    timeList: {
+      type: Array,
+      value: ''
+    },
+    teacher: {
+      type: String,
+      value: ''
+    },
+    isTopFlagList: {
+      type: Array,
+      value: ''
     }
   },
 
@@ -148,6 +160,54 @@ Component({
         ratio: height/width,
         canvasHeight: imgHeight + 300
       })
+    },
+    //修改留言
+    setMessage: function ({currentTarget}) {
+      const id = currentTarget.dataset.id;
+      const type = currentTarget.dataset.type;
+      const ind = currentTarget.dataset.ind;
+      if(type == 'isTop') {
+        //置顶
+        wx.showModal({
+          title: '提示',
+          content: '确定置顶吗',
+          success: (res) => {
+            if (res.confirm) {
+              APIClient.setMessage({
+                id,
+                isTop: 1,
+              }).success(res => {
+                this.data.productionData.list[ind].isTop = 1;
+                this.setData({
+                  productionData: this.data.productionData
+                })
+              })
+            }
+          }
+        })
+
+      }else {
+        //删除
+        wx.showModal({
+          title: '提示',
+          content: '确定删除吗',
+          success: (res) => {
+            if (res.confirm) {
+              APIClient.setMessage({
+                id,
+                status: 'DEL'
+              }).success(res => {
+                console.log('删除成功');
+                this.data.productionData.list.splice(ind,1);
+                this.setData({
+                  productionData: this.data.productionData
+                })
+              })
+            }
+          }
+        })
+
+      }
     }  
   },
   ready: function(){

compontents/chat/chat.wxml

@@ -12,14 +12,19 @@
                 <view class="head">
                     <view class="head-img">
                         <image src="{{item.featureMap.headImgUrl}}"></image>
-                    </view>    
+                    </view>   
                     <view class="lesson-name">
-                        <text>{{item.featureMap.wechatName}}</text>
+                        <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="height: 100%">{{item.title}}</text>
+                        <text>{{timeList[index]}}</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="operation" wx:if="{{teacher == 1}}">
+                    <image src="../../pages/image/del.png" catchtap="setMessage" data-id="{{item.id}}" data-type="status" data-ind="{{index}}"></image>
+                    <image src="../../pages/image/top.png" catchtap="setMessage" data-id="{{item.id}}" data-type="isTop" data-ind="{{index}}"></image>
+                </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>

compontents/chat/chat.wxss

@@ -58,7 +58,7 @@
 
 .share-con .head {
     padding:20rpx 0;
-
+    position: relative;
 }
 
 .head-img {
@@ -86,7 +86,8 @@
     font-weight: 600;
 }
 
-.lesson-name text:nth-child(2) {
+.lesson-name text:nth-child(2),
+.lesson-name text:nth-child(3) {
     height: 30rpx;
     margin-top: 10rpx;
     font-size: 28rpx;
@@ -137,7 +138,7 @@
 
 .Stick {
     position: absolute;
-    left:136px;
+    right:136px;
     top:32rpx;
     font-size: 32rpx;
     color: skyblue;
@@ -260,4 +261,16 @@
   display:block;
   word-break:break-all;
   color: #444444;
+}
+
+.operation {
+    position: absolute;
+    right: 60rpx;
+    top: 20rpx;
+}
+
+.operation image {
+    height:38rpx;
+    width:42rpx;
+    margin: 0 20rpx;    
 }

compontents/lesson_list/lessonList.js

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

compontents/lesson_list/lessonList.wxml

@@ -5,7 +5,7 @@
         <image src="../../pages/image/courseware.png"></image>
         <view class="lesson-name">
             <text>课件列表</text>
-            <text>本周推荐课已经完成了</text>
+            <text>本周推荐课</text>
         </view>
     </view>
     <view class=" timer-shaft " animation="{{animationData}}" style="height: {{height}}rpx">

compontents/lesson_list/lessonList.wxss

@@ -47,7 +47,7 @@
 
 .art-lesson {
      position: relative;
-     height:32rpx;
+     height:40rpx;
      margin-top: 24rpx;
  }
 
@@ -69,13 +69,21 @@
 .art-con-color {
     display: flex;
     justify-content: space-between;
-    height:32rpx;
+    height:40rpx;
     margin-left: 53rpx;
-    height:32rpx;
     font-size: 28rpx;
     color: #878787;
 }
 
+.art-con-color text:nth-child(1) {
+    width:70%;
+    overflow:hidden;
+    white-space:nowrap;
+    text-overflow:ellipsis;
+}
+
+
+
 .graph {
     position: absolute;
     left: 0;

compontents/preview/preview.js

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

compontents/preview/preview.wxss

@@ -48,9 +48,8 @@
 .art-img {
     display: flex;
     justify-content: space-between;
-    height:32rpx;
     margin-left: 53rpx;
-    height:32rpx;
+    height: 40rpx;
     font-size: 28rpx;
     color: #303030;
     margin-top: 24rpx;

compontents/set_grade/set_grade.wxml

@@ -2,8 +2,8 @@
 <view class="container" bindtap="hidePopup" hidden="{{flag}}">
     <view class="share">
         <view class="share-img"> 
-            <view class="download" wx:for="{{gradeData}}" wx:key="{{index}}">
-                <text class="{{item === grade ? 'color' : ''}}" catchtap="grade" data-grade="{{index}}">{{item}}</text>
+            <view class="download" catchtap="grade" data-grade="{{index}}" wx:for="{{gradeData}}"  wx:key="{{index}}">
+                <text class="{{item === grade ? 'color' : ''}}" >{{item}}</text>
             </view>
         </view>
         <view class="deselect" catchtap="hidePopup">

compontents/share/share.js

@@ -69,6 +69,25 @@ Component({
       const windowWidth = wx.getSystemInfoSync().windowWidth;
       //获取图片高度
       const imgHeight = windowWidth*ratio;
+      if(imgUrl.length == 0) {
+        wx.showModal({
+          title: '提示',
+          content: '没有上传图片不能分享',
+          showCancel:false,
+          confirmText:'我知道了',
+          confirmColor:'#72B9C3',
+          success: (res) => {
+              if (res.confirm) {
+                  console.log('用户点击确定');
+                  this.setData({
+                    flag: !this.data.flag
+                  })
+              }
+              //that.hideShareImg()
+          }
+        })
+        return false;
+      }
       //先绘制图片
       for (let item of imgUrl) {
         wx.downloadFile({

compontents/tarbar/tarbar.js

@@ -6,7 +6,6 @@ Component({
    * 第一次进入课程的nav
    */
   properties: {
-    
   },
 
   /**

pages/art/art.js

@@ -37,7 +37,9 @@ Page({
     canvasHeight: '',
     flag: true,
     materialData: [],
-    loginType: 1
+    loginType: 1,
+    timeList: [],
+    teacher: ''
   },
 
   /* 区分答疑和分享 */
@@ -72,7 +74,11 @@ Page({
             questionsData: res.data.data,
           }) 
           if(res.data.data) {
+            res.data.data.list.forEach(item => {
+              this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+            });
             this.setData({
+              timeList: this.data.timeList,
               questionsdian: util.replyNo(res.data.data.list)
             })
             if(5*this.data.num1 > res.data.data.totalSize) {
@@ -93,8 +99,12 @@ Page({
       this.distinction(type, columnId, 1, 5*this.data.num2, res => {
         if(res.data.success) {
           console.log(res.data.data)
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
           this.setData({
-            productionData: res.data.data,
+            timeList: this.data.timeList,
+            productionData: res.data.data
           }) 
           if(5*this.data.num2 > res.data.data.totalSize) {
             this.setData({
@@ -124,7 +134,6 @@ Page({
   },
 
 
-
   onLoad: function (options) {
     //this.chat = this.selectComponent("#chat");
     if(options.type == "noTv") {
@@ -132,6 +141,11 @@ Page({
         loginType: ""
       })
     }
+    if(wx.getStorageSync('user')) {
+      this.setData({
+        teacher: wx.getStorageSync('user').data.data.isTeacher
+      })
+    }
     const columnId = util.column('6').columnId;
     /* 分享 */
     this.distinction(2, columnId, 1, 2, res => {
@@ -141,6 +155,12 @@ Page({
           productionData: res.data.data
         })
         if(res.data.data) {
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
+          this.setData({
+            timeList: this.data.timeList,
+          }) 
           if(res.data.data.totalSize > 2) {
             this.setData({
               productionMore: true
@@ -156,10 +176,14 @@ Page({
         this.setData({
           questionsData: res.data.data
         })
-        if(res.data.data) {
+        if(res.data.data) { 
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
           this.setData({
+            timeList: this.data.timeList,
             questionsdian: util.replyNo(res.data.data.list)
-          })  
+          }) 
           if(res.data.data.totalSize > 2) {
             this.setData({
               questionsMore: true
@@ -180,12 +204,12 @@ Page({
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 280
+            lessonListHeight: 144
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 280
+            previewHeight: 144
           })
         } 
         this.setData({
@@ -204,7 +228,6 @@ Page({
   },
 
   onShow: function () {
-    
   },
   keep: function () {
 

pages/art/art.wxml

@@ -16,35 +16,43 @@
             <preview 
             materialData="{{materialData}}"
             height="{{previewHeight}}"/>
+            
+            <view id="upload-position">
+                <chat id="upload"
+                    ind="7"
+                    id="chat"
+                    productionData="{{productionData}}" 
+                    title="作品展示"
+                    query="上传作品"
+                    type="2"
+                    columnType="6"
+                    bind:myevent="onMyEvent"
+                    bind:getHeight="onGetHeight"
+                    data-type="2"
+                    more="{{productionMore}}"
+                    timeList="{{timeList}}"
+                    teacher="{{teacher}}"
+                    />
+            </view>
+            <view id="questions-position">
+                <chat id="questions"
+                    productionData="{{questionsData}}" 
+                    title="答疑讨论"
+                    query="我有疑问"
+                    type="1"
+                    columnType="6"
+                    bind:myevent="onMyEvent"
+                    data-type="1"
+                    more="{{questionsMore}}"
+                    timeList="{{timeList}}"
+                    teacher="{{teacher}}"/>
+            </view>
 
-            <chat id="upload"
-                ind="7"
-                id="chat"
-                productionData="{{productionData}}" 
-                title="作品展示"
-                query="上传作品"
-                type="2"
-                columnType="6"
-                bind:myevent="onMyEvent"
-                bind:getHeight="onGetHeight"
-                data-type="2"
-                more="{{productionMore}}"/>
-
-            <chat id="questions"
-                productionData="{{questionsData}}" 
-                title="答疑讨论"
-                query="我有疑问"
-                type="1"
-                columnType="6"
-                bind:myevent="onMyEvent"
-                data-type="1"
-                more="{{questionsMore}}"/>
-
-            <view class="upload-one" data-id="upload" bindtap="location">
+            <view class="upload-one" data-id="upload-position" bindtap="location">
                 <image src="../image/works.png" ></image>
             </view>  
 
-            <view class="questions-one" data-id="questions" bindtap="location">
+            <view class="questions-one" data-id="questions-position" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
                 <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>

pages/chinese/chinese.js

@@ -19,7 +19,8 @@ Page({
     wxObjectives: [],
     flag: true,
     materialData: [],
-    loginType: 1
+    loginType: 1,
+    timeList: []
   },
 
   /* 区分答疑和分享 */
@@ -54,7 +55,11 @@ Page({
             questionsData: res.data.data
           })
           if(res.data.data) {
+            res.data.data.list.forEach(item => {
+              this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+            });
             this.setData({
+              timeList:  this.data.timeList,
               questionsdian: util.replyNo(res.data.data.list)
             })
             if(5*this.data.num1 > res.data.data.totalSize) {
@@ -86,6 +91,11 @@ Page({
 
   onShow: function () {
     const columnId = util.column('3').columnId;
+    if(wx.getStorageSync('user')) {
+      this.setData({
+        teacher: wx.getStorageSync('user').data.data.isTeacher
+      })
+    }
     /* 答疑 */
     this.distinction(1, columnId, 1, 2, res => {
       if(res.data.success) {
@@ -94,7 +104,11 @@ Page({
           questionsData: res.data.data
         })
         if(res.data.data) {
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
           this.setData({
+            timeList: this.data.timeList,
             questionsdian: util.replyNo(res.data.data.list)
           })
           if(res.data.data.totalSize > 2) {
@@ -118,12 +132,12 @@ Page({
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 280
+            lessonListHeight: 144
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 280
+            previewHeight: 144
           })
         } 
         this.setData({

pages/chinese/chinese.wxml

@@ -25,7 +25,9 @@
                 columnType="3"
                 bind:myevent="onMyEvent"
                 data-type="1"
-                more="{{questionsMore}}"/>
+                more="{{questionsMore}}"
+                timeList="{{timeList}}"
+                teacher="{{teacher}}"/>
 
 
             <view class="questions-one" data-id="questions" bindtap="location">

pages/english/english.js

@@ -19,7 +19,8 @@ Page({
     wxObjectives: [],
     flag: true,
     materialData: [],
-    loginType: 1    
+    loginType: 1,
+    timeList: []    
   },
 
   /* 区分答疑和分享 */
@@ -54,7 +55,11 @@ Page({
             questionsData: res.data.data,
           })
           if(res.data.data) {
+            res.data.data.list.forEach(item => {
+              this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+            });
             this.setData({
+              timeList: this.data.timeList,
               questionsdian: util.replyNo(res.data.data.list)
             })
           }   
@@ -82,6 +87,11 @@ Page({
         loginType: ""
       })
     } 
+    if(wx.getStorageSync('user')) {
+      this.setData({
+        teacher: wx.getStorageSync('user').data.data.isTeacher
+      })
+    }
   },
 
   onShow: function () {
@@ -94,7 +104,11 @@ Page({
           questionsData: res.data.data,
         })
         if(res.data.data) {
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
           this.setData({
+            timeList: this.data.timeList,
             questionsdian: util.replyNo(res.data.data.list)
           })
           if(res.data.data.totalSize > 2) {
@@ -119,12 +133,12 @@ Page({
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 280
+            lessonListHeight: 144
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 280
+            previewHeight: 144
           })
         } 
         this.setData({

pages/english/english.wxml

@@ -25,7 +25,9 @@
                 columnType="4"
                 bind:myevent="onMyEvent"
                 data-type="1"
-                more="questionsMore"/>
+                more="questionsMore"
+                timeList="{{timeList}}"
+                teacher="{{teacher}}"/>
 
 
             <view class="questions-one" data-id="questions" bindtap="location">

pages/language/language.js

@@ -19,7 +19,8 @@ Page({
     wxObjectives: [],
     flag: true,
     materialData: [],
-    loginType: 1        
+    loginType: 1,
+    timeList: []        
   },
 
   /* 区分答疑和分享 */
@@ -54,7 +55,11 @@ Page({
             questionsData: res.data.data,
           })  
           if(res.data.data) {
+            res.data.data.list.forEach(item => {
+              this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+            });
             this.setData({
+              timeList: this.data.timeList,
               questionsdian: util.replyNo(res.data.data.list)
             })
             if(5*this.data.num1 > res.data.data.totalSize) {
@@ -81,6 +86,11 @@ Page({
       this.setData({
         loginType: ""
       })
+    }
+    if(wx.getStorageSync('user')) {
+      this.setData({
+        teacher: wx.getStorageSync('user').data.data.isTeacher
+      })
     } 
   },
 
@@ -93,7 +103,11 @@ Page({
           questionsData: res.data.data,
         })
         if(res.data.data) {
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
           this.setData({
+            timeList: this.data.timeList,
             questionsdian: util.replyNo(res.data.data.list)
           })
           if(res.data.data.totalSize > 2) {
@@ -117,12 +131,12 @@ Page({
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 280
+            lessonListHeight: 144
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 280
+            previewHeight: 144
           })
         } 
         this.setData({

pages/language/language.wxml

@@ -25,7 +25,9 @@
                 columnType="1"
                 bind:myevent="onMyEvent"
                 data-type="1"
-                more="{{questionsMore}}"/>
+                more="{{questionsMore}}"
+                timeList="{{timeList}}"
+                teacher="{{teacher}}"/>
 
 
             <view class="questions-one" class="questions-one" data-id="questions" bindtap="location">

pages/mathematics/mathematics.js

@@ -19,7 +19,8 @@ Page({
     wxObjectives: [],
     flag: true,
     materialData: [],
-    loginType: 1
+    loginType: 1,
+    timeList: []
   },
 
   /* 区分答疑和分享 */
@@ -54,7 +55,11 @@ Page({
             questionsData: res.data.data,
           })
           if(res.data.data) {
+            res.data.data.list.forEach(item => {
+              this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+            });
             this.setData({
+              timeList: this.data.timeList,
               questionsdian: util.replyNo(res.data.data.list)
             })
             if(5*this.data.num1 > res.data.data.totalSize) {
@@ -73,6 +78,11 @@ Page({
       this.setData({
         loginType: ""
       })
+    }
+    if(wx.getStorageSync('user')) {
+      this.setData({
+        teacher: wx.getStorageSync('user').data.data.isTeacher
+      })
     } 
   },
   /*点击定位*/
@@ -94,7 +104,11 @@ Page({
           questionsData: res.data.data,
         })
         if(res.data.data) {
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
           this.setData({
+            timeList: this.data.timeList,
             questionsdian: util.replyNo(res.data.data.list)
           })
           if(res.data.data.totalSize > 2) {
@@ -119,12 +133,12 @@ Page({
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 280
+            lessonListHeight: 144
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 280
+            previewHeight: 144
           })
         } 
         this.setData({

pages/mathematics/mathematics.wxml

@@ -25,7 +25,9 @@
                 columnType="2"
                 bind:myevent="onMyEvent"
                 data-type="1"
-                more="{{questionsMore}}"/>
+                more="{{questionsMore}}"
+                timeList="{{timeList}}"
+                teacher="{{teacher}}"/>
 
 
             <view class="questions-one" class="questions-one" data-id="questions" bindtap="location">

pages/mistakes/mistakes.js

@@ -10,31 +10,35 @@ Page({
   data: {
     mistakesData: [],
     animationData: {},
-    flags: [],
     exponentData: [],
-    course: ['语文', '数学'],
+    course: [{
+      title: '语文',
+      flag:[]
+    }, {
+      title: '数学',
+      flag: []
+    }],
     courseIndex: 0,
     flag: true,
     switchs: true,
     errorData: {},
-    errImgW: [],
-    errImgH: [],
     loginType: 1
   },
 
   particulars: function ({ currentTarget }) {
     //console.log(currentTarget.dataset.flag, currentTarget.dataset.index);
-    let flage = currentTarget.dataset.flag;
+    let flag = currentTarget.dataset.flag;
     let index = currentTarget.dataset.index;
-    if(flage){
-      this.data.flags[index] = false;
+    const ind = this.data.courseIndex;
+    if(flag){
+      this.data.course[ind].flag[index] = false
       this.setData({
-        flags: this.data.flags,
+        course: this.data.course
       })
     } else {
-      this.data.flags[index] = true;
+      this.data.course[ind].flag[index] = true;
       this.setData({
-        flags: this.data.flags,
+        course: this.data.course
       })
       let contentId = this.data.mistakesData[index].questions.id;
       let grade = this.data.mistakesData[index].userQuestionResult.grade;
@@ -54,23 +58,6 @@ Page({
     }
   },
 
-  //获取image宽高
-  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: this.data.errImgW,
-      errImgH: this.data.errImgH
-    })
-  },
-
   /*tab切换*/
   tab (e) {
     const index = e.currentTarget.dataset.index;
@@ -114,10 +101,10 @@ Page({
         })
 
         for(let item of  res.data.data.list) {
-          this.data.flags.push(false);
+          this.data.course[category-1].flag.push(false);
         }
         this.setData({
-          flags: this.data.flags
+          course: this.data.course
         })
       })
       //用户答题指数
@@ -155,7 +142,6 @@ Page({
     console.log('qid:' + qid);
     if(qid) {
       APIClient.getScheduleErr(qid).success(res => {
-        console.log(res.data.data)
         this.setData({
           errorData: res.data.data
         })

pages/mistakes/mistakes.wxml

@@ -23,20 +23,20 @@
            <view class="course">
             <view class="course-head">
                 <view class="subject {{courseIndex == index ? 'select' : ''}}"  wx:for="{{course}}" wx:key="{{index}}" bindtap="tab" data-index="{{index}}">
-                    {{item}}
+                    {{item.title}}
                 </view>
             </view>
             <view class="course-content">
-                <view class="error answer-content" wx:for="{{mistakesData}}" wx:key="index" style="height: {{ flags[index] ? 405 + errImgH[index] : '465'}}rpx">
+                <view class="error answer-content" wx:for="{{mistakesData}}" wx:key="index" >
                     <image class="questions" src="{{item.questions.img}}"></image>
-                    <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" >
+                        <image class="analysis-box" src="{{item.wrongQuestionsAnalysis.analysis}}" mode="widthFix" style="width: 660rpx; " hidden="{{!course[courseIndex].flag[index]}}"></image>
                         <view class="answer-txt">
                             <text>你的答案：{{item.userQuestionResult.answer === "0" ? '不知道' : item.userQuestionResult.answer}}</text>
                             <text>{{item.questions.answer == item.userQuestionResult.answer ? "" : "（错误）"}}</text>
                         </view>
-                        <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>
+                        <view class="analysis"  data-flag="{{course[courseIndex].flag[index]}}" data-index="{{index}}" bindtap="particulars">
+                            <image class="analysis-img" src="../image/analysis_bottom.png" wx:if="{{!course[courseIndex].flag[index]}}"></image>
                             <image class="analysis-img-top" src="../image/analysis_top.png" wx:else></image>
                         </view>
                     </view>
@@ -53,9 +53,9 @@
     <dialog bindmyevent="jurisdiction"/>
   </view>
   <view class="mistakes-dialog" hidden='{{switchs}}'>
-    <image class="error-questions" src="{{errorData.img}}"></image>
+    <image class="error-questions" src="{{errorData.img}}" mode="widthFix"></image>
     <scroll-view scroll-y class='mistakes-dialog-scroll'>
-       <image class="error-analysis" src="{{errorData.analysis}}" bindload="imageLoad" style="width: {{errImgW[0]}}rpx; height: {{errImgH[0]}}rpx"></image>
+       <image class="error-analysis" src="{{errorData.analysis}}" mode="widthFix"></image>
     </scroll-view>
     <image class="close" src="../image/close.png" bindtap='closeDialog'></image>
   </view>   

pages/mistakes/mistakes.wxss

@@ -63,44 +63,33 @@
 
 .answer-content {
     position: relative;
-    padding-bottom: 20rpx;
+    padding-bottom: 100rpx;
 }
 
 .answer-content .questions {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 1; 
     width: 100%;
-    height: 405rpx;
     border-radius: 20rpx;
 }
 
 .answer {
     position: relative;
-    margin:0 20rpx;
+    margin: -10rpx 20rpx;
     border-radius: 10rpx;
 }
 
 .analysis-box {
-    position: absolute;
-    left: 2%;
-    top: 398rpx;
+    margin-left: 2%;
 }
 
 .answer-txt {
     position: absolute;
     left: 20%;
-    top: 416rpx;
+    top: 20rpx;
     z-index: 2;
     font-size: 28rpx;
     color: #858585;
 }
 
-.analysis {
-   
-}
-
 .unfold {
     background: #fff;
 }
@@ -108,14 +97,14 @@
 .analysis .analysis-img {
     position: absolute;
     right: 0;
-    top: 404rpx;
+    top: 0;
     width: 103rpx;
     height: 60rpx;
 }
 
 .analysis .analysis-img-top {
     position: absolute;
-    bottom: -402rpx;
+    bottom: 10rpx;
     left: 50%;
     transform: translate(-50%, 0);
     width: 99rpx;

pages/science/science.js

@@ -23,7 +23,8 @@ Page({
     canvasHeight: '',
     flag: true,
     materialData: [],
-    loginType: 1   
+    loginType: 1 ,
+    timeList: []  
   },
   /* 区分答疑和分享 */
   distinction: function(type, columnId, pageNo, pageSize, success) {
@@ -67,7 +68,11 @@ Page({
             questionsData: res.data.data,
           })
           if(res.data.data) {
+            res.data.data.list.forEach(item => {
+              this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+            });
             this.setData({
+              timeList: this.data.timeList,
               questionsdian: util.replyNo(res.data.data.list)
             })
             if(5*this.data.num1 > res.data.data.totalSize) {
@@ -91,6 +96,12 @@ Page({
           this.setData({
             productionData: res.data.data,
           })
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
+          this.setData({
+            timeList: this.data.timeList
+          })
           if(5*this.data.num2 > res.data.data.totalSize) {
             this.setData({
               productionMore: ''
@@ -114,6 +125,11 @@ Page({
         loginType: ""
       })
     } 
+    if(wx.getStorageSync('user')) {
+      this.setData({
+        teacher: wx.getStorageSync('user').data.data.isTeacher
+      })
+    }
     const columnId = util.column('5').columnId;
     /* 分享 */
     this.distinction(2, columnId, 1, 2, res => {
@@ -123,6 +139,12 @@ Page({
           productionData: res.data.data,
         }) 
         if(res.data.data) {
+          res.data.data.list.forEach(item => {
+            this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+          });
+          this.setData({
+            timeList: this.data.timeList,
+          })
           if(res.data.data.totalSize > 2) {
             this.setData({
               productionMore: true
@@ -140,9 +162,13 @@ Page({
           questionsData: res.data.data,
         })
         if(res.data.data) {
-          this.setData({
-            questionsdian: util.replyNo(res.data.data.list)
-          })
+            res.data.data.list.forEach(item => {
+              this.data.timeList.push(util.formatDate(item.gmtCreated,4));
+            });
+            this.setData({
+              timeList: this.data.timeList,
+              questionsdian: util.replyNo(res.data.data.list)
+            })
           if(res.data.data.totalSize > 2) {
             this.setData({
               questionsMore: true
@@ -164,12 +190,12 @@ Page({
         const previewLength = util.filter(res.data.data.lessonPage.list).length;
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 280
+            lessonListHeight: 144
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 280
+            previewHeight: 144
           })
         } 
         this.setData({

pages/science/science.wxml

@@ -16,36 +16,43 @@
             <preview 
             materialData="{{materialData}}"
             height="{{previewHeight}}"/>
-
-            <chat id="upload"
-                id="chat"
-                productionData="{{productionData}}" 
-                title="作品展示"
-                query="上传作品"
-                type="2"
-                columnType="5"
-                bind:getHeight="onGetHeight"
-                bind:myevent="onMyEvent"
-                data-type="2"
-                more="{{productionMore}}"/>
+            <view id="upload-position">
+                <chat id="upload"
+                    id="chat"
+                    productionData="{{productionData}}" 
+                    title="作品展示"
+                    query="上传作品"
+                    type="2"
+                    columnType="5"
+                    bind:getHeight="onGetHeight"
+                    bind:myevent="onMyEvent"
+                    data-type="2"
+                    more="{{productionMore}}"
+                    timeList="{{timeList}}"
+                    teacher="{{teacher}}"/>            
+            </view>
 
 
-            <chat id="questions"
-                productionData="{{questionsData}}" 
-                title="答疑讨论"
-                query="我有疑问"
-                type="1"
-                columnType="5"
-                bind:myevent="onMyEvent"
-                data-type="1"
-                more="{{questionsMore}}"/>
+            <view id="questions-position">
+                <chat id="questions"
+                    productionData="{{questionsData}}" 
+                    title="答疑讨论"
+                    query="我有疑问"
+                    type="1"
+                    columnType="5"
+                    bind:myevent="onMyEvent"
+                    data-type="1"
+                    more="{{questionsMore}}"
+                    timeList="{{timeList}}"
+                    teacher="{{teacher}}"/>
+            </view>
 
-            <view class="questions-one" data-id="questions" bindtap="location">
+            <view class="questions-one" data-id="questions-position" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
                 <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>
 
-            <view class="upload-one" data-id="upload" bindtap="location">
+            <view class="upload-one" data-id="upload-position" bindtap="location">
                 <image src="../image/works.png" ></image>
             </view>
           </view>

utils/APIClient.js

@@ -116,7 +116,16 @@ module.exports = {
 	//获取二维码
 	getqrCode(data) {
 		let url = genAPIUrl('wx/qrCode/postsCache');
-		return request.getInstance().url(url).data(data).method('GET').send();
+		return request.getInstance().url(url).header({
+			uid: wx.getStorageSync('uid')
+		}).data(data).method('GET').send();
+	},
+	//操作留言
+	setMessage(data) {
+		let url = genAPIUrl('wx/posts');
+		return request.getInstance().url(url).header({
+			uid: wx.getStorageSync('uid')
+		}).data(data).method('PUT').send();		
 	},
 	/**另一个小程序接口调用从此处开始 */
 	// 获取课程表列表

utils/util.js

@@ -4,6 +4,30 @@ const gradeUpper = grade => {
   return gradeArr[grade];
 } 
 
+//时间戳转时间
+function formatDate(time, flag) {
+	console.log(time)
+	const t = new Date(time); 
+	const tf = function(i){return (i < 10 ? '0' : '') + i};
+	const year = t.getFullYear();
+	const month = tf(t.getMonth() + 1);
+	const day = tf(t.getDate());
+	const hour = tf(t.getHours());
+	const minute = tf(t.getMinutes());
+	//console.log( month + '月' + day + '日' + hour + ':' + minute);
+	if(flag == 1) {
+		return  month + '月' + day + '日' + ' ' + hour + ':' + minute;
+	}else if(flag == 2) {
+		console.log(year,month,day)
+		return year + '-' + month + '-' + day
+	}else if(flag == 3){
+		return month + '-' + day + ' ' + hour + ':' + minute;
+	}else if( flag == 4) {
+		return year + '年' + month + '月' + day + '日';
+	}
+}
+
+
 //将秒转化为 X/XX 比如四小时三十六分 为4/36
 const day = msd => {
   //不到一分钟的情况；
@@ -287,6 +311,7 @@ function saveFile(tempFile, success) {
 }
 
 module.exports = {
+  formatDate,
   studyTime,
   studyPageTime,
   filter,