Merge branch 'feature/1.1.4开发' into develop

zhaojs

2023-07-20 fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff

 uniapp/pages/index/launchPage.vue

@@ -29,20 +29,17 @@
               this.$u.api.getBanner({
                  type: '1,15'
               }).then(e => {
				
                  console.log(e)
                  if (e.code == 1) 
                  {//返回失败，直接跳首页
                     this.t_index();
                  return;
                  }
                  var res = e.data.info;
                  if(res.launchpic&&res.launchpic.length>0)
                  if(res&&res.launchpic&&res.launchpic.length>0)
                  {
                     that.list=res.launchpic;
                  }
                  else{
                  console.log("跳转")
                     this.t_index();
                  }
               }).catch(function(err) {
@@ -65,12 +62,12 @@
         },
         t_index()
         {
            uni.reLaunch({
                url: "/pages/index/index"
            });
            /* setTimeout(()=>{
					
            }, 500); */
				
             setTimeout(()=>{
               uni.reLaunch({
                   url: "/pages/index/index"
               });
            }, 500);
         }
        }
    }