Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !75

app.js

@@ -130,8 +130,8 @@ App({
 	},
 
 	globalData: {
-		// baseUrl: 'https://wandoutiyu.xueyoubangedu.com/api/', //线上接口
-		baseUrl: 'https://wandoutiyu.test.xueyoubangedu.com/api/', //测试接口
+		baseUrl: 'https://wandoutiyu.xueyoubangedu.com/api/', //线上接口
+		// baseUrl: 'https://wandoutiyu.test.xueyoubangedu.com/api/', //测试接口
 		extAppid: 'wx6e6eaca9cc1c406d', // 当前appid
 		userInfo: '', //微信user信息
 		userTel: '', //  手机号

pages/index/performance/performance.wxml

@@ -11,20 +11,21 @@
 			<view class="teacher_left flex-v flex-hc">
 				<image src="/images/default_head.png" wx:if="{{coach.thumb == null}}"></image>
 				<image src="{{coach.thumb}}" wx:else mode="aspectFill"></image>
-				<text class="name">{{coach.title}}</text>
+				<!-- <text class="name">{{coach.title}}</text> -->
 			</view>
-			<text class="teacher_right">{{coachcomment.class_comment}}</text>
+			<text class="teacher_right">{{coachcomment.class_comment !=null ? coachcomment.class_comment : ''}}</text>
 		</view>
 	</view>
 	<view class="line" wx:if="{{coachcomment.comment_reply!='' && coachcomment.comment_reply!=null}}"></view>
 	<view class="parents" wx:if="{{coachcomment.comment_reply!='' && coachcomment.comment_reply!=null}}">
 		<view class="title">家长回复</view>
-		<view class="flex-h">
+		<view class="flex-h flex-vc">
 			<image src="/images/default_head.png" wx:if="{{coachcomment.child.wx_user.avatarurl == null}}"></image>
-			<image src="{{coachcomment.child.wx_user.avatarurl}}" wx:else></image>
-			<text class="name">{{coachcomment.child.wx_user.nickname}}</text>
+			<image src="{{coachcomment.child.wx_user.avatarurl}}" mode="aspectFill" wx:else></image>
+			<!-- <text class="name">{{coachcomment.child.wx_user.nickname}}</text> -->
+			<text class="teacher_right">{{coachcomment.comment_reply}}</text>
 		</view>
-		<text class="comments">{{coachcomment.comment_reply}}</text>
+		
 	</view>
 </view>
 <view class="one" wx:if="{{awardList.length > 0}}">

utils/base.js

@@ -3,8 +3,8 @@ var app = getApp()
 const qiniuUploader = require("./qiniuUploader.js");
 class Base {
 	constructor() {
-		// this.baseUrl = 'https://wandoutiyu.xueyoubangedu.com/api/' //线上接口
-		this.baseUrl = 'https://wandoutiyu.test.xueyoubangedu.com/api/' //测试接口
+		this.baseUrl = 'https://wandoutiyu.xueyoubangedu.com/api/' //线上接口
+		// this.baseUrl = 'https://wandoutiyu.test.xueyoubangedu.com/api/' //测试接口
 	}
 	newRequest(params, flag = false, tips = true) {	
 		let that = this