From c0907aaa5c4a0fbf67ca2e6f28be2adffe81d05c Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Mon, 30 Dec 2019 14:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/addaddress/addaddress.js |  2 +-
 pages/login/login.wxml         | 16 +++++++++++++---
 pages/login/login.wxss         | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/pages/addaddress/addaddress.js b/pages/addaddress/addaddress.js
index 2a9dcef..3f22062 100644
--- a/pages/addaddress/addaddress.js
+++ b/pages/addaddress/addaddress.js
@@ -164,7 +164,7 @@ Page({
         }).then((res)=>{
             // console.log(res)
                 this.setData({
-                    arealist1:res.data.result,
+                    // arealist1:res.data.result,
                     tagDis:[false,false,false],
                     active:1
                 })
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 810930d..d73bfb7 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -1,3 +1,13 @@
-<view>
-    <button open-type="getUserInfo" bindgetuserinfo="login">登录</button>
-</view>
\ No newline at end of file
+
+ <view class='header'>
+  <image src='/images/wx_login.png'></image>
+ </view>
+  
+ <view class='content'>
+  <view>申请获取以下权限</view>
+  <text>获得你的公开信息(昵称，头像等)</text>
+ </view>
+  
+ <button class='bottom' type='primary' open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="login">
+  授权登录
+ </button>
\ No newline at end of file
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index 4827a66..a057269 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -1 +1,31 @@
-/* pages/login/login.wxss */
\ No newline at end of file
+/* pages/login/login.wxss */
+.header {
+    margin: 90rpx 0 90rpx 50rpx;
+    border-bottom: 1px solid #ccc;
+    text-align: center;
+    width: 650rpx;
+    height: 300rpx;
+    line-height: 450rpx;
+   }
+     
+   .header image {
+    width: 200rpx;
+    height: 200rpx;
+   }
+     
+   .content {
+    margin-left: 50rpx;
+    margin-bottom: 90rpx;
+   }
+     
+   .content text {
+    display: block;
+    color: #9d9d9d;
+    margin-top: 40rpx;
+   }
+     
+   .bottom {
+    border-radius: 80rpx;
+    margin: 70rpx 50rpx;
+    font-size: 35rpx;
+   }
\ No newline at end of file