调课

pages/Components/classList/classList.js

@@ -91,7 +91,7 @@ Component({
     toPages: function (e) {
       let urls = urlDef.urls
       let stu = wx.getStorageSync('student')
-      let item = null;
+      let item = e.currentTarget.dataset.item;
       this.properties.list.map(h => {
         if (item == null) {
           if (h.items && h.items.length > 0) {
@@ -286,7 +286,7 @@ Component({
             icon: 'none'
           })
           return;
-        } 
+        }
         wx.showToast({
           title: '您已' + this.data.actionName + '课成功！'
         })

pages/Components/lessonsList/lessonsList.js

@@ -42,9 +42,10 @@ Component({
    */
   methods: {
     toPages: function (e) {
-      let item = this.properties.list.filter(o => o.id == e.currentTarget.dataset.id)[0]
+      let item = this.properties.list.filter(o => o.attenceStudentId == e.currentTarget.dataset.id)[0]
       let action = e.currentTarget.dataset.action
       if (action == 1) {
+        item.classRoomId  = ''// 补课不指定教室
         item.curDate = item.beginTime.substring(0, 10)
       }
       wx.navigateTo({

pages/Components/lessonsList/lessonsList.wxml

@@ -11,8 +11,8 @@
         <view class="lessons-endDate" wx:if="{{action=='1' || action=='2'}}">请假时间：{{item.createdDate}}</view>
       </view>
       <view class="lessons-btn-box" wx:if="{{action == '1'}}">
-        <view class="apply-btn" wx:if="{{item.makeupId == null}}" bindtap="toPages" data-url="/pages/targetList/targetList" data-id="{{item.id}}" data-action="1">申请补课</view>
-        <view class="more-btn" wx:elif="{{item.makeupId != null}}" bindtap="toPages" data-url="/pages/lessonsDetail/lessonsDetail" data-id="{{item.id}}" >查看详情</view>
+        <view class="apply-btn" wx:if="{{item.makeupId == null}}" bindtap="toPages" data-url="/pages/targetList/targetList" data-id="{{item.attenceStudentId}}" data-action="1">申请补课</view>
+        <view class="more-btn" wx:elif="{{item.makeupId != null}}" bindtap="toPages" data-url="/pages/lessonsDetail/lessonsDetail" data-id="{{item.attenceStudentId}}" >查看详情</view>
       </view>
     </view>
   </view>

pages/leave/leave.js

@@ -26,11 +26,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // let date = options.beginDate;
-    const curDate = new Date()
-    const month = (curDate.getMonth()+1)>=10 ? curDate.getMonth()+1 : "0"+(curDate.getMonth()+1)
-    const day = curDate.getDate()>=10? curDate.getDate() : "0"+curDate.getDate()
-    let date = curDate.getFullYear()+"-"+ month+"-"+day
+    let date = options.endDate;
     if (date) {
       this.setData({
         bd: date
@@ -149,7 +145,7 @@ Page({
   },
   selectDate: function (v) {
     this.setData({ 
-      curDate: v
+      curDate: v, bd: v
     })
     let vd = new Date(v);
     let week = this.data.weekMap[vd.getDay()];

pages/targetList/targetList.js

@@ -50,11 +50,31 @@ Page({
     let bd = util.formatTime(bdd).substring(0, 10).replace(/\//g, '-')
     let edd = new Date(now.setDate(now.getDate() + this.data.dayScope));
     let ed = util.formatTime(edd).substring(0, 10).replace(/\//g, '-')
-    this.setData({ beginDate: bd, endDate: ed, list: [] });
 
+
+    if (o.action == '3') {
+      // 根据curDate 算出前后七天， 其实时间晚于当天，已次日为其实时间
+      // console.log('item.queryDate : ' + item.curDate);
+      const temDate = new Date(s.attenceDate.replace(/-/g, '/') + ' 00:00:00')
+      temDate.setDate(temDate.getDate() + 7); // 一周后
+      ed = temDate.getFullYear() + '-' + this.addZero(temDate.getMonth() + 1) + '-' + this.addZero(temDate.getDate());
+      // console.log('ed : ' + ed);
+      temDate.setDate(temDate.getDate() - 14); // 往前推2周
+      bd = temDate.getFullYear() + '-' + this.addZero(temDate.getMonth() + 1) + '-' + this.addZero(temDate.getDate());
+      // console.log('bd : ' + bd);
+      // 如果早于当前日期
+      let nextDay = util.formatTime(new Date(new Date().getTime() + 86400000)).substring(0, 10).replace(/\//g, '-')
+      // console.log('nextDay : ' + nextDay);
+      if (parseInt(bd.replace(/-/g, '')) < parseInt(nextDay.replace(/-/g, ''))) {
+        bd = nextDay;
+      }
+    }
+    this.setData({ beginDate: bd, endDate: ed, list: [] });
     this.queryList()
   },
-
+  addZero: function (n) {
+    return (n < 10 ? '0' : '') + n;
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -221,7 +241,7 @@ Page({
           this.setData({ list: classItem })
 
           wx.hideLoading()
-          if(classItem.length <= 0){
+          if (classItem.length <= 0) {
             wx.showModal({
               title: '提示',
               content: '暂无目标课程',
@@ -230,7 +250,7 @@ Page({
               cancelColor: '#999999', //取消文字的颜色
               confirmText: "确定", //默认是“确定”
               // confirmColor: 'skyblue', //确定文字的颜色
-              success(){
+              success() {
                 wx.navigateBack({
                   delta: 1,
                 })
@@ -316,7 +336,7 @@ Page({
           let tempItems = [];
           if (this.len(c.beginTime) > 0) {
             let bt = c.beginTime.replace('T', ' ').substring(0, 16)
-            item.newDate = bt.substring(0.10)
+            item.newDate = bt.substring(0, 10)
             item.beginTime = bt.substring(11);
             item.endTime = this.addZero(it.endHours) + ':' + this.addZero(it.endMinutes);
             tempItems.push(item);

pages/theClasses/theClasses.js

@@ -48,7 +48,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let date = options.beginDate;
+    let date = options.endDate;
     if (date) {
       this.setData({ bd: date })
     }
@@ -69,6 +69,9 @@ Page({
       });
       util.apiPost(urls.get_schedule_month, { 'q.studentId': stu.studentId }).then((rs) => {
         if (rs && rs.length > 0) {
+          rs.map(o => {
+            o.id = o.studentId
+          })
           this.setData({ 'eventList': rs })
         }
       });
@@ -133,7 +136,7 @@ Page({
 
   },
   selectDate: function (v) {
-    this.setData({ curDate: v })
+    this.setData({ curDate: v, bd: v })
     let vd = new Date(v);
     let week = this.data.weekMap[vd.getDay()];
     let list = this.data.eventList.filter(o => {