Selaa lähdekoodia

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

yukangzhe 4 vuotta sitten
vanhempi
commit
6985551078

+ 3 - 2
app.json

@@ -1,15 +1,16 @@
 {
   "plugins": {},
   "pages": [
+    "pages/index/index",
     "pages/doTask/doTask",
     "pages/task/task",
     "pages/taskDetail/taskDetail",
-    "pages/index/index",
     "pages/schedule/schedule",
     "pages/piano/piano",
     "pages/login/login",
     "pages/makePiano/makePiano",
-    "pages/myself/myself"
+    "pages/myself/myself",
+    "pages/leave/leave"
   ],
   "window": {
     "backgroundTextStyle": "dark",

+ 2 - 1
pages/Components/calendar/calendar.wxss

@@ -99,7 +99,8 @@
 }
 
 .calendar {
-  background-color: #fff;
+  height: 712rpx;
+  background: #FFF;
 }
 
 .calendar .title {

+ 26 - 0
pages/Components/classList/classList.js

@@ -0,0 +1,26 @@
+// pages/Components/classList/classList.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    showLeaveNum:{
+      type:Boolean,
+      value: false
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

+ 4 - 0
pages/Components/classList/classList.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

+ 16 - 0
pages/Components/classList/classList.wxml

@@ -0,0 +1,16 @@
+<view class="class-container">
+  <view class="class-view">
+    <view class="class-date">2021-02-22 星期一</view>
+    <view class="class-list">
+      <view class="class-box" wx:for="{{3}}" wx:key="index">
+        <view class="class-name"><text class="class-type">1v1</text>小鹏钢琴课</view>
+        <view class="class-time">09:00 ~ 11:00</view>
+        <view class="class-room">钢琴教室01</view>
+        <view class="class-flag">已上课</view>
+        <view class="class-teacher">张老师</view>
+        <view wx:if="{{showLeaveNum}}" class="last-leave-num">本课程请假余额 6 次</view>
+      </view>
+    </view>
+    
+  </view>
+</view>

+ 57 - 0
pages/Components/classList/classList.wxss

@@ -0,0 +1,57 @@
+/* 课表列表 */
+.class-box{
+  display: flex;
+  flex-wrap: wrap;
+  align-content: space-between;
+  width: 646rpx;
+  background: #FFF;
+  border-left: 4rpx solid #cc6031;
+  padding: 25rpx;
+  border-radius: 15rpx;
+  margin: 0 auto 40rpx;
+}
+.class-box view{
+  height: 60rpx;
+  line-height: 60rpx;
+}
+.class-name,.class-time{
+  font-size: 36rpx;
+  font-weight: 600;
+}
+.class-time,.class-flag{
+  text-align: right;
+  width: 240rpx;
+  margin-left: auto;
+}
+.class-name,.class-room,.class-teacher{
+  width: 400rpx;
+}
+.class-flag,.class-teacher{
+  color: #999;
+}
+.class-date{
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  color: #666;
+  font-size: 32rpx;
+}
+.class-type{
+  color: #FFF;
+  background: #cc6031;
+  line-height: 30rpx;
+  height: 30rpx;
+  margin-top: 20rpx;
+  font-size: 24rpx;
+  margin-right: 10rpx;
+  padding: 0 5rpx;
+  border-radius: 10rpx;
+  font-weight: 400;
+}
+
+.last-leave-num{
+  color: #005033;
+  width: 100%;
+}
+
+/* end */

+ 23 - 0
pages/Components/lessons/lessons.js

@@ -0,0 +1,23 @@
+// pages/Components/lessons/lessons.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

+ 4 - 0
pages/Components/lessons/lessons.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

+ 2 - 0
pages/Components/lessons/lessons.wxml

@@ -0,0 +1,2 @@
+<!--pages/Components/lessons/lessons.wxml-->
+<text>pages/Components/lessons/lessons.wxml</text>

+ 1 - 0
pages/Components/lessons/lessons.wxss

@@ -0,0 +1 @@
+/* pages/Components/lessons/lessons.wxss */

+ 1 - 1
pages/index/index.js

@@ -21,7 +21,7 @@ Page({
       { img: '/images/zy.png', title: '提交作业' },
       { img: '/images/dp.png', title: '课堂点评' },
       { img: '/images/zj.png', title: '成长足迹' },
-      { img: '/images/qj.png', title: '请假' },
+      { img: '/images/qj.png', title: '请假',url:"/pages/leave/leave" },
       { img: '/images/bk.png', title: '补课' },
       { img: '/images/jk.png', title: '加课' },
       { img: '/images/dk.png', title: '调课' },

+ 66 - 0
pages/leave/leave.js

@@ -0,0 +1,66 @@
+// pages/leave/leave.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 7 - 0
pages/leave/leave.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "请假",
+  "usingComponents": {
+    "calendar":"/pages/Components/calendar/calendar",
+    "classList":"/pages/Components/classList/classList"
+  }
+}

+ 11 - 0
pages/leave/leave.wxml

@@ -0,0 +1,11 @@
+<view class="container">
+
+   <!-- 日历组件 -->
+   <calendar></calendar>
+  <!-- end -->
+
+  <!-- 课表列表 -->
+  <classList showLeaveNum="true"></classList>
+  <!-- end -->
+
+</view>

+ 8 - 0
pages/leave/leave.wxss

@@ -0,0 +1,8 @@
+.container{
+  padding: 0;
+  margin: 0;
+}
+
+page{
+  background: #f1f1f1;
+}

+ 2 - 1
pages/schedule/schedule.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "我的课表",
   "usingComponents": {
-    "calendar":"/pages/Components/calendar/calendar"
+    "calendar":"/pages/Components/calendar/calendar",
+    "classList":"/pages/Components/classList/classList"
   }
 }

+ 2 - 16
pages/schedule/schedule.wxml

@@ -1,25 +1,11 @@
 <view class="container">
 
   <!-- 日历组件 -->
-  <view class="calendar">
-    <calendar></calendar>
-  </view>
+  <calendar></calendar>
   <!-- end -->
 
   <!-- 课表列表 -->
-  <view class="class-view">
-    <view class="class-date">2021-02-22 星期一</view>
-    <view class="class-list">
-      <view class="class-box" wx:for="{{3}}" wx:key="index">
-        <view class="class-name"><text class="class-type">1v1</text>小鹏钢琴课</view>
-        <view class="class-time">09:00 ~ 11:00</view>
-        <view class="class-room">钢琴教室01</view>
-        <view class="class-flag">已上课</view>
-        <view class="class-teacher">张老师</view>
-      </view>
-    </view>
-  </view>
-
+  <classList></classList>
   <!-- end -->
 
 </view>

+ 0 - 57
pages/schedule/schedule.wxss

@@ -7,61 +7,4 @@ page{
   background: #f1f1f1;
 }
 
-/* 日历组件 */
-.calendar{
-  height: 712rpx;
-  background: #FFF;
-}
-/* end */
 
-/* 课表列表 */
-  .class-box{
-    display: flex;
-    flex-wrap: wrap;
-    align-content: space-between;
-    width: 646rpx;
-    background: #FFF;
-    border-left: 4rpx solid #cc6031;
-    padding: 25rpx;
-    border-radius: 15rpx;
-    margin: 0 auto 40rpx;
-  }
-  .class-box view{
-    height: 60rpx;
-    line-height: 60rpx;
-  }
-  .class-name,.class-time{
-    font-size: 36rpx;
-    font-weight: 600;
-  }
-  .class-time,.class-flag{
-    text-align: right;
-    width: 240rpx;
-    margin-left: auto;
-  }
-  .class-name,.class-room,.class-teacher{
-    width: 400rpx;
-  }
-  .class-flag,.class-teacher{
-    color: #999;
-  }
-  .class-date{
-    height: 80rpx;
-    line-height: 80rpx;
-    text-align: center;
-    color: #666;
-    font-size: 32rpx;
-  }
-  .class-type{
-    color: #FFF;
-    background: #cc6031;
-    line-height: 30rpx;
-    height: 30rpx;
-    margin-top: 20rpx;
-    font-size: 24rpx;
-    margin-right: 10rpx;
-    padding: 0 5rpx;
-    border-radius: 10rpx;
-    font-weight: 400;
-  }
-/* end */