Merge branch 'feature/1.1.4开发' into develop

zhaojs

2023-07-20 fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff

 uniapp/pages/index/launchPage.vue

@@ -29,8 +29,6 @@
               this.$u.api.getBanner({
                  type: '1,15'
               }).then(e => {
				
                  console.log(e)
                  if (e.code == 1) 
                  {//返回失败，直接跳首页
                     this.t_index();
@@ -42,7 +40,6 @@
                     that.list=res.launchpic;
                  }
                  else{
                  console.log("跳转")
                     this.t_index();
                  }
               }).catch(function(err) {