Merge branch 'shipanpan' into 'master'

列表页逻辑修改

See merge request !15

pages/tabbar/class/class.wxml

@@ -3,9 +3,9 @@
 		<text class="{{activeIndex == 1 ? 'active': ''}}" catchtap="changeTab" data-index="1">抢班列表</text>
 		<text class="{{activeIndex == 2 ? 'active': ''}}" catchtap="changeTab" data-index="2">我的班级</text>
 	</view>
-	<view>
+	<view wx:if="{{activeIndex == 1 }}">
 		<block wx:if="{{datalList.length>0}}">
-			<view class="tabContent" wx:if="{{activeIndex == 1 }}" wx:for="{{datalList}}" wx:key="item" data-item="{{item}}">
+			<view class="tabContent"  wx:for="{{datalList}}" wx:key="item" data-item="{{item}}">
 				<view class="tab_item">
 					<view class="class-title">{{item.course.name}}</view>
 					<view class="text column">
@@ -23,9 +23,9 @@
 			</view>
 		</block>
 	</view>
-	<view>
+	<view wx:if="{{activeIndex == 2}}">
 		<block wx:if="{{classList.length>0}}">
-			<view class="tabContent1" wx:if="{{activeIndex == 2}}" wx:for="{{classList}}" wx:key="item" data-id="{{item.id}}" catchtap="goteamDetail">
+			<view class="tabContent1"  wx:for="{{classList}}" wx:key="item" data-id="{{item.id}}" catchtap="goteamDetail">
 				<view class="tab_item1">
 					<view class="top">
 						<view class="class-title">{{item.course.name}}</view>