Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !42

pages/index/classManagement/classManagement.wxml

@@ -14,7 +14,7 @@
 	<block wx:for="{{list}}" wx:key='index'>
 		<view class="item flex-h flex-vc flex-hb">
 			<view class="flex-h flex-vc">
-				<image src="{{item.child.thumb !=null ? item.child.thumb: '/images/default_head.png'}}"></image>
+				<image src="{{item.child.thumb !=null ? item.child.thumb: '/images/default_head.png'}}" mode="aspectFill"></image>
 				<view>
 					<view class="name">{{item.child.nick_name != null ? item.child.nick_name: ''}}</view>
 					<view class="big_name">大名：{{item.child.child_name}}</view>

pages/index/classManagement/classManagement.wxss

@@ -28,6 +28,9 @@ page {
   line-height: 64rpx;
   text-align: center;
 }
+.instant image{
+  margin-left: 12rpx;
+}
 .top image{
   width: 41rpx;
   height: 32rpx;

pages/my/parents/parents.wxml

@@ -3,7 +3,7 @@
 		<view class="item" wx:for="{{list}}" wx:key="index">
 			<view class="top flex-h flex-vc flex-hb">
 				<view class="row">
-					<image src="{{item.child.wx_user.avatarurl}}"></image>
+					<image src="{{item.child.wx_user.avatarurl}}" mode="aspectFill"></image>
 					<view class="name">{{item.child.wx_user.nickname}}</view>
 				</view>
 				<view class="date">

pages/tabbar/class/class.js

@@ -111,7 +111,7 @@ Page({
       this.setData({
         locked: true
       })
-      this.onLoadFun();
+      this.onLoad();
     }
     wx.stopPullDownRefresh()
   },

pages/tabbar/class/class.json

 {
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "van-empty": "/components/vant/empty/index"
   },

pages/tabbar/index/index.js

@@ -90,6 +90,7 @@ Page({
     
     afterCalendarRender(e) {
         const calendar = this.selectComponent('#calendar').calendar;
+        calendar.cancelSelectedDates()
 		const toSet = [
 			{
 				year: this.data.curDate.split('-')[0],
@@ -204,4 +205,21 @@ Page({
             url: '/pages/index/classDetail/classDetail?class_id=' + item.class_id + '&lesson_id=' + item.id,
         })
     },
+    initData : function (){
+        this.setData({
+            allList : [],
+            list : [],
+            locked : false
+        })
+    },
+    onPullDownRefresh : function () {
+        this.initData()
+        if (!this.data.locked) {
+			this.setData({
+				locked: true
+			})
+			this.onLoad()
+		}
+		wx.stopPullDownRefresh()
+    }
 })
\ No newline at end of file

pages/tabbar/index/index.json

 {
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "van-count-down": "/components/vant/count-down/index",
     "van-empty": "/components/vant/empty/index",

pages/tabbar/personal/personal.json

 {
   "usingComponents": {},
   "navigationBarTitleText": "我的",
-  "enablePullDownRefresh": true,
   "navigationBarBackgroundColor": "#FFC600"
 }
\ No newline at end of file

pages/team/teamDetail/teamDetail.wxml

@@ -19,9 +19,9 @@
 	<text>本班学员</text>
 	<view class="stu flex-h flex-hw">
 		<view class="stus column" wx:for="{{studentList}}" wx:key="index" wx:for-item="item">
-			<image src="/images/default_head.png" wx:if="{{item.child.thumb == null}}"></image>
-			<image src="{{item.child.thumb}}" wx:else></image>
-			<view class="name">{{item.child.child_name}}</view>
+			<image src="/images/default_head.png" wx:if="{{item.child.thumb == null}}" mode="aspectFill"></image>
+			<image src="{{item.child.thumb}}" mode="aspectFill" wx:else ></image>
+			<view class="name">{{item.child.nick_name}}</view>
 		</view>
 	</view>
 </view>