Merge branch 'feature/userinfo' into 'master'

Feature/userinfo

See merge request !2

src/app.wpy

@@ -9,7 +9,11 @@ wepy.app({
     // App 级别 hook，对整个 App 生效
     // 同时存在 Page hook 和 App hook 时，优先执行 Page hook，返回值再交由 App hook 处
   },
+  globalData: {
+    info:''
+  },
   onLaunch() {
+//    this.$options.globalData.info = '333';
     wx.checkSession({
       success () {
         console.log('已登录')

src/pages/index.wpy

@@ -229,6 +229,12 @@
         </swiper-item>
       </swiper>
     </view>
+    <view class="authmodal" v-show="authmodal">
+      <view class="wrap">
+        <view class="text">来到lukii，再平凡的人，也有幸运的权利！</view>
+        <button open-type="getUserInfo" bindgetuserinfo="getUserInfo">授权并进入</button>
+      </view>
+    </view>
     <network v-if="!isConnected"></network>
     <!-- <star-animation></star-animation> -->
     <star-animation1 v-if="sign && showAnimation"></star-animation1>
@@ -467,6 +473,7 @@
     },
     onLoad () {
       let that = this;
+//      console.log(this.$app.$options.globalData.info,111)
       //如果已经存在store里就不用再获取用户信息了
       if(this.userInfo) return;
       wx.getSetting({