Merge branch '机器人dev' into 海峡new

@@ -3,8 +3,16 @@
 <view class='page'>
 <view class='page'>
   <image src='/images/bg.png' class='back-img' mode="bottom aspectFill"></image>
   <image src='/images/bg.png' class='back-img' mode="bottom aspectFill"></image>
   <view class='content-wrap'>
   <view class='content-wrap'>
-    <button open-type="getPhoneNumber" class='btn' bindgetphonenumber="getPhoneNumber">微信快速授权/登录</button> 
+    <image style="width:160rpx;height:36rpx;margin:0 60rpx" src="/images/login_tip.png"></image>
+    <view style="font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;color:#828699;margin:15rpx 60rpx 150rpx 60rpx">您需要登录后才能进行个人信息采集、专项附加扣除填报、查看个人工资条和扣税明细。</view>
+    <view style="justify-content: center;display: flex;flex-direction: row;margin:0 auto;">
+      <view style="width:160rpx;height:2rpx;margin:20rpx;background:#eef2fb"></view>
+      <text style="font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;color:#828699;">请选择以下方式登录</text>
+      <view style="width:160rpx;height:2rpx;margin:20rpx;background:#eef2fb"></view>
+    </view>
+    <button open-type="getPhoneNumber" class='btn' bindgetphonenumber="getPhoneNumber">微信快速授权/登录</button>
     <view class='loginByPhone' bindtap='phoneLogin'>输入手机号登录</view>
     <view class='loginByPhone' bindtap='phoneLogin'>输入手机号登录</view>
+
   </view>
   </view>
 
 
-</view> 
+</view>

@@ -9,7 +9,7 @@
   height: 440rpx;
   height: 440rpx;
 }
 }
 .content-wrap{
 .content-wrap{
-  margin-top:580rpx;
+  margin-top:450rpx;
   width: 100%;
   width: 100%;
 }
 }
 
 
@@ -25,6 +25,7 @@
   background-color: #659CF7;
   background-color: #659CF7;
   background-image: linear-gradient(-90deg, #357AEB 0%, #659CF7 100%);
   background-image: linear-gradient(-90deg, #357AEB 0%, #659CF7 100%);
   /* background:gradient(linear, 0 0, 0 bottom, from(#659CF7), to(#357AEB) */
   /* background:gradient(linear, 0 0, 0 bottom, from(#659CF7), to(#357AEB) */
+  margin-top: 60rpx;
 }
 }
 
 
 .loginByPhone{
 .loginByPhone{