个人中心以及登录功能

@@ -3,7 +3,7 @@ import { GET, POST } from '../../libs/request';
 import { API_HOST } from '../../libs/config';
 Component({
 
-  externalClasses: ['login-class'],
+  // externalClasses: ['login-class'],
   /**
    * 组件的属性列表
    */

@@ -6,3 +6,8 @@
   align-items: center;
   justify-content: center;
 }
+
+.login-class{
+  width: 100%;
+  height: 100%;
+}
\ No newline at end of file

 Page({
   data: {
-
+    url: 'https://m.yohobuy.com',
   },
   onLoad: function(options) {
     //Do some initialize when page load.

-<view class="container">
+<!-- <view class="container">
   <image src="../../static/images/empty_view@3x.png" mode="widthFix" class="empty"></image>
-</view>
\ No newline at end of file
+</view> -->
+
+<web-view src="{{url}}"></web-view>
\ No newline at end of file

@@ -47,26 +47,26 @@ Page({
       hasUnionID: app.globalData.WXUnion_ID !== null && app.globalData.WXUnion_ID !== '' && app.globalData.WXUnion_ID !== undefined ? true:false,
       cur_undoneTicket
     })
-    if (app.isLogin()) {
-      this.data.isLogin = true;
-    }else{
-      this.setData({
-        isLogin:false,
-      })
-    }
 
     //订阅登录完成通知
     listen(function (succeed) {
       if (succeed) {
         this.showUserInfo();
-        this.getInfoNum();
-        this.fetchInviteInfo();
       } 
     }.bind(this))
   },
   onReady: function() {
     //Do some when page ready.
-    
+    if (app.isLogin()) {
+      this.setData({
+        isLogin: true,
+      })
+      this.showUserInfo();
+    }else{
+      this.setData({
+        isLogin: false,
+      })
+    }
   },
   onShow: function() {
     //Do some when page show.

 {
   "navigationBarTitleText": "我的",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "section-header" : "/components/user-center/section-header/index",
     "undone-view": "/components/user-center/undone-view/index",

 <view class="container">
-  <!-- 头部用户信息 -->
-  <view class="user-info">
+  <!-- 未登录 -->
+  <view wx:if="{{!isLogin}}" class="not-login-view">
+    <image class="login-icon" src="../../static/images/userCenter_login@3x.png">
       <login-button  
-      wx:if="{{!isLogin}}" 
-      class="login-bg" 
-      login-class="login-btn" 
+          class="login-btn" 
           open-type="{{hasUnionID?'getPhoneNumber':'getUserInfo'}}" 
           bindgetphonenumber="getPhoneNumber" 
           bindgetuserinfo='getUserInfo' 
-      bindupdateuserinfo="updateUserInfo">登录/注册
+          bindupdateuserinfo="updateUserInfo">
       </login-button>
+    </image>
+  </view>
+  <!-- 已登录 -->
   <block wx:else>
-        <image class="header-bg" src="https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2700915385,2771074487&fm=26&gp=0.jpg" mode="aspectFill">
+    <!-- 头部用户信息 -->
+    <view class="header-bg">
+      <image class="user-info" src="{{isLogin ? userInfo.avatarUrl : ''}}" mode="aspectFill">
+        <view class="black-cover">
             <view class="user-info">
                 <image class="portrait" src="{{userInfo.avatarUrl}}" mode="aspectFill"></image>
                 <view class="nick-name">{{userInfo.nickName}}</view>
-              <view class="qrcode-view" bindtap="tapMyQRCode">
+                <view class="qrcode-view" bindtap="tapMyQRCode" wx:if="{{isLogin}}">
                     <image class="qrcode-icon" src="../../static/images/myQRcode@3x.png"></image>
                     <view class="qrcode-tips">我的二维码</view>
                 </view>
             </view>
+        </view>
       </image>
-    </block>
     </view>
   
     <!-- 我的门票 -->
@@ -59,6 +64,7 @@
           </block>
       </scroll-view>
     </block>
+  </block>
 
 </view>
 <quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" isShowShopCart="{{true}}" isShowMenu="{{false}}" marginBottom="{{50}}" bind:backToTop="backToTop"></quickNavigation>

@@ -2,6 +2,30 @@
   position: relative;
 }
 
+.not-login-view {
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+  display: flex;
+  justify-content: center;
+}
+
+.not-login-view .login-icon {
+  position: absolute;
+  width: 369rpx;
+  height: 277rpx;
+  margin-top: 45%;
+}
+
+.not-login-view .login-icon .login-btn {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 369rpx;
+  height: 80rpx;
+  opacity: 0.01;
+}
+
 .header-bg {
   width: 750rpx;
   height: 360rpx;
@@ -16,7 +40,16 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  z-index: 99;
+}
+
+.user-info .black-cover {
+  opacity: 0.8;
+  background-color: #000;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 360rpx;
 }
 
 .user-info .portrait {