Merge branch 'wuying' into 'master'

Wuying

See merge request !52

pages/tabbar/financial/financial.js

@@ -25,6 +25,8 @@ Page({
 		withdrawPage: 1,
 		withdrawMore: true,
 		withdrawLocked: false,
+
+		tipType: '1'
 	},
 
 	onLoad: function (options) {
@@ -36,9 +38,10 @@ Page({
 		this.getList(1)
 		this.getList(2)
 	},
-	showPopup : function (){
+	showPopup : function (e){
 		this.setData({
-			show : true
+			show : true,
+			tipType: e.currentTarget.dataset.index
 		})
 	},
 	onClose : function (){

pages/tabbar/financial/financial.wxml

@@ -24,7 +24,7 @@
 					<view class="num">{{detail ? detail.total_revenue: 0}}</view>
 					<view class="small">已结算</view>
 				</view>
-				<van-icon class="question_icon" name="question-o" catchtap="showPopup" />
+				<van-icon class="question_icon" name="question-o" catchtap="showPopup" data-index="1"/>
 			</view>
 			
 			<view class="content1" wx:if="{{profitList.length > 0}}">
@@ -63,7 +63,7 @@
 					<view class="small">已结算</view>
 				</view>
 
-				<van-icon class="question_icon" name="question-o" catchtap="showPopup" />
+				<van-icon class="question_icon" name="question-o" catchtap="showPopup" data-index="2" />
 				<view class="share" catchtap="withdrawClick">全部提现</view>
 			</view>
 			
@@ -99,12 +99,16 @@
 <view class="cityBox" wx:if="{{ show }}" catchtap="onClose">
 	<view class="cityContent">
 		<view class="cityTitle">
-			收益规则
+			{{tipType == 1 ? '收益说明' : '提现说明'}}
 			<text class="iconfont iconguanbi1" catchtap="onClose"></text>
 		</view>
-		<view class="cityCenter">
-			<view>1.每节课程完成后预计收益变为已结算收益，每节课程完成后预计收益变为已结算收益；</view>
-			<view>2.已结算的收益可以于每周二在提现页面进行提现，目前平台支持提现至微信账户。</view>
+		<view class="cityCenter" wx:if="{{tipType == 1}}">
+			<view>1、预计收益：预计可获得的收益，若学员退课则预计收益可能会减少</view>
+			<view>2、已结算：学员完成上课后，一般第二天完成结算</view>
+		</view>
+		<view class="cityCenter" wx:if="{{tipType == 2}}">
+			<view>1、余额：已结算金额减去已提现金额为余额，可提现的金额</view>
+			<view>2、已提现：全部已提现过的金额</view>
 		</view>
 		<view class="cityConfirm" catchtap="onClose">我知道了</view>
 	</view>

pages/tabbar/financial/financial.wxss

@@ -191,6 +191,7 @@
 
 /* table表格 */
 .content1 {
+	margin: auto;
 	width: 690rpx;
 	background: #FFFFFF;
 	border-radius: 15px;