更新迭代

compontents/chat/chat.js

@@ -168,10 +168,11 @@ Component({
       const ind = currentTarget.dataset.ind; 
       const top = currentTarget.dataset.top == 1 ? '0' : '1';
       if(type == 'isTop') {
+        const str = top == 1 ? '确定置顶吗' : '确定取消置顶吗';
         //置顶
         wx.showModal({
           title: '提示',
-          content: '确定这样操作吗',
+          content: str,
           success: (res) => {
             if (res.confirm) {
               APIClient.setMessage({

compontents/chat/chat.wxml

@@ -22,7 +22,7 @@
                 </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/{{item.isTop > 0 ? 'top1' : 'top2'}}.png" catchtap="setMessage" data-top="{{item.isTop}}" data-id="{{item.id}}" data-type="isTop" data-ind="{{index}}"></image>
+                    <image src="../../pages/image/{{item.isTop > 0 ? 'top2' : 'top1'}}.png" catchtap="setMessage" data-top="{{item.isTop}}" 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}}">

compontents/chat/chat.wxss

@@ -96,7 +96,7 @@
 .picture {
     display: flex; 
     height:176rpx;   
-    margin: 24rpx 112rpx 17rpx 103rpx;
+    margin: 0 112rpx 17rpx 103rpx;
 }
 
 .picture image {

compontents/lesson_list/lessonList.js

@@ -33,7 +33,7 @@ Component({
       let flage = e.target.dataset.flag;
       const height = this.properties.lessonData.length * 72;
       if(flage){
-        this.util(flage, '144rpx');
+        this.util(flage, `${this.data.height}rpx`);
         this.setData({
           'flag': false,
           'downUp': '展开',

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}}" style="border-bottom: 2rpx solid #ccc;padding-bottom: 6rpx;">
+        <view class="art-lesson" wx:for="{{lessonData}}" wx:key="{{index}}">
             <view class="graph">
                 <view class="yuan {{item.isStudy ? 'check' : 'no-check'}} "></view>
             </view>
@@ -17,6 +17,8 @@
                 <text >{{item.title}}</text>
                 <text>{{item.isStudy ? item.studyDate : '未学习'}}</text>
             </view>
+            <view wx:if="{{index == 0 && height == 72}}" style="border-bottom: 2rpx solid #ccc; width: 100%; height: 2rpx; position:absolute; left: 0; bottom: 0;"></view>
+            <view wx:if="{{index == 1 && height == 144}}" style="border-bottom: 2rpx solid #ccc; width: 100%; height: 2rpx; position:absolute; left: 0; bottom: 0;"></view>
         </view>
     </view>
 

compontents/preview/preview.js

@@ -33,7 +33,7 @@ Component({
       let flage = e.target.dataset.flag;
       const height = this.properties.materialData.length * 72;
       if(flage){
-        this.util(flage, '144rpx');
+        this.util(flage, `${this.data.height}rpx`);
         this.setData({
           'flag': false,
           'downUp': '展开',

compontents/preview/preview.wxml

@@ -11,9 +11,11 @@
     </view>
 
     <view class="material-con" animation="{{animationData}}" style="height: {{height}}rpx">
-        <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 class="art-img" wx:if="{{ item.warePath && item.fileName}}" wx:for="{{materialData}}" wx:key="{{index}}" style="padding-bottom: 6rpx;">
+            <text>{{item.fileName}}</text>
+            <text data-warePath="{{item.warePath}}" bindtap="preview">点击预览</text>
+            <view wx:if="{{index == 0 && height == 72}}" style="border-bottom: 2rpx solid #ccc; width: 100%; height: 2rpx; position:absolute; left: 0; bottom: 0;"></view>
+            <view wx:if="{{index == 1 && height == 144}}" style="border-bottom: 2rpx solid #ccc; width: 100%; height: 2rpx; position:absolute; left: 0; bottom: 0;"></view>
         </view>
     </view>
     

compontents/preview/preview.wxss

@@ -46,6 +46,7 @@
 }
 
 .art-img {
+    position: relative;
     display: flex;
     justify-content: space-between;
     margin-left: 53rpx;

pages/art/art.js

@@ -39,7 +39,9 @@ Page({
     materialData: [],
     loginType: 1,
     timeList: [],
-    teacher: ''
+    teacher: '',
+    messageNum: '',
+    uploadNum: ''
   },
 
   /* 区分答疑和分享 */
@@ -65,8 +67,10 @@ Page({
     if(type == 1) {
       this.data.num1++
       this.setData({
-        num1: this.data.num1
+        num1: this.data.num1,
+        messageNum: 5*this.data.num1
       })
+      // wx.setStorageSync('messageNum', 5*this.data.num1);
       this.distinction(type, columnId, 1, 5*this.data.num1, res => {
         if(res.data.success) {
           console.log(res.data.data)
@@ -94,8 +98,10 @@ Page({
     if(type == 2) {
       this.data.num2++
       this.setData({
-        num: this.data.num2
+        num: this.data.num2,
+        uploadNum: 5*this.data.num2
       })
+      // wx.setStorageSync('uploadNum', 5*this.data.num2);
       this.distinction(type, columnId, 1, 5*this.data.num2, res => {
         if(res.data.success) {
           console.log(res.data.data)
@@ -158,12 +164,12 @@ Page({
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 144
+            lessonListHeight: 72
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 144
+            previewHeight: 72
           })
         } 
         this.setData({
@@ -183,8 +189,10 @@ Page({
 
   onShow: function () {
     const columnId = util.column('6').columnId;
+    const uploadNum = this.data.uploadNum ? this.data.uploadNum : '2';
+    const messageNum = this.data.messageNum ? this.data.messageNum : '2';
     /* 分享 */
-    this.distinction(2, columnId, 1, 2, res => {
+    this.distinction(2, columnId, 1, uploadNum, res => {
       if(res.data.success) {
         console.log(res.data.data)
         this.setData({
@@ -206,7 +214,7 @@ Page({
       }
     });
     /* 答疑 */
-    this.distinction(1, columnId, 1, 2, res => {
+    this.distinction(1, columnId, 1, messageNum, res => {
       if(res.data.success) {
         console.log(res.data.data)
         this.setData({

pages/chinese/chinese.js

@@ -132,12 +132,12 @@ Page({
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 144
+            lessonListHeight: 72
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 144
+            previewHeight: 72
           })
         } 
         this.setData({

pages/english/english.js

@@ -133,12 +133,12 @@ Page({
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 144
+            lessonListHeight: 72
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 144
+            previewHeight: 72
           })
         } 
         this.setData({

pages/particulars/particulars.wxml

@@ -11,7 +11,7 @@
                     <view class="lesson-name">
                         <text>{{productionData.featureMap.wechatName}}</text>
                         <text style="height: 30rpx; display： block;">{{time}}</text>
-                        <text class='content-data' style="display： block; color: #000; font-size: 36rpx;">{{productionData.title}}</text>
+                        <text class='content-data' style="display： block; color: #000; font-size: 36rpx; margin-top: 20rpx;">{{productionData.title}}</text>
                     </view>
                 </view>
                 <view class="picture" wx:if="{{type == 2}}">
@@ -39,7 +39,7 @@
         <view class="comment" >
             <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="height: 30rpx; display： block; color: #C3C3C3">{{discussTime[index]}}</view>
                 <view style="margin-top: 20rpx;">{{item.content}}</view>
             </view>  
         </view>

pages/particulars/particulars.wxss

@@ -53,14 +53,14 @@
 }
 
 .lesson-name text:nth-child(2) {
-    margin-top: 10rpx;
+    margin-top: 20rpx;
     font-size: 28rpx;
-    color: #C3C3C3;
+    color: #404040;
 }
 
 .picture {
     display: flex;    
-    margin: 24rpx 112rpx 17rpx 103rpx;
+    margin: 0 112rpx 17rpx 103rpx;
 }
 .picture image {
      width: 236rpx;

pages/science/science.js

@@ -24,7 +24,9 @@ Page({
     flag: true,
     materialData: [],
     loginType: 1 ,
-    timeList: []  
+    timeList: [],
+    messageNum: '',
+    uploadNum: ''  
   },
   /* 区分答疑和分享 */
   distinction: function(type, columnId, pageNo, pageSize, success) {
@@ -59,7 +61,8 @@ Page({
     if(type == 1) {
       this.data.num1++
       this.setData({
-        num1: this.data.num1
+        num1: this.data.num1,
+        messageNum: 5*this.data.num1
       })
       this.distinction(type, columnId, 1, 5*this.data.num1, res => {
         if(res.data.success) {
@@ -88,7 +91,8 @@ Page({
     if(type == 2) {
       this.data.num2++
       this.setData({
-        num: this.data.num2
+        num: this.data.num2,
+        uploadNum: 5*this.data.num2
       })
       this.distinction(type, columnId, 1, 5*this.data.num2, res => {
         if(res.data.success) {
@@ -143,12 +147,12 @@ Page({
         const previewLength = util.filter(res.data.data.lessonPage.list).length;
         if(lessonListLength > 4) {
           this.setData({
-            lessonListHeight: 144
+            lessonListHeight: 72
           })
         }
         if(previewLength > 4){
           this.setData({
-            previewHeight: 144
+            previewHeight: 72
           })
         } 
         this.setData({
@@ -168,8 +172,10 @@ Page({
 
   onShow: function () {
     const columnId = util.column('5').columnId;
+    const uploadNum = this.data.uploadNum ? this.data.uploadNum : '2';
+    const messageNum = this.data.messageNum ? this.data.messageNum : '2';
     /* 分享 */
-    this.distinction(2, columnId, 1, 2, res => {
+    this.distinction(2, columnId, 1, uploadNum, res => {
       if(res.data.success) {
         console.log(res.data.data)
         this.setData({
@@ -192,7 +198,7 @@ Page({
       
     });
     /* 答疑 */
-    this.distinction(1, columnId, 1, 2, res => {
+    this.distinction(1, columnId, 1, messageNum, res => {
       if(res.data.success) {
         console.log(res.data.data)
         this.setData({