Merge branch 'feature/1.1.4开发' into develop

zhaojs

2023-07-20 fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff

 uniapp/pages/index/index.vue

@@ -1,6 +1,6 @@
<template>
   <view v-if="!isshowtype">
      <indexnewPage></indexnewPage>
    <view v-if="isshowtype">
      <indexnewPage :Topheight="Topheight" :recomendType="recomendType" :canrefush='canrefush' :fixedClass='fixedClass'></indexnewPage>
   </view>
   <view v-else class="index-wrapper wrapperLayer borderBox">
      <view class="fixed-container colCen borderBox" :style="'background:'+ (categoryCurrent>0?'#EE1B14':(scrollTop>30?'#EE1B14;':bannerColor) +';')">
@@ -128,47 +128,19 @@
            nowcurrentid:'',
            recomendType:1,
            isshowtype:false,
            hasshow:false
         }
      },
      onLoad() {
         this.getCategoryList();
         this.getPopBannerInfo();
			
      },
      onShow() {
         if(!this.hasLogin){
            setTimeout(function(){
					
               uni.reLaunch({
                  url:"/pages/login/wxlogin"
               })
            },1000);
            return;
         }
         // #ifdef APP-PLUS
			
         var showtar = getApp().globalData.ifwt == 1 ? false : true;
         var platform = plus.os.name;
         console.log(showtar);
         console.log(platform);
         if(showtar&&platform=='iOS')
         {//跳转new
            this.isshowtype=true;
				
            return;
         }
         // #endif
         var user= uni.getStorageSync('userInfo');
         console.log(user);
         if(!user.invitation_code)
         if(!this.hasshow)
         {
            setTimeout(function(){
					
               uni.reLaunch({
                  url:"/pages/login/wxlogin"
               })
            },1000);
            return;
         }
            this.shShow();
         } 
         if(this.categoryList){
            this.getCategoryList();
         }
@@ -178,10 +150,54 @@
         this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
      },
      onReady() {
         this.getTopheight()
         this.getTopheight();
      },
      watch: {},
      methods: {
			
         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;
                  }
               }
               if(istoLogin)
               {
                  if(!that.hasLogin){
                     setTimeout(() => {
                        uni.reLaunch({
                           url:"/pages/login/wxlogin"
                        })
                     }, 1000)
							
                  }
                  /* var user= uni.getStorageSync('userInfo');
                  if(!user.invitation_code)
                  {
                     setTimeout(function(){
								
                        uni.reLaunch({
                           url:"/pages/login/wxlogin"
                        })
                     },1000);
                     return;
                  } */
               }
					
               // #endif
            }).catch(function(err) {
               console.log(err);
            })
         },
         goToShowBulletFrame(info){
             this.showBulletFrame = false
            utils.goUrl(info, this)
@@ -275,7 +291,6 @@
         stopswiper(){
            this.canrefush = true
         },

         // 路由跳转
         goPath(url) {
            if (url == 'search') {
@@ -354,6 +369,11 @@
</script>

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