暂时提交

App.vue

@@ -10,7 +10,7 @@ usePageAnimation();
 const appword = 'aKd20dbGdFvmuwrt'; // 固定值
 
 onLaunch((options) => {
-    // uni.hideTabBar();
+    uni.hideTabBar();
     useDictStore().getDictData();
     try {
         getUserInfo();
@@ -163,6 +163,16 @@ uni-modal,
     z-index: 998;
 }
 
+/* toast大小改为rpx */
+uni-toast .uni-sample-toast {
+    width: 300rpx !important; 
+}
+uni-toast .uni-simple-toast__text{
+    font-size: 30rpx !important;
+    padding: 15rpx 25rpx;
+    border-radius: 15rpx !important;
+}
+
 @font-face {
     font-family: DingTalk JinBuTi;
     src: url('/static/font/DingTalk JinBuTi_min.woff2') format('woff2');

hook/useColumnCount.js

@@ -23,15 +23,15 @@ export function useColumnCount(onChange = () => {}) {
         const width = uni.getSystemInfoSync().windowWidth
 
         let count = 2
-        if (width >= 1000) {
-            count = 5
-        } else if (width >= 750) {
-            count = 4
-        } else if (width >= 500) {
-            count = 3
-        } else {
-            count = 2
-        }
+        // if (width >= 1000) {
+        //     count = 5
+        // } else if (width >= 750) {
+        //     count = 4
+        // } else if (width >= 500) {
+        //     count = 3
+        // } else {
+        //     count = 2
+        // }
 
         if (count !== columnCount.value) {
             columnCount.value = count

pages.json

@@ -277,7 +277,7 @@
         // "enablePullDownRefresh": false,
         // "navigationStyle": "custom",
         "rpxCalcBaseDeviceWidth": 375,
-        "rpxCalcMaxDeviceWidth": 750,
+        "rpxCalcMaxDeviceWidth": 1200,
         "rpxCalcIncludeWidth": 750
     },
     "uniIdRouter": {}

pages/careerfair/careerfair.vue

@@ -100,7 +100,7 @@
                     <empty v-if="!fairList.length" content="暂时没有结果，下一天也许就有惊喜"></empty>
                 </scroll-view>
             </view>
-            <!-- <Tabbar :currentpage="1"></Tabbar> -->
+            <Tabbar :currentpage="1"></Tabbar>
         </view>
     </view>
 </template>

pages/chat/chat.vue

@@ -63,9 +63,9 @@
                 <ai-paging ref="paging"></ai-paging>
             </view>
             <!-- 自定义tabbar -->
-            <!-- <view class="chatmain-footer" v-show="!isDrawerOpen">
+            <view class="chatmain-footer" v-show="!isDrawerOpen">
                 <Tabbar :currentpage="2"></Tabbar>
-            </view> -->
+            </view>
         </view>
     </view>
 </template>

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">
@@ -81,10 +81,11 @@ const THRESHOLD = 5;
 onLoad(() => {
     // 判断浏览器是否有 fristEntry 第一次进入
     let fristEntry = uni.getStorageSync('fristEntry') === false ? false : true; // 默认未读
-    maskFristEntry.value = fristEntry;
-    if (fristEntry) {
-        uni.hideTabBar();
-    }
+    maskFristEntry.value = fristEntry
+    // if (fristEntry) {
+    //     uni.hideTabBar();
+    // }
+    
     // 预加载较重页面
     setTimeout(() => {
         uni.preloadPage({ url: '/packageA/pages/post/post' });

pages/mine/mine.vue

@@ -95,9 +95,9 @@
                 ></uni-popup-dialog>
             </uni-popup>
         </view>
-        <!-- <template #footer>
+        <template #footer>
             <Tabbar :currentpage="4"></Tabbar>
-        </template> -->
+        </template>
     </AppLayout>
 </template>
 

pages/msglog/msglog.vue

@@ -40,7 +40,7 @@
                 </swiper>
             </view>
 
-            <!-- <Tabbar :currentpage="3"></Tabbar> -->
+            <Tabbar :currentpage="3"></Tabbar>
         </view>
     </view>
 </template>

utils/jobAnalyzer.js

@@ -126,20 +126,24 @@ const jobAnalyzer = {
     _mergeAllStats: (results) => {
         const merged = {}
 
-        // 合并岗位类别（添加前缀）
-        Object.entries(results.categories).forEach(([k, v]) => {
-            merged[`岗位:${k}`] = v
-        })
+        try {
+            // 合并岗位类别（添加前缀）
+            Object.entries(results.categories).forEach(([k, v]) => {
+                merged[`岗位:${k}`] = v
+            })
 
-        // 合并工作地区（添加前缀）
-        Object.entries(results.areas).forEach(([k, v]) => {
-            merged[`地区:${k}`] = v
-        })
+            // 合并工作地区（添加前缀）
+            Object.entries(results.areas).forEach(([k, v]) => {
+                merged[`地区:${k}`] = v
+            })
 
-        // 合并经验要求（添加前缀）
-        Object.entries(results.experience).forEach(([k, v]) => {
-            merged[`经验:${k}`] = v
-        })
+            // 合并经验要求（添加前缀）
+            Object.entries(results.experience).forEach(([k, v]) => {
+                merged[`经验:${k}`] = v
+            })
+        } catch (error) {
+            return merged
+        }
 
         return merged
     },