Merge branch 'release/v1.1.3发布'

zhaojs

2023-06-30 ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae

 uniapp/pages/index/index.vue

@@ -137,32 +137,10 @@
         this.getPopBannerInfo();
      },
      onShow() {
         /* if(!this.hasLogin){
            setTimeout(function(){
					
               uni.reLaunch({
                  url:"/pages/login/wxlogin"
               })
            },1000);
            return;
         } */
         if(!this.hasshow)
         {
            this.shShow();
         }
			
      /*    var user= uni.getStorageSync('userInfo');
         console.log(user); */
         // if(!user.invitation_code)
         // {
         //    setTimeout(function(){
					
         //       uni.reLaunch({
         //          url:"/pages/login/wxlogin"
         //       })
         //    },1000);
         //    return;
         // }
         } 
         if(this.categoryList){
            this.getCategoryList();
         }
@@ -180,34 +158,38 @@
         shShow()
         {
            var that=this;
            var istoLogin=true;
            this.$u.api.comminInt({}).then(e => {
               that.hasshow=true;
               // #ifdef APP-PLUS
               if (plus.os.name == 'iOS') {
                  if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
                     that.isshowtype=true;
                     istoLogin=false;
                  } else {
                     that.isshowtype=false;
                     console.log("跳转");
                     if(!that.hasLogin){
                  }
               }
               if(istoLogin)
               {
                  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"
                        })
                     }
                     var user= uni.getStorageSync('userInfo');
                     if(!user.invitation_code)
                     {
                        setTimeout(function(){
									
                           uni.reLaunch({
                              url:"/pages/login/wxlogin"
                           })
                        },1000);
                        return;
                     }
                  }
                  console.log(that.isshowtype);
                     },1000);
                     return;
                  } */
               }
					
               // #endif
            }).catch(function(err) {
               console.log(err);