From 664352dea9250f6a3220348692689fdfdca5bf4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E5=85=B8=E5=8D=93?=
 <shidianzhuo@shidianzhuodeMacBook-Pro.local>
Date: Fri, 16 May 2025 09:28:44 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E5=85=BC=E5=AE=B9=E5=B9=B3=E6=9D=BF?=
 =?UTF-8?q?=E3=80=81=E7=AD=89=E8=B6=85=E5=AE=BD=E5=B1=8F=E5=B9=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hook/useColumnCount.js         |  29 ++++++++++++++++++++++++++++-
 index.html                     |   2 +-
 pages.json                     |   8 ++++----
 pages/index/index.vue          |  11 ++++++++---
 unpackage/dist/build/.DS_Store | Bin 6148 -> 6148 bytes
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/hook/useColumnCount.js b/hook/useColumnCount.js
index ecd80c9..7ed1c79 100644
--- a/hook/useColumnCount.js
+++ b/hook/useColumnCount.js
@@ -8,13 +8,39 @@ import {
 
 export function useColumnCount(onChange = () => {}) {
     const columnCount = ref(0)
+    const columnSpace = ref(2)
 
+
+    // const calcColumn = () => {
+    //     const width = uni.getSystemInfoSync().windowWidth
+    //     console.log(width)
+    //     const count = Math.min(5, Math.floor(width / 375) + 1)
+    //     if (count !== columnCount.value) {
+    //         columnCount.value = count < 2 ? 2 : count
+    //     }
+    // }
     const calcColumn = () => {
         const width = uni.getSystemInfoSync().windowWidth
-        const count = Math.min(5, Math.floor(width / 375) + 1)
+
+        let 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
         }
+
+        // 计算间距：count=2 => 1，count=5 => 2，中间线性插值
+        const spacing = 2 - (count - 2) * (1 / 3)
+        // console.log('列数:', count, '间距:', spacing.toFixed(2))
+        columnSpace.value = spacing
     }
 
     onMounted(() => {
@@ -40,5 +66,6 @@ export function useColumnCount(onChange = () => {}) {
 
     return {
         columnCount,
+        columnSpace
     }
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 182fac7..8f3b102 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
         </script>
         <title></title>
         <!-- vconsole -->
-        <!-- <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+        <!--     <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
         <script>
             var vConsole = new window.VConsole();
             vConsole.destroy();
diff --git a/pages.json b/pages.json
index b03aa14..86fad08 100644
--- a/pages.json
+++ b/pages.json
@@ -234,12 +234,12 @@
         "navigationBarTextStyle": "black",
         "navigationBarTitleText": "uni-app",
         "navigationBarBackgroundColor": "#F8F8F8",
-        "backgroundColor": "#F8F8F8"
+        "backgroundColor": "#F8F8F8",
         // "enablePullDownRefresh": false,
         // "navigationStyle": "custom",
-        // "rpxCalcBaseDeviceWidth": 3840,
-        // "rpxCalcMaxDeviceWidth": 3840,
-        // "rpxCalcIncludeWidth": 750
+        "rpxCalcBaseDeviceWidth": 375,
+        "rpxCalcMaxDeviceWidth": 750,
+        "rpxCalcIncludeWidth": 750
     },
     "uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 15d47cb..1055c89 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -67,7 +67,12 @@
         <view class="table-list">
             <scroll-view :scroll-y="true" class="falls-scroll" @scroll="handleScroll" @scrolltolower="scrollBottom">
                 <view class="falls" v-if="list.length">
-                    <custom-waterfalls-flow :column="columnCount" ref="waterfallsFlowRef" :value="list">
+                    <custom-waterfalls-flow
+                        :column="columnCount"
+                        :columnSpace="columnSpace"
+                        ref="waterfallsFlowRef"
+                        :value="list"
+                    >
                         <template v-slot:default="job">
                             <view class="item btn-feel" v-if="!job.recommend">
                                 <view class="falls-card" @click="nextDetail(job)">
@@ -187,7 +192,7 @@ const rangeOptions = ref([
 //     { name: '创意总监', highlight: false },
 // ]);
 
-const { columnCount } = useColumnCount(() => {
+const { columnCount, columnSpace } = useColumnCount(() => {
     pageState.pageSize = 10 * (columnCount.value - 1);
     getJobRecommend('refresh');
     nextTick(() => {
@@ -726,4 +731,4 @@ function dataToImg(data) {
 .isBut{
     filter: grayscale(100%);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/unpackage/dist/build/.DS_Store b/unpackage/dist/build/.DS_Store
index 8614cffd888d7e99e7f058d853f2df28ac76a4d8..defd879a61685c1cdea80be3352e4a916d2fd92e 100644
GIT binary patch
delta 27
fcmZoMXfc?ul-rSkfkE#-7;M}a#=e=2;~zf&ruYn>

delta 27
fcmZoMXfc?ulzTk`1B2dwFxa>;jD0g3$3K1muaFH5