Merge branch 'shipanpan' into 'master'

增加开启通知样式

See merge request !63

iconfont/iconfont.wxss

 @font-face {font-family: "iconfont";
-    src: url('//at.alicdn.com/t/font_2172922_bfznc3bwivf.eot?t=1604299492582'); /* IE9 */
-    src: url('//at.alicdn.com/t/font_2172922_bfznc3bwivf.eot?t=1604299492582#iefix') format('embedded-opentype'), /* IE6-IE8 */
-    url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
-    url('//at.alicdn.com/t/font_2172922_bfznc3bwivf.woff?t=1604299492582') format('woff'),
-    url('//at.alicdn.com/t/font_2172922_bfznc3bwivf.ttf?t=1604299492582') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-    url('//at.alicdn.com/t/font_2172922_bfznc3bwivf.svg?t=1604299492582#iconfont') format('svg'); /* iOS 4.1- */
-  }
-  
-  .iconfont {
+  src: url('//at.alicdn.com/t/font_2172922_8860ibg3y1e.eot?t=1607408882996'); /* IE9 */
+  src: url('//at.alicdn.com/t/font_2172922_8860ibg3y1e.eot?t=1607408882996#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+  url('//at.alicdn.com/t/font_2172922_8860ibg3y1e.woff?t=1607408882996') format('woff'),
+  url('//at.alicdn.com/t/font_2172922_8860ibg3y1e.ttf?t=1607408882996') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('//at.alicdn.com/t/font_2172922_8860ibg3y1e.svg?t=1607408882996#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  }
+}
+
+.iconguanbi2:before {
+  content: "\e637";
+}
+
+.iconduigou-green:before {
+  content: "\e600";
+}
 
-  .iconxiangji:before {
+.icontixing:before {
+  content: "\e628";
+}
+
+.iconxiangji:before {
   content: "\e67e";
-  }
+}
 
-  .iconshipin:before {
+.iconshipin:before {
   content: "\e635";
-  }
+}
 
-  .iconwenhao:before {
+.iconwenhao:before {
   content: "\e67f";
-  }
+}
 
-  .icondaohang:before {
+.icondaohang:before {
   content: "\e640";
-  }
+}
 
-  .icondanxuanxuanzhong:before {
+.icondanxuanxuanzhong:before {
   content: "\e61f";
-  }
+}
 
-  .iconguanbi:before {
+.iconguanbi:before {
   content: "\e696";
-  }
+}
 
-  .iconziyuan:before {
+.iconziyuan:before {
   content: "\e61b";
-  }
+}
 
-  .iconguanbi1:before {
+.iconguanbi1:before {
   content: "\e6d6";
-  }
+}
 
-  .icongengduo:before {
+.icongengduo:before {
   content: "\e633";
-  }
+}
 
-  .iconhuo:before {
+.iconhuo:before {
   content: "\e66c";
-  }
-  
+}
\ No newline at end of file

pages/tabbar/financial/financial.js

@@ -7,6 +7,7 @@ const base = new Base()
 Page({
 
 	data: {
+		showTixian : false,
 		show : false,
 		activeIndex: 1,
 		user_id: '',
@@ -175,6 +176,18 @@ Page({
 			path: '/pages/index/index?parent_id=' + this.data.user_id
 		}
 	},
+	//全部提现提示语
+	showTixianPopup(){
+		console.log(111111111)
+		this.setData({
+			showTixian : true
+		})
+	},
+	Close() {
+		this.setData({
+			showTixian : false
+		})
+	},
 
 	withdrawClick() { // 提现
 		console.log(this.data.detail)

pages/tabbar/financial/financial.wxml

@@ -64,7 +64,7 @@
 				</view>
 
 				<van-icon class="question_icon" name="question-o" catchtap="showPopup" data-index="2" />
-				<view class="share" catchtap="withdrawClick">全部提现</view>
+				<!-- <view class="share" catchtap="showTixianPopup">全部提现</view> -->
 			</view>
 			
 			<view class="tips">
@@ -113,3 +113,17 @@
 		<view class="cityConfirm" catchtap="onClose">我知道了</view>
 	</view>
 </view>
+
+<view class="cityBox" wx:if="{{ showTixian }}" catchtap="Close">
+	<view class="txContent">
+		<view class="top">
+			<view class="title">提示</view>
+			<text class="iconfont iconguanbi1" catchtap="Close"></text>
+		</view>
+		<view class="center">提现当日结算的金额不可提现！请点击立即提现，提现到微信零钱。</view>
+		<view class="bottom flex-h">
+			<view class="cancle">取消</view>
+			<view class="confirm active" catchtap="withdrawClick">立即提现</view>
+		</view>
+	</view>
+</view>
\ No newline at end of file

pages/tabbar/financial/financial.wxss

@@ -286,3 +286,59 @@
 	color: #1A1A1A;
 }
 
+/* 提现弹窗样式 */
+.txContent{
+  width: 500rpx;
+  height: auto;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  margin: 40% auto;
+  position: relative;
+  padding-top: 44rpx;
+}
+.txContent .title {
+  color: #1A1A1A;
+  font-size: 32rpx;
+  text-align: center;
+  font-weight: bold;
+}
+
+.iconguanbi1 {
+  position: absolute;
+  top: 26rpx;
+  right: 28rpx;
+  color: #CCCCCC;
+}
+
+.center {
+  font-size: 26rpx;
+  color: #808080;
+  line-height: 42rpx;
+  padding: 30rpx 28rpx;
+  text-align: center;
+}
+
+.cancle {
+  width: 50%;
+  height: 80rpx;
+  border-top: 1px solid #EBEBEB;
+  border-right: 1px solid #EBEBEB;
+  text-align: center;
+  line-height: 80rpx;
+  color: #B3B3B3;
+  font-size: 28rpx;
+}
+
+.confirm {
+  width: 50%;
+  height: 80rpx;
+  border-top: 1px solid #EBEBEB;
+  text-align: center;
+  line-height: 80rpx;
+  color: #B3B3B3;
+  font-size: 28rpx;
+}
+
+.active{
+  color: #B4BC4D;
+}
\ No newline at end of file

pages/tabbar/index/index.wxml

+<view class="notice flex-h flex-vc flex-hb">
+	<view>
+		<text class="iconfont icontixing"></text>
+		<text class="tip">开启上课通知，接收更多消息</text>
+	</view>
+	<view class="open">立即开启</view>
+</view>
 <view class="tabContent">
 	<view class="rili">
 		<view class="board">
-			<calendar
-				id="calendar"
-				config="{{calendarConfig}}"
-				bind:afterCalendarRender="afterCalendarRender"
-				bind:afterTapDate="afterTapDate"
-				bind:whenChangeMonth="whenChangeMonth" 
-			/>
+			<calendar id="calendar" config="{{calendarConfig}}" bind:afterCalendarRender="afterCalendarRender" bind:afterTapDate="afterTapDate" bind:whenChangeMonth="whenChangeMonth" />
 		</view>
 	</view>
 
 	<view wx:if='{{list.length > 0}}'>
-		<block wx:for="{{list}}" wx:key='index' >
+		<block wx:for="{{list}}" wx:key='index'>
 			<view class="cont flex-v flex-hb" catchtap="goclassDetail">
 				<view class="top flex-h flex-vc flex-hb">
 					<view class="time_title">{{item.course.name}}</view>
@@ -36,10 +37,6 @@
 		</block>
 	</view>
 	<view wx:else class="empty">
-		<van-empty
-			class="custom-image"
-			image="/images/without.png"
-			description="暂无课表"
-		/>
+		<van-empty class="custom-image" image="/images/without.png" description="暂无课表" />
 	</view>
 </view>
\ No newline at end of file

pages/tabbar/index/index.wxss

+
+.notice{
+  width: 690rpx;
+  height: 96rpx;
+  background: url('https://wdty.xueyoubangedu.com/wandou/tip_bg.png') no-repeat;
+  background-size: 690rpx 96rpx;
+  margin: 20rpx 30rpx 10rpx;
+  border-radius: 15rpx;
+  padding: 0 20rpx;
+}
+.notice .tip{
+  font-size: 24rpx;
+  color: #FFFFFF;
+  margin-left: 10rpx;
+}
+.notice .open{
+  width: 136rpx;
+  height: 48rpx;
+  background:#FFFFFF;
+  border-radius: 24px;
+  color: #00C3A4;
+  font-size: 24rpx;
+  line-height: 48rpx;
+  text-align: center;
+}
+.notice .icontixing{
+  color: #FFFFFF ;
+}
 .date.circle_data::after{
   position: absolute;
   content: '';