feats

src/components/MainPage/index.vue

@@ -105,7 +105,7 @@ export default {
             _that.WxLogin({ queryData: { code: res.code } }).then((res) => {
               wx.setStorageSync('token', res.data.data.token)
               wx.setStorageSync('tokentime', Date.now())
-              if (CurrentPageRoute !== 'pages/Index/index') { // 非首页
+              if (_that.isAuthPage()) { // 非首页
                 // if (CurrentPageRoute !== '') { // 非首页
                 if (!_that.UserInfo.avatar) { // 未授权头像
                   _that.ShowUserIconAuthPopup = true
@@ -121,7 +121,7 @@ export default {
           }
         })
       } else {
-        if (CurrentPageRoute !== 'pages/Index/index') { // 非首页
+        if (this.isAuthPage()) { // 非首页
           // if (CurrentPageRoute !== '') { // 非首页
           if (!_that.UserInfo.avatar) { // 未授权头像
             _that.ShowUserIconAuthPopup = true
@@ -193,6 +193,17 @@ export default {
           this.$emit('UserInfoChange')
         }
       })
+    },
+    isAuthPage() {
+      const whiteList = [
+        'pages/Index/index',
+        'pages/Study/index',
+      ]
+
+      const current = Taro.getCurrentPages()[Taro.getCurrentPages().length - 1].route
+      const exists = whiteList.filter((it) => current.indexOf(it) > -1)
+
+      return exists.length < 1
     }
   }
 }