Signed-off-by: yukangzhe <382985154@qq.com>

pages/Components/tabbar/tabbar.js

@@ -45,10 +45,10 @@ Component({
         path: '/pages/index/index'
       },
       {
-        title: '预约',
+        title: '练琴',
         icon: '/images/piano.png',
         curIcon: '/images/cur-piano.png',
-        val: '预约',
+        val: '练琴',
         path: '/pages/piano/piano'
       },
       {

pages/index/index.js

@@ -9,6 +9,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    quanList: [],
     quanTipFlag: false,
     isShow: true,
     array: ['艾克斯郎校区1', '艾克斯郎校区2', '艾克斯郎校区3', '艾克斯郎校区4'],
@@ -82,6 +83,36 @@ Page({
     teaShowList: [],
   },
 
+  queryQuan: function () {
+    const urls = urlDef.urls;
+    let stu = wx.getStorageSync('student');
+    if (stu) {
+      let params = { 'q.studentId': stu.studentId, 'q.orgId': stu.orgId }
+      let url = null;
+      url = urls.coupon_receive_list;
+      params.pageNum = 9999
+      util.apiPost(url, params).then(rs => {
+        let quanList = rs.list
+        for(var i in quanList){
+          quanList[i].lastDate = quanList[i].endDate.substring(0,10)
+        }
+         this.setData({
+          quanList
+         })
+         if(quanList.length > 0 ) {
+           const indexQuanTip = wx.getStorageSync('indexQuanTip')
+           if(indexQuanTip){
+            this.setData({
+              quanTipFlag: true
+            })
+            wx.setStorageSync('indexQuanTip', false)
+           }
+            
+         }
+      })
+    }
+  },
+
   //切换身份
   changeStu: function (e) {
     let sid = e.currentTarget.dataset.id;
@@ -170,15 +201,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    setTimeout(() => {
-      this.setData({
-        quanTipFlag: true
-      })
-  }, 3000);
     this.setData({
       isShow: wx.getStorageSync('isShow'),
     })
     this.localtionMethod()
+    // this.queryQuan()
   },
 
   /**
@@ -323,6 +350,8 @@ Page({
           })
           // 放入 strong中
           wx.setStorageSync('student', student);
+          wx.setStorageSync('indexQuanTip', true)
+          this.queryQuan()
         }
         if (this.strLen(u.imageUrl) === 0) {
           u.imageUrl = '/images/head.png'
@@ -495,6 +524,7 @@ Page({
         that.getMyLocal()
       },
       fail(res) {
+        console.log(JSON.stringify(res))
         wx.hideLoading({
           success: (res) => {
             wx.showModal({

pages/index/index.wxml

@@ -96,20 +96,21 @@
   <!-- 优惠券弹窗 -->
   <view class="quan-bg" wx:if="{{quanTipFlag}}"></view>
   <view class="quan-tip" wx:if="{{quanTipFlag}}">
-    <image src="/images/quan-tip.png"></image>
-    <view class="quan-tip-content">
-      <view class="quan-tip-title">恭喜获得优惠券4张</view>
-      <view class="quan-tip-list">
-        <view class="quan-tip-list-box" wx:for="{{4}}" wx:key="index">
-          <view class="quan-tip-list-title view-left">钢琴类通用</view>
-          <view class="quan-tip-list-price"><text>￥</text>20</view>
-          <view class="quan-tip-list-date view-left">有效期至2021/07/01</view>
-          <view class="quan-tip-list-code">满200可用</view>
-        </view>
-      </view>
-      <view class="quan-tip-bottom">
-        <view class="quan-tip-btn" bindtap="toQuan">去看看</view>
-        <view class="tip-font">已自动存至优惠券</view>
+		<image src="/images/quan-tip.png"></image>
+		<view class="quan-tip-content">
+			<view class="quan-tip-title">恭喜获得优惠券{{quanList.length}}张</view>
+			<view class="quan-tip-list">
+				<view class="quan-tip-list-box" wx:for="{{quanList}}" wx:key="index">
+					<view class="quan-tip-list-title view-left">{{item.couponName}}</view>
+					<view class="quan-tip-list-price"><text>￥</text>{{item.couponAmount}}</view>
+					<view class="quan-tip-list-date view-left" wx:if="{{item.lastDate}}">有效期至{{item.lastDate}}</view>
+					<view class="quan-tip-list-date view-left" wx:else>长期有效</view>
+					<!-- <view class="quan-tip-list-code">满200可用</view> -->
+				</view>
+			</view>
+			<view class="quan-tip-bottom">
+				<view class="quan-tip-btn" bindtap="toQuan">去看看</view>
+				<view class="tip-font">已自动存至优惠券</view>
       </view>
     </view>
     <view class="close-tip" bindtap="closeTip">X</view>

pages/index/index.wxss

@@ -261,6 +261,8 @@
   .quan-tip-list {
     position: relative;
     z-index: 3;
+    height: 648rpx;
+    overflow-y: auto;
   }
   
   .quan-tip-title {
@@ -305,6 +307,8 @@
     color: #333;
     font-size: 24rpx;
     line-height: 38rpx;
+    width: 100%;
+    text-align: left;
   }
   
   .quan-tip-list-code {

pages/login/login.js

@@ -63,6 +63,7 @@ Page({
       title: '加载中',
       mask: true
     })
+    wx.setStorageSync('indexQuanTip', true)
     if (options.isPage) {
       this.setData({
         isPage: options.isPage,

pages/makePiano/makePiano.js

@@ -38,7 +38,10 @@ Page({
     hasNextPage: true,
     schoolIndex: 0,
     timeScope: '0,0',
-    yFlag: false
+    yFlag: false,
+    endDate: '2099-12-31',
+    punishType: 0,
+    maxLength: 2,
   },
 
   getTimeDate: function (e) {
@@ -188,7 +191,8 @@ Page({
     }
     this.setData({
       weekList: list,
-      homeName: wx.getStorageSync('wxLocalName')
+      homeName: wx.getStorageSync('wxLocalName'),
+      maxLength:parseInt(options.maxLength)
     })
 
   },
@@ -389,8 +393,18 @@ Page({
         util.apiPost(urls.query_school_attence, params).then(rs => {
           s.moreFlag = true
           s.items = rs
+          if(rs[0].endDate){
+            this.setData({
+              endDate: rs[0].endDate,
+            })
+          } 
+          if(rs[0].punishType){
+            this.setData({
+              punishType: rs[0].punishType
+            })
+          }
           this.setData({
-            schoolList: sl
+            schoolList: sl,
           })
         })
       } else {
@@ -416,10 +430,50 @@ Page({
     }
   },
   doAppointment: function (e) {
+    if (this.data.punishType == 1) {
+      if (this.data.maxLength >= 1) {
+        wx.hideLoading({
+          success: (res) => {},
+        })
+        wx.showModal({
+          title: '提示',
+          content: '预约上限已满',
+          showCancel: false, //是否显示取消按钮
+          cancelText: "否", //默认是“取消”
+          cancelColor: '#999999', //取消文字的颜色
+          confirmText: "确定", //默认是“确定”
+          // confirmColor: 'skyblue', //确定文字的颜色
+        })
+        return
+      }
+    } else if (this.data.punishType == 2) {
+      let date = new Date()
+      const year = date.getFullYear()
+      const month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+      const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+      const curDate = year + '/' + month + "/" + day
+      console.log(curDate)
+      let endDate = this.data.endDate.replace(/-/g, '/')
+      if (curDate <= endDate) {
+        let newEndDate = year + '年' + this.data.endDate.substring(5, 7) + '月' + this.data.endDate.substring(8, 10) + '日'
+        wx.showModal({
+          title: '提示',
+          content: newEndDate + '前不可预约课程',
+          showCancel: false, //是否显示取消按钮
+          cancelText: "否", //默认是“取消”
+          cancelColor: '#999999', //取消文字的颜色
+          confirmText: "确定", //默认是“确定”
+          // confirmColor: 'skyblue', //确定文字的颜色
+        })
+        return
+      }
+    }
+
     wx.showLoading({
       title: '处理中',
       mask: true
     })
+
     let id = e.currentTarget.dataset.id;
     const index = e.currentTarget.dataset.index
     const cIndex = e.currentTarget.dataset.cindex

pages/makePiano/makePiano.wxss

@@ -212,6 +212,7 @@ page{
     margin-top: 5rpx;
     font-size: 22rpx;
     padding: 0 5px;
+    width: 88rpx;
   }
   .wait-btn{
     background: #cc6031;

pages/piano/piano.js

@@ -33,8 +33,14 @@ Page({
   },
 
   getPiano: function () {
+    let num = 0 
+    for(var i in this.data.list){
+      if( this.data.list[i].attend == 0 &&  this.data.list[i].type != '2'){
+        num++
+      }
+    }
     wx.navigateTo({
-      url: '/pages/makePiano/makePiano',
+      url: '/pages/makePiano/makePiano?maxLength=' + num,
     })
   },
 

pages/piano/piano.wxml

@@ -8,7 +8,7 @@
   <!-- end -->
 
   <view class="piano-list">
-    <view class="piano-box" wx:for="{{list}}" wx:key="index">
+     <!-- <view class="piano-box" wx:for="{{list}}" wx:key="index">
       <view class="piano-detail">
         <view class="piano-title">{{item.pianoName}}</view>
         <view class="addr">{{item.orgName}}</view>
@@ -28,6 +28,37 @@
         <view class="class-btn cancelList" bindtap="doCancelQueue" data-id="{{item.id}}" wx:if="{{item.type == '2'}}">
           取消排队</view>
       </view>
+    </view> -->
+    <view class="piano-box2" wx:for="{{list}}" wx:key="index">
+      <view class="piano-org">
+        <view class="piano-title">{{item.orgName}}</view>
+        <view class="class-btn" bindtap="doCancel" data-id="{{item.id}}"
+          wx:if="{{item.cancelFlag && item.type == '1'}}">取消预约</view>
+        <view class="class-btn cancelList" bindtap="doCancelQueue" data-id="{{item.id}}" wx:elif="{{item.type == '2'}}">
+          取消排队</view>
+        <view class="class-status" wx:elif="{{item.attend == 0 && item.type != '2'}}">已预约</view>
+        <view class="class-status" wx:elif="{{item.attend == 0 && item.type == '2'}}">排队中</view>
+        <view class="class-status" wx:elif="{{item.attend == 1}}">已点名</view>
+        <view class="class-status" wx:elif="{{item.attend == 2}}">已缺勤</view>
+        <view class="class-status" wx:elif="{{item.attend == 3}}">已取消</view>
+       
+      </view>
+
+      <view class="piano-other">
+        <view>
+           <view class="other-title">练琴日期</view>
+           <view class="other-detail">{{item.visitDate}}</view>
+        </view>
+        <view>
+           <view class="other-title">练琴时段</view>
+           <view class="other-detail">{{item.beginTime}} ~ {{item.endTime}}</view>
+        </view>
+        <view>
+           <view class="other-title">座位号</view>
+           <view class="other-detail">{{item.pianoName}}</view>
+        </view>
+      </view>
+      <view class="piano-tip">请提前10分钟，到校人脸签到</view>
     </view>
   </view>
   <view class="getPiano" bindtap="getPiano">去预约</view>
@@ -53,7 +84,7 @@
       5.旷课：如旷课（包含未出席，未签到）1次，所约课程结束时间开始计算，72小时内只能预约一次课，如旷课2次，所约课程结束时间开始计算，72小时内无法预约
     </view> -->
     <view>
-      5.旷课：如遇旷课（包含未出席，未签到）1次，从所约时间段结束时间开始计算，48小时内最多只能再预约1次。如旷课2次，从所约时间段结束时间开始计算，72小时内则无法进行预约。（我们的初衷：把有限的练琴时段，留给需要练琴的学员）
+      5.旷课惩罚：如遇旷课（包含未出席，未签到）1次，从所约时间段结束时间开始计算，48小时内最多只能再预约1次。如旷课2次，从所约时间段结束时间开始计算，72小时内则无法进行预约。
     </view>
     <view>
       6.迟到：课程迟到5分钟不允许进入教室，特殊情况需要和老师说明情况，根据实际情况安排；课程迟到15分钟，不允许进入课堂

pages/piano/piano.wxss

@@ -7,7 +7,7 @@
   width: 750;
 }
 page{
-  background: #f1f1f1;
+  background: #fff;
 }
 .piano-box {
   padding: 20rpx 0;
@@ -45,7 +45,7 @@ page{
 .loading {
   height: 200rpx;
   line-height: 100rpx;
-  background: #f1f1f1;
+  background: #fff;
   color: #999;
   text-align: center;
 }
@@ -233,4 +233,46 @@ page{
     right: 70rpx;
     border: 1rpx solid #333;
     background: #FFF;
+}
+
+.piano-box2{
+  width: 700rpx;
+    margin: 0 25rpx;
+    padding: 25rpx 0 50rpx;
+    border-bottom: 4rpx solid #f1f1f1;
+}
+.piano-org{
+  display: flex;
+}
+.piano-box2 .class-status{
+  margin-left: auto;
+  line-height: 60rpx;
+}
+.piano-box2 .piano-title{
+  font-size: 36rpx;
+    width: 400rpx;
+    line-height: 60rpx;
+}
+.piano-other{
+  display: flex;
+  background: #f1f1f1;
+  margin-top: 25rpx;
+}
+.piano-other>view{
+  margin: 25rpx auto;
+  text-align: center;
+}
+.other-detail{
+  font-size: 32rpx;
+  margin-top: 25rpx;
+}
+
+.piano-tip{
+  text-align: right;
+    margin-top: 25rpx;
+    font-size: 28rpx;
+}
+.piano-box2 .class-btn{
+  position: initial;
+  margin-left: auto;
 }

pages/quan/quan.js

@@ -94,6 +94,50 @@ Page({
       params.pageNum = this.data.pageNum
       util.apiPost(url, params).then(rs => {
         let list = rs.list
+        for (var i in list) {
+          if (list[i].endDate) {
+            list[i].lastTime = list[i].endDate.substring(0, 10)
+          }
+          let arr = list[i].instructions.split(" ")
+          const oneBegin = arr[2].indexOf('元')
+          list[i].tempMoney = arr[0] + arr[1] + arr[2].substring(0, oneBegin + 1)
+  
+          if (arr.length == 5) {
+            const twoBegin = oneBegin + 1
+            const threeBein = arr[3].indexOf(')')
+            list[i].tempDate = (arr[2].substring(twoBegin, arr[2].length) + arr[3].substring(0, threeBein + 1)).trim()
+  
+            const fourBegin = threeBein + 1
+            const fiveBegin = arr[3].indexOf("适")
+            list[i].tempThreshold = arr[3].substring(fourBegin, fiveBegin).trim()
+            list[i].tempThreshold = list[i].tempThreshold.substring(5,list[i].tempThreshold.length)
+  
+            const sixBegin = fiveBegin
+            const sevenbegin = arr[3].lastIndexOf('适')
+            list[i].tempRange = arr[3].substring(sixBegin, sevenbegin).trim()
+  
+            list[i].tempCrowd = (arr[3].substring(sevenbegin, arr[3].length) + arr[4]).trim()
+          }
+  
+          if (arr.length == 6) {
+            const twoBegin = arr[2].indexOf('有')
+            const threeBegin = arr[4].indexOf('金')
+            list[i].tempDate = arr[2].substring(twoBegin, arr[2].length).trim() + ' 至 ' + arr[4].substring(0, threeBegin).trim()
+  
+  
+            const fourBegin = threeBegin
+            const fiveBegin = arr[4].indexOf('适')
+            list[i].tempThreshold = arr[4].substring(fourBegin, fiveBegin).trim()
+            list[i].tempThreshold = list[i].tempThreshold.substring(5,list[i].tempThreshold.length)
+  
+            const sixBegin = fiveBegin 
+            const sevenbegin = arr[4].lastIndexOf('适')
+            list[i].tempRange = arr[4].substring(sixBegin, sevenbegin).trim()
+  
+            list[i].tempCrowd = (arr[4].substring(sevenbegin, arr[4].length) + arr[5]).trim()
+  
+          }
+        }
         this.setData({
           'hasNextPage': rs.hasNextPage,
           'loading': rs.hasNextPage ? '下拉刷新' : '没有更多数据',

pages/quan/quan.wxml

@@ -12,7 +12,7 @@
           <!-- 左侧box -->
           <view class="content">
             <view class="{{status == 0 ? 'couponCount' : 'couponCount-ed'}}">火爆</view>
-            <view class="oilline linwidth160 lineBt"></view>
+            <view class="oilline linwidth160 lineBt" style="margin-top:26rpx"></view>
             <view  wx:if="{{item.couponType == 1}}">
               <text class="moyfh">¥</text>
               <text class="moneyNum">{{item.couponAmount}}</text>
@@ -27,42 +27,50 @@
               <text class="moneyNum">{{item.couponAmount}} 个</text>
             </view>
             <view class="oilline  linwidth160 lineBt"></view>
+            <view class="tempThreshold">{{item.tempThreshold}}</view>
           </view>
 
           <view class="split-line"></view>
           <!-- 右侧box -->
           <view class="tip">
+            <view class="tempDate">{{item.tempDate}}</view>
             <view class="oilline linwidth227 lineBt "></view>
             <view class="vnameBx">
               <view class="couponmaes">{{item.itemName}}</view>
-              <view class="couponmaes" wx:if="{{item.couponType == 1}}">抵扣券</view>
-              <view class="couponmaes" wx:if="{{item.couponType == 2}}">折扣券</view>
+              <view class="couponmaes" wx:if="{{item.couponType == 1}}">{{item.couponAmount}}元 优惠券</view>
+              <view class="couponmaes" wx:if="{{item.couponType == 2}}">{{item.couponAmount}}折 折扣券</view>
               <view class="couponmaes" wx:if="{{item.couponType == 3}}">赠课券</view>
               <view class="couponmaes" wx:if="{{item.couponType == 4}}">礼品券</view>
             </view>
             <view class="oilline linwidth227 lineBt"></view>
+            <view class="tempDetail">
+              {{item.tempRange}}<view style="display:inline-block;width:20rpx"></view>{{item.tempCrowd}}
+            </view>
 
-            <view class="moveCm btnbx" wx:if="{{status == '0' && item.flag == 0}}"> 
+            <!-- <view class="moveCm btnbx" wx:if="{{status == '0' && item.flag == 0}}"> 
               <view class="btnw btnBgActive" bindtap="submitCilck" data-index="{{index}}">
                 <view class="btnn">立即领取</view>
               </view>
-            </view>
+            </view> -->
 
-            <view class="btnbx" wx:elif="{{status == '0' && item.flag!= 0}}"> 
+            <!-- <view class="btnbx" wx:elif="{{status == '0' && item.flag!= 0}}"> 
               <view class="btnw btnBgActive">
                 <view class="btnn-ed">已领取</view>
               </view>
-            </view>
+            </view> -->
 
-            <view class="moveCm-ed btnbx-ed"  wx:elif="{{status != '0'}}">
+            <!-- <view class="moveCm-ed btnbx-ed" >
               <view class="btnw btnBgGray">
                 <view wx:if="{{item.couponStatus == 1}}" class="btnn-ed">可使用</view>
                 <view wx:if="{{item.couponStatus == 2}}" class="btnn-ed">已使用</view>
                 <view wx:if="{{item.couponStatus == 3}}" class="btnn-ed">已过期</view>
               </view>
-            </view>
+            </view> -->
           </view>
         </view>
+
+
+
       </view>
     </view>
   </view>

pages/quan/quan.wxss

@@ -7,9 +7,9 @@
   box-sizing: border-box;
   position: relative;
   background: #000;
-} 
+}
 
-.quan-view{
+.quan-view {
   margin-top: 40rpx;
 }
 
@@ -18,12 +18,13 @@
   height: 226rpx;
   margin: 0 auto;
   display: flex;
+  flex-wrap: wrap;
   background: linear-gradient(135deg, rgba(219, 93, 115, 1) 0%, rgba(137, 29, 34, 1) 100%);
   border-radius: 20rpx;
   margin-bottom: 28rpx;
 }
 
-.wrapper-ed{
+.wrapper-ed {
   opacity: 0.5;
   width: 670rpx;
   height: 226rpx;
@@ -33,13 +34,16 @@
   margin-bottom: 28rpx;
   background: linear-gradient(135deg, #999 0%, #CBC9C9 100%);
 }
-.btnBgActive-ed{
+
+.btnBgActive-ed {
   box-shadow: none;
   background: #ccc;
 }
-.moveCm-ed{
+
+.moveCm-ed {
   animation: none;
 }
+
 /*前半部分样式*/
 .content {
   position: relative;
@@ -133,7 +137,7 @@
   top: -78rpx;
   left: -78rpx;
   background: #333;
-    color: #FFF;
+  color: #FFF;
 }
 
 .oilline {
@@ -161,15 +165,15 @@
 }
 
 .moyfh {
-  font-size: 69rpx;
-  font-family: PingFangSC-Semibold, PingFang SC;
-  font-weight: 600;
-  color: rgba(255, 255, 255, 1);
-  margin-right: -2rpx;
+  font-size: 46rpx;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: rgba(255, 255, 255, 1);
+    margin-right: 0rpx;
 }
 
 .moneyNum {
-  font-size: 96rpx;
+  font-size: 66rpx;
   font-family: PingFangSC-Semibold, PingFang SC;
   font-weight: 600;
   color: rgba(255, 255, 255, 1);
@@ -181,11 +185,11 @@
   font-weight: 600;
   color: rgba(255, 255, 255, 1);
   width: 260rpx;
-   overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
 }
 
 .vnameBx {
@@ -223,17 +227,20 @@
   border-radius: 50%;
   margin-right: 30rpx;
 }
+
 .btnBgActive {
   color: rgba(140, 31, 37, 1);
   box-shadow: 0px 2px 29px 0px rgba(77, 12, 15, 0.56);
   background: linear-gradient(319deg, rgba(244, 219, 160, 1) 0%, rgba(255, 255, 255, 1) 100%);
 }
+
 .btnBgGray {
   /* box-shadow: 0px 2px 29px 0px rgba(77, 12, 15, 0.56); */
   color: #cc6031;
-    border: 1px solid #cc6031;
-    transform: rotate(-45deg);
+  border: 1px solid #cc6031;
+  transform: rotate(-45deg);
 }
+
 .btnn {
   font-size: 30rpx;
   font-family: PingFangSC-Semibold, PingFang SC;
@@ -247,7 +254,8 @@
   padding: 18rpx;
   line-height: 46rpx;
 }
-.btnn-ed{
+
+.btnn-ed {
   font-size: 28rpx;
   font-family: PingFangSC-Semibold, PingFang SC;
   font-weight: 600;
@@ -259,6 +267,7 @@
   padding: 18rpx;
   line-height: 92rpx;
 }
+
 .moveCm {
   animation: scale 0.8s ease-in-out infinite alternate;
 }
@@ -272,12 +281,56 @@
     transform: scale(1);
   }
 }
+
 .loading {
   height: 200rpx;
   line-height: 100rpx;
   color: #999;
   text-align: center;
 }
-.zk-quan{
+
+.zk-quan {
   font-size: 60rpx;
+}
+
+/* 顶部切换标题 */
+.switch-view {
+  display: flex;
+  background: #FFF;
+}
+
+.switch-view view {
+  margin: 0 auto;
+  color: #005033;
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 32rpx;
+}
+
+.curTitle {
+  color: #cc6031 !important;
+  border-bottom: 2px solid #cc6031;
+  font-weight: 600;
+}
+
+/* end */
+.tempDate {
+  top: -15rpx;
+  color: #FFF;
+  font-size: 20rpx;
+  position: relative;
+}
+
+.tempDetail {
+  top: 15rpx;
+  color: #FFF;
+  font-size: 20rpx;
+  position: relative;
+}
+
+.tempThreshold {
+  position: relative;
+  color: #FFF;
+  font-size: 20rpx;
+  top: 20rpx;
 }