Merge branch 'feature/1.1.3版本开发' into develop

zhaojs

2023-06-28 9ea0383c303620cd019d0776ecbb47f52bcef805

 uniapp/pages/index/index.vue

@@ -1,8 +1,7 @@
<template>
    <view v-if="isshowtype">
      <indexnewPage></indexnewPage>
		
   </view> 
      <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>
@@ -129,15 +128,16 @@
            nowcurrentid:'',
            recomendType:1,
            isshowtype:false,
            hasshow:false,
         }
      },
      onLoad() {
         this.shShow();
			
         this.getCategoryList();
         this.getPopBannerInfo();
      },
      onShow() {
         if(!this.hasLogin){
         /* if(!this.hasLogin){
            setTimeout(function(){
               
               uni.reLaunch({
@@ -145,19 +145,24 @@
               })
            },1000);
            return;
         }
         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();
         }
			
      /*    var user= uni.getStorageSync('userInfo');
         console.log(user); */
         // if(!user.invitation_code)
         // {
         //    setTimeout(function(){
					
         //       uni.reLaunch({
         //          url:"/pages/login/wxlogin"
         //       })
         //    },1000);
         //    return;
         // }
         if(this.categoryList){
            this.getCategoryList();
         }
@@ -167,6 +172,7 @@
         this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
      },
      onReady() {
         console.log("获取高低")
         this.getTopheight()
      },
      watch: {},
@@ -174,14 +180,31 @@
         shShow()
         {
            var that=this;
            console.log('开始请求······');
            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;
                  } 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);
               }
@@ -283,7 +306,6 @@
         stopswiper(){
            this.canrefush = true
         },

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