piao,quan,student

pages/classTotalList/classTotalList.js

@@ -65,7 +65,10 @@ Page({
   onReachBottom: function () {
     if (this.data.hasNextPage) {
       let pn = this.data.pageNum
-      this.setData({ loading: '加载中', 'pageNum': ++pn })
+      this.setData({
+        loading: '加载中',
+        'pageNum': ++pn
+      })
       this.queryList()
     }
   },
@@ -79,7 +82,10 @@ Page({
   queryList: function () {
     const urls = urlDef.urls;
     let stu = wx.getStorageSync('student')
-    let params = { 'q.studentId': stu.studentId, 'q.orgId': stu.orgId }
+    let params = {
+      'q.studentId': stu.studentId,
+      'q.orgId': stu.orgId
+    }
     params.pageNum = this.data.pageNum
     util.apiPost(urls.get_course_report, params).then(rs => {
       let list = rs.list
@@ -95,6 +101,23 @@ Page({
         }
       })
 
+      if (this.data.courseItems.length <= 0) {
+        wx.showModal({
+          title: '提示',
+          content: '暂无数据',
+          showCancel: false, //是否显示取消按钮
+          cancelText: "否", //默认是“取消”
+          cancelColor: '#999999', //取消文字的颜色
+          confirmText: "确定", //默认是“确定”
+          confirmColor: 'skyblue', //确定文字的颜色
+          success(){
+            wx.navigateBack({
+              delta: -1,
+            })
+          }
+        })
+      }
+
       this.setData({
         'hasNextPage': rs.hasNextPage,
         'loading': rs.hasNextPage ? '下拉刷新' : '没有更多数据',

pages/makePiano/makePiano.js

@@ -31,7 +31,8 @@ Page({
     pageNum: 0,
     hasNextPage: true,
     schoolIndex: 0,
-    timeScope: '0,0'
+    timeScope: '0,0',
+    yFlag: false
   },
 
   getWeek: function (e) {
@@ -62,6 +63,14 @@ Page({
     })
     this.queryList()
   },
+
+  resetTime:function(){
+    let timeScope = '0,0'
+    this.setData({ timeScope })
+    this.showSelect()
+    this.queryList()
+  },
+
   localtionMethod: function () {
     var that = this
     wx.getLocation({

pages/makePiano/makePiano.wxml

@@ -16,7 +16,7 @@
     </view>
     <view class="search-btn-view">
       <view class="search-btn" bindtap="selectTime">确定</view>
-      <view class="reset-btn">重置</view>
+      <view class="reset-btn" bindtap="resetTime">重置</view>
     </view>
   </view>
   <view class="select-box-bg" bindtap="showSelect" animation="{{animationBg}}" wx:if="{{yFlag == true}}"></view>

pages/piano/piano.wxss

@@ -9,6 +9,7 @@ page{
   display: flex;
   justify-content: space-between;
   border-bottom: 20rpx solid #f1f1f1;
+  background: #FFF;
 }
 
 .piano-detail view {

pages/quan/quan.wxml

@@ -8,7 +8,7 @@
   <view class="quan-view">
     <view class="quan-list">
       <view class="quan-box">
-        <view class="{{index == 0 ? 'wrapper' : 'wrapper-ed'}}" wx:for="{{list}}" key='index'>
+        <view class="{{index == 0 ? 'wrapper' : 'wrapper-ed'}}" wx:for="{{list}}" wx:key='index'>
           <!-- 左侧box -->
           <view class="content">
             <view class="{{index == 0 ? 'couponCount' : 'couponCount-ed'}}">火爆</view>

pages/quan/quan.wxss

@@ -83,7 +83,7 @@ page{
   position: absolute;
   width: 32rpx;
   height: 16rpx;
-  background: #000;
+  background: #FFF;
   left: -18rpx;
   z-index: 1;
 }

pages/showVideoList/showVideoList.wxml

@@ -5,7 +5,7 @@
   <!-- end -->
 
   <!-- 视频列表 -->
-  <view class="show-view">
+  <view class="show-view" style="{{list.length > 0 ? 'padding: 25rpx' : ''}}">
     <showList list="{{list}}" bind:callThumbsUp="doThumbsUp"></showList>
   </view>
   <!-- end -->

pages/showVideoList/showVideoList.wxss

@@ -16,5 +16,4 @@ page{
 .show-view{
   width: 700rpx;
   background: #FFF;
-  padding: 25rpx;
 }

pages/student/student.wxss

@@ -131,7 +131,7 @@ image{
     color: #333;
 }
 .camera-view{
-  position: absolute;
+    position: fixed;
     top: 0;
     width: 750rpx;
     left: 750rpx;