Merge branch 'HEAD' of http://dev.schoolwisdoms.com/xzh/schoolwisdoms-student-mp

pages/Components/calendar/calendar.js

@@ -21,7 +21,8 @@ Component({
     dateList: [], //日历主体渲染数组
     selectDay: {}, //选中时间
     open: true, //默认展开
-    curMonth: ''
+    curMonth: '',
+    eventList: []
   },
 
   /**
@@ -30,9 +31,9 @@ Component({
   methods: {
 
     //月份转为汉字
-    formatMonth(month){
+    formatMonth(month) {
       var arr = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二']
-      return arr[parseInt(month,10)-1]+'月';
+      return arr[parseInt(month, 10) - 1] + '月';
     },
 
 
@@ -162,8 +163,8 @@ Component({
     },
     //设置日历底下是否展示小圆点
     setSpot() {
-      const timeArr = this.data.spot.map(item => {
-        return this.formatTime(item, "Y-M-D")
+      const timeArr = this.data.eventList.map(item => {
+        return item.attenceDate
       })
       this.data.dateList.forEach(item => {
         if (timeArr.indexOf(item.dateString) !== -1) {
@@ -253,6 +254,7 @@ Component({
   },
   observers: {
     spot: function (spot) {
+      this.setData({ 'eventList': spot })
       this.setSpot()
     }
   }

pages/Components/calendar/calendar.wxml

@@ -42,7 +42,7 @@
 			<view class="bg {{(item.year === selectDay.year && item.month === selectDay.month) ? (item.day === selectDay.day?'select':''): 'other-month'}}" catchtap="selectChange" data-day="{{item.day}}" data-year="{{item.year}}" data-month="{{item.month}}" data-date-string="{{item.dateString}}">
 				{{item.day}}
 			</view>
-			<view class="spot" ></view>
+			<view class="spot" wx:if="{{item.spot}}"></view>
 		</view>
 	</view>
 </view>

pages/Components/showList/showList.js

@@ -1,26 +1,38 @@
 // pages/Component/showList/showList.js
+const util = require("../../../utils/util")
+const urlDef = require("../../../utils/urls")
 Component({
   /**
    * 组件的属性列表
    */
   properties: {
-    list:{
-      type:Array,
-      value:[]
-    }
+    list: {
+      type: Array,
+      value: []
+    },
   },
 
   /**
    * 组件的初始数据
    */
   data: {
-
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
-
-  }
+    doThumbsUp: function (e) {
+      let id = e.currentTarget.dataset.id
+      this.properties.list.map(o => {
+        if (o.videoId == id) {
+          this.triggerEvent('callThumbsUp', o)
+        }
+      })
+    },
+    doPlay: function (e) {
+      let playUrl = e.currentTarget.dataset.url
+      console.log('playUrl: ' + playUrl)
+    }
+  },
 })

pages/Components/showList/showList.wxml

@@ -1,20 +1,20 @@
 <view class="show-view">
   <view class="show-list">
     <view class="show-box" wx:for="{{list}}" wx:key="index">
-      <view class="show-img">
-        <image mode="aspectFill" src="https://file.schoolwisdoms.com/image/26cf1980-5b25-4c2e-af7f-376677d76033.jpg"></image>
+      <view class="show-img"  bindtap="doPlay" data-url="{{item.playUrl}}">
+        <image mode="aspectFill" src="{{item.imgUrl}}"></image>
       </view>
       <view class="show-title-view">
-        <view class="show-title">这是一个测试数据</view>
-        <view class="zan-view">
+        <view class="show-title">{{item.title}}</view>
+        <view class="zan-view"  bindtap="doThumbsUp" data-id="{{item.videoId}}">
           <view class="zan-img">
             <image src="/images/zan.png" ></image>
           </view>
-          <view class="zan-num">0</view>
+          <view class="zan-num">{{item.goodCount}}</view>
         </view>
       </view>
       <view class="show-desc">
-        这是一条测试数据,这是一条测试数据,这是一条测试数据
+        {{item.content}}
       </view>
     </view>
   </view>

pages/index/index.js

@@ -12,7 +12,7 @@ Page({
     index: 0,
     curStu: {},
     classList: [
-      { img: '/images/kc.png', title: '今日课程', num: '0', url:"/pages/schedule/schedule" },
+      { img: '/images/kc.png', title: '今日课程', num: '0', url: "/pages/schedule/schedule" },
       { img: '/images/jtzy.png', title: '今日作业', num: '0' },
       { img: '/images/cq.png', title: '出勤率', num: '0%' },
     ],
@@ -30,6 +30,8 @@ Page({
     userList: [],
     userItems: [],
     orgItems: [],
+    stuShowList: [],
+    teaShowList: [],
   },
 
   //切换身份
@@ -85,7 +87,7 @@ Page({
     });
   },
 
-  toPage:function(e){
+  toPage: function (e) {
     wx.navigateTo({
       url: e.currentTarget.dataset.url,
     })
@@ -147,15 +149,43 @@ Page({
 
   },
   strLen(s) {
-    return (s ? s.length : 0);
+    return (s ? s.length : 0)
+  },
+  loadVideoInfo: function (videos, personType) {
+    let urls = urlDef.urls
+    videos.forEach(v => {
+      util.apiPost(urls.video_loadInfo + v.videoId).then((rs) => {
+        v.imgUrl = rs.img
+        v.playUrl = rs.url
+        if (personType == 0) {
+          this.setData({ 'stuShowList': videos })
+        }
+        if (personType == 1) {
+          this.setData({ 'teaShowList': videos })
+        }
+      });
+    });
+  },
+  queryVideoShow: function (personType) {
+    const urls = urlDef.urls;
+    //获取登录用户数据, 并加载首页数据
+    util.apiPost(urls.person_video_list, { 'q.orgId': this.data.curStu.orgId, 'q.doPersonId': this.data.curStu.studentId, 'q.personType': personType, 'q.sortBy': 'rand', 'q.limit4': 'true' }).then(rs => {
+      this.loadVideoInfo(rs, personType)
+    })
+  },
+  queryStudentShow: function () {
+    this.queryVideoShow(0)
+  },
+  queryTeacherShow: function () {
+    this.queryVideoShow(1)
   },
   loadIndexData: function () {
     const urls = urlDef.urls;
     //获取登录用户数据, 并加载首页数据
     util.apiPost(urls.get_cur_user, {}).then(rs => {
       // console.log(JSON.stringify(rs));
-      let userItems = rs.attr.others;
-      let orgItems = [];
+      let userItems = rs.attr.others
+      let orgItems = []
       userItems.forEach(u => {
         let exists = false;
         orgItems.some(o => {
@@ -163,65 +193,96 @@ Page({
             exists = true;
             return true;
           }
-        });
+        })
         if (!exists) {
-          orgItems.push({ orgId: u.orgId, orgName: u.orgName });
+          orgItems.push({ orgId: u.orgId, orgName: u.orgName })
         }
         if (u.id === rs.id) { // 当前用户
-          this.setData({ 'curStu': { studentId: u.studentId, orgId: u.orgId } });
+          let student = { studentId: u.studentId, orgId: u.orgId }
+          this.setData({ 'curStu': student })
+          // 放入 strong中
+          wx.setStorageSync('student', student);
         }
         if (this.strLen(u.imageUrl) === 0) {
-          u.imageUrl = '/images/head.png';
+          u.imageUrl = '/images/head.png'
         } else {
-          u.imageUrl = urls.oss_file + 'image/' + u.imageUrl;
+          u.imageUrl = urls.oss_file + 'image/' + u.imageUrl
         }
-      });
+      })
 
-      this.setData({ 'userItems': userItems, 'orgItems': orgItems });
+      this.setData({ 'userItems': userItems, 'orgItems': orgItems })
 
 
-      let personId = rs.attr.personId;
-      let orgId = rs.attr.orgId;
-      let today = util.curTime().substring(0, 10).replace(/\//g, '-');
+      let personId = rs.attr.personId
+      let orgId = rs.attr.orgId
+      let today = util.curTime().substring(0, 10).replace(/\//g, '-')
 
       // banner 图片
       util.apiPost(urls.get_advert, { '&q.use': 1, 'q.orgId': orgId, 'q.exceptStatus': 2 }).then(r => {
         // console.log('banner : ' + JSON.stringify(r));
-        this.setData({ 'bannerList': r });
+        this.setData({ 'bannerList': r })
       });
 
       // 今日课程
       util.apiPost(urls.leave_get_classes_date, { 'q.studentId': personId, 'q.attenceDate': today }).then(r => {
         // console.log('今日课程 : ' + JSON.stringify(r));
-        this.setData({ 'classList[0].num': (r ? r.length : 0) });
+        this.setData({ 'classList[0].num': (r ? r.length : 0) })
       })
 
       // 作业未提交
       util.apiPost(urls.my_homework, { 'q.studentId': personId, 'q.status': 0 }).then(r => {
         // console.log('作业未提交 : ' + JSON.stringify(r));
-        this.setData({ 'classList[1].num': (r ? r.length : 0) });
+        this.setData({ 'classList[1].num': (r ? r.length : 0) })
       });
 
       // 出勤率
       util.apiPost(urls.get_attendance_rate, { 'q.studentId': personId }).then(r => {
-        console.log('出勤率 : ' + JSON.stringify(r));
+        // console.log('出勤率 : ' + JSON.stringify(r));
         let attendRate = 0, alreadyCount = 0, shouldCount = 0;
         if (r != null) {
           r.forEach(it => {
             if (it.isAttend === '1') {
-              alreadyCount = it.num;
+              alreadyCount = it.num
             } else if (it.isAttend === '0') {
-              shouldCount = it.num;
+              shouldCount = it.num
             }
           });
         }
-        let t = (alreadyCount + shouldCount);
+        let t = (alreadyCount + shouldCount)
         if (t > 0) {
-          attendRate = alreadyCount * 100 / t;
+          attendRate = alreadyCount * 100 / t
         }
-        console.log(attendRate)
-        this.setData({ 'classList[2].num': attendRate.toFixed(2) + '%' });
+        this.setData({ 'classList[2].num': attendRate.toFixed(2) + '%' })
       })
+      this.queryVideoShow(0)
+      this.queryVideoShow(1)
     });
+  },
+  doThumbsUp: function (o) {
+    const urls = urlDef.urls;
+    let pid = this.data.curStu.studentId;
+    let pt = o.detail.personType;
+    let vid = o.detail.videoId;
+    let entity = { videoId: vid, personId: pid, personType: pt, actionType: 1 };
+    util.apiPost(urls.person_video_view_save, entity, 'application/json').then(rs => {
+      if (pt == 0) {
+        this.data.stuShowList.map(o => {
+          if (o.videoId == vid) {
+            o.goodCount += 1
+          }
+        })
+        this.setData({ 'stuShowList': this.data.stuShowList })
+      }
+      if (pt == 1) {
+        this.data.teaShowList.map(o => {
+          if (o.videoId == vid) {
+            o.goodCount += 1
+          }
+        })
+        this.setData({ 'teaShowList': this.data.teaShowList })
+      }
+    }).catch(e => {
+      console.log(e);
+    })
   }
 })

pages/index/index.wxml

@@ -67,8 +67,8 @@
       <view class="title">学生秀</view>
       <view class="more">更多</view>
     </view>
-    <showView list="{{stuShowList}}"></showView>
-    <view class="reset-btn">换一批</view>
+    <showView list="{{stuShowList}}" bind:callThumbsUp="doThumbsUp"></showView>
+    <view class="reset-btn" bindtap="queryStudentShow">换一批</view>
   </view>
   <!-- end -->
 
@@ -78,8 +78,8 @@
       <view class="title">老师秀</view>
       <view class="more">更多</view>
     </view>
-    <showView list="{{teaShowList}}"></showView>
-    <view class="reset-btn">换一批</view>
+    <showView list="{{teaShowList}}" bind:callThumbsUp="doThumbsUp"></showView>
+    <view class="reset-btn" bindtap="queryTeacherShow">换一批</view>
   </view>
   <!-- end -->
 

pages/schedule/schedule.js

@@ -1,18 +1,48 @@
 // pages/schedule/schedule.js
+const app = getApp()
+const util = require("../../utils/util")
+const urlDef = require("../../utils/urls")
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    curStu: null,
+    aheadTime: 0,
+    eventList: [],
+    holidayList: [],
+    dateList: [],
+    date: null,
+    week: 0,
+    weekMap: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    const urls = urlDef.urls;
+    let stu = wx.getStorageSync('student');
+    if (stu) {
+      this.setData('curStu', stu);
+      util.apiPost(urls.get_sys_params, { 'q.orgId': stu.orgId, 'q.id': 'f8158acabeeb44ec9ff651aade6b295f' }).then((rs) => {
+        if (rs && rs.length > 0) {
+          // 将分钟转为毫秒
+          this.setData({ 'aheadTime': parseInt(rs[0].sysVal, 10) * 60 * 1000 })
+        }
+      });
+      util.apiPost(urls.get_schedule_month, { 'q.studentId': stu.studentId }).then((rs) => {
+        if (rs && rs.length > 0) {
+          this.setData({ 'eventList': rs })
+        }
+      });
+      util.apiPost(urls.get_holidays, { 'q.companyId': stu.orgId }).then((rs) => {
+        if (rs && rs.length > 0) {
+          this.setData({ 'holidayList': rs })
+        }
+      });
+    }
   },
 
   /**
@@ -62,5 +92,23 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  selectDate: function (d) {
+    console.log('selectDate ' + d)
+  },
+  callSelectDate: function (d) {
+    let v = d.detail.dateString;
+    let vd = new Date(v);
+    let week = this.data.weekMap[vd.getDay()];
+
+
+    let list = this.data.eventList.filter(o => {
+      return o.attenceDate == v;
+    });
+    list.map(o => {
+      o.bt = o.beginTime.substring(11, 16);
+      o.et = o.endTime.substring(11, 16);
+    })
+    this.setData({ 'date': v, 'week': week, 'dateList': list });
   }
 })

pages/schedule/schedule.wxml

@@ -1,11 +1,31 @@
 <view class="container">
 
   <!-- 日历组件 -->
-  <calendar></calendar>
+  <view class="calendar">
+    <calendar spot="{{eventList}}" bind:change="callSelectDate"></calendar>
+  </view>
   <!-- end -->
 
   <!-- 课表列表 -->
-  <classList></classList>
+  <view class="class-view">
+    <view class="class-date">{{date}} {{week}}</view>
+    <view class="class-list">
+      <view class="class-box" wx:for="{{dateList}}" wx:key="index">
+        <view class="class-name"><text class="class-type">{{item.kindId == 1 ? '1v1':'集体'}}</text>{{item.classesName}}</view>
+        <view class="class-time">{{item.bt}} ~ {{item.et}}</view>
+        <view class="class-room">{{item.roomName}}</view>
+        <view class="class-flag">
+          <span wx:if="{{item.status == 0 || item.status == 11 || item.status == 12 || item.status == 4}}">{{item.isAttend == 1 ?'已' : '待'}}上课</span>
+          <span wx:if="{{item.status == 2}}">已请假</span>
+          <span wx:if="{{item.status == 3}}">已调出</span>
+          <span wx:if="{{item.status == 11 || item.status == 12}}">加课</span>
+          <span wx:if="{{item.status == 5}}">补课</span>
+        </view>
+        <view class="class-teacher">老师:{{item.teacherName}}</view>
+      </view>
+    </view>
+  </view>
+
   <!-- end -->
 
 </view>

utils/util.js

@@ -9,29 +9,29 @@ const notWxApiPath = urlsDef.urls.baseUrl + '/schoolbaby/api/';
 const apiPath = urlsDef.urls.baseUrl + '/schoolbaby/api/wx/';
 
 
-function fun_date(num) { 
+function fun_date(num) {
   var date1 = new Date();
   //今天时间
   var time1 = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate()
   var date2 = new Date(date1);
-   date2.setDate(date1.getDate() + num);
-   //num是正数表示之后的时间，num负数表示之前的时间，0表示今天
-   var month = date2.getMonth() + 1
-    if(month < 10) {
-      month = "0" + month
-    }
-    var date = date2.getDate()
-    if(date < 10) {
-      date = "0" + date
-    }
-   var time2 = date2.getFullYear() + "-" + (month) + "-" + date; 
-  return time2;
+  date2.setDate(date1.getDate() + num);
+  //num是正数表示之后的时间，num负数表示之前的时间，0表示今天
+  var month = date2.getMonth() + 1
+  if (month < 10) {
+    month = "0" + month
+  }
+  var date = date2.getDate()
+  if (date < 10) {
+    date = "0" + date
   }
+  var time2 = date2.getFullYear() + "-" + (month) + "-" + date;
+  return time2;
+}
 
-  function fun_week(datestr){
-    var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
-    var week = weekArray[new Date(datestr).getDay()];
-    return week;
+function fun_week(datestr) {
+  var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+  var week = weekArray[new Date(datestr).getDay()];
+  return week;
 }
 
 
@@ -159,10 +159,13 @@ function setAccessHeader(accessKey, appId) {
   accessHeader.accessKey = accessKey;
 }
 
-function apiPost(url, params) {
+function apiPost(url, params, contentType) {
   return new Promise((resolve, reject) => {
     let headers = getHeaders();
     headers['Content-Type'] = 'application/x-www-form-urlencoded';
+    if (contentType) {
+      headers['Content-Type'] = contentType;
+    }
     wx.request({
       url: url,
       header: headers,
@@ -289,7 +292,7 @@ module.exports = {
   setAccessHeader: setAccessHeader,
   distance: distance,
   apiPost: apiPost,
-  fun_date:fun_date,
+  fun_date: fun_date,
   fun_week: fun_week
 
 }