每节课程显示多少天学得和分享跳转到详情页

compontents/lesson_list/lessonList.wxml

@@ -15,7 +15,7 @@
             </view>
             <view class="{{item.isStudy ? 'art-con' : 'art-con-color'}}">
                 <text >{{item.title}}</text>
-                <text>{{item.isStudy ? '28分钟前' : '未学习'}}</text>
+                <text>{{item.isStudy ? item.studyDate : '未学习'}}</text>
             </view>
         </view>
     </view>

compontents/preview/preview.js

@@ -56,6 +56,22 @@ Component({
       this.setData({  
         animationData: animation.export()  
       })  
+    },
+    //点击预览图片
+    preview (e) { 
+      const warePath = e.currentTarget.dataset.warepath;
+      wx.downloadFile({
+        url: warePath,
+        success: function (res) {
+          var filePath = res.tempFilePath
+          wx.openDocument({
+            filePath: filePath,
+            success: function (res) {
+              console.log('打开文档成功')
+            }
+          })
+        }
+      })
     }
   }
 })

compontents/preview/preview.wxml

@@ -11,9 +11,9 @@
     </view>
 
     <view class="material-con" animation="{{animationData}}">
-        <view wx:if="{{ item.warePath }}" class="art-img" wx:for="{{materialData}}" wx:key="{{index}}">
-            <text>{{item.warePath}}</text>
-            <text>点击预览</text>
+        <view wx:if="{{ item.warePath && item.title}}" class="art-img" wx:for="{{materialData}}" wx:key="{{index}}">
+            <text>{{item.title}}</text>
+            <text data-warePath="{{item.warePath}}" bindtap="preview">点击预览</text>
         </view>
     </view>
 

pages/art/art.js

@@ -13,7 +13,8 @@ Page({
     num1: 0,
     num2: 0,
     position: '',
-    questionsdian: ''
+    questionsdian: '',
+    list: ''
   },
 
   /* 区分答疑和分享 */
@@ -56,7 +57,7 @@ Page({
         if(res.data.success) {
           console.log(res.data.data)
           this.setData({
-            questionsData: res.data.data
+            questionsData: res.data.data,
           }) 
           if(res.data.data) {
             this.setData({
@@ -135,7 +136,8 @@ Page({
         "category": 6
       }).success((res) => {
         this.setData({
-          courseData: res.data.data
+          courseData: res.data.data,
+          list: util.studyPageTime(res.data.data.lessonPage.list)
         })
       })
     }, function() {

pages/art/art.wxml

@@ -9,7 +9,7 @@
           <view class="art">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{courseData.lessonPage.list}}"/>
+            <lessonList lessonData="{{list}}"/>
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 

pages/chinese/chinese.js

@@ -11,7 +11,8 @@ Page({
     courseData: {},
     num1: 0,
     position: '',
-    questionsdian: ''
+    questionsdian: '',
+    list: ''
   },
 
   /* 区分答疑和分享 */
@@ -104,7 +105,8 @@ Page({
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
         this.setData({
-          courseData: res.data.data
+          courseData: res.data.data,
+          list: util.studyPageTime(res.data.data.lessonPage.list)
         })
       })
     }, function() {

pages/chinese/chinese.wxml

@@ -9,7 +9,7 @@
           <view class="chinese">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{courseData.lessonPage.list}}"/>
+            <lessonList lessonData="{{list}}"/>
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 

pages/english/english.js

@@ -11,7 +11,8 @@ Page({
     courseData: {},
     num1: 0,
     position: '',
-    questionsdian: ''
+    questionsdian: '',
+    list: ''
   },
 
   /* 区分答疑和分享 */
@@ -104,7 +105,8 @@ Page({
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
         this.setData({
-          courseData: res.data.data
+          courseData: res.data.data,
+          list: util.studyPageTime(res.data.data.lessonPage.list)
         })
       })
     }, function() {

pages/english/english.wxml

@@ -9,7 +9,7 @@
           <view class="english">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{courseData.lessonPage.list}}"/>
+            <lessonList lessonData="{{list}}"/>
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 

pages/language/language.js

@@ -11,7 +11,8 @@ Page({
     courseData: {},
     num1: 0,
     position: '',
-    questionsdian: ''
+    questionsdian: '',
+    list: []
   },
 
   /* 区分答疑和分享 */
@@ -73,7 +74,6 @@ Page({
       position: position
     })
   },
-
   onLoad: function (options) {
   },
 
@@ -82,7 +82,6 @@ Page({
     /* 答疑 */
     this.distinction(1, columnId, 1, 2, res => {
       if(res.data.success) {
-        console.log(res.data.data)
         this.setData({
           questionsData: res.data.data,
         })
@@ -101,9 +100,10 @@ Page({
       }, {
         "category": 1
       }).success((res) => {
-        //console.log('科目信息' + JSON.stringify(res));
+        console.log(res)
         this.setData({
-          courseData: res.data.data
+          courseData: res.data.data,
+          list: util.studyPageTime(res.data.data.lessonPage.list)
         })
       })
     }, function() {

pages/language/language.wxml

@@ -9,7 +9,7 @@
           <view class="language">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{courseData.lessonPage.list}}"/>
+            <lessonList lessonData="{{list}}"/>
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 

pages/mathematics/mathematics.js

@@ -11,7 +11,8 @@ Page({
     courseData: {},
     num1: 0,
     position: '',
-    questionsdian: ''
+    questionsdian: '',
+    list: ''
   },
 
   /* 区分答疑和分享 */
@@ -103,7 +104,8 @@ Page({
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
         this.setData({
-          courseData: res.data.data
+          courseData: res.data.data,
+          list: util.studyPageTime(res.data.data.lessonPage.list)
         })
       })
     }, function() {

pages/mathematics/mathematics.wxml

@@ -9,7 +9,7 @@
           <view class="mathematics">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{courseData.lessonPage.list}}"/>
+            <lessonList lessonData="{{list}}"/>
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 

pages/recommend/recommend.js

@@ -19,7 +19,7 @@ Page({
       APIClient.getRecommendSchedule({
         uid: res.data.data.uid
       }).success(res => {
-        //console.log(res.data)
+        console.log(res.data)
         this.setData({
           recommendData: res.data.data,
         })

pages/recommend/recommend.wxml

@@ -30,17 +30,18 @@
                     </view>
                 </view>
                 <view class="get-gem">
-                    <text>本宝石获取方法</text>
-                    <text>学习完每门课程，并与XXXPK成功获取</text>
+                    <text>{{recommendData.weekPageThemeConfig.metalsStrategy}}</text>
                 </view>
+                <!--
                 <view class="get-medal">
                     <text>勋章获取方法</text>
-                    <text>1，{{recommendData.weekPageThemeConfig.metalsStrategy}}</text>
+                    
                     <text>2，学习完每门课程，获取宝石</text>
                     <text>3，学习完每门课程，获取宝石</text>
                 </view>
+                -->
             </view>
-
+            <!--
             <view class="recommend-strategy">
                 <view class="this-week">
                     <image src="../image/strategy.png"></image>
@@ -54,6 +55,7 @@
                     <text class="unfold">{{downUp}}</text>
                 </view>
             </view>
+            -->
         </view> 
       </scroll-view>
   </view>

pages/science/science.js

@@ -13,7 +13,8 @@ Page({
     num1: 0,
     num2: 0,
     position: '',
-    questionsdian: ''
+    questionsdian: '',
+    list: ''
   },
   /* 区分答疑和分享 */
   distinction: function(type, columnId, pageNo, pageSize, success) {
@@ -132,7 +133,8 @@ Page({
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
         this.setData({
-          courseData: res.data.data
+          courseData: res.data.data,
+          list: util.studyPageTime(res.data.data.lessonPage.list)
         })
       })
     }, function() {

pages/science/science.wxml

@@ -9,7 +9,7 @@
           <view class="science">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
 
-            <lessonList lessonData="{{courseData.lessonPage.list}}"/>
+            <lessonList lessonData="{{list}}"/>
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 

pages/transmit/transmit.js

@@ -13,6 +13,14 @@ Page({
     favors: '',
     like: false
   },
+  //跳转详情页
+  particulars: function (e) {
+    const postId = e.currentTarget.dataset.postsid;
+    wx.navigateTo({
+      url: '../../pages/particulars/particulars?postId=' + postId + '&type=2'
+    })
+
+  },
   /*预览图片*/
   listenerButtonPreviewImage: function(e) {
     let imgUrl = [];

pages/transmit/transmit.wxml

@@ -13,7 +13,7 @@
                     <text class="">分享作品</text>
                     <image src="../../pages/image/xing.png" class="xing"></image>
                 </view>
-                <view class="share-con">
+                <view class="share-con" bindtap="particulars" data-postsId="{{productionData.id}}">
                     <view class="head">
                         <view class="head-img">
                             <image src="{{productionData.featureMap.headImgUrl}}"></image>
@@ -25,11 +25,11 @@
                     </view>
                     <view class="picture">
                         <block wx:for="{{productionData.imagesList}}" wx:for-item="items" wx:key="{{items.id}}">
-                            <image src="{{items.path}}" bindtap="listenerButtonPreviewImage" data-img="{{items.path}}"></image>
+                            <image src="{{items.path}}" catchtap="listenerButtonPreviewImage" data-img="{{items.path}}"></image>
                         </block>
                     </view>
                     <view class="icon">
-                        <view bindtap="like">
+                        <view catchtap="like">
                             <image src="../../pages/image/zan.png" class="zan" wx:if="{{like}}"></image>
                             <image src="../../pages/image/nozan.png" class="zan" wx:else></image>
                             <text>{{favors ? favors : '0'}}</text>

utils/util.js

@@ -40,7 +40,7 @@ const day = msd => {
   return time;          
 }
 
-//计算学过了多长时间
+//计算首页学过了多长时间
 function studyTime (arr) {
   const studyLog = [];
   const time = new Date();
@@ -60,6 +60,27 @@ function studyTime (arr) {
   return studyLog
 }
 
+//计算各个页面学了多长时间
+function studyPageTime (arr) {
+  const studyLog = [];
+  const time = new Date();
+  for(let item of arr) {
+    if(!item.title) {
+      break;
+    }
+    let msd = (time - item.studyDate*1) / 1000;
+    studyLog.push(
+      {
+      title: item.title, 
+      lessonId: item.lessonId,
+      isStudy: item.isStudy,
+      studyDate: day(msd) + '之前'
+      }
+    )
+  }
+  return studyLog;
+}
+
 //获取当前页面传的的值
 
 function getUrl() {
@@ -162,6 +183,7 @@ function replyNo (arr) {
 module.exports = {
   formatTime: formatTime,
   studyTime,
+  studyPageTime,
   gradeUpper,
   day,
   getUrl,