Merge branch 'feature/1.1.3版本开发' into develop

zhaojs

2023-06-28 9ea0383c303620cd019d0776ecbb47f52bcef805

 uniapp/pages/index/index.vue

@@ -137,7 +137,7 @@
         this.getPopBannerInfo();
      },
      onShow() {
         if(!this.hasLogin){
         /* if(!this.hasLogin){
            setTimeout(function(){
               
               uni.reLaunch({
@@ -145,24 +145,24 @@
               })
            },1000);
            return;
         }
         } */
         if(!this.hasshow)
         {
            this.shShow();
         }
         
         var user= uni.getStorageSync('userInfo');
         console.log(user);
         if(!user.invitation_code)
         {
            setTimeout(function(){
      /*    var user= uni.getStorageSync('userInfo');
         console.log(user); */
         // if(!user.invitation_code)
         // {
         //    setTimeout(function(){
               
               uni.reLaunch({
                  url:"/pages/login/wxlogin"
               })
            },1000);
            return;
         }
         //       uni.reLaunch({
         //          url:"/pages/login/wxlogin"
         //       })
         //    },1000);
         //    return;
         // }
         if(this.categoryList){
            this.getCategoryList();
         }
@@ -188,6 +188,23 @@
                     that.isshowtype=true;
                  } else {
                     that.isshowtype=false;
                     console.log("跳转");
                     if(!that.hasLogin){
                        uni.reLaunch({
                           url:"/pages/login/wxlogin"
                        })
                     }
                     var user= uni.getStorageSync('userInfo');
                     if(!user.invitation_code)
                     {
                        setTimeout(function(){
									
                           uni.reLaunch({
                              url:"/pages/login/wxlogin"
                           })
                        },1000);
                        return;
                     }
                  }
                  console.log(that.isshowtype);
               }