Merge branch 'wuying' into 'master'

Wuying

See merge request !50

pages/index/classManagement/classManagement.js

@@ -136,6 +136,10 @@ Page({
 			},
 			callback : (data) => {
 				base.toast('课程完结')
+				app.globalData.classRush = true
+				wx.switchTab({
+				  url: '/pages/tabbar/index/index',
+				})
 			}
 		}
 		base.newRequest(params)

pages/my/parents/parents.wxml

@@ -8,7 +8,6 @@
 				</view>
 				<view class="date">
 					<text>{{item.updated_at}}</text>
-					<!-- <text>10:00</text> -->
 				</view>
 			</view>
 			<view class="comments">{{item.comment_reply}}</view>

pages/tabbar/index/index.js

@@ -53,7 +53,7 @@ Page({
         this.getList()
     },
     onShow() {
-        if (app.globalData.classRush) { // 抢班成功之后刷新当前页面
+        if (app.globalData.classRush) { // 抢班成功之后刷新当前页面 或者课程完结以后
             this.initData() 
             this.getAllList()
             this.getList()

pages/team/teamDetail/teamDetail.wxml

@@ -21,7 +21,7 @@
 		<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}}" mode="aspectFill"></image>
 			<image src="{{item.child.thumb}}" mode="aspectFill" wx:else ></image>
-			<view class="name">{{item.child.nick_name}}</view>
+			<view class="name">{{item.child.nick_name ? item.child.nick_name : item.child.child_name}}</view>
 		</view>
 	</view>
 </view>