课程表小程序的迁移

README.md

@@ -9,6 +9,8 @@ AppSecret: adece358e0d933e39d87b68fbf700651
 账号：sunzhilei@efunbox.cn， 密码：efunbox@3366;
 
 ## 关于代码
+刚开始是一个小程序，结束后提出新需求，把另一个小程序上的东西也给放这个小程序上，所以注释里说的另一个小程序就是两个小程序结合在一起的，
+注释里会说明有的方法名字会加two，那就是另一个小程序上的方法，接口的调用也会不同，等等一些问题代码例会给出注释。
 这个小程序基本上都是tab切换由于微信的tabBar中的 list 是一个数组，只能配置最少2个、最多5个 tab，tab 按数组的顺序排序。
 所以只好把导航条封装成公用组件采用wx.switchTab(OBJECT)来跳转页面，达到tab切换的效果其他的一些组件和功能主要是用微信小程序API来实现的。
 

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/my/my",
     "pages/logs/logs",
     "pages/recommend/recommend",
     "pages/language/language",
@@ -18,7 +19,9 @@
     "pages/accuracy_rank/accuracy_rank",
     "pages/set_name/set_name",
     "pages/particulars/particulars",
-    "pages/mistakes/mistakes"
+    "pages/mistakes/mistakes",
+    "pages/schedule/scheduleSubject/scheduleSubject",
+    "pages/schedule/scheduleSubjectInner/scheduleSubjectInner"
   ],
   "window": {
     "backgroundTextStyle": "light",

compontents/set_grade/set_grade.js

@@ -58,7 +58,7 @@ Component({
           console.log(res)
           if(res.data.success) {  
             wx.redirectTo({
-              url: '../index/index?ind=0'
+              url: '../my/my?ind=0'
             })
           }
         })      

compontents/tarbar/tarbar.js

@@ -37,7 +37,7 @@ Component({
       }
       if(index == 0) {
         wx.redirectTo({
-          url: '../index/index?ind=0'
+          url: '../my/my?ind=0'
         })
       }
       if(index == 1) {
@@ -79,7 +79,7 @@ Component({
   },
   ready() {
     let options = util.getUrl();
-    const ind = options.ind || util.convertObject(unescape(options.scene)).ind;
+    const ind = options.ind || util.convertObject(decodeURIComponent(options.scene)).ind;
     if(ind) {
       this.setData({ navBtnSelectIdx: ind});
     }

pages/index/index.js

@@ -1,197 +1,82 @@
 //index.js
 //获取应用实例
-const app = getApp()
-const util = require('../../utils/util.js');
-const APIClient = require('../../utils/APIClient.js');
+var app = getApp();
+var APIClient = require('../../utils/APIClient.js');
 const login = require('../../utils/loginSchedule.js');
 
 Page({
-  data: {
-    motto: ['我的','本周推荐','语文','数学','中文','英语','科学','艺术'],
-    navBtnSelectIdx: 0,
-    left: 0,
-    //questionsPreviewing: false,
-    //questionsShare: false,
-    data: {},
-    grade: "",
-    time: "",
-    rankData: {},
-    share: false,
-    studyLog: [],
-    height: '',
-    flag: true,
-    productionData: {},
-    num2: 0,
-    productionMore: '',
-    canvasHeight: ''
-  },
-  
-  lower: function (e) {
-    //console.log(e);
-    //console.log(e.detail.scrollTop)
-    // if (320 <= e.detail.scrollTop && e.detail.scrollTop <= 1000){
-    //   this.setData({ questionsPreviewing: true, questionsShare: false});
-    // }else {
-    //   this.setData({ questionsPreviewing: false });
-    // }
-    // if (1090 <= e.detail.scrollTop) {
-    //   this.setData({ questionsPreviewing: false, questionsShare: true});
-    // } else {
-    //   this.setData({ questionsShare: false });
-    // }
-  },
+	data: {
+    scheduleList: [],
+    flag: true    
+	},
+  onLoad(options) {
+    this.getClassSchedule();
+    let scene = decodeURIComponent(options.scene);
+    if (scene && scene !== 'undefined') {
+      let idParam = scene.split('&')[0];
+      let showIdParam = scene.split('&')[1];
 
-  jurisdiction: function () {
-    //隐藏弹框
-    this.setData({
-      flag: !this.data.flag
-    })
-    //登录页信息
-    this.onShow();
-  },
+      let idKey = idParam.split('=')[0];
+      let idvalue = idParam.split('=')[1];
 
-  /*点击获取canvas高度*/
-  onGetHeight: function (e) {
-    const canvasHeight = this.selectComponent("#chat").data.canvasHeight;
-    this.setData({
-      canvasHeight,
-    })
-  },
-  /*更改年级*/
-  setgrade: function (e) {
-    this.setGrade.showPopup()
-  },
-  onLoad: function (options) {
-    //获取更改年级组件
-    this.setGrade = this.selectComponent("#set-grade");
-    console.log(this.setGrade)
-    //获取分享过来的值跳转页面
-    const ind  = options.ind;
-    const postsId = options.postId || '';
-    //判断ind的值移动到到艺术
-    if(ind) {
-      this.setData({
-        navBtnSelectIdx: ind
-      })
-      //移动nav
-      if (ind <= 2) {
-        this.setData({ left: 0 });
-      }
-      if(ind > 2){
-        this.setData({left: 200 });
-      }  
-    }
-  },
-  onShow: function () {
-    //登录页信息
-    login.getOpenidSessionKey(res => {
-      APIClient.getMySchedule({
-        uid: res.data.data.uid
-      }).success(res => {
-        console.log(res)
-        this.setData({
-          data: res.data.data,
-          grade: util.gradeUpper(res.data.data.users.grade),
-          test:util.day(),
-          time: util.day(res.data.data.timeSpend),
-          studyLog: util.studyTime(res.data.data.studyLog)
-        })
-        
+      let showIdKey = showIdParam.split('=')[0];
+      let showIdvalue = showIdParam.split('=')[1];
 
-        if(res.data.data.studyLog.length > 10) {
-          this.setData({
-            height: '680'
-          })
-        }
-      })
-      //获取排名
-      APIClient.getFriendSchedule('wx/friendsRank/user', {
-        uid: res.data.data.uid
-      }).success(res => {
-        console.log(res)
-        this.setData({
-          rankData: res.data.data,
+      if (idKey === 'id' && idvalue && idvalue !== 'undefined' && showIdKey === 'showId' && showIdvalue && showIdvalue !== 'undefined') {
+        wx.navigateTo({
+          url: `/pages/schedule/scheduleSubject/scheduleSubject?id=${idvalue}&showId=${showIdvalue}`
         })
-      })
-    }, () => {
+      }
+    }
+	},
+	onPullDownRefresh: function () {
+		// 页面相关事件处理函数--监听用户下拉动作
+		this.getClassSchedule()
+		wx.stopPullDownRefresh();
+	},
+	onShareAppMessage: function() {
+		// 用户点击右上角分享
+		return {
+			title: '课程表列表', // 分享标题
+			desc: '课程表列表', // 分享描述
+      path: `pages/index/index`, // 分享路径
+      success: (res) => {
+        console.log(res);
+      }
+		}
+	},
+	getClassSchedule() {
+		wx.showToast({
+			title: '加载中...',
+			icon: 'loading',
+			duration: 4000
+    })
+    login.getOpenidSessionKeyTwo(() => {}, () => {
       this.setData({
         flag: !this.data.flag
       })
-    });  
-    /* 分享 */
-    const columnId = util.column('6').columnId;
-    this.distinction(2, columnId, 1, 2, res => {
-      if(res.data.success) {
-        console.log(res.data.data)
-        this.setData({
-          productionData: res.data.data
-        })
-        if(res.data.data) {
-          if(res.data.data.totalSize > 2) {
-            this.setData({
-              productionMore: true
-            })
-          }
-        }
-      }
-    });
-  },
-  /* 区分答疑和分享 */
-  distinction: function(type, columnId, pageNo, pageSize, success) {
-    login.getOpenidSessionKey(function(res) {
-      //console.log(res.data.data.uid);
-      APIClient.getProductionSchedule({
-        uid: res.data.data.uid
-      }, {
-        "type": type,
-        "pageNo": pageNo,
-        "pageSize": pageSize
-      }).success(success)
-    }, function() {
-      
-    });
+    })
+		APIClient.getClassSchedule().success((res) => {
+			this.setData({
+				scheduleList: res.data.data.list
+			})
+			console.log('课程列表', res.data.data);
+			wx.hideToast()
+		}).fail(function (res) {
+			console.log(res)
+		})
+	},
+	navToSchedule(e) {
+		let id = e.currentTarget.dataset.id;
+		let title = e.currentTarget.dataset.title;
+		wx.navigateTo({
+			url: `/pages/schedule/scheduleSubject/scheduleSubject?id=${id}&title=${title}`
+		})
   },
-  /*点击加载更多*/
-  onMyEvent: function(e){
-    const columnId = util.column('6').columnId;
-    this.data.num2++
+  /*获取个人信息弹框*/
+  jurisdiction: function () {
     this.setData({
-      num: this.data.num2
+      flag: !this.data.flag
     })
-    this.distinction(2, columnId, 1, 5*this.data.num2, res => {
-      if(res.data.success) {
-        console.log(res.data.data)
-        this.setData({
-          productionData: res.data.data,
-        }) 
-        if(5*this.data.num2 > res.data.data.totalSize) {
-          this.setData({
-            productionMore: ''
-          })
-        }
-      }
-    });
-  },
-    /* 转发*/
-  onShareAppMessage: function (ops) {
-    if (ops.from === 'button') {
-      // 来自页面内转发按钮
-      console.log(ops.target)
-    }
-    const postId = ops.target.dataset.postid;
-    const imageUrl= ops.target.dataset.imageurl[0];
-    return {
-      title: '小学王者班',
-      path: `pages/transmit/transmit?ind=7&postId=${postId}`,
-      imageUrl,
-      success: function (res) {
-        // 转发成功
-        console.log("转发成功:" + JSON.stringify(res));
-      },
-      fail: function (res) {
-        // 转发失败
-        console.log("转发失败:" + JSON.stringify(res));
-      }
-    }
-  }
+  } 
 })

pages/index/index.json

@@ -1,11 +1,10 @@
-
 {
-    "usingComponents": {
-     "tarbar": "/compontents/tarbar/tarbar",
-     "art": "../art/art",
-     "curriculum": "/compontents/curriculum/curriculum",
-     "dialog": "/compontents/dialog/dialog",
-     "chat": "/compontents/chat/chat",
-     "setGrade": "/compontents/set_grade/set_grade"
-    }
+	"navigationBarTitleText": "课程表",
+	"enablePullDownRefresh": true,
+	"backgroundTextStyle": "dark",
+  "backgroundColor": "#333",
+  "component": true,
+  "usingComponents": {
+    "dialog": "/compontents/dialog/dialog"
   }
+}

pages/index/index.wxml

@@ -1,129 +1,17 @@
 <!--index.wxml-->
-<view class="container">
-  <!-- 标题 -->
-  <tarbar id="tarbar"/>
-  <!-- 内容 -->
-  <view class="content">
-      <scroll-view scroll-y="true" bindscroll="lower" scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
-          <!-- 我的 -->
-          <view class="my {{navBtnSelectIdx == 0 ? '' : 'none'}}">
-            <!-- 个人信息 -->
-            <view class='message'>
-              <view class='user'>
-                <view class='head'>
-                  <image class="userinfo-avatar" src="{{data.users.headImgUrl}}" background-size="cover"></image>
-                  <view class='left'>
-                    <view class="student">
-                      学号:<text>{{data.users.eid}}</text>
-                    </view>
-                    <view class="name">
-                      {{data.users.wechatName}}
-                      <text class='LV'>LV {{data.level}}</text>
-                    </view>
-                  </view>
-                </view>
-                <view>
-                  <view class='grade' bindtap="setgrade">
-                    {{grade}}
-                  </view>
-                  <view class='set-name'>
-                    <navigator style='font-size:28rpx;' url="../set_name/set_name" >更改昵称</navigator>
-                  </view>
-                </view>
-              </view>
-              <view class='personal'>
-                <view class="particulars">
-                    <text>登录天数</text>
-                    <text>{{data.users.loginDay}}</text>
-                </view>
-                <view class="particulars">
-                  <text>TV端学习时长</text>
-                  <text>{{time}}</text>
-                </view>
-                <view class="particulars">
-                  <text>当前排名</text>
-                  <text>{{data.scoreRank}}</text>
-                </view>
-                <view class="particulars">
-                  <text>超过用户</text>
-                  <text>{{data.proportion}}%</text>
-                </view>
-              </view>  
-            </view>
-            <!-- 答题 -->
-            <view class="ranking">
-              <view class="dashed"></view>
-              <view class="ranking-con">
-                <view class="rank">
-                  <text>勋章数量：{{rankData.userMetalNum}}枚</text>
-                  <text>第{{rankData.userMetalRank == 0 ? '1000+' : rankData.userMetalRank}}名</text>
-                </view>
-                <view class="rank">
-                  <text>等级：LV{{rankData.level}}</text>
-                  <text>第{{rankData.expRank === 0 ? '1000+' : rankData.expRank}}名</text>
-                </view>
-                <view class="rank">
-                  <text>答题量：{{rankData.userQuestionNum}}题</text>
-                  <text>第{{rankData.userQuestionRank == 0 ? '1000+' :  rankData.userQuestionRank}}名</text>
-                </view>
-                <view class="rank">
-                  <text>答题准确率：{{rankData.userQuestionAccuracy}}%</text>
-                  <text>第{{rankData.userQuestionCorrectRank == 0 ? '1000+' : rankData.userQuestionCorrectRank}}名</text>
-                </view>
-              </view>
-              <view class="particular">
-                <navigator url="../medal_rank/medal_rank" >查看详细排行</navigator>
-              </view>
-            </view>
-            <!-- 勋章 -->
-            <view class="medal">
-              <view class="title">
-                <text>我的勋章</text>
-                <text class="{{data.metalsList.length > 0 ? 'none' : ''}}">本周还没获得</text>
-              </view>
-
-              <scroll-view scroll-x="true" >
-                <view class="img">
-                  <view wx:if="{{!data.isHave}}">
-                    <image src="../image/no_gain.png" class="no-gain"></image>
-                    <image src="{{data.currentMetals.unsoldImg}}"></image>
-                    <text>本周勋章</text>
-                  </view>
-                  <view wx:for="{{data.metalsList}}" wx:key="{{item.id}}" >    
-                    <image src="{{item.img}}"></image>
-                    <text>{{item.name}}</text>
-                  </view>
-                </view>
-              </scroll-view>
-              
-            </view>
-            <!-- 课模板 -->
-            <view>
-              <curriculum 
-              studyLog="{{ studyLog }}"
-              height="{{height}}"/>
-            </view>
-            <!-- 上传作品 -->
-            <chat id="upload"
-              id="chat"
-              productionData="{{productionData}}" 
-              title="我的作品"
-              type="2"
-              columnType="6"
-              bind:getHeight="onGetHeight"
-              bind:myevent="onMyEvent"
-              more="{{productionMore}}"/>
-            <!-- 更改年级 -->
-            <setGrade 
-             id="set-grade"
-             grade="{{grade}}"/>
-          </view>
-      </scroll-view>
+<view class="subject">
+  <view class="schedule">
+    <navigator url="/pages/my/my">
+      <image src="../image/xiaoxue.png"></image>
+    </navigator>
   </view>
-  <view class="canvas-box">
-    <canvas canvas-id="myCanvas" style="width:100%; height: {{canvasHeight}}px;"></canvas>
-  </view>  
+	<block wx:for="{{scheduleList}}" wx:key="{{index}}">
+		<!-- <template is="wx_schedule" data="{{data: item, bindtap: funName}}"/> -->
+    <view class="schedule" bindtap="navToSchedule" data-id="{{item.id}}" data-title="{{item.itemTitle}}">
+		  <image src="{{'https://efunimgs.ai160.com/'+item.discribePicUrlArray[1]}}"></image>
+	  </view>
+	</block>
   <view hidden="{{flag}}">
     <dialog bindmyevent="jurisdiction"/>
-  </view>
+  </view>   
 </view>

pages/index/index.wxss

@@ -1,238 +1,33 @@
 /**index.wxss**/
 
-/* 隐藏内容 */
-.none {
-  display: none;
-} 
-
-.my {
-  width: 100%;
-  padding: 0 15rpx;
-  box-sizing: border-box;
-}
-
-.message,
-.medal,
-.ranking {
-  width: 100%;
-  margin: 20rpx 0;
-  border-radius: 25rpx;
-  padding: 32rpx 24rpx;
-  box-sizing: border-box;
-  background: #fff;
-}
-
-.message {
-  margin: 20rpx 0 0 0;
-}
-
-.user {
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 2rpx solid #CDCED3;
-  padding-bottom: 20rpx;
-}
-
-.head {
-  display: flex;
-  align-items: center;
-}
-
-.left {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  width: 340rpx;  
-  word-break:keep-all;/* 不换行 */   
-  white-space:nowrap;/* 不换行 */  
-  overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
-  text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/
-  margin-left: 34rpx;
-}
-
-.userinfo-avatar {
-  width: 86rpx;
-  height: 86rpx;
-  border-radius: 20%;
-}
-
-.name {
-  height:44rpx;
-  font-size: 36rpx;
-  font-weight: 600;
-  margin-top: 10rpx;
-}
-
-.LV {
-  font-size: 28rpx;
-  font-weight: 600;
-}
-
-.student {
-  height:34rpx;
-  font-size: 28rpx;
-  color: #878787;
-}
-
-.grade,
-.set-name {
-  width: 146rpx;
-  height: 46rpx;
-  font-size: 28rpx;
-  font-weight: bolder;
-  color: #878787;
-  border: 2rpx solid #CECDD2;
-  border-radius: 30rpx;
-  text-align: center;
-  line-height: 48rpx; 
-}
-
-.set-name {
-  margin-top: 10rpx;
-}
-
-.personal {
-  display: flex;
-  margin-top: 34rpx;
-}
-
-.personal .particulars {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  text-align: center;
-}
-
-/*排名*/
-.ranking {
-  margin: 0 0 20rpx 0;
-  position: relative;
-}
-
-.dashed {
-  position: absolute;
-  top: 0;
-  left: 5%;
-  width: 90%;
-  border-top:2rpx dashed #878787;
+page {
+	height: 100%;
+	background:#f0eff5;
 }
-
-.ranking .title text{
-  font-size: 36rpx;
-  font-weight: 600;
-}
-
-.ranking-con {
-  margin-bottom: 40rpx;
-}
-
-.rank {
-  display: flex;
-  justify-content: space-between;
-  font-size: 28rpx;
-  margin-bottom: 30rpx;
-}
-
-.particular {
-  position: absolute;
-  right: 30rpx;
-  bottom: 30rpx;
-  color: #5984F7;
-  font-size: 28rpx;
-}
-
-/*勋章*/
-.medal {
-  padding: 28rpx;
-}
-
-.medal .title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-} 
-
-.medal .title text:nth-child(1){
-  font-size: 36rpx;
-  font-weight: 600;
-}
-
-.medal .title text:nth-child(2){
-  font-size: 28rpx;
-  color: #878787;
-}
-
-.img {
-  display: flex;
-  padding-top: 38rpx;
-}
-
-.img view {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  margin-right: 15rpx;
-}
-
-.no-gain {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 142rpx;
-  height: 142rpx;
-}
-
-.img image {
-  width: 140rpx;
-  height: 140rpx;
-}
-
-.img text {
-  font-size: 28rpx;
-  color: #878787;
-  margin-top: 10rpx;
-}
-
-.personal .particulars text:nth-child(1) {
-  font-size: 24rpx;
-  color: #878787;
-}
-
-.personal .particulars text:nth-child(2) {
-  font-size: 28rpx;
-  color: #000;
-  font-weight: 600;
-}
-
-.questions, .share {
-  width: 100%;
-  margin-top: 40rpx;
-}
-
-.questions text, .share text {
-  width: 100%;
-  display: inline-block;
-  border: 1px solid #ccc;
-  background: #fff;
+.subject {
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	width: 100%;
+	height: 100%;
+	padding: 14rpx;
+	overflow: hidden;
 }
 
-.questions view, .share view {
-  height: 1400rpx;
-  margin-top: 20rpx;
-  background: red;
+.schedule {
+	position: relative;
+	width: 722rpx;
+	height: 228rpx;
+	border-radius: 20rpx;
+	margin-bottom: 14rpx;
+	overflow: hidden;
 }
 
-.adsorb {
-  position: fixed;
-  left: 0;
-  top: 84rpx;
+.schedule navigator {
+	width: 100%;
+	height: 100%;
 }
 
-.canvas-box {
-    position: fixed;
-    left: 999px;
-    top: 0;
-    width: 100%;
-    z-index: -2;
+.schedule image {
+	width: 100%;
+	height: 100%;
 }

pages/mistakes/mistakes.js

@@ -1,5 +1,4 @@
 // pages/mistakes/mistakes.js
-const util = require('../../utils/util.js');
 const APIClient = require('../../utils/APIClient.js');
 const login = require('../../utils/loginSchedule.js');
 Page({

pages/my/my.js

@@ -0,0 +1,197 @@
+//index.js
+//获取应用实例
+const app = getApp()
+const util = require('../../utils/util.js');
+const APIClient = require('../../utils/APIClient.js');
+const login = require('../../utils/loginSchedule.js');
+
+Page({
+  data: {
+    motto: ['我的','本周推荐','语文','数学','中文','英语','科学','艺术'],
+    navBtnSelectIdx: 0,
+    left: 0,
+    //questionsPreviewing: false,
+    //questionsShare: false,
+    data: {},
+    grade: "",
+    time: "",
+    rankData: {},
+    share: false,
+    studyLog: [],
+    height: '',
+    flag: true,
+    productionData: {},
+    num2: 0,
+    productionMore: '',
+    canvasHeight: ''
+  },
+  
+  lower: function (e) {
+    //console.log(e);
+    //console.log(e.detail.scrollTop)
+    // if (320 <= e.detail.scrollTop && e.detail.scrollTop <= 1000){
+    //   this.setData({ questionsPreviewing: true, questionsShare: false});
+    // }else {
+    //   this.setData({ questionsPreviewing: false });
+    // }
+    // if (1090 <= e.detail.scrollTop) {
+    //   this.setData({ questionsPreviewing: false, questionsShare: true});
+    // } else {
+    //   this.setData({ questionsShare: false });
+    // }
+  },
+
+  jurisdiction: function () {
+    //隐藏弹框
+    this.setData({
+      flag: !this.data.flag
+    })
+    //登录页信息
+    this.onShow();
+  },
+
+  /*点击获取canvas高度*/
+  onGetHeight: function (e) {
+    const canvasHeight = this.selectComponent("#chat").data.canvasHeight;
+    this.setData({
+      canvasHeight,
+    })
+  },
+  /*更改年级*/
+  setgrade: function (e) {
+    this.setGrade.showPopup()
+  },
+  onLoad: function (options) {
+    //获取更改年级组件
+    this.setGrade = this.selectComponent("#set-grade");
+    console.log(this.setGrade)
+    //获取分享过来的值跳转页面
+    const ind  = options.ind;
+    const postsId = options.postId || '';
+    //判断ind的值移动到到艺术
+    if(ind) {
+      this.setData({
+        navBtnSelectIdx: ind
+      })
+      //移动nav
+      if (ind <= 2) {
+        this.setData({ left: 0 });
+      }
+      if(ind > 2){
+        this.setData({left: 200 });
+      }  
+    }
+  },
+  onShow: function () {
+    //登录页信息
+    login.getOpenidSessionKey(res => {
+      APIClient.getMySchedule({
+        uid: res.data.data.uid
+      }).success(res => {
+        console.log(res)
+        this.setData({
+          data: res.data.data,
+          grade: util.gradeUpper(res.data.data.users.grade),
+          test:util.day(),
+          time: util.day(res.data.data.timeSpend),
+          studyLog: util.studyTime(res.data.data.studyLog)
+        })
+        
+
+        if(res.data.data.studyLog.length > 10) {
+          this.setData({
+            height: '680'
+          })
+        }
+      })
+      //获取排名
+      APIClient.getFriendSchedule('wx/friendsRank/user', {
+        uid: res.data.data.uid
+      }).success(res => {
+        console.log(res)
+        this.setData({
+          rankData: res.data.data,
+        })
+      })
+    }, () => {
+      this.setData({
+        flag: !this.data.flag
+      })
+    });  
+    /* 分享 */
+    const columnId = util.column('6').columnId;
+    this.distinction(2, columnId, 1, 2, res => {
+      if(res.data.success) {
+        console.log(res.data.data)
+        this.setData({
+          productionData: res.data.data
+        })
+        if(res.data.data) {
+          if(res.data.data.totalSize > 2) {
+            this.setData({
+              productionMore: true
+            })
+          }
+        }
+      }
+    });
+  },
+  /* 区分答疑和分享 */
+  distinction: function(type, columnId, pageNo, pageSize, success) {
+    login.getOpenidSessionKey(function(res) {
+      //console.log(res.data.data.uid);
+      APIClient.getProductionSchedule({
+        uid: res.data.data.uid
+      }, {
+        "type": type,
+        "pageNo": pageNo,
+        "pageSize": pageSize
+      }).success(success)
+    }, function() {
+      
+    });
+  },
+  /*点击加载更多*/
+  onMyEvent: function(e){
+    const columnId = util.column('6').columnId;
+    this.data.num2++
+    this.setData({
+      num: this.data.num2
+    })
+    this.distinction(2, columnId, 1, 5*this.data.num2, res => {
+      if(res.data.success) {
+        console.log(res.data.data)
+        this.setData({
+          productionData: res.data.data,
+        }) 
+        if(5*this.data.num2 > res.data.data.totalSize) {
+          this.setData({
+            productionMore: ''
+          })
+        }
+      }
+    });
+  },
+    /* 转发*/
+  onShareAppMessage: function (ops) {
+    if (ops.from === 'button') {
+      // 来自页面内转发按钮
+      console.log(ops.target)
+    }
+    const postId = ops.target.dataset.postid;
+    const imageUrl= ops.target.dataset.imageurl[0];
+    return {
+      title: '小学王者班',
+      path: `pages/transmit/transmit?ind=7&postId=${postId}`,
+      imageUrl,
+      success: function (res) {
+        // 转发成功
+        console.log("转发成功:" + JSON.stringify(res));
+      },
+      fail: function (res) {
+        // 转发失败
+        console.log("转发失败:" + JSON.stringify(res));
+      }
+    }
+  }
+})

pages/my/my.json

@@ -0,0 +1,11 @@
+
+{
+    "usingComponents": {
+     "tarbar": "/compontents/tarbar/tarbar",
+     "art": "../art/art",
+     "curriculum": "/compontents/curriculum/curriculum",
+     "dialog": "/compontents/dialog/dialog",
+     "chat": "/compontents/chat/chat",
+     "setGrade": "/compontents/set_grade/set_grade"
+    }
+  }

pages/my/my.wxml

@@ -0,0 +1,129 @@
+<!--index.wxml-->
+<view class="container">
+  <!-- 标题 -->
+  <tarbar id="tarbar"/>
+  <!-- 内容 -->
+  <view class="content">
+      <scroll-view scroll-y="true" bindscroll="lower" scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
+          <!-- 我的 -->
+          <view class="my {{navBtnSelectIdx == 0 ? '' : 'none'}}">
+            <!-- 个人信息 -->
+            <view class='message'>
+              <view class='user'>
+                <view class='head'>
+                  <image class="userinfo-avatar" src="{{data.users.headImgUrl}}" background-size="cover"></image>
+                  <view class='left'>
+                    <view class="student">
+                      学号:<text>{{data.users.eid}}</text>
+                    </view>
+                    <view class="name">
+                      {{data.users.wechatName}}
+                      <text class='LV'>LV {{data.level}}</text>
+                    </view>
+                  </view>
+                </view>
+                <view>
+                  <view class='grade' bindtap="setgrade">
+                    {{grade}}
+                  </view>
+                  <view class='set-name'>
+                    <navigator style='font-size:28rpx;' url="../set_name/set_name" >更改昵称</navigator>
+                  </view>
+                </view>
+              </view>
+              <view class='personal'>
+                <view class="particulars">
+                    <text>登录天数</text>
+                    <text>{{data.users.loginDay}}</text>
+                </view>
+                <view class="particulars">
+                  <text>TV端学习时长</text>
+                  <text>{{time}}</text>
+                </view>
+                <view class="particulars">
+                  <text>当前排名</text>
+                  <text>{{data.scoreRank}}</text>
+                </view>
+                <view class="particulars">
+                  <text>超过用户</text>
+                  <text>{{data.proportion}}%</text>
+                </view>
+              </view>  
+            </view>
+            <!-- 答题 -->
+            <view class="ranking">
+              <view class="dashed"></view>
+              <view class="ranking-con">
+                <view class="rank">
+                  <text>勋章数量：{{rankData.userMetalNum}}枚</text>
+                  <text>第{{rankData.userMetalRank == 0 ? '1000+' : rankData.userMetalRank}}名</text>
+                </view>
+                <view class="rank">
+                  <text>等级：LV{{rankData.level}}</text>
+                  <text>第{{rankData.expRank === 0 ? '1000+' : rankData.expRank}}名</text>
+                </view>
+                <view class="rank">
+                  <text>答题量：{{rankData.userQuestionNum}}题</text>
+                  <text>第{{rankData.userQuestionRank == 0 ? '1000+' :  rankData.userQuestionRank}}名</text>
+                </view>
+                <view class="rank">
+                  <text>答题准确率：{{rankData.userQuestionAccuracy}}%</text>
+                  <text>第{{rankData.userQuestionCorrectRank == 0 ? '1000+' : rankData.userQuestionCorrectRank}}名</text>
+                </view>
+              </view>
+              <view class="particular">
+                <navigator url="../medal_rank/medal_rank" >查看详细排行</navigator>
+              </view>
+            </view>
+            <!-- 勋章 -->
+            <view class="medal">
+              <view class="title">
+                <text>我的勋章</text>
+                <text class="{{data.metalsList.length > 0 ? 'none' : ''}}">本周还没获得</text>
+              </view>
+
+              <scroll-view scroll-x="true" >
+                <view class="img">
+                  <view wx:if="{{!data.isHave}}">
+                    <image src="../image/no_gain.png" class="no-gain"></image>
+                    <image src="{{data.currentMetals.unsoldImg}}"></image>
+                    <text>本周勋章</text>
+                  </view>
+                  <view wx:for="{{data.metalsList}}" wx:key="{{item.id}}" >    
+                    <image src="{{item.img}}"></image>
+                    <text>{{item.name}}</text>
+                  </view>
+                </view>
+              </scroll-view>
+              
+            </view>
+            <!-- 课模板 -->
+            <view>
+              <curriculum 
+              studyLog="{{ studyLog }}"
+              height="{{height}}"/>
+            </view>
+            <!-- 上传作品 -->
+            <chat id="upload"
+              id="chat"
+              productionData="{{productionData}}" 
+              title="我的作品"
+              type="2"
+              columnType="6"
+              bind:getHeight="onGetHeight"
+              bind:myevent="onMyEvent"
+              more="{{productionMore}}"/>
+            <!-- 更改年级 -->
+            <setGrade 
+             id="set-grade"
+             grade="{{grade}}"/>
+          </view>
+      </scroll-view>
+  </view>
+  <view class="canvas-box">
+    <canvas canvas-id="myCanvas" style="width:100%; height: {{canvasHeight}}px;"></canvas>
+  </view>  
+  <view hidden="{{flag}}">
+    <dialog bindmyevent="jurisdiction"/>
+  </view>
+</view>

pages/my/my.wxss

@@ -0,0 +1,238 @@
+/**index.wxss**/
+
+/* 隐藏内容 */
+.none {
+  display: none;
+} 
+
+.my {
+  width: 100%;
+  padding: 0 15rpx;
+  box-sizing: border-box;
+}
+
+.message,
+.medal,
+.ranking {
+  width: 100%;
+  margin: 20rpx 0;
+  border-radius: 25rpx;
+  padding: 32rpx 24rpx;
+  box-sizing: border-box;
+  background: #fff;
+}
+
+.message {
+  margin: 20rpx 0 0 0;
+}
+
+.user {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 2rpx solid #CDCED3;
+  padding-bottom: 20rpx;
+}
+
+.head {
+  display: flex;
+  align-items: center;
+}
+
+.left {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  width: 340rpx;  
+  word-break:keep-all;/* 不换行 */   
+  white-space:nowrap;/* 不换行 */  
+  overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
+  text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/
+  margin-left: 34rpx;
+}
+
+.userinfo-avatar {
+  width: 86rpx;
+  height: 86rpx;
+  border-radius: 20%;
+}
+
+.name {
+  height:44rpx;
+  font-size: 36rpx;
+  font-weight: 600;
+  margin-top: 10rpx;
+}
+
+.LV {
+  font-size: 28rpx;
+  font-weight: 600;
+}
+
+.student {
+  height:34rpx;
+  font-size: 28rpx;
+  color: #878787;
+}
+
+.grade,
+.set-name {
+  width: 146rpx;
+  height: 46rpx;
+  font-size: 28rpx;
+  font-weight: bolder;
+  color: #878787;
+  border: 2rpx solid #CECDD2;
+  border-radius: 30rpx;
+  text-align: center;
+  line-height: 48rpx; 
+}
+
+.set-name {
+  margin-top: 10rpx;
+}
+
+.personal {
+  display: flex;
+  margin-top: 34rpx;
+}
+
+.personal .particulars {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+}
+
+/*排名*/
+.ranking {
+  margin: 0 0 20rpx 0;
+  position: relative;
+}
+
+.dashed {
+  position: absolute;
+  top: 0;
+  left: 5%;
+  width: 90%;
+  border-top:2rpx dashed #878787;
+}
+
+.ranking .title text{
+  font-size: 36rpx;
+  font-weight: 600;
+}
+
+.ranking-con {
+  margin-bottom: 40rpx;
+}
+
+.rank {
+  display: flex;
+  justify-content: space-between;
+  font-size: 28rpx;
+  margin-bottom: 30rpx;
+}
+
+.particular {
+  position: absolute;
+  right: 30rpx;
+  bottom: 30rpx;
+  color: #5984F7;
+  font-size: 28rpx;
+}
+
+/*勋章*/
+.medal {
+  padding: 28rpx;
+}
+
+.medal .title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+} 
+
+.medal .title text:nth-child(1){
+  font-size: 36rpx;
+  font-weight: 600;
+}
+
+.medal .title text:nth-child(2){
+  font-size: 28rpx;
+  color: #878787;
+}
+
+.img {
+  display: flex;
+  padding-top: 38rpx;
+}
+
+.img view {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  margin-right: 15rpx;
+}
+
+.no-gain {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 142rpx;
+  height: 142rpx;
+}
+
+.img image {
+  width: 140rpx;
+  height: 140rpx;
+}
+
+.img text {
+  font-size: 28rpx;
+  color: #878787;
+  margin-top: 10rpx;
+}
+
+.personal .particulars text:nth-child(1) {
+  font-size: 24rpx;
+  color: #878787;
+}
+
+.personal .particulars text:nth-child(2) {
+  font-size: 28rpx;
+  color: #000;
+  font-weight: 600;
+}
+
+.questions, .share {
+  width: 100%;
+  margin-top: 40rpx;
+}
+
+.questions text, .share text {
+  width: 100%;
+  display: inline-block;
+  border: 1px solid #ccc;
+  background: #fff;
+}
+
+.questions view, .share view {
+  height: 1400rpx;
+  margin-top: 20rpx;
+  background: red;
+}
+
+.adsorb {
+  position: fixed;
+  left: 0;
+  top: 84rpx;
+}
+
+.canvas-box {
+    position: fixed;
+    left: 999px;
+    top: 0;
+    width: 100%;
+    z-index: -2;
+}

pages/schedule/scheduleSubject/scheduleSubject.js

@@ -0,0 +1,95 @@
+var APIClient = require('../../../utils/APIClient.js');
+Page({
+	data: {
+		userInfo: wx.getStorageSync('userInfo'),
+		swiperList: [],
+		currentIndex: 0,
+		currentId: '',
+		id: '',
+		showId: '',
+		title: ''
+	},
+	onLoad(options) {
+		console.log(wx.getStorageSync('userInfo'));
+		this.setData({
+			userInfo: wx.getStorageSync('userInfo'),
+			id: options.id
+		})
+		if(options.title) {
+			wx.setNavigationBarTitle({
+				title: options.title
+			})
+		}
+		if (options.showId) {
+			this.getClassScheduleWeeklyQR(this.data.id, this.data.userInfo.id, options.showId);
+		} else {
+			this.getClassSchedule(this.data.id, this.data.userInfo.id);
+		}
+	},
+	onShareAppMessage: function() {
+		// 用户点击右上角分享
+		let title = this.data.title
+		let id = this.data.id
+		let index = this.data.currentIndex
+		let showId = this.data.swiperList[index].categoryId
+		return {
+			title: title, // 分享标题
+			desc: title, // 分享描述
+			path: `pages/index/index?id=${id}&showId=${showId}` // 分享路径
+		}
+	},
+	switchContent(e) {
+		console.log(e.detail.current);
+		this.setData({
+			currentIndex: e.detail.current
+		})
+		wx.setNavigationBarTitle({
+			title: this.data.swiperList[e.detail.current].mainTitle
+		})
+	},
+	// 获取课程列表
+	getClassSchedule(itemId, userId) {
+
+		APIClient.getClassScheduleWeekly(itemId, userId).success(function (res) {
+			console.log('轮播图', res);
+      if (res.data.success) {
+        this.setData({
+          swiperList: res.data.data.items,
+          currentId: res.data.data.currentId
+        })
+        this.getCurrentIndex(this.data.currentId, this.data.swiperList)
+      }
+		}.bind(this))
+	},
+	// 获取课程列表qr
+	getClassScheduleWeeklyQR(itemId, userId, showId) {
+		APIClient.getClassScheduleWeeklyQR(itemId, userId, showId).success(function (res) {
+			console.log('轮播图', res);
+      if (res.data.success) {
+        this.setData({
+          swiperList: res.data.data.items,
+          currentId: res.data.data.currentId
+        })
+        this.getCurrentIndex(this.data.currentId, this.data.swiperList)
+      }
+		}.bind(this))
+	},
+	toScheduleSubjectInner(e) {
+		let id = e.currentTarget.dataset.id
+		console.log(id);
+		wx.navigateTo({
+			url: `/pages/schedule/scheduleSubjectInner/scheduleSubjectInner?id=${id}`
+		})
+	},
+	getCurrentIndex(id, arr) {
+		let len = arr.length;
+		for (let i = 0; i < len; i++) {
+			if (arr[i].categoryId === id) {
+				this.setData({
+					currentIndex: i
+				})
+				return;
+			}
+		}
+	}
+})

pages/schedule/scheduleSubject/scheduleSubject.json

@@ -0,0 +1,3 @@
+{
+
+}

pages/schedule/scheduleSubject/scheduleSubject.wxml

@@ -0,0 +1,34 @@
+<view class="scheduleSubject">
+	<swiper current="{{currentIndex}}" bindchange="switchContent">
+		<block wx:for="{{swiperList}}" wx:key="{{item.categoryId}}">
+			<swiper-item>
+				<view class="content-wrapper"  data-id="{{item.categoryId}}" bindtap="toScheduleSubjectInner">
+					<view class="content">
+						<view class="title">{{item.summary}}</view>
+						<view class="rate-title">本期全国平均完课率</view>
+						<view class="rate-num">{{item.completionRate}}<text class="percentage">%</text></view>
+						<view class="remind">在电视上看看你的完课率有没有超过平均值？</view>
+						<view class="keywords-wrapper">
+							<view class="keywords-title">关键词</view>
+							<view wx:for="{{item.keyWord}}" wx:for-item="keywordItem" wx:key="index" class="keyword-item">{{keywordItem}}</view>
+						</view>
+						<view class="learning-goal-wrapper">
+							<view class="goal-title">学习目标</view>
+							<view class="goal-desc">{{item.simpleGoal}}</view>
+						</view>
+					</view>
+					<view class="touch">
+						<image src="https://efunimgs.ai160.com/resource/wechat/subject/schedule/touch.png"></image>
+					</view>
+				</view>	
+			</swiper-item>		
+		</block>
+	</swiper>
+	<view class="footer">
+		<view class="avatar-wrapper">
+			<image class="avatar" src="{{userInfo.avatar}}"></image>
+			<image class="avatar" wx:for="{{swiperList[currentIndex].avatars}}" src="{{item}}" wx:key="{{index}}"></image>
+		</view>
+		<view class="look-num">{{swiperList[currentIndex].memberCount}}</view>
+	</view>
+</view>

pages/schedule/scheduleSubject/scheduleSubject.wxss

@@ -0,0 +1,143 @@
+page {
+	height: 100%;
+	background-image: url('https://efunimgs.ai160.com/resource/wechat/subject/schedule/schedule_bg.jpg');
+	overflow: hidden;
+	background-size: cover;
+}
+.scheduleSubject {
+	width: 100%;
+}
+swiper {
+	padding-top: 99rpx;
+	height: 850rpx;
+}
+.avatar-wrapper {
+	width: 100%;
+	overflow: hidden;
+	margin-top: 10rpx;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-pack: center;
+	-ms-flex-pack: center;
+	justify-content: center;
+
+}
+.avatar {
+	-webkit-flex: 0 0 80rpx;
+	-ms-flex: 0 0 80rpx;
+	flex: 0 0 80rpx;
+	width: 80rpx;
+	height: 80rpx;
+	border-radius: 50%;
+	margin: 8rpx;
+}
+.look-num {
+	position: relative;
+	width: 100rpx;
+	height: 40rpx;
+	margin-top: 20rpx;
+	margin-left: 50%;
+	line-height: 40rpx;
+	font-size: 36rpx;
+	color: #fff;
+}
+.look-num::before {
+	display: block;
+	width: 36rpx;
+	height: 36rpx;
+	line-height: 40rpx;
+	position: absolute;
+	top: 0rpx;
+	left: -40rpx;
+	content: ' ';
+	background-image: url('https://efunimgs.ai160.com/resource/wechat/subject/schedule/person.png');
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: 80%;
+}
+
+.content-wrapper {
+	position: relative;
+	width: 670rpx;
+	height: 730rpx;
+	-webkit-box-sizing: border-box;
+					box-sizing: border-box;
+	padding: 40rpx 44rpx 85rpx;
+	margin-left: auto;
+	margin-right: auto;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+}
+.content {
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+}
+.title {
+	font-size: 36rpx;
+	line-height: 40rpx;
+	font-weight: bold;
+	color: #2d2e4c;
+	margin-bottom: 25rpx;
+}
+.rate-title {
+	font-size: 30rpx;
+	line-height: 30rpx;
+	color: #f06231;
+}
+.rate-num {
+	font-size: 110rpx;
+	font-weight: bold;
+	line-height: 110rpx;
+	color: #f06231;
+}
+.percentage {
+	font-size: 60rpx;
+	font-weight: normal;
+}
+.remind {
+	font-size: 26rpx;
+	color: #5252d4;
+	margin-bottom: 20rpx;
+}
+.keywords-title, .goal-title {
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #2d2e4d;
+}
+.goal-title {
+	margin-top: 10rpx;
+}
+.keyword-item {
+	display: inline-block;
+	-webkit-box-sizing: border-box;
+					box-sizing: border-box;
+	height: 40rpx;
+	font-size: 28rpx;
+	line-height: 40rpx;
+	font-weight: lighter;
+	padding: 0 14rpx;
+	margin: 0 10rpx 15rpx 0rpx;
+	background-color: #5252d4;
+	color: #fff;
+	border-radius: 20rpx;
+}
+.goal-desc {
+	height:170rpx;
+	overflow:hidden;
+	font-size: 30rpx;
+	color: #2d2e4c;
+}
+.touch {
+	position: absolute;
+	bottom: -83rpx;
+	left: 253rpx;
+	width: 165rpx;
+	height: 165rpx;
+}
+.touch image {
+	width: 100%;
+	height: 100%;
+}
+

pages/schedule/scheduleSubjectInner/scheduleSubjectInner.js

@@ -0,0 +1,294 @@
+var APIClient = require('../../../utils/APIClient.js');
+var util = require('../../../utils/util.js');
+Page({
+	data: {
+		userInfo: wx.getStorageSync('userInfo'),
+		columnId: '',
+		tabData: ['问答区', '学习资料', '学习目标', '课程表'],
+		isSelect: 0,
+		teacherId: -1,
+		qaData: {},
+		inputvalue: '',
+		_inputvalue: '', //重制input的值
+		isReply: false,
+		postsId: -1,
+		focus: false,
+		goal: '',
+		schedule: [],
+		scheduleLesson: [],
+		scheduleUnfolded: 'scheduleUnfolded',
+		scheduleSelect: -1,
+		courseWare: [],
+		title: '',
+		materials: []
+	},
+	onLoad(options) {
+		console.log(options)
+		this.setData({
+			userInfo: wx.getStorageSync('userInfo'),
+			columnId: options.id
+		})
+		this.getScheduleGoal(this.data.columnId); //目标
+		this.getScheduleMaterials(this.data.userInfo.id, this.data.columnId) //学习资料
+		this.getScheduleQA(this.data.userInfo.id, this.data.columnId, 'CLASS_SCHEDULE', 1, 50) // 问答
+		this.getScheduleCourse(this.data.columnId, 'COURSE', this.data.userInfo.id) // 学习目标和课程表
+	},
+	// 用户点击右上角分享
+	onShareAppMessage(res) {
+		console.log(res);
+		let id = this.data.columnId
+		let title= this.data.title
+		return {
+			title: title,
+			path: `pages/schedule/scheduleSubjectInner/scheduleSubjectInner?id=${id}`
+		}
+	},
+	// 获取学习资料
+	getScheduleMaterials(userId, itemId) {
+		APIClient.getScheduleMaterials(userId, itemId).success(function(res) {
+			console.log('获取学习资料', res.data.data);
+			this.setData({ materials: res.data.data})
+		}.bind(this))
+	},
+	switchTab(e) {
+		let index = e.currentTarget.dataset.index
+		this.setData({
+			isSelect: index
+		})
+	},
+	// 获取teacherID goal title
+	getScheduleGoal(itemId) {
+		APIClient.getScheduleGoal(itemId).success(function(res) {
+			let paragraph  = res.data.data.goal
+			res.data.data.goal = paragraph.split(/[\r\n]/g)
+			this.setData({
+				goal: res.data.data.goal,
+				teacherId: res.data.data.teacherId,
+				title: res.data.data.title
+			})
+			console.log(this.data.teacherId);
+			wx.setNavigationBarTitle({
+				title: this.data.title
+			})
+		}.bind(this))
+	},
+	// 获取问答区数据
+	getScheduleQA(userId, columnId, columnType, pageNo, pageSize) {
+		APIClient.getQAList(userId, columnId, columnType, pageNo, pageSize).success(function(res) {
+			console.log('问答区数据', res)
+			let list = []
+			if(res.data.data && res.data.data.list) {
+				list = res.data.data.list
+			}
+			if (list.length > 0) {
+				list.forEach(function(item, index) {
+					list[index].posts.gmtModified = util.formatTime(item.posts.gmtModified)
+				})
+			}
+			this.setData({
+				qaData: list
+			})
+		}.bind(this))
+	},
+	// 获取输入框里面的内容
+	getValue(e) {
+		this.setData({
+			inputvalue: e.detail.value,
+		})
+	},
+	//回复问题
+	reply(e) {
+		if (!this.data.userInfo.id) {
+			util.showToast('请删除小程序再次进入时授权用户信息', 'success', '2000')
+			return;
+		}
+		this.setData({
+			isReply: true,
+			focus: true,
+			postsId: e.currentTarget.dataset.questions_id
+		})
+	},
+	//问问题
+	setReplay() {
+		console.log('是否回复');
+		if (this.data.inputvalue == '') {
+			console.log('添加问题');
+			this.setData({
+				isReply: false
+			})
+		}
+	},
+	// 回复问题
+	replyQuestion(userId, postsId, content, columnNames) {
+		console.log(userId, postsId, content, columnNames);
+		APIClient.addReply(userId, postsId, content, columnNames).success(function(res){
+			console.log('回复问题', res);
+			this.setData({
+				_inputvalue: '',
+				isReply: false
+			})
+			this.getScheduleQA(this.data.userInfo.id, this.data.columnId, 'CLASS_SCHEDULE', 1, 50)
+		}.bind(this))
+	},
+	// 增加问题
+	addQuestion(userId, columnId, columnType, title, columnNames) {
+		APIClient.addQuestion(userId, columnId, columnType, title, columnNames).success(function(res){
+			console.log('增加问题', res);
+			this.setData({
+				_inputvalue: ''
+			})
+			this.getScheduleQA(this.data.userInfo.id, this.data.columnId, 'CLASS_SCHEDULE', 1, 50)
+		}.bind(this))
+	},
+	//点击发送
+	submit() {
+		let userId = this.data.userInfo.id;
+		let value = this.data.inputvalue.trim();
+		let postsId = this.data.postsId;
+		let columnId = this.data.columnId;
+		let columnNames = this.data.title
+		if(this.data.inputvalue.trim() === '') {
+			util.showToast('输入内容为空', 'success', '2000')
+		} else if (!this.data.userInfo.id) {
+			util.showToast('请删除小程序再次进入时授权用户信息', 'success', '2000')
+		} else if(this.data.isReply) {
+			console.log('回复问题');
+			this.replyQuestion(userId, postsId, value, columnNames)
+		} else {
+			console.log('添加问题');
+			this.addQuestion(userId, columnId, 'CLASS_SCHEDULE', value, columnNames)
+		}
+	},
+	// 问题点赞
+	addPraise(userId, id) {
+		APIClient.addPraise(userId, id).success(function(res) {
+			console.log('问题点赞', res);
+			this.praiseLock = false;
+			this.getScheduleQA(this.data.userInfo.id, this.data.columnId, 'CLASS_SCHEDULE', 1, 50)
+		}.bind(this))
+	},
+	// 取消点赞
+	cancelPraise(userId, id) {
+		APIClient.cancelPraise(userId, id).success(function(res) {
+			console.log('取消收藏', res);
+			this.praiseLock = false;
+			this.getScheduleQA(this.data.userInfo.id, this.data.columnId, 'CLASS_SCHEDULE', 1, 50)
+		}.bind(this))
+	},
+	//点赞操作锁
+	praiseLock: false,
+	// 问题点赞切换
+	togglePraise(e) {
+		if (this.praiseLock) {
+			return;
+		}
+		this.praiseLock = true;
+		let userId = this.data.userInfo.id;
+		let id = e.currentTarget.dataset.questions_id
+		let islike = e.currentTarget.dataset.islike
+		if (!islike) {
+			console.log('点赞');
+			this.addPraise(userId, id)
+		} else {
+			console.log('取消点赞');
+			this.cancelPraise(userId, id)
+		}
+	},
+	// 获取资料列表
+	getMaterials(columnId) {
+		APIClient.getMaterials(columnId).success(function(res) {
+			console.log('获取资料列表', res);
+		})
+	},
+	// 课件预览
+	viewMaterial(e) {
+		console.log('课件预览');
+		var _url = e.currentTarget.dataset.url
+		var url = '';
+		if (_url.indexOf('/') === 0) {
+			url = 'https://efunimgs.ai160.com' + _url;
+		} else {
+    		url = 'https://efunimgs.ai160.com/' + _url;
+		}
+		wx.showToast({
+			title: '打开中请稍后',
+			icon: 'loading',
+			duration: 6000
+		})
+		wx.downloadFile({
+			url: url,
+			success: function(res) {
+				console.log(res, '下载')
+				let tempFilePath = res.tempFilePath				
+				wx.openDocument({
+					filePath: tempFilePath,
+					success: function(res) {
+						wx.hideToast()
+						console.log('打开文档成功')
+					},
+					fail: function(res) {
+						wx.hideToast()
+						console.log('打开文件失败', res);
+					}
+				})
+			},
+			fail: function(res) {
+				wx.hideToast()
+				wx.showToast({
+					title: '资源出错',
+					icon: 'success',
+					duration: 1000
+				})
+				console.log('下载失败', res);
+			}
+		})
+	},
+	// 课件收藏
+	collectMaterial(e) {
+		console.log(e, '课件收藏');
+		let userId = this.data.userInfo.id
+		let name = this.data.title
+		let favoritesCode = e.currentTarget.dataset.id
+		console.log(favoritesCode);
+		APIClient.toggleCollection(userId, favoritesCode, 'CLASS_SCHEDULE', name).success(function(res) {
+			console.log('课件收藏', res);
+			this.getScheduleMaterials(this.data.userInfo.id, this.data.columnId)
+		}.bind(this))
+	},
+	// 分享
+	share() {
+		console.log('share');
+	},
+	// 课程表
+	getScheduleCourse(id, type, userId) {
+		APIClient.getScheduleDetailGoalSchedule(id, type, userId).success(function(res) {
+			console.log('----调取课程表课程----', res);
+			this.setData({
+				schedule: res.data.data
+			})
+		}.bind(this))
+	},
+	// 获取课程表lesson
+	getScheduleLesson(id, type, userId) {
+		APIClient.getScheduleDetailGoalSchedule(id, type, userId).success(function(res) {
+			console.log('----调取课程表课---', res);
+			this.setData({
+				scheduleLesson: res.data.data
+			})
+		}.bind(this))
+	},
+	// 折叠课程表
+	scheduleUnfolded(e) {
+		let id = e.currentTarget.dataset.id
+		this.getScheduleLesson(id, 'LESSON', this.data.userInfo.id)
+		if (id == this.data.scheduleSelect) {
+			this.setData({
+				scheduleSelect: -1
+			})
+		} else {
+			this.setData({
+				scheduleSelect: id
+			})
+		}
+	}
+})

pages/schedule/scheduleSubjectInner/scheduleSubjectInner.json

@@ -0,0 +1,3 @@
+{
+
+}

pages/schedule/scheduleSubjectInner/scheduleSubjectInner.wxml

@@ -0,0 +1,36 @@
+<import src="../template/qa/qa.wxml"/>
+<import src="../template/materials/materials.wxml"/>
+<import src="../template/detail/detail.wxml"/>
+<import src="../template/schedule/schedule.wxml"/>
+<view class="root-view">
+	<view class="frame-view">
+		<!-- 切换页面 -->
+		<view class="tab-wrapper">
+			<view wx:for="{{tabData}}" data-index="{{index}}" id="tab-{{index}}" wx:key="{{index}}" class="{{isSelect == index ? 'tab-select' : 'tab-item'}}"  bindtap="switchTab">
+				<text>{{item}}</text>
+			</view>
+		</view>
+		<view class="detail-wrapper">
+			<!-- 这里是问答 -->
+			<view class="detail-item" hidden="{{isSelect !== 0}}">
+				<template is="qa" data="{{qa: qaData, reply, teacherId, inputvalue}}"/>
+			</view>
+			<!-- 这里是学习资料 -->
+			 <view class="detail-item" hidden="{{isSelect !== 1}}">
+				<template is="materials" data="{{materials}}"/>
+			</view>
+			<!-- 这里是详情-->
+			<view class="detail-item" hidden="{{isSelect !== 2}}">
+				<template is="detail" data="{{goal}}"/>
+			</view>
+			<!-- 课程列表 -->
+			<view class="detail-item" hidden="{{isSelect !== 3}}">
+				<template is="schedule" data="{{courseList: schedule, unfolded: scheduleUnfolded, scheduleLesson, currentSelect: scheduleSelect}}"/>
+			</view>
+		</view>
+	</view>
+	<view class="input-wrapper" hidden="{{isSelect !== 0}}">
+		<view class="input-item"><input maxlength="-1" bindtap="setReplay" value="{{_inputvalue}}" bindinput="getValue" focus="{{focus}}" cursor-spacing="10" placeholder="我也说两句" confirm-type="done"/></view>
+		<view class="submit" bindtap="submit" >发送</view>
+	</view>
+</view>

pages/schedule/scheduleSubjectInner/scheduleSubjectInner.wxss

@@ -0,0 +1,198 @@
+@import "../template/detail/detail.wxss";
+@import "../template/schedule/schedule.wxss";
+@import "../template/materials/materials.wxss";
+@import "../template/qa/qa.wxss";
+page{
+	height: 100%;
+}
+.root-view {
+	background-color: #f0eff5;
+	width: 100%;
+	height: 100%;
+	font-family: "PingFang SC",
+								"Hiragino Sans GB",
+								"Heiti SC",
+								"Microsoft YaHei",
+								"WenQuanYi Micro Hei";
+}
+
+.frame-view {
+	width: 100%;
+	height: 100%;
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	padding: 16rpx 0 0;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-orient: vertical;
+	-webkit-box-direction: normal;
+		-ms-flex-direction: column;
+			flex-direction: column;
+}
+.tab-wrapper {
+	-webkit-box-flex: 0;
+		-ms-flex: 0 0 80rpx;
+			flex: 0 0 80rpx;
+	height: 80rpx;
+	margin: 20rpx 16rpx;
+	font-size: 30rpx;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+}
+.tab-item {
+	-webkit-box-flex: 1;
+			-ms-flex: 1 1 auto;
+					flex: 1 1 auto;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	text-align: center;
+	-webkit-box-pack: center;
+		-ms-flex-pack: center;
+			justify-content: center;
+	-webkit-box-align: center;
+		-ms-flex-align: center;
+			align-items: center;
+	background: #fff;
+}
+#tab-0{
+	border-top-left-radius:15rpx;
+	border-bottom-left-radius:15rpx;
+}
+#tab-3{
+	border-top-right-radius:15rpx;
+	border-bottom-right-radius:15rpx;
+}
+/*选中tab样式*/
+.tab-select {
+	-webkit-box-flex: 1;
+			-ms-flex: 1 1 auto;
+					flex: 1 1 auto;
+	position: relative;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-pack: center;
+		-ms-flex-pack: center;
+			justify-content: center;
+	-webkit-box-align: center;
+		-ms-flex-align: center;
+			align-items: center;
+	text-align: center;
+	background: #3db254;
+	color: #fff;
+}
+
+.tab-select::after{
+	position: absolute;
+	bottom: -20rpx;
+	left: 40%;
+	content: '';
+	display: block;
+	width: 0;
+	height: 0;
+	border-style: solid;
+	border-width: 30rpx 15rpx 0 15rpx;
+	border-color: #3db254 transparent transparent transparent;
+}
+.detail-wrapper {
+	-webkit-box-flex: 1;
+		-ms-flex: 1 1 auto;
+			flex: 1 1 auto;
+	height: 600rpx;
+	border-top-left-radius: 20rpx;
+	border-top-right-radius: 20rpx;
+	background-color: #fff;
+	margin: 0 16rpx;
+	position: relative;
+}
+.detail-item {
+	position: absolute;
+  width: 100%;
+  height: 100%;
+}
+scroll-view {
+	height: 100%;
+}
+.input-wrapper {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-align: center;
+		-ms-flex-align: center;
+			align-items: center;
+	-webkit-box-flex: 0;
+		-ms-flex: 0 0 auto;
+			flex: 0 0 auto;
+	width: 100%;
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	background-color: #cce9ce;
+	padding: 0 30rpx;
+	overflow: hidden;
+}
+.speak-icon {
+	-webkit-box-flex: 0;
+		-ms-flex: 0 0 auto;
+			flex: 0 0 auto;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-pack: center;
+		-ms-flex-pack: center;
+			justify-content: center;
+	-webkit-box-align: center;
+		-ms-flex-align: center;
+			align-items: center;
+	width: 68rpx;
+	min-height: 100rpx;
+	border-radius: 50%;
+	margin-right: 12rpx;
+}
+.speak-icon image{
+	width: 68rpx;
+	height: 68rpx;
+}
+.input-item {
+	-webkit-box-flex: 1;
+		-ms-flex: 1 1 100rpx;
+			flex: 1 1 100rpx;
+	/*position: relative;*/
+	width: 100rpx;
+	height: 68rpx;
+	background-color: #fff;
+	margin: 16rpx 12rpx 16rpx 0;
+	border-radius: 32rpx;
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	padding: 0 32rpx;
+}
+.input-wrapper input{
+	width: 100%;
+	display: block;
+	height: 68rpx;
+	line-height: 68rpx;
+}
+.submit {
+	-webkit-box-flex: 0;
+		-ms-flex: 0 0 auto;
+			flex: 0 0 auto;
+	width: 120rpx;
+	height: 68rpx;
+	line-height: 68rpx;
+	border-radius: 32rpx;
+	background-color: #3cb350;
+	text-align: center;
+	font-size: 34rpx;
+	color: #fff;
+}
+.no-info {
+	color: #999;
+	line-height: 50rpx;
+	font-size: 32rpx;
+}

pages/schedule/template/detail/detail.js

@@ -0,0 +1 @@
+

pages/schedule/template/detail/detail.json

@@ -0,0 +1 @@
+{}

pages/schedule/template/detail/detail.wxml

@@ -0,0 +1,7 @@
+<template name="detail">
+	<scroll-view scroll-y="true">
+		<view id="detail">
+			<text wx:for="{{goal}}" wx:key="{{index}}" class="desc">{{item}}</text>
+		</view>
+	</scroll-view>
+</template>

pages/schedule/template/detail/detail.wxss

@@ -0,0 +1,20 @@
+#detail {
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	padding: 30rpx 40rpx;
+	min-height: 100%;
+}
+#detail text{
+	display: block;
+	margin-bottom: 10rpx;
+	line-height: 60rpx;
+}
+#detail .title{
+	font-size: 34rpx;
+	font-weight: 600;
+}
+#detail .desc{
+	text-indent: 60rpx;
+	font-size: 30rpx;
+	font-weight: 400;
+}

pages/schedule/template/materials/materials.json

@@ -0,0 +1 @@
+{}

pages/schedule/template/materials/materials.wxml

@@ -0,0 +1,14 @@
+<template name="materials">
+	<scroll-view scroll-y="true">
+		<view id="materials" >
+			<view wx:if="{{!materials.length}}" class="no-info">暂无学习资料</view>
+			<view wx:for="{{materials}}" wx:key="{{index}}" class="{{index === 0 ? 'material-wrapper first' : 'material-wrapper'}}" >
+					<text class="name">{{item.courseware.name}}</text>
+					<view class="btns">
+						<text class="btn view" data-url="{{item.courseware.playUrl}}" bindtap="viewMaterial"></text>
+						<text class="{{item.isFavourite  ? 'collected btn' : 'btn collect'}}" data-id="{{item.courseware.id}}" bindtap="collectMaterial"></text>
+					</view>
+			</view>
+		</view>
+	</scroll-view>
+</template>

pages/schedule/template/materials/materials.wxss

@@ -0,0 +1,71 @@
+#materials {
+	min-height: 100%;
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	padding: 20rpx 0;
+}
+
+#materials .material-wrapper {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-pack: justify;
+		-ms-flex-pack: justify;
+			justify-content: space-between;
+	-webkit-box-align: center;
+		-ms-flex-align: center;
+			align-items: center;
+	width: 100%;
+	min-height: 80rpx;
+	border-top: 2rpx solid #f3f3f3;
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	padding-left: 26rpx;
+	padding-right: 26rpx;
+}
+
+#materials .first {
+	border: 0 solid #ddd;
+}
+#materials .name {
+	-webkit-box-flex: 1;
+	    -ms-flex: 1 1 auto;
+	        flex: 1 1 auto;
+	font-size: 30rpx;
+}
+#materials .btns {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	height: 100%;
+	-webkit-box-align: center;
+		-ms-flex-align: center;
+			align-items: center;
+	-webkit-box-flex: 0;
+	    -ms-flex: 0 0 150rpx;
+	        flex: 0 0 150rpx;
+}
+#materials .btn {
+	background-position: center;
+	background-repeat: no-repeat;
+}
+#materials .btn.view{
+	width: 70rpx;
+	height: 80rpx;
+	margin-left: 15rpx;
+	margin-right: 20rpx;
+	background-image: url(https://efunimgs.ai160.com/resource/wechat/live/eye.png);
+	background-size: 50rpx 25rpx;
+}
+#materials .btn.collect{
+	width: 70rpx;
+	height: 80rpx;
+	background-image: url(https://efunimgs.ai160.com/resource/wechat/live/collect.png);
+	background-size: 45rpx 45rpx;
+}
+#materials .btn.collected{
+	width: 70rpx;
+	height: 80rpx;
+	background-image: url(https://efunimgs.ai160.com/resource/wechat/live/collected.png);
+	background-size: 45rpx 45rpx;
+}

pages/schedule/template/qa/qa.json

@@ -0,0 +1 @@
+{}

pages/schedule/template/qa/qa.wxml

@@ -0,0 +1,40 @@
+<template name="qa">
+	<view id="qa" class="clearfix">
+		<scroll-view scroll-y="true">
+			<view class="qa-content clearfix">
+				<view wx:if="{{!qa.length}}" class="no-info">暂无问答</view>
+				<view wx:for="{{qa}}" wx:key="{{index}}" class="qa-item clearfix">
+				<view class="avatar">
+					<image src="{{item.posts.userInfo.avatar}}"></image>
+				</view>
+				<view class="msg-wrapper clearfix">
+					<view class="q-name-wrapper">
+						<view wx:if="{{item.posts.userInfo.userId != teacherId}}" class="q-name">{{item.posts.userInfo.nickName}}</view>
+						<view wx:if="{{item.posts.userInfo.userId == teacherId}}" class="q-name teacher">{{item.posts.userInfo.nickName}} 老师</view>
+						<view class="time">{{item.posts.gmtModified}}</view>
+					</view>
+					<view class="question clearfix"><text>{{item.posts.title}}</text></view>
+					<view class="features">
+						<view class="praise-wrapper feature-item clearfix">
+							<view class="{{item.like? 'praised-icon':'praise-icon'}}" bindtap="togglePraise" data-questions_id="{{item.posts.id}}" data-islike="{{item.like}}"></view>
+							<text class="praise-num">{{item.likeCount}}</text>
+						</view>
+						<view class="answer-wrapper feature-item clearfix">
+							<view class="answer-icon" data-questions_id="{{item.posts.id}}" bindtap="reply"></view>
+							<text class="answer-num">{{item.posts.replyList? item.posts.replyList.length: 0}}</text>
+						</view>
+						<view class="share-wrapper feature-item clearfix" bindtap="share">
+							<button class="share-icon" open-type="share" plain="true"></button>
+						</view>
+					</view>
+					<view class="answer-wrapper clearfix" wx:for="{{item.posts.replyList}}" wx:for-item="answerItem" wx:key="{{index}}">
+						<text wx:if="{{answerItem.userInfo.userId == teacherId}}" class="name teacher">{{answerItem.userInfo.nickName}} 老师</text>
+						<text wx:if="{{answerItem.userInfo.userId != teacherId}}" class="name">{{answerItem.userInfo.nickName}}</text>
+						<text>:{{answerItem.content}}</text>
+					</view>
+				</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>

pages/schedule/template/qa/qa.wxss

@@ -0,0 +1,174 @@
+#qa {
+	width: 100%;
+	height: 100%;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-orient: vertical;
+	-webkit-box-direction: normal;
+		-ms-flex-direction: column;
+			flex-direction: column;
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	padding-bottom: 100rpx;
+}
+.qa-content {
+	-webkit-box-flex: 1;
+		-ms-flex: 1 1 auto;
+			flex: 1 1 auto;
+	min-height: 100%;
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	padding: 28rpx 32rpx 0;
+	position: relative;
+}
+.qa-content .qa-wrapper {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-flex: 1;
+		-ms-flex: 1 0 auto;
+			flex: 1 0 auto;
+	width: 100%;
+	height: 200rpx;
+}
+.qa-content .qa-item {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	margin-bottom: 26rpx;
+}
+.qa-content .avatar {
+	-webkit-box-flex: 0;
+		-ms-flex: 0 0 auto;
+			flex: 0 0 auto;
+	width: 70rpx;
+	height: 70rpx;
+}
+.qa-content .avatar image {
+	width: 100%;
+	height: 100%;
+	border-radius: 50%;
+}
+.qa-content .msg-wrapper {
+	width: 100%;
+	margin-left: 15rpx;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-orient: vertical;
+	-webkit-box-direction: normal;
+		-ms-flex-direction: column;
+			flex-direction: column;
+}
+.q-name-wrapper {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-pack: justify;
+		-ms-flex-pack: justify;
+			justify-content: space-between;
+}
+.qa-content .q-name {
+	-webkit-box-flex: 1;
+	    -ms-flex: 1 1 auto;
+	        flex: 1 1 auto;
+	margin-right: 10rpx;
+	font-size: 30rpx;
+	color: #214a93;
+}
+#qa .teacher {
+	color: #fd6826;
+}
+#qa .qa-content .time {
+	-webkit-box-flex: 0;
+	    -ms-flex: 0 0 160rpx;
+	        flex: 0 0 160rpx;
+	font-size: 26rpx;
+	color: #a1a1a1;
+	margin: 0;
+}
+.qa-content .question {
+	margin-top: 5rpx;
+	font-size: 30rpx;
+}
+.qa-content .features {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-align: center;
+		-ms-flex-align: center;
+			align-items: center;
+	height: 50rpx;
+	color: #a1a1a1;
+	margin-top: 15rpx;
+	margin-right: 30rpx;
+	margin-bottom: 10rpx;
+}
+.feature-item {
+	width: 150rpx;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	margin-right: 10rpx;
+	height: 50rpx;
+}
+.share-wrapper {
+	width: 50rpx;
+	height: 50rpx;
+}
+.feature-item view {
+	display: inline-block;
+	width: 50rpx;
+	height: 50rpx;
+	margin-right: 4rpx;
+}
+.feature-item button  {
+	outline: none;
+	border: 0;
+	display: inline-block;
+	width: 50rpx;
+	height: 50rpx;
+	padding: 0;
+}
+.feature-item text {
+	display: inline-block;
+	height: 50rpx;
+	font-size: 30rpx;
+	line-height: 50rpx;
+	padding-top: 5rpx;
+	-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+}
+.praise-icon{
+	background: url('https://efunimgs.ai160.com/resource/wechat/live/good.png') no-repeat center/90%;
+}
+.praised-icon{
+	background: url('https://efunimgs.ai160.com/resource/wechat/live/better.png') no-repeat center/90%;
+}
+.answer-icon{
+	background: url('https://efunimgs.ai160.com/resource/wechat/live/comment.png') no-repeat center/90%;
+}
+.collection-icon{
+	background: url('https://efunimgs.ai160.com/resource/wechat/live/collect.png') no-repeat center/90%;
+}
+.collected-icon{
+	background: url('https://efunimgs.ai160.com/resource/wechat/live/collected.png') no-repeat center/90%;
+}
+.share-icon{
+	background: url('https://efunimgs.ai160.com/resource/wechat/subject/schedule/share.png') no-repeat center/80%;
+}
+.answer-wrapper{
+	font-size: 30rpx;
+	line-height: 50rpx;
+}
+.answer-wrapper .name{
+	color: #214a93;
+}
+.no-info {
+	position: absolute;
+	left: 50%;
+	top: 40%;
+	-webkit-transform: translate(-50%, -50%);
+			transform: translate(-50%, -50%);
+}

pages/schedule/template/schedule/schedule.json

@@ -0,0 +1 @@
+{}

pages/schedule/template/schedule/schedule.wxml

@@ -0,0 +1,15 @@
+<template name="schedule">
+	<view id="schedule">
+		<scroll-view scroll-y="true" scroll-into-view="{{scheduleScroll}}">
+			<view class="course-wrapper"  data-id="{{item.id}}" wx:for="{{courseList}}" wx:key="{{index}}" bindtap="{{unfolded}}">
+				<view class="course-item">
+					<view class="name">{{item.summary}}</view>
+					<view class="{{item.id == currentSelect ? 'icon selected' : 'icon'}}"></view>
+				</view>
+				<view hidden="{{item.id != currentSelect}}" class="course-item-wrapper">
+					<view wx:for="{{scheduleLesson}}" wx:for-item = "sonItem" wx:key="{{index}}" class="course-ware"><text>{{sonItem.itemTitle}}</text></view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>

pages/schedule/template/schedule/schedule.wxss

@@ -0,0 +1,91 @@
+#schedule {
+	height: 100%;
+	padding: 20rpx 0;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	font-size: 30rpx;
+}
+
+#schedule .course-item {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-pack: justify;
+	-ms-flex-pack: justify;
+	justify-content: space-between;
+	-webkit-box-align: center;
+	-ms-flex-align: center;
+	align-items: center;
+	overflow: hidden;
+	width: 100%;
+	height: 80rpx;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	border-bottom: 2rpx solid #f3f3f3;
+	padding-left: 36rpx;
+	padding-right: 36rpx;
+}
+
+.name {
+	-webkit-box-flex: 1;
+	-ms-flex: 1 1 auto;
+	flex: 1 1 auto;
+}
+
+.icon {
+	-webkit-box-flex: 0;
+	-ms-flex: 0 0 auto;
+	flex: 0 0 auto;
+	width: 50rpx;
+	height: 100%;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: 18rpx 35rpx;
+	background-image: url('https://efunimgs.ai160.com/resource/wechat/subject/schedule/right_arrow.png');
+}
+
+.icon.selected {
+	background-size: 35rpx 18rpx;
+	background-image: url('https://efunimgs.ai160.com/resource/wechat/subject/schedule/down_arrow.png');
+}
+
+.course-ware {
+	position: relative;
+	height: 80rpx;
+	line-height: 80rpx;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	padding-left: 30rpx;
+	margin-left: 40rpx;
+	margin-right: 30rpx;
+	border-left: 2rpx solid #f3f3f3;
+	border-bottom: 2rpx solid #f3f3f3;
+}
+
+.course-ware text {
+	display: inline-block;
+	width: 100%;
+	height: 80rpx;
+	line-height: 80rpx;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.course-ware::before {
+	display: block;
+	position: absolute;
+	top: 50%;
+	left: 0;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	width: 20rpx;
+	height: 20rpx;
+	content: '.';
+	font-size: 0;
+	border-radius: 50%;
+	border: 1rpx solid #3db254;
+	background-color: #ffffff;
+}

pages/set_name/set_name.js

@@ -49,7 +49,7 @@ Page({
         console.log(res)
         if(res.data.success) {  
           wx.redirectTo({
-            url: '../index/index?ind=0'
+            url: '../my/my?ind=0'
           })
         }
       })      

pages/transmit/transmit.js

@@ -91,8 +91,8 @@ Page({
     //   }
     // })
     const postsId = options.postId || '';
-    const shareKey = util.convertObject(unescape(options.scene)).shareKey || '';
-    console.log('shareKey:' + util.convertObject(unescape(options.scene)).shareKey);
+    const shareKey = util.convertObject(decodeURIComponent(options.scene)).shareKey || '';
+    console.log('shareKey:' + util.convertObject(decodeURIComponent(options.scene)).shareKey);
     //判断分享过来的参数是否有postId查询单挑显示 
     if(postsId || shareKey) {
       login.getOpenidSessionKey(res => {

project.config.json

@@ -85,6 +85,13 @@
 					"pathName": "pages/transmit/transmit",
 					"query": "shareKey=1527671780483633&ind=7",
 					"scene": "1011"
+				},
+				{
+					"id": 8,
+					"name": "详情",
+					"pathName": "pages/schedule/scheduleSubject/scheduleSubject",
+					"query": "id=1522213858287640",
+					"scene": "1011"
 				}
 			]
 		}

utils/APIClient.js

@@ -1,12 +1,47 @@
 const request = require('./WXHttpRequest.js');
 const url = require('./const.js');
+const loginSchedule = require('./loginSchedule.js');
 
 const HOST = url.apiUrl;
+const HOSTTwo = url.apiUrlTwo;
 
 function genAPIUrl(action) {
 	return HOST + action;
 }
 
+function genAPIUrlTwo(action) {
+	return HOSTTwo + action;
+}
+
+// function genData(data) {
+// 	debugger;
+// 	let commonData = {
+// 		platform_type: PLATFORM
+// 	}
+
+// 	for (let key in commonData) {
+// 		data[key] = commonData[key];
+// 	}
+// 	return data;
+// }
+
+//没有登录的提示
+function showModal() {
+	wx.showModal({
+	  title: '提示',
+	  content: '需要获取您的公开信息（昵称、头像等），请从小程序列表删除快乐学堂小助手后再次扫码进入，允许授权后可正常使用',
+	  showCancel: false,
+	  success: function (res) {
+		if (res.confirm) {
+		  console.log('用户点击确定')
+		} else if (res.cancel) {
+		  console.log('用户点击取消')
+		}
+	  }
+	})
+}
+
+
 module.exports = {
     // 获取我的data
 	getMySchedule(header) {
@@ -77,5 +112,130 @@ module.exports = {
 	getqrCode(data) {
 		let url = genAPIUrl('wx/qrCode/postsCache');
 		return request.getInstance().url(url).data(data).method('GET').send();
-	}
+	},
+	/**另一个小程序接口调用从此处开始 */
+	// 获取课程表列表
+	getClassSchedule() {
+		let url = genAPIUrlTwo('wx/classSchedule/list');
+		return request.getInstance().url(url).send();
+	},
+	// 课程表详情列表
+	getClassScheduleWeekly(itemId, userId) {
+		if (!userId) {
+			loginSchedule.getOpenidSessionKeyTwo(function (res) {
+				wx.navigateBack();
+				wx.navigateTo({
+				  url: `/pages/schedule/scheduleSubject/scheduleSubject?scene=sc&id=${itemId}`
+				})
+			}, function (res) {
+				wx.navigateBack()
+			});
+		}
+		let url = genAPIUrlTwo(`wx/classSchedule/weekly/${itemId}`);
+		//let data = genData({ userId })
+		return request.getInstance().data({ userId }).url(url).send();
+	},
+	// 课程表详情列表二维码
+	getClassScheduleWeeklyQR(itemId, userId, showId) {
+		if (!userId) {
+			loginSchedule.getOpenidSessionKeyTwo(function (res) {
+			wx.navigateBack()
+			wx.navigateTo({
+			  url: `/pages/schedule/scheduleSubject/scheduleSubject?scene=sc&id=${itemId}&showId=${showId}`
+			})
+		  }, function (res) {
+			wx.navigateBack()
+			showModal()
+		  });
+		}
+		let url = genAPIUrlTwo(`wx/classSchedule/weekly/${itemId}`);
+		//let data = genData({ userId, showId })
+		return request.getInstance().data({ userId, showId }).url(url).send();
+	},	
+	// 课程表详情问答列表
+	getQAList(userId, columnId, columnType, pageNo, pageSize) {
+		let url = genAPIUrlTwo(`wx/posts`);
+		let data = {
+			userId,
+			columnId,
+			columnType,
+			pageNo,
+			pageSize
+		}
+		return request.getInstance().url(url).data(data).send();
+	},
+	// 添加问题
+	addQuestion(userId, columnId, columnType, title, columnNames) {
+		let url = genAPIUrlTwo(`wx/posts`);
+		let header = {'content-type': 'application/x-www-form-urlencoded'}
+		let data = {
+			userId,
+			columnId,
+			columnType,
+			title,
+			columnNames
+		}
+		return request.getInstance().url(url).header(header).method('POST').data(data).send();
+	},
+	// 添加问题回复
+	addReply(userId, postsId, content, columnNames) {
+		let url = genAPIUrlTwo(`wx/posts/addReply`);
+		let header = {'content-type': 'application/x-www-form-urlencoded'}
+		let data = {
+			userId,
+			postsId,
+			content,
+			columnNames
+		}
+		return request.getInstance().url(url).header(header).method('POST').data(data).send();
+	},
+	// 问题点赞
+	addPraise(userId, id) {
+		let url = genAPIUrlTwo(`wx/posts/like`);
+		let header = {'content-type': 'application/x-www-form-urlencoded'}
+		let data = {
+			userId,
+			id
+		}
+		return request.getInstance().url(url).header(header).method('POST').data(data).send();
+	},
+	// 问题取消点赞
+	cancelPraise(userId, id) {
+		let url = genAPIUrlTwo(`wx/posts/unlike`);
+		let header = {'content-type': 'application/x-www-form-urlencoded'}
+		let data = {
+			userId,
+			id
+		}
+		return request.getInstance().url(url).header(header).method('POST').data(data).send();
+	},	
+	// 直播课资料列表
+	getMaterials(columnId) {
+		let url = genAPIUrlTwo(`wx/classSchedule/courseware/${columnId}`);
+		return request.getInstance().url(url).send();
+	},
+	// 课程表资料列表
+	getScheduleMaterials(userId, itemId) {
+		let url = genAPIUrlTwo(`wx/classSchedule/courseware/${itemId}`);
+		let data = { userId }
+		return request.getInstance().url(url).data(data).send();
+	},
+	// 添加收藏
+	toggleCollection(userId, favoritesCode, favoritesType, name) {
+		let url = genAPIUrlTwo('wx/favorites')
+		let header = {'content-type': 'application/x-www-form-urlencoded'}
+		let data = { userId, favoritesCode, favoritesType, name }
+		return request.getInstance().url(url).method('POST').header(header).data(data).send()
+	},
+	// 获取teacherID title goal
+	getScheduleGoal(itemId) {
+		let url = genAPIUrlTwo(`wx/classSchedule/goal/${itemId}`);
+		return request.getInstance().url(url).send();
+	},
+	// 课程表详情中的课程表和学习目标
+	getScheduleDetailGoalSchedule(itemId, type, userId) {
+		let url = genAPIUrlTwo(`wx/classSchedule/info/${itemId}`);
+		let data = { type, userId }
+		return request.getInstance().url(url).data(data).send();
+	},					
 }

utils/const.js

@@ -7,6 +7,9 @@ module.exports = {
 	// host: 'wss://weixin.ai160.com/wx/websocket'
 	// ----测试环境-----
    //apiUrl: 'https://weixin.efunbox.cn/',
-   apiUrl: 'https://schedule.api.ai160.com/'
+   // ----正式环境-----
+   apiUrl: 'https://schedule.api.ai160.com/',
+   // ----正式环境----- 另一个小程序
+   apiUrlTwo: 'https://weixin.ai160.com/',
 
 }

utils/loginSchedule.js

@@ -1,7 +1,10 @@
 const request = require('./WXHttpRequest.js');
 const url = require('./const.js');
+const util = require('./util.js');
 
 const HOST = url.apiUrl;
+const HOSTTwo = url.apiUrlTwo;
+
 
 function genAPIUrl(action) {
 	return HOST + action;
@@ -28,7 +31,7 @@ function wxLogin(successcallback, failcallback) {
     })
 }
 
-// 获取 openid 和 session_key
+// 获取原来的 openid 和 session_key
 function getOpenidSessionKey(successcallback, failcallback) {
   if (wx.getStorageSync('user')) {
     successcallback(
@@ -43,40 +46,87 @@ function getOpenidSessionKey(successcallback, failcallback) {
     wxLogin(function(res) {
         //console.log('获取sessionKey等内容'+JSON.stringify(res.data));
         let sessionKey = JSON.parse(res.data).session_key;
-        //登录
-        getLoginSchedule(sessionKey, successcallback, failcallback);
+        let openId = JSON.parse(res.data).openid;
+        getLoginSchedule(sessionKey, openId, successcallback, failcallback, false);
     },function(res) {
         failcallback(res);
     })    
 }
 
+// 获取另一个的 openid 和 session_key
+function getOpenidSessionKeyTwo(successcallback, failcallback) {
+    if (wx.getStorageSync('userInfo')) {
+      successcallback(
+        wx.getStorageSync('userInfo'),
+        //分享小程序按钮
+        wx.showShareMenu({
+          withShareTicket: true
+        })
+      );
+      return;
+    }
+      wxLogin(function(res) {
+          //console.log('获取sessionKey等内容'+JSON.stringify(res.data));
+          let sessionKey = JSON.parse(res.data).session_key;
+          let openId = JSON.parse(res.data).openid;
+          getLoginSchedule(sessionKey, openId, successcallback, failcallback, true);
+      },function(res) {
+          failcallback(res);
+      })    
+  }
+
 //登录
-function getLoginSchedule(sessionKey, successcallback, failcallback) {
+function getLoginSchedule(sessionKey, openId, successcallback, failcallback, affirm) {
     wx.getSetting({
         success: function(res) {
             // 已经授权，可以直接调用 getUserInfo 获取头像昵称
             wx.getUserInfo({
                 success: function (res) {
-                    let userInfo = res.userInfo
-                    let url = genAPIUrl('wx/ucenter/user/loginRegist');
-                    const userData = {
-                        encryptedData: res.encryptedData,
-                        sessionKey: sessionKey,
-                        iv: res.iv,
-                        dist: '1133',
-                        headimgurl: userInfo.avatarUrl
-                    }          
-                    request.getInstance().url(url).data(userData).method('GET').send().success(res => {
-                        wx.hideToast()
-                        wx.showToast({
-                            title: '登录成功',
-                            icon: 'success',
-                            duration: 1500
-                        })
-                        wx.setStorageSync('uid', res.data.data.uid)
-                        wx.setStorageSync('user', res)
-                        successcallback(res)
-                    });
+                    let userInfo = res.userInfo;
+                    if(affirm) {
+                        let nickName = userInfo.nickName
+                        let avatarUrl = userInfo.avatarUrl
+                        let dataUrl = `openId=${openId}&nickName=${encodeURIComponent(nickName)}&avatar=${avatarUrl}`
+                        wx.request({
+                            url: `${HOSTTwo}wx/user`,
+                            data: dataUrl,
+                            method: 'POST',
+                            header: {
+                                'content-type': 'application/x-www-form-urlencoded'
+                            },
+                            success: function(res) {
+                                console.log(res.data.data, '----注册返回----')
+                                wx.setStorageSync('userInfo', res.data.data)
+                                util.hideToast()
+                                util.showToast('登录中成功', true, 'success', 500)
+                                successcallback(res);
+                            },
+                            fail: function(res) {
+                                console.log(res, '----注册失败返回----')
+                                failcallback(res);
+                            }
+                        }) 
+                    }else {
+                        let url = genAPIUrl('wx/ucenter/user/loginRegist');
+                        const userData = {
+                            encryptedData: res.encryptedData,
+                            sessionKey: sessionKey,
+                            iv: res.iv,
+                            dist: '1133',
+                            headimgurl: userInfo.avatarUrl
+                        }          
+                        request.getInstance().url(url).data(userData).method('GET').send().success(res => {
+                            wx.hideToast()
+                            wx.showToast({
+                                title: '登录成功',
+                                icon: 'success',
+                                duration: 1500
+                            })
+                            wx.setStorageSync('uid', res.data.data.uid)
+                            wx.setStorageSync('user', res)
+                            successcallback(res)
+                        });
+                    }
                 },
                 fail: function(res) {
                     failcallback(res)
@@ -88,5 +138,6 @@ function getLoginSchedule(sessionKey, successcallback, failcallback) {
 }
 
 module.exports = {
-    getOpenidSessionKey
+    getOpenidSessionKey,
+    getOpenidSessionKeyTwo
 }

utils/util.js

@@ -1,19 +1,3 @@
-const formatTime = date => {
-  const year = date.getFullYear()
-  const month = date.getMonth() + 1
-  const day = date.getDate()
-  const hour = date.getHours()
-  const minute = date.getMinutes()
-  const second = date.getSeconds()
-
-  return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
-}
-
-const formatNumber = n => {
-  n = n.toString()
-  return n[1] ? n : '0' + n
-}
-
 //年级显示方法
 let gradeArr = ["学前班", "一年级", "二年级", "三年级"]
 const gradeUpper = grade => {
@@ -222,8 +206,69 @@ function convertObject (str) {
   return obj;
 }
 
+/*另一个小程序用到的方法 */
+//时间转换
+function formatTime(time) {
+	let currentTime = (new Date()).getTime();
+	let durationTime = (currentTime - Number(time)) / 1000;
+
+	let date = new Date(time)
+	let year = date.getFullYear()
+	let month = date.getMonth() + 1
+	let day = date.getDate()
+
+	let hour = date.getHours()
+	let minute = date.getMinutes()
+	let second = date.getSeconds()
+	let interval = '';
+	switch (true) {
+		case durationTime < 60:
+			interval = '刚刚';
+			break;
+		case durationTime < 3600:
+			interval = `${parseInt(durationTime / 60)}分钟前`;
+			break;
+		case durationTime < 3600 * 24:
+			interval = `${parseInt(durationTime / 3600)}小时前`;
+			break;
+		default:
+			interval = [month, day].map(formatNumber).join('/') + ' ' + [hour, minute].map(formatNumber).join(':');
+	}
+	return interval
+}
+
+const formatNumber = n => {
+  n = n.toString()
+  return n[1] ? n : '0' + n
+}
+
+// 弹出Toast
+function showToast(str, mask, icon, time) {
+	wx.showToast({
+		title: str.toString(),
+		mask: mask,
+		icon: icon,
+		duration: +time
+	})
+}
+//隐藏Toast
+function hideToast() {
+	wx.hideToast();
+}
+// 保存文件
+function saveFile(tempFile, success) {
+	wx.saveFile({
+		tempFilePath: tempFile,
+		success: function(res) {
+			let svaedFile = res.savedFilePath
+			if (success) {
+				success(svaeFile)
+			}
+		}
+	})
+}
+
 module.exports = {
-  formatTime: formatTime,
   studyTime,
   studyPageTime,
   strategy,
@@ -235,5 +280,9 @@ module.exports = {
   url,
   topThree,
   replyNo,
-  convertObject
+  convertObject,
+  formatTime,
+  showToast,
+  hideToast,
+  saveFile
 }