Merge branch 'master' of http://60.204.153.149:8081/r/dfgApp

heyuntao

2023-06-01 90ef820cdc18a108b67aef0c7d6c3fa1e8ecb3f7

 uniapp/pages/index/index.vue

@@ -122,26 +122,30 @@
         }
      },
      onLoad() {
         this.getCategoryList();
         this.getPopBannerInfo();
      },
      onShow() {
         if(!this.hasLogin){
            uni.reLaunch({
               url:"/pages/login/wxlogin"
            })
            setTimeout(function(){
					
               uni.reLaunch({
                  url:"/pages/login/wxlogin"
               })
            },1000);
            return;
         }
         var user= uni.getStorageSync('userInfo');
         if(!user.invitation_code)
         {
            uni.reLaunch({
               //url:"/pages/login/setInviteCode"
               url:"/pages/login/wxlogin"
            })
            setTimeout(function(){
					
               uni.reLaunch({
                  url:"/pages/login/wxlogin"
               })
            },1000);
            return;
         }
         else
         {
            this.getCategoryList();
            this.getPopBannerInfo();
         }
      },
      onShow() {
         if(this.categoryList){
            this.getCategoryList();
         }