diff --git a/pages/basicInformation/basicInformation.js b/pages/basicInformation/basicInformation.js
index c5faac4..cf693c5 100644
--- a/pages/basicInformation/basicInformation.js
+++ b/pages/basicInformation/basicInformation.js
@@ -1,6 +1,5 @@
 Page({
   data: {
-    userInfo:{},
     statusBarHeight: 44, // 导航高度
     modalY: 0, // 楼栋选择top值
     addressList:[
@@ -112,9 +111,6 @@ Page({
           wx.getUserInfo({
             success: function (res) {
               console.log(res)
-              // _this.setData({
-              //   userInfo
-              // })
             }
           })
         } else {
diff --git a/pages/basicInformation/basicInformation.wxml b/pages/basicInformation/basicInformation.wxml
index 502d7cb..941d256 100644
--- a/pages/basicInformation/basicInformation.wxml
+++ b/pages/basicInformation/basicInformation.wxml
@@ -7,8 +7,12 @@
     <view class="content-details-wrap">
       <!-- 问卷列表 -->
       <view class="user-details">
-        <image class="user-logo" mode="物业logo" src="{{userInfo.avatarUrl}}"></image>
-        <view class="user-name">{{userInfo.nickName}}</view>
+        <view class="user-logo">
+          <open-data type="userAvatarUrl"></open-data>
+        </view>
+        <view class="user-name">
+          <open-data type="userNickName"></open-data>
+        </view>
       </view>
       <view class="content-details-content-wrap">
         <!-- 地址信息等级 -->
@@ -16,16 +20,21 @@
           <view class="information-title">请选择您的楼栋：</view>
           <view class="information-address-wrap">
             <view class="information-address-btn-wrap" id="information-address-btn-wrap">
-              <button class="information-address-btn" type="default" plain bindtap="showSelectAddress">{{addressSelectItem.descr}}</button>
+              <button class="information-address-btn" type="default" plain
+                bindtap="showSelectAddress">{{addressSelectItem.descr}}</button>
               <image class="information-address-icon"
                 src="http://8.140.133.55:8096/public/uploadfile/select-address-down.png"></image>
             </view>
             <view class="information-address-select-wrap"
               style="top: {{modalY}}px; display: {{modalY ? 'block':'none'}}">
-              <!-- addressList -->
-              <view wx:for="{{addressList}}" wx:key="index" data-index="{{index}}" bindtap="setAddressItem"
-                class="information-address-list {{index===0?'information-address-list-one':''}} {{(addressSelectIndex===0 && addressSelectIndex===index)? 'information-address-list-select1' : ''}}{{(addressSelectIndex && addressSelectIndex===index)? 'information-address-list-select' : ''}}">
-                {{item.descr}}</view>
+              <view class="information-address-select-bg-wrap">
+                <view class="information-address-select-content-wrap">
+                  <view wx:for="{{addressList}}" wx:key="index" data-index="{{index}}" bindtap="setAddressItem"
+                  class="information-address-list {{addressSelectIndex===index? 'information-address-list-select' : ''}}">
+                  {{item.descr}}
+                  </view>
+                </view>
+              </view>
             </view>
           </view>
         </view>
diff --git a/pages/basicInformation/basicInformation.wxss b/pages/basicInformation/basicInformation.wxss
index 5f2312a..461ec10 100644
--- a/pages/basicInformation/basicInformation.wxss
+++ b/pages/basicInformation/basicInformation.wxss
@@ -20,7 +20,7 @@
   text-align: center;
   font-size: 34rpx;
   font-family: Helvetica;
-  color: #fff;
+  color: #000000;
   line-height: 48rpx;
   border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 }
@@ -44,31 +44,32 @@
   background: #fff;
   border-radius: 32px 32px 0px 0px;
 }
-.information-address-select-wrap{
-  width: 100%;
-  height: 482rpx;
-  background: url("http://8.140.133.55:8096/public/uploadfile/address-bg.png") no-repeat;
-  background-size: 100% 100%;
-}
+
 /* 用户基本信息 */
 .user-details{
   position: absolute;
   top: 132rpx;
   left: 0;
   width: 100%;
+  height: 200rpx;
   text-align: center;
 }
 .user-logo{
+  float: left;
   width: 96rpx;
   height: 96rpx;
   margin-bottom: 24rpx;
+  margin-left: calc( 50% - 48rpx );
+  border-radius: 8rpx;
+  overflow: hidden;
 }
 .user-name{
+  float: left;
+  width: 100%;
   font-size: 32rpx;
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
   color: #323436;
-  margin-bottom: 80rpx;
 }
 .information-wrap{
   width: 100%;
@@ -111,17 +112,32 @@
 }
 .information-address-select-wrap{
   position: fixed;
-  left: 13rpx;
-  width: calc( 100vw - 26rpx );
-  height: 482rpx;
-  box-sizing: border-box;
-  padding: 0 34rpx;
+  left: 0;
+  width: 100%;
   z-index: 3;
-  background: #fff;
   display: none;
+  background: #fff;
+  box-sizing: border-box;
+  padding-bottom: 10rpx;
+  overflow: hidden;
+}
+.information-address-select-bg-wrap{
+  width: calc( 100vw - 26rpx );
+  height: 430rpx;
+  box-sizing: border-box;
+  padding: 10rpx 34rpx;
+  padding-top: 32rpx;
+  margin-left: 13rpx;
+  background: url("http://8.140.133.55:8096/public/uploadfile/address-bg.png") no-repeat;
+  background-size: 100% 477rpx;
+}
+.information-address-select-content-wrap{
+  width: 100%;
+  height: 100%;
   overflow-y: auto;
 }
 .information-address-list{
+  position: relative;
   width: 100%;
   height: 100rpx;
   font-size: 32rpx;
@@ -133,20 +149,11 @@
   box-sizing: border-box;
   padding: 0 26rpx;
 }
-.information-address-list-one{
-  padding-top: 32rpx;
-  height: 120rpx;
-  line-height: 76rpx;
-}
+
 .information-address-list-select{
   background: #F0F1F3;
 }
-.information-address-list-select1{
-  
-  background: url('http://8.140.133.55:8096/public/uploadfile/select-address.png') no-repeat;
-  background-size: 100% 100%;
 
-}
 .information-title-text{
   float: left;
   width: 46%;
diff --git a/pages/questionnaire/questionnaire.wxml b/pages/questionnaire/questionnaire.wxml
index 0c8b31b..361c515 100644
--- a/pages/questionnaire/questionnaire.wxml
+++ b/pages/questionnaire/questionnaire.wxml
@@ -2,7 +2,7 @@
 <view class="questionnaire">
     <view class="questionnaire-title-wrap">
       <view class="questionnaire-title" style="top:{{statusBarHeight}}px">问卷调查</view>
-      <mp-icon class="navigateBack" bindtap="navigateBack" icon="back" style="top:{{statusBarHeight}}px" type="field" color="rgba(0, 0, 0, 0.9)" size="{{14}}"></mp-icon>
+      <mp-icon class="navigateBack" bindtap="navigateBack" icon="back" style="top:{{statusBarHeight}}px" type="field" color="#fff" size="{{14}}"></mp-icon>
     </view>
     <view class="content-wrap">
       <view class="content-details-wrap">