Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !56

pages/index/classDetail/classDetail.wxml

@@ -16,8 +16,8 @@
 <view class="cont">
 	<view class="item flex-h flex-vc flex-hb" wx:for="{{stuList}}" wx:key="index" data-id="{{item.id}}">
 		<view class="flex-h flex-vc">
-			<image src="/images/default_head.png" wx:if="{{item.child.thumb == null}}"></image>
-			<image src="{{item.child.thumb}}" wx:else></image>
+			<image src="/images/default_head.png" wx:if="{{item.child.thumb == null}}" mode="aspectFill"></image>
+			<image src="{{item.child.thumb}}" wx:else 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/my/parents/parents.wxss

@@ -3,7 +3,6 @@ page{
 }
 .item{
   width: 750rpx;
-  height: 454rpx;
   background: #FFFFFF;
   margin-top: 20rpx;
   padding: 30rpx;