bug

app.json

@@ -33,7 +33,8 @@
     "pages/quan/quan",
     "pages/editMyself/editMyself",
     "pages/showVideoList/showVideoList",
-    "pages/leaveDetail/leaveDetail"
+    "pages/leaveDetail/leaveDetail",
+    "pages/uploadShow/uploadShow"
   ],
   "window": {
     "backgroundTextStyle": "dark",

pages/index/index.js

@@ -8,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    isShow: wx.getStorageSync('isShow'),
+    isShow: true,
     array: ['艾克斯郎校区1', '艾克斯郎校区2', '艾克斯郎校区3', '艾克斯郎校区4'],
     index: 0,
     curStu: {},
@@ -154,7 +154,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.setData({
+      isShow: wx.getStorageSync('isShow')
+    })
   },
 
   /**

pages/index/index.json

@@ -1,5 +1,4 @@
 {
-  "enablePullDownRefresh": true,
   "usingComponents": {
     "showView":"/pages/Components/showList/showList"
   },

pages/leaveRecord/leaveRecord.json

@@ -1,5 +1,4 @@
 {
-  "enablePullDownRefresh": true,
   "navigationBarTitleText": "请假记录",
   "usingComponents": {
     "lessonsList":"/pages/Components/lessonsList/lessonsList"

pages/login/login.js

@@ -37,7 +37,6 @@ Page({
         wx.setStorageSync('isShow', true)
         this.getOpenId()
       }
-      
     })
   },
 

pages/makePiano/makePiano.js

@@ -66,7 +66,7 @@ Page({
 
   resetTime:function(){
     let timeScope = '0,0'
-    this.setData({ timeScope })
+    this.setData({ timeScope , index: 0})
     this.showSelect()
     this.queryList()
   },
@@ -284,6 +284,10 @@ Page({
     })
   },
   doAppointment: function (e) {
+    wx.showLoading({
+      title: '处理中',
+      mask: true
+    })
     let id = e.currentTarget.dataset.id;
     const urls = urlDef.urls;
     let w = this.data.weekList[this.data.curIndex];

pages/makePiano/makePiano.wxss

@@ -11,10 +11,10 @@ page{
 .select-view {
   height: 60rpx;
   line-height: 60rpx;
-  background: #cc6031;
+  background: #005033;
   color: #FFF;
   text-align: center;
-  font-size: 36rpx;
+  font-size: 32rpx;
   position: fixed;
   width: 750rpx;
   z-index: 3;
@@ -83,7 +83,7 @@ page{
   line-height: 60rpx;
   width: 150rpx;
   border-radius: 10rpx;
-  background: #cc6031;
+  background: #005033;
   text-align: center;
   color: #FFF;
 }
@@ -120,7 +120,7 @@ page{
   margin-top: 10rpx;
 }
 .cur-week{
-  background: #cc6031;
+  background: #005033;
   color:#FFF;
 }
 /* end */
@@ -138,8 +138,9 @@ page{
     height: 60rpx;
   }
   .disImg{
-    width: 40rpx;
-    height: 40rpx;
+    width: 32rpx;
+    height: 32rpx;
+    padding-top: 8rpx;
     margin-right: 10rpx;
   }
   .disImg image{
@@ -148,14 +149,14 @@ page{
   }
   .school-name{
     width: 500rpx;
-    font-size: 36rpx;
+    font-size: 32rpx;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
   }
   .school-dis{
     margin-left: auto;
-    font-size: 32rpx;
+    font-size: 28rpx;
     height: 40rpx;
     line-height: 40rpx;
   }
@@ -194,10 +195,14 @@ page{
   }
   .class-get-btn{
     color: #FFF;
-    background: #cc6031;
+    background: #005033;
     border-radius: 10rpx;
     width: 90rpx;
     text-align: center;
+    height: 50rpx;
+    line-height: 50rpx;
+    margin-top: 5rpx;
+    font-size: 24rpx;
   }
   .class-box{
     height: 60rpx;

pages/piano/piano.wxml

@@ -11,10 +11,12 @@
         <view class="addr">{{item.orgName}}</view>
         <view class="piano-time">{{item.visitDate}} {{item.beginTime}} ~ {{item.endTime}}</view>
       </view>
-      <view class="piano-date">
+      <view>
+        <view class="piano-date">
         {{item.createdDate}}
       </view>
       <view class="class-btn" bindtap="doCancel" data-id="{{item.id}}" wx:if="{{item.cancelFlag}}">取消预约</view>
+      </view>
     </view>
   </view>
   <view class="getPiano" bindtap="getPiano">去预约</view>

pages/piano/piano.wxss

@@ -17,6 +17,7 @@ page{
   line-height: 60rpx;
   width: 470rpx;
   margin-left: 25rpx;
+  font-size: 32rpx;
 }
 
 .piano-time {
@@ -58,7 +59,7 @@ page{
 .select-box {
   position: fixed;
   background: #FFF;
-  top: -240rpx;
+  top: -300rpx;
   width: 750rpx;
   height: 300rpx;
   font-size: 32rpx;
@@ -138,11 +139,16 @@ page{
   margin-left: -150rpx;
   border-radius: 100rpx;
 }
+
 .class-btn{
-  width: 178rpx;
-    border: 2rpx solid #cc6031;
-    color: #cc6031;
-    text-align: center;
-    font-size: 28rpx;
-    border-radius: 50rpx;
+  color: #005033;
+  border: 1px solid #005033;
+  width: 200rpx;
+  text-align: center;
+  height: 60rpx;
+  line-height: 60rpx;
+  position: relative;
+  top: 50rpx;
+  border-radius: 50rpx;
+  font-size: 28rpx;
 }

pages/schedule/schedule.js

@@ -112,6 +112,11 @@ Page({
       o.bt = o.beginTime.substring(11, 16);
       o.et = o.endTime.substring(11, 16);
     })
+    if(list.length<=0){
+      setTimeout(() => {
+        this.selectDate(v)
+      }, 1000);
+    }
     this.setData({ 'date': v, 'week': week, 'dateList': [{ items: list, date: v, week: week }] });
   },
   callSelectDate: function (d) {

pages/showVideoList/showVideoList.js

@@ -63,7 +63,10 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+    this.setData({
+      list: []
+    })
+    this.queryList()
   },
 
   /**
@@ -121,6 +124,7 @@ Page({
             that.reloadVideos(v)
           })
         })
+        wx.stopPullDownRefresh()
       })
     }
   },

pages/task/task.json

@@ -1,5 +1,4 @@
 {
-  "enablePullDownRefresh": true,
   "navigationBarTitleText": "提交作业",
   "usingComponents": {
     "selectDate":"/pages/Components/selectDate/selectDate",

pages/uploadShow/uploadShow.js

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

pages/uploadShow/uploadShow.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "视频上传",
+  "usingComponents": {}
+}

pages/uploadShow/uploadShow.wxml

@@ -0,0 +1,38 @@
+<view class="container">
+  <view class="show-box">
+    <view class="title">选择关联课程</view>
+    <view class="select-view">
+      <picker bindchange="bindPickerChange" value="{{arrIndex}}" range="{{array}}">
+          <view class="picker">
+            {{array[arrIndex]}}
+          </view>
+        </picker>
+    </view>
+    <view class="title">标题</view>
+    <view class="input-view">
+      <input name="title" placeholder="请输入视频标题" maxlength="20" />
+    </view>
+    <view class="title textarea-title">视频说明</view>
+    <view class="textarea-view">
+      <textarea name="desc" placeholder="与大家具体描述这次精彩的表现内容把" maxlength="200"></textarea>
+    </view>
+  </view>
+  <view class="video-box">
+    <view class="title">上传视频</view>
+    <view class="uploadImg-task-view">
+      <view class="my-img-view" wx:for="{{1}}" wx:key="index" data-index="{{index}}" catchtap="showVideo">
+        <view class="new-task-img">
+          <image src="{{item.imgUrl}}"></image>
+        </view>
+        <view class="del-btn" data-index="{{index}}" catchtap="delVideo">X</view>
+      </view>
+      <view class="upload-btn" bindtap="upLoadVideo">
+        <view style="margin-top:30rpx">
+          <image src="/images/addFile.png"></image>
+          <view>添加视频</view>
+        </view>
+      </view>
+      </view>
+  </view>
+  <view class="submit-btn">发布</view>
+</view>

pages/uploadShow/uploadShow.wxss

@@ -0,0 +1,123 @@
+/* pages/uploadShow/uploadShow.wxss */
+.container {
+  padding: 0;
+  margin: 0;
+}
+
+.show-box,.video-box {
+  width: 700rpx;
+  padding: 25rpx;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.title {
+  min-width: 50rpx;
+  max-width: 200rpx;
+  font-size: 32rpx;
+  margin-right: 20rpx;
+  height: 100rpx;
+  line-height: 100rpx;
+  border-bottom: 1px solid #eee;
+}
+
+.select-view,
+.input-view {
+  width: 450rpx;
+  height: 100rpx;
+  line-height: 100rpx;
+  border-bottom: 1px solid #eee;
+}
+
+.input-view input {
+  height: 100rpx;
+  line-height: 100rpx;
+}
+
+.textarea-title {
+  border: none;
+  width: 700rpx;
+}
+
+textarea {
+  width: 650rpx;
+  padding: 25rpx;
+  height: 200rpx;
+  background: #f1f1f1;
+}
+
+.textarea-view {
+  border-bottom: 1px solid #eee;
+  height: 280rpx;
+}
+
+.uploadImg-task-view {
+  display: grid;
+  justify-content: space-between;
+  grid-template-columns: repeat(auto-fill, 140rpx);
+  grid-gap: auto;
+  width: 650rpx;
+  margin: 0 auto;
+  border-bottom: 1px dashed #ccc;
+  padding-bottom: 40rpx;
+  margin-bottom: 40rpx;
+}
+
+.my-img-view{
+  position: relative;
+  margin: 20rpx 0 20rpx;
+}
+
+.del-btn{
+  position: absolute;
+  width: 40rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  z-index: 2;
+  background: #cc6031;
+  color: #FFF;
+  text-align: center;
+  font-weight: 600;
+  border-radius: 50rpx;
+  top: -20rpx;
+  left: -20rpx;
+  border: 8rpx solid #FFF;
+}
+
+.upload-btn image{
+  height: 40rpx;
+  width: 40rpx;
+}
+
+.upload-btn{
+  width: 139rpx;
+    height: 139rpx;
+    border: 1rpx dashed #ccc;
+    text-align: center;
+    background: #f8f8f8;
+    margin: 20rpx 0 20rpx;
+    color: #999;
+    font-size: 22rpx;
+    line-height: 36rpx;
+}
+
+.new-task-img{
+  width: 139rpx;
+  height: 139rpx;
+  border: 1rpx dashed #ccc;
+}
+
+.submit-btn{
+  font-size: 32rpx;
+  background: #005033;
+  color: #FFF;
+  width: 400rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  position: relative;
+  left: 50%;
+  margin-left: -200rpx;
+  margin-top: 50rpx;
+  text-align: center;
+  border-radius: 50rpx;
+}