Merge branch 'feature/change' into 'master'

Feature/change

See merge request !23

src/app.wpy

@@ -32,27 +32,7 @@ wepy.app({
       }
     });
     wx.setStorageSync('onNetworkStatusChange', true);
-    // wx.checkSession({
-    //   success () {
-    //     console.log('已登录');
-    //     // session_key 未过期，并且在本生命周期一直有效
-    //   },
-    //   fail () {
-    //     // session_key 已经失效，需要重新执行登录流程
-    //     wx.login({
-    //       success (res) {
-    //         if (res.code) {
-    //           // 发起网络请求，告诉后端
-    //           wx.setStorageSync('wxCode', res.code);
-    //         } else {
-    //           console.log('登录失败！' + res.errMsg);
-    //         }
-    //       }
-    //     });
-    //   }
-    // });
     wx.onNetworkStatusChange((res) => {
-      console.log('onNetworkStatusChange', res.isConnected);
       wx.setStorageSync('onNetworkStatusChange', res.isConnected);
     });
   },

src/pages/index.wpy

@@ -351,7 +351,7 @@
           // 有效值 develop（开发版），trial（体验版），release（正式版）
           envVersion: 'release',
           success(res) {
-            console.log('跳转成功');
+//            console.log('跳转成功');
           }
         });
        /* wx.navigateTo({
@@ -476,7 +476,6 @@
                   innerAudioContext.autoplay = true;
                   innerAudioContext.src = '/static/audio/supermarie.mp3';
                   innerAudioContext.onPlay(() => {
-                    console.log('开始播放');
                   });
                   innerAudioContext.onError((res) => {
                     console.log(res.errMsg);
@@ -509,7 +508,6 @@
             let shareId = res.shareTickets[0];
             console.log('shareId', shareId);
                 // 转发成功
-            console.log(res);
           },
           fail: function(res) {
                 // 转发失败
@@ -573,35 +571,20 @@
       if (options.openid) {
         this.inviter = options.openid;
       }
-
-      wx.setStorageSync('openId', false);
-
+      let statusHeight = this.$app.$options.globalData.statusBarHeight || '';
+      statusHeight && (this.userImgStyle = 'top:' + statusHeight + 'px');
+    },
+    async onShow() {
       if (!wx.getStorageSync('openId')) {
         const { code } = await wepy.wx.login();
         const userInfo = await login(code);
         wx.setStorageSync('openId', userInfo.openid);
         wx.setStorageSync('isRegister', userInfo.register);
       }
-
-      let self = this;
-      let statusHeight = this.$app.$options.globalData.statusBarHeight || '';
-      statusHeight && (this.userImgStyle = 'top:' + statusHeight + 'px');
       if (store.state.userInfo) {
         this.userInfo = store.state.userInfo;
+        this.registUser(this.userInfo);
       } else {
-        wx.getUserInfo({
-          success (res) {
-            self.userInfo = res.userInfo;
-            store.dispatch('setUserInfo', res.userInfo);
-          }
-        });
-      }
-
-      await this.getMainInfo();
-      this.videoList = await getPrizeList();
-      this.adlist = await getActivityFeed({ count: 50 });
-      // 如果已经存在store里就不用再获取用户信息了
-      if (!this.userInfo) {
         const setting = await wepy.wx.getSetting();
         if (setting.authSetting['scope.userInfo']) {
           const { userInfo } = await wepy.wx.getUserInfo();
@@ -610,13 +593,10 @@
         } else {
           this.authmodal = true;
         }
-      } else {
-        this.registUser(this.userInfo);
       }
-    },
-    onShow() {
-      // 从其他小程序回来可以在当前生命周期检测到,但是这个方法，自己的小程序页面返回也会进入
-//      console.log('页面show！！');
+      await this.getMainInfo();
+      this.videoList = await getPrizeList();
+      this.adlist = await getActivityFeed({ count: 50 });
     }
   });
 </script>
@@ -639,9 +619,5 @@
       'video-loading': '~@/components/custom/loading'
     },
     navigationStyle: "custom",
-    "navigateToMiniProgramAppIdList":[
-      "wx91d27dbf599dff74"
-    ],
-
   }
 </config>