Merge branch 'wuying' into 'master'

Wuying

See merge request !51

pages/tabbar/financial/financial.js

@@ -9,6 +9,7 @@ Page({
 	data: {
 		show : false,
 		activeIndex: 1,
+		user_id: '',
 		coach_id: '',
 		role_id: '2',
 		detail: '',
@@ -26,10 +27,10 @@ Page({
 		withdrawLocked: false,
 	},
 
-
 	onLoad: function (options) {
 		this.setData({
 			coach_id: app.globalData.coach_id,
+			user_id: wx.getStorageSync('userInfo').id
 		})
 		this.getMoney()
 		this.getList(1)
@@ -59,7 +60,7 @@ Page({
 			url: 'commission/list',
 			data: {
 				role_id: this.data.role_id,
-				wx_user_id: this.data.coach_id,
+				wx_user_id: this.data.user_id,
 				type: type,
 				pageSize: '15',
 				page: this.data.profitPage
@@ -90,7 +91,7 @@ Page({
 		let params = {
 			url: 'commission',
 			data: {
-				wx_user_id: this.data.coach_id
+				wx_user_id: this.data.user_id,
 			},
 			callback: (data) => {
 				this.setData({
@@ -188,11 +189,11 @@ Page({
 						url: 'take_money',
 						type: 'POST',
 						data: {
-							wx_user_id: this.data.coach_id,
+							wx_user_id: this.data.user_id,
 							amount: this.data.detail.unrealized_revenue
 						},
 						callback:(data)=>{
-							base.toast('您的提现申请已提交')
+							base.toast('提现成功')
 						}
 					}
 					base.newRequest(params)