From 229b0cee95b881b89716db46abe2239671f7df8f Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Mon, 25 Apr 2022 19:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json               |  4 +--
 pages/login/index.wxml | 16 ++++++++---
 pages/login/index.wxss | 63 +++++++++++++++++++++++++-----------------
 pages/share/index.wxss |  6 ++--
 4 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/app.json b/app.json
index b4a582a..a6ebccd 100644
--- a/app.json
+++ b/app.json
@@ -1,8 +1,8 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/share/index",
     "pages/login/index",
+    "pages/share/index",
     "pages/out/index",
     "pages/middle/index",
     "pages/rank/index",
@@ -12,7 +12,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Weixin",
+    "navigationBarTitleText": "碧桂园",
     "navigationBarTextStyle": "black"
   },
   "style": "v2",
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index 6ebaf88..7efc807 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -2,7 +2,7 @@
 <view class="container">
   <view class="cont">
     <image class="sanjiao" src="https://static.quhouse.com/dbc18bc151dc4e839fb9cbe7e3d1d49e.png"></image>
-    <image class="title" src="https://static.quhouse.com/18484fa813a24a64bd007dfca3652379.png"></image>
+    <image class="title" src="https://static.quhouse.com/16d6832f581e4c4ba12b7fe4bb42fce6.png"></image>
     <image class="search" src="https://static.quhouse.com/72cac48d2d804744bd83a2a882713a6f.png"></image>
     <image class="logo" src="https://static.quhouse.com/fecdef9ed6a045aaade3d48980e33a35.png"></image>
     <view class="btn" bindtap="shouquan">微信一键授权</view>
@@ -10,13 +10,21 @@
   </view>
   <view class="bg" wx:if="{{showBg}}">
     <view class="avatar-modal" wx:if="{{avatarModal}}">
-      <view class="desc">请授权"加油新青年"获取您的昵称、头像</view>
-      <view class="btn" bindtap="getUserInfo">授权</view>
+      <image class="toppic" src="https://static.quhouse.com/662e7725c6ce45f284a1729e409cfc11.png"></image>
+      <view class="desc">“加油新青年”小程序申请获取以下权限:</view>
+      <view class="desc1">获得您的公开信息 (昵称、头像等)</view>
+      <image class="avatarbtn" bindtap="getUserInfo" src="https://static.quhouse.com/ce258ace701549af8a3a47c07881d3ed.png"></image>
     </view>
     <view class="phope-modal" wx:if="{{phoneModal}}">
+      <image class="toppic" src="https://static.quhouse.com/662e7725c6ce45f284a1729e409cfc11.png"></image>
+      <view class="desc">“加油新青年”小程序申请获取:</view>
+      <view class="desc1">您的微信绑定的手机号</view>
+      <button class="phone-btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"></button>
+    </view>
+    <!-- <view class="phope-modal" wx:if="{{phoneModal}}">
       <view class="desc">请授权"加油新青年"获取您的手机号</view>
       <button class="phone-btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">授权</button>
-    </view>
+    </view> -->
     <image class="close" bindtap="closeModal" src="https://static.quhouse.com/e37ca20892a04e8391b611968ff6c944.png"></image>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/login/index.wxss b/pages/login/index.wxss
index 9e7c5d1..eaf6878 100644
--- a/pages/login/index.wxss
+++ b/pages/login/index.wxss
@@ -28,9 +28,9 @@
   height: 44rpx;
 }
 .title{
-  width: 554rpx;
-  height: 228rpx;
-  margin-bottom: 24rpx;
+  width: 550rpx;
+  height: 176rpx;
+  margin-bottom: 56rpx;
 }
 .logo{
  width: 542rpx;
@@ -88,36 +88,49 @@ margin-top: 30rpx;
 }
 .avatar-modal,.phope-modal{
   width: 650rpx;
-  height: 392rpx;
-  background: url('https://static.quhouse.com/8bf6c53566574d01ad6836a894511b95.png') no-repeat;
-  background-size: 650rpx 392rpx;
+  height: 596rpx;
   display: flex;
-  justify-content: center;
   flex-direction: column;
   align-items: center;
+  background: #FFFFFF;
+  border-radius: 20rpx;
 }
-.desc{
-  width: 434rpx;
-  height: 96rpx;
-  font-size: 32rpx;
-  text-align: center;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: #000000;
-  line-height: 48rpx;
+.toppic{
+  width: 650rpx;
+  height: 210rpx;
   margin-bottom: 60rpx;
 }
+.desc{
+  width: 560rpx;
+height: 52rpx;
+font-size: 32rpx;
+font-family: PingFangSC-Medium, PingFang SC;
+font-weight: 500;
+color: #000000;
+line-height: 52rpx;
+text-align:  center;
+}
+.desc1{
+  width: 560rpx;
+height: 52rpx;
+text-align:  center;
+font-size: 32rpx;
+font-weight: normal;
+color: #666;
+line-height: 52rpx;
+}
+.avatarbtn{
+  width: 284rpx;
+  height: 98rpx;
+  margin-top: 50rpx;
+}
 .phone-btn{
-  width: 510rpx !important;
-  height: 96rpx !important;
-  background: #CE592E;
-  border-radius: 48rpx;
-  line-height: 96rpx !important;
-  color: #fff;
-  font-size: 32rpx;
+  width: 284rpx !important;
+  height: 98rpx !important;
+  background: url('https://static.quhouse.com/ce258ace701549af8a3a47c07881d3ed.png')no-repeat;
+  background-size: 284rpx 98rpx;
   padding: 0;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
+  margin-top: 50rpx;
 }
 .bg .close{
   margin-top: 40rpx;
diff --git a/pages/share/index.wxss b/pages/share/index.wxss
index 0dd822f..1399432 100644
--- a/pages/share/index.wxss
+++ b/pages/share/index.wxss
@@ -64,11 +64,11 @@
   line-height: 37rpx;
 }
 .insetbox .btn{
-  width: 280rpx;
-  height: 92rpx;
+  width: 284rpx;
+  height: 98rpx;
   margin-left: 130rpx;
   background: url('https://static.quhouse.com/cbbbda43ce244fe39c235f59c2b1e8fa.png') no-repeat;
-  background-size: cover;
+  background-size: 284rpx 98rpx;
   padding: 0;
 }