Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !55

pages/sign/apply/apply.wxml

 <view>
-    <button class="save" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">申请成为教练</button>
+	<view class="img">
+		<image src="https://wdty.xueyoubangedu.com/wandou/applycoach.jpg"></image>
+	</view>
+
+	<button class="save" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">申请成为教练</button>
 </view>
\ No newline at end of file

pages/sign/apply/apply.wxss

+.img {
+    width: 690rpx;
+    height: 2652rpx;
+    margin: 30rpx auto;
+}
+.img image{
+    width: 690rpx;
+    height: 2652rpx;
+}
 .save {
-    position: absolute;
-    bottom: 33rpx;
-    left: 50rpx;
-    right: 50rpx;
+    /* position: absolute; */
+    /* bottom: 33rpx; */
+    /* left: 50rpx; */
+    /* right: 50rpx; */
+    margin: 50rpx 0;
     width: 650rpx !important;
     height: 80rpx !important;
     line-height: 80rpx !important;

pages/sign/login/login.wxml

-<view class="loginBox">
+<!-- <view class="loginBox">
 	<view class="logo-view">
 		<image src="/images/my/login.png"></image>
 	</view>
@@ -8,4 +8,23 @@
 		微信一键注册/登录
 	</button>
 	<view class="desc">请登录查看更多内容</view>
-</view>
\ No newline at end of file
+</view> -->
+
+<view class="pic">
+	<swiper indicator-dots="true" autoplay="true" style="width:690rpx;height:750rpx">
+		<swiper-item>
+			<image src="https://wdty.xueyoubangedu.com/wandou/firstopen1.png"></image>
+		</swiper-item>
+		<swiper-item>
+			<image src="https://wdty.xueyoubangedu.com/wandou/firstopen2.png"></image>
+		</swiper-item>
+		<swiper-item>
+			<image src="https://wdty.xueyoubangedu.com/wandou/firstopen3.png"></image>
+		</swiper-item>
+		<swiper-item>
+			<image src="https://wdty.xueyoubangedu.com/wandou/firstopen4.png"></image>
+		</swiper-item>
+	</swiper>
+</view>
+
+<button class="save" open-type="getUserInfo" bindgetuserinfo="userInfoHandler" catchtap="checkVisions">开始使用</button>
\ No newline at end of file

pages/sign/login/login.wxss

-.loginBox {
+/* .loginBox {
 	padding-top: 174rpx;
 }
 
@@ -38,4 +38,30 @@
 	font-size: 24rpx;
 	color: #999999;
 	text-align: center;
+} */
+
+.pic{
+	width: 690rpx;
+	height: 750rpx;
+	margin: 100rpx 30rpx;
+}
+swiper-item image{
+	width: 100%;
+	height: 750rpx;
+}
+
+.save {
+	position: absolute;
+	 bottom: 33rpx; 
+	left: 50rpx; 
+	right: 50rpx;
+	width: 650rpx !important;
+	height: 80rpx !important;
+	line-height: 80rpx !important;
+	text-align: center;
+	background: linear-gradient(-70deg, #FFC600 0%, #FFD400 100%);
+	border-radius: 40rpx;
+	font-size: 30rpx;
+	color: #000000;
+	padding: 0 !important;
 }
\ No newline at end of file