Merge branch 'feature/1.1.4开发' into develop

zhaojs

2023-07-20 fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff

 uniapp/pages/index/index.vue

@@ -128,13 +128,13 @@
            nowcurrentid:'',
            recomendType:1,
            isshowtype:false,
            hasshow:false,
            hasshow:false
         }
      },
      onLoad() {
			
         this.getCategoryList();
         this.getPopBannerInfo();
			
      },
      onShow() {
         if(!this.hasshow)
@@ -150,11 +150,11 @@
         this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
      },
      onReady() {
         console.log("获取高低")
         this.getTopheight()
         this.getTopheight();
      },
      watch: {},
      methods: {
			
         shShow()
         {
            var that=this;
@@ -173,9 +173,12 @@
               if(istoLogin)
               {
                  if(!that.hasLogin){
                     uni.reLaunch({
                        url:"/pages/login/wxlogin"
                     })
                     setTimeout(() => {
                        uni.reLaunch({
                           url:"/pages/login/wxlogin"
                        })
                     }, 1000)
							
                  }
                  /* var user= uni.getStorageSync('userInfo');
                  if(!user.invitation_code)
@@ -341,7 +344,6 @@
         getTopheight() {
            // 获取顶部高度
            uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
               console.log(data.height+":----------------");
               this.Topheight = data.height
            }).exec();
         },
@@ -367,6 +369,11 @@
</script>

<style lang="scss">
   uni-image
   {
      width:30rem;
      height:25rem
   }
   .index-wrapper {
      height: 100vh;
      overflow: hidden;
@@ -583,9 +590,10 @@
         // height: 100vw;
       }
   }
	
   .clone {
       position:absolute;
       bottom: -150rpx;
       bottom: -30rpx;
       transform: translate(calc(50% - 32rpx));
       .image {
           width: 64rpx;