Merge remote-tracking branch 'origin/master'

nnzwminiapp/pages/login/login.wxml

@@ -13,8 +13,9 @@
       <image src="{{imgUrl}}loginLogo.png" style="height: 140rpx;width: 140rpx"></image>
     </view>
   </view>
+  <!-- <view class="tips">掌新南岸用户登录</view> -->
 
-  <view style="margin-top:50rpx;height: 100rpx;width: 100%;display:flex;align-items:center;justify-content:center">
+  <!-- <view style="margin-top:50rpx;height: 100rpx;width: 100%;display:flex;align-items:center;justify-content:center"> -->
     <!-- <view style="width: 80%;display:flex;align-items:center;justify-content:center">
       <view style="height: 66rpx">
         <image src="{{agreementImg}}" bindtap="agreementSuccess" style="height: 40rpx;width: 40rpx"></image>
@@ -24,17 +25,17 @@
         <view style="float:left">阅读并同意</view><view style="float:left;color:#ff7a14;text-decoration: underline" bind:tap="serviceAgreement">《服务协议及个人信息处理规则》</view>和 <view style="float:left;color:#ff7a14;text-decoration: underline" bind:tap="informationProcessing">《个人信息处理规则》</view> 
       </view>
     </view> -->
-  </view>
+  <!-- </view> -->
 
-  <view style="margin-top: 10rpx">
+  <view style="margin-top: 40rpx">
     <!-- <button wx:if="{{!agree}}"  type="primary" bindtap="protocolTips" style="width: 80%;display: flex;align-items:center;justify-content: center">
       <image style="height: 33rpx;width: 41rpx" src="{{imgUrl}}wx-login.png"></image>
       <text style="padding-left: 15rpx;font-size:27rpx">微信用户一键登录</text>
     </button> -->
 
-    <button  open-type="getPhoneNumber" type="primary" bindgetphonenumber="getPhoneNumber" style="width: 80%;display: flex;align-items:center;justify-content: center">
-      <image style="height: 33rpx;width: 41rpx" src="{{imgUrl}}wx-login.png"></image>
-      <text style="padding-left: 15rpx;font-size:27rpx">微信用户一键登录</text>
+    <button  open-type="getPhoneNumber" type="primary" bindgetphonenumber="getPhoneNumber" style="width: 80%; display: flex; align-items:center;justify-content: center">
+      <!-- <image style="height: 33rpx;width: 41rpx" src="{{imgUrl}}wx-login.png"></image> -->
+      <text style="padding-left: 15rpx;font-size:27rpx">一键登录</text>
     </button>
   </view>
 

nnzwminiapp/pages/login/login.wxss

@@ -2,4 +2,12 @@
 
 .xyys{
     
+}
+
+.tips{
+    width: 100%;
+    text-align: center;
+    color: #215bc9;
+    font-size: 40rpx;
+    font-weight: bold;
 }