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

pages/cardList/cardList.wxml

@@ -21,7 +21,7 @@
 				<view class="piano-btn" data-index="{{index}}" data-id="{{item.schemeId}}" data-code="{{item.code}}" bindtap="getPiano">查看详情</view>
 			</view>
 		</view>
-		<view class="loading-view no-more" wx:if="{{pianoList.length == 0}}">— {{loading2}} —</view>
+		<view class="loading-view" wx:if="{{pianoList.length == 0}}">{{loading2}}</view>
 	</view>
 	<!-- 练琴卡end -->
 </view>

pages/cardList/cardList.wxss

@@ -96,12 +96,11 @@
 }
 
 .loading-view {
-  margin-top: 96rpx;
-  padding-bottom: 100rpx;
-  width: 100%;
+  height: 200rpx;
+  line-height: 100rpx;
+  /* background: #f1f1f1;  */
+  color: #999;
   text-align: center;
-  font-size: 24rpx;
-  color: rgba(197, 197, 197, 1);
 }
 
 .tip-view {

pages/classOrder/classOrder.wxss

@@ -81,7 +81,7 @@ page{
 .loading {
   height: 200rpx;
   line-height: 100rpx;
-  background: #f1f1f1;
+  background: #f1f1f1; 
   color: #999;
   text-align: center;
 }

pages/doTask/doTask.js

@@ -273,9 +273,9 @@ Page({
           wx.showLoading({
             title: '上传中...',
           })
-          that.setData({
-            uploadIng: true
-          })
+          // that.setData({
+          //   uploadIng: true
+          // })
           uploader.addFile(file, null, null, null, userData)
           uploader.startUpload();
           // uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId);

pages/leave/leave.js

@@ -75,6 +75,7 @@ Page({
             'eventList': rs
           })
         }
+        this.initList()
       });
       util.apiPost(urls.get_holidays, {
         'q.companyId': stu.orgId
@@ -88,6 +89,14 @@ Page({
     }
   },
 
+  initList:function(){
+    let date = this.data.bd
+    if (date) {
+      let t = this;
+      t.selectDate(date)
+    }
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/pianoDetail/pianoDetail.js

@@ -11,7 +11,7 @@ Page({
     num: 1,
     initMoney: 19.90,
     id: "",
-    payFlag: 1,
+    payFlag: 1, 
     schoolList: [],
     moreFlag: 0,
     isBuy: true,

pages/schedule/schedule.js

@@ -41,6 +41,7 @@ Page({
         if (rs && rs.length > 0) {
           this.setData({ 'eventList': rs })
         }
+        this.initList()
       });
       util.apiPost(urls.get_holidays, { 'q.companyId': stu.orgId }).then((rs) => {
         if (rs && rs.length > 0) {
@@ -50,11 +51,19 @@ Page({
     }
   },
 
+  initList:function(){
+    let date = this.data.bd
+    if (date) {
+      let t = this;
+      t.selectDate(date)
+    }
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-
+   
   },
 
   /**
@@ -64,7 +73,7 @@ Page({
     let date = this.data.bd
     if (date) {
       let t = this;
-      setTimeout(() => { t.selectDate(date) }, 500)
+      t.selectDate(date)
     }
   },
 
@@ -108,6 +117,7 @@ Page({
     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);