Merge tag '苹果审核修改' into develop

zhaojs

2023-06-25 afb7bcf6e31979be352bfcf14812d52339478cef

 uniapp/pages/index/index.vue

@@ -1,8 +1,8 @@
<template>
  <!--  <view v-if="isshowtype">
      <indexnewPage></indexnewPage>
   </view> -->
   <view class="index-wrapper wrapperLayer borderBox">
    <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) +';')">
         <view class="topbarbox"></view>
         <view class="headerSearch-container rowCenBet borderBox">
@@ -137,7 +137,7 @@
         this.getPopBannerInfo();
      },
      onShow() {
         if(!this.hasLogin){
         /* if(!this.hasLogin){
            setTimeout(function(){
               
               uni.reLaunch({
@@ -145,24 +145,24 @@
               })
            },1000);
            return;
         }
         } */
         if(!this.hasshow)
         {
            this.shShow();
         }
         
         var user= uni.getStorageSync('userInfo');
         console.log(user);
         if(!user.invitation_code)
         {
            setTimeout(function(){
      /*    var user= uni.getStorageSync('userInfo');
         console.log(user); */
         // if(!user.invitation_code)
         // {
         //    setTimeout(function(){
               
               uni.reLaunch({
                  url:"/pages/login/wxlogin"
               })
            },1000);
            return;
         }
         //       uni.reLaunch({
         //          url:"/pages/login/wxlogin"
         //       })
         //    },1000);
         //    return;
         // }
         if(this.categoryList){
            this.getCategoryList();
         }
@@ -172,6 +172,7 @@
         this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
      },
      onReady() {
         console.log("获取高低")
         this.getTopheight()
      },
      watch: {},
@@ -187,6 +188,23 @@
                     that.isshowtype=true;
                  } else {
                     that.isshowtype=false;
                     console.log("跳转");
                     if(!that.hasLogin){
                        uni.reLaunch({
                           url:"/pages/login/wxlogin"
                        })
                     }
                     var user= uni.getStorageSync('userInfo');
                     if(!user.invitation_code)
                     {
                        setTimeout(function(){
									
                           uni.reLaunch({
                              url:"/pages/login/wxlogin"
                           })
                        },1000);
                        return;
                     }
                  }
                  console.log(that.isshowtype);
               }
@@ -288,7 +306,6 @@
         stopswiper(){
            this.canrefush = true
         },

         // 路由跳转
         goPath(url) {
            if (url == 'search') {
@@ -342,6 +359,7 @@
         getTopheight() {
            // 获取顶部高度
            uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
               console.log(data.height+":----------------");
               this.Topheight = data.height
            }).exec();
         },