flat: 合并

pages/index/components/index-one.vue

@@ -66,7 +66,7 @@
         </view>
         <view class="table-list">
             <scroll-view :scroll-y="true" class="falls-scroll" @scroll="handleScroll" @scrolltolower="scrollBottom">
-                <view class="falls" v-if="list.length">
+                <view class="falls">
                     <custom-waterfalls-flow
                         :column="columnCount"
                         :columnSpace="columnSpace"
@@ -142,7 +142,7 @@
                     </custom-waterfalls-flow>
                     <loadmore ref="loadmoreRef"></loadmore>
                 </view>
-                <empty v-else pdTop="200"></empty>
+                <empty v-if="!list.length"></empty>
             </scroll-view>
         </view>
         <!-- 筛选 -->
@@ -298,6 +298,7 @@ function nextDetail(job) {
 function openFilter() {
     showFilter.value = true;
     emits('onShowTabbar', false);
+    uni.hideTabBar();
     selectFilterModel.value?.open({
         title: '筛选',
         maskClick: true,
@@ -310,10 +311,12 @@ function openFilter() {
             }
             showFilter.value = false;
             getJobList('refresh');
+            uni.showTabBar();
         },
         cancel: () => {
             showFilter.value = false;
             emits('onShowTabbar', true);
+            uni.showTabBar();
         },
     });
 }
@@ -359,7 +362,11 @@ function getJobRecommend(type = 'add') {
         ...pageState.search,
         ...conditionSearch.value,
     };
-    let comd = { recommend: true, jobCategory: '', tip: '确认你的兴趣，为您推荐更多合适的岗位' };
+    let comd = {
+        recommend: true,
+        jobCategory: '',
+        tip: '确认你的兴趣，为您推荐更多合适的岗位',
+    };
     $api.createRequest('/app/job/recommend', params).then((resData) => {
         const { data, total } = resData;
         pageState.total = 0;
@@ -380,7 +387,16 @@ function getJobRecommend(type = 'add') {
 
                     if (question) {
                         comd.jobCategory = question;
-                        data.unshift(comd);
+                        // 生成随机插入位置，排除前两个和最后两个位置
+                        let insertIndex;
+                        if (data.length <= 4) {
+                            // 如果数据长度小于等于4，直接插入到中间位置
+                            insertIndex = Math.floor(data.length / 2);
+                        } else {
+                            // 生成2到data.length-2之间的随机位置
+                            insertIndex = Math.floor(Math.random() * (data.length - 4)) + 2;
+                        }
+                        data.splice(insertIndex, 0, comd);
                     }
                 }
                 const reslist = dataToImg(data);

pages/index/index.vue

@@ -41,7 +41,7 @@
                 </swiper>
             </view>
 
-            <Tabbar v-show="showTabbar" :currentpage="0"></Tabbar>
+            <!-- <Tabbar v-show="showTabbar" :currentpage="0"></Tabbar> -->
 
             <!-- maskFristEntry -->
             <view class="maskFristEntry" v-if="maskFristEntry">
@@ -49,7 +49,7 @@
                     <text class="text1">左滑查看视频</text>
                     <text class="text2">快去体验吧～</text>
                     <view class="goExperience" @click="goExperience">去体验</view>
-                    <view class="maskFristEntry-Close" @click="closeFristEntry">1</view>
+                    <view class="maskFristEntry-Close" @click="closeFristEntry"></view>
                 </view>
             </view>
         </view>
@@ -82,7 +82,16 @@ onLoad(() => {
     // 判断浏览器是否有 fristEntry 第一次进入
     let fristEntry = uni.getStorageSync('fristEntry') === false ? false : true; // 默认未读
     maskFristEntry.value = fristEntry;
-    // maskFristEntry.value = true;
+    if (fristEntry) {
+        uni.hideTabBar();
+    }
+    // 预加载较重页面
+    setTimeout(() => {
+        uni.preloadPage({ url: '/packageA/pages/post/post' });
+        uni.preloadPage({ url: '/pages/nearby/nearby' });
+        uni.preloadPage({ url: '/pages/chat/chat' });
+        uni.preloadPage({ url: '/packageA/pages/choiceness/choiceness' });
+    }, 3000);
 });
 
 onShow(() => {
@@ -189,10 +198,12 @@ function changeSwiperMsgType(e) {
 function closeFristEntry() {
     uni.setStorageSync('fristEntry', false);
     maskFristEntry.value = false;
+    uni.showTabBar();
 }
 
 function goExperience() {
     closeFristEntry();
+    uni.showTabBar();
     state.current = 1;
 }
 </script>