From 04b4bddaac0a222760113899568d20b45af701f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 九月 2024 19:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_staff/pages/login/index.less |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/wechat_staff/pages/login/index.less b/wechat_staff/pages/login/index.less
index b5818dc..f485360 100644
--- a/wechat_staff/pages/login/index.less
+++ b/wechat_staff/pages/login/index.less
@@ -13,6 +13,9 @@
 .placeholder9{
   text-align: center;
 }
+page{
+  overflow: hidden;
+}
 .btns{
   margin-top: 120rpx;
   padding: 0 62rpx;
@@ -39,6 +42,7 @@
     border-bottom: 1rpx solid #E5E5E5;
     .icon{
       width: 40rpx;
+      height: 40rpx;
     }
     .input{
       flex: 1;
@@ -65,8 +69,9 @@
   padding: 40rpx;
   position: relative;
   .content{
-    height: calc( 100vh - 460rpx );
-    overflow: auto;
+    height: calc( 100% - 180rpx );
+    overflow-y: auto;
+    overflow-x: hidden;
     margin-bottom: 20rpx;
   }
   .btns{
@@ -74,6 +79,7 @@
     padding: 20rpx 0rpx;
     width: 100%; 
     z-index: 999;
+    bottom: 12rpx;
     border-top: 1px solid #e5e5e5;
     .reject{
       width: 670rpx;
@@ -82,10 +88,11 @@
       color: #999999;
       text-align: center;
       margin-top: 30rpx;
+      height: 60rpx;
     }
     .agree{
       width: 670rpx;
-      height: 88rpx;
+      height: 90rpx;
       background: #B08771;
       border-radius: 8rpx;
       display: flex;
@@ -94,4 +101,13 @@
       color: #fff;
     }
   }
+}
+.tip{
+  position: fixed;
+  bottom: 108rpx;
+  left: 0;
+  width: 100%;
+  text-align: center;
+  font-size: 26rpx;
+  color: #666666;
 }
\ No newline at end of file

--
Gitblit v1.9.3