Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !34

pages/tabbar/financial/financial.wxss

@@ -126,6 +126,7 @@
 	position: absolute;
 	top: 46rpx;
 	left: 344rpx;
+	opacity: 0.3;
 }
 
 .question_icon {

pages/tabbar/personal/personal.js

@@ -47,7 +47,7 @@ Page({
 			},
 			callback:(data)=>{
 				this.setData({
-					userInfo: data.wx_user,
+					userInfo: data,
 					userTel: data.wx_user.tel.substr(0, 3) + '****' + data.wx_user.tel.substring(7, 11)
 				})
 			}
@@ -77,6 +77,9 @@ Page({
 	getSubjectlist: function () {
 		let params = {
 			url: 'coach/course',
+			data:{
+				coach_id: app.globalData.coach_id,
+			},
 			callback: (data) => {
 				this.setData({
 					subjectList: data
@@ -118,7 +121,7 @@ Page({
 			let params = {
 				url: 'coach/save_course',
 				data: {
-					coach_id: 4,
+					coach_id: app.globalData.coach_id,
 					course_ids: JSON.stringify(newArr)
 				},
 				type: 'POST',
@@ -127,6 +130,7 @@ Page({
 					this.setData({
 						subjectShow: false
 					})
+					this.getInfo()
 				}
 			}
 			base.newRequest(params)

pages/tabbar/personal/personal.wxml

 <view class="personInf">
 	<view class="head flex-h flex-vc flex-hb" wx:if='{{showUserInfo}}' catchtap="goUserInfo">
 		<view class="headLeft flex-h flex-vc">
-			<image src="{{userInfo.avatarurl}}"></image>
+			<image src="{{userInfo.wx_user.avatarurl}}"></image>
 			<view>
-				<view class="name">{{userInfo.nickname}}</view>
+				<view class="name">{{userInfo.wx_user.nickname}}</view>
 				<view class="tel">{{userTel}}</view>
 			</view>
 		</view>