Commit d95d5dbe authored by 石盼盼's avatar 石盼盼

Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !56
parents d6bf1d0a f47967a6
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<view class="cont"> <view class="cont">
<view class="item flex-h flex-vc flex-hb" wx:for="{{stuList}}" wx:key="index" data-id="{{item.id}}"> <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"> <view class="flex-h flex-vc">
<image src="/images/default_head.png" wx:if="{{item.child.thumb == null}}"></image> <image src="/images/default_head.png" wx:if="{{item.child.thumb == null}}" mode="aspectFill"></image>
<image src="{{item.child.thumb}}" wx:else></image> <image src="{{item.child.thumb}}" wx:else mode="aspectFill"></image>
<view> <view>
<view class="name">{{item.child.nick_name !=null ? item.child.nick_name : ''}}</view> <view class="name">{{item.child.nick_name !=null ? item.child.nick_name : ''}}</view>
<view class="big_name">{{item.child.child_name}}</view> <view class="big_name">{{item.child.child_name}}</view>
......
...@@ -3,7 +3,6 @@ page{ ...@@ -3,7 +3,6 @@ page{
} }
.item{ .item{
width: 750rpx; width: 750rpx;
height: 454rpx;
background: #FFFFFF; background: #FFFFFF;
margin-top: 20rpx; margin-top: 20rpx;
padding: 30rpx; padding: 30rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment