Merge branch 'master' of git.quantgroup.cn:ui/mini-program-wepy into feature/optimize

src/pages/index.wpy

@@ -404,7 +404,6 @@
       async getUserInfo (e) {
         if (e.$wx.detail.userInfo) {
           this.setUserInfo(e.$wx.detail.userInfo);
-          await this.getMainInfo();
           this.authmodal = false;
           this.registUser(e.$wx.detail.userInfo);
         }
@@ -558,8 +557,11 @@
         }
       }
     },
+    async onLoad (options) {
+      if (options.openid) {
+        this.inviter = options.openid;
+      }
 
-    async created () {
       let self = this;
       let statusHeight = this.$app.$options.globalData.statusBarHeight || '';
       statusHeight && (this.userImgStyle = 'top:' + statusHeight + 'px');
@@ -573,12 +575,9 @@
           }
         });
       }
+
+      await this.getMainInfo();
       this.videoList = await getPrizeList();
-    },
-    async onLoad (options) {
-      if (options.openid) {
-        this.inviter = options.openid;
-      }
       // 如果已经存在store里就不用再获取用户信息了
       this.adlist = await getActivityFeed({ count: 50 });
       if (!this.userInfo) {
@@ -587,7 +586,6 @@
           const { userInfo } = await wepy.wx.getUserInfo();
           this.setUserInfo(userInfo);
           this.registUser(userInfo);
-          await this.getMainInfo();
         } else {
           this.authmodal = true;
         }