Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !57

pages/index/performance/performance.wxml

@@ -13,7 +13,7 @@
 				<image src="{{coach.thumb}}" wx:else mode="aspectFill"></image>
 				<text class="name">{{coach.title}}</text>
 			</view>
-			<view class="teacher_right">{{coachcomment.class_comment}}</view>
+			<text class="teacher_right">{{coachcomment.class_comment}}</text>
 		</view>
 	</view>
 	<view class="line" wx:if="{{coachcomment.comment_reply!='' && coachcomment.comment_reply!=null}}"></view>
@@ -24,7 +24,7 @@
 			<image src="{{coachcomment.child.wx_user.avatarurl}}" wx:else></image>
 			<text class="name">{{coachcomment.child.wx_user.nickname}}</text>
 		</view>
-		<view class="comments">{{coachcomment.comment_reply}}</view>
+		<text class="comments">{{coachcomment.comment_reply}}</text>
 	</view>
 </view>
 <view class="one" wx:if="{{awardList.length > 0}}">

pages/sign/info/info.js

@@ -57,7 +57,7 @@ Page({
                 })
             },
             fail() {
-                base.toast('上传失败，请重试')
+                // base.toast('上传失败，请重试')
             }
         })
     },

pages/tabbar/financial/financial.wxml

@@ -28,7 +28,7 @@
 			</view>
 			
 			<view class="content1" wx:if="{{profitList.length > 0}}">
-				<view class="content1_head flex-h flex-vc">
+				<view class="content1_head flex-h flex-vc flex-hc">
 					<view style="width:30%">日期</view>
 					<view style="width:30%">结算金额</view>
 					<view style="width:40%">说明</view>