Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !35

pages/my/teachingArea/teachingArea.wxml

@@ -4,9 +4,9 @@
 </view>
 <view class="select">选择意向区域</view>
 <view class="item" wx:for="{{forIndex}}" wx:key="index">
-	<view class="every flex-h flex-vc flex-hb">
+	<view class="every flex-h flex-vc flex-hb" bindtap="showCitypop">
 		<view>意向区域{{index+1}}</view>
-		<view bindtap="showCitypop" data-index="{{index+1}}">
+		<view  data-index="{{index+1}}">
 			<text wx:if="{{index == 0}}">{{first_area_name}}</text>
 			<text wx:if="{{index == 1}}">{{second_area_name}}</text>
 			<text wx:if="{{index == 2}}">{{third_area_name}}</text>

pages/tabbar/financial/financial.js

@@ -7,6 +7,7 @@ const base = new Base()
 Page({
 
 	data: {
+		show : false,
 		activeIndex: 1,
 		coach_id: '',
 		role_id: '2',
@@ -34,6 +35,16 @@ Page({
 		this.getList(1)
 		this.getList(2)
 	},
+	showPopup : function (){
+		this.setData({
+			show : true
+		})
+	},
+	onClose : function (){
+		this.setData({
+			show : false
+		})
+	},
 	changeTab(e) {
 		let index = e.currentTarget.dataset.index
 		if (this.data.activeIndex != index) {

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" />
+				<van-icon class="question_icon" name="question-o" catchtap="showPopup" />
 			</view>
 			
 			<view class="content1" wx:if="{{profitList.length > 0}}">
@@ -63,11 +63,14 @@
 					<view class="small">已结算</view>
 				</view>
 
-				<van-icon class="question_icon" name="question-o" />
+				<van-icon class="question_icon" name="question-o" catchtap="showPopup" />
 				<view class="share" catchtap="withdrawClick">全部提现</view>
 			</view>
 			
-			<view class="tip">提示：每周二为提现日！其他日不支持提现</view>
+			<view class="tips">
+				<image src="/images/tipbg.png"></image>
+				<text>提示：每周二为提现日！其他日不支持提现</text>
+			</view>
 			<view class="content1" wx:if='{{withdrawList.length > 0}}'>
 				<view class="content1_head flex-h flex-vc">
 					<view style="width:50%">日期</view>
@@ -92,3 +95,17 @@
 		</view>
 	</view>
 </view>
+
+<view class="cityBox" wx:if="{{ show }}" catchtap="onClose">
+	<view class="cityContent">
+		<view class="cityTitle">
+			收益规则
+			<text class="iconfont iconguanbi1" catchtap="onClose"></text>
+		</view>
+		<view class="cityCenter">
+			<view>1.每节课程完成后预计收益变为已结算收益，每节课程完成后预计收益变为已结算收益；</view>
+			<view>2.已结算的收益可以于每周二在提现页面进行提现，目前平台支持提现至微信账户。</view>
+		</view>
+		<view class="cityConfirm" catchtap="onClose">我知道了</view>
+	</view>
+</view>
\ No newline at end of file

pages/tabbar/financial/financial.wxss

@@ -105,10 +105,12 @@
 	box-shadow: 0 10rpx 20rpx 10rpx rgba(239, 240, 241, 0.72);
 	position: relative;
 }
+
 .detailed .item-one {
 	text-align: center;
 	width: 50%;
 }
+
 .detailed .item-one .num {
 	color: #FFDEAA;
 	font-size: 50rpx;
@@ -151,7 +153,7 @@
 	right: 0;
 }
 
-.tip {
+/* .tip {
 	width: 690rpx;
 	height: 53rpx;
 	background: #FFF2DD;
@@ -161,6 +163,30 @@
 	text-align: left;
 	padding-left: 12rpx;
 	margin-left: 30rpx;
+} */
+.tips {
+	width: 690rpx;
+	margin-bottom: 30rpx;
+	margin-left: 30rpx;
+	font-size: 24rpx;
+	color: #7F5C37;
+	height: 53rpx;
+	position: relative;
+}
+.tips image {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+}
+.tips text {
+	color: #7F5C37;
+	position: absolute;
+	left: 24rpx;
+	line-height: 53rpx;
 }
 
 /* table表格 */
@@ -198,3 +224,63 @@
 .content1_body_th:nth-child(2n) {
 	background: #F7F8FA;
 }
+
+/* 弹窗样式 */
+
+.cityBox {
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.3);
+	z-index: 20;
+}
+
+.cityContent {
+	width: 500rpx;
+	height: auto;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	margin: 40% auto;
+	padding: 54rpx 0 51rpx 0;
+	position: relative;
+}
+
+.cityTitle {
+	font-size: 32rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #1A1A1A;
+	width: 100%;
+	text-align: center;
+	margin-bottom: 58rpx;
+}
+
+.cityTitle text {
+	position: absolute;
+	right: 39rpx;
+	top: 43rpx;
+	color: #CCCCCC;
+}
+
+.cityCenter {
+	padding-left: 40rpx;
+	padding-right: 40rpx;
+	color: #808080;
+	font-size: 26rpx;
+	line-height: 46rpx;
+}
+
+.cityConfirm {
+	width: 345rpx;
+	height: 68rpx;
+	background: linear-gradient(-70deg, #FFC600 0%, #FFD400 100%);
+	border-radius: 34rpx;
+	text-align: center;
+	line-height: 68rpx;
+	margin: 29rpx auto 0 auto;
+	font-size: 28rpx;
+	color: #1A1A1A;
+}
+