diff --git a/components/new-filter-page/new-filter-page.vue b/components/new-filter-page/new-filter-page.vue new file mode 100644 index 0000000..cda9e06 --- /dev/null +++ b/components/new-filter-page/new-filter-page.vue @@ -0,0 +1,424 @@ + + + + + \ No newline at end of file diff --git a/hook/useColumnCount.js b/hook/useColumnCount.js index d96017e..c0f075a 100644 --- a/hook/useColumnCount.js +++ b/hook/useColumnCount.js @@ -32,25 +32,21 @@ export function useColumnCount(onChange = () => {}) { // #endif let count = 2 + // #ifdef H5 + // H5端固定显示2列 + count = 2 + // #endif + // #ifndef H5 if (width >= 1000) { - // #ifdef H5 - count = 3 // H5端最多显示3列 - // #endif - // #ifndef H5 count = 5 - // #endif } else if (width >= 750) { - // #ifdef H5 - count = 3 // H5端最多显示3列 - // #endif - // #ifndef H5 count = 4 - // #endif } else if (width >= 500) { count = 3 } else { count = 2 } + // #endif if (count !== columnCount.value) { columnCount.value = count diff --git a/packageA/pages/nearby/components/four.vue b/packageA/pages/nearby/components/four.vue index 7fd0921..43fed3e 100644 --- a/packageA/pages/nearby/components/four.vue +++ b/packageA/pages/nearby/components/four.vue @@ -120,7 +120,7 @@ const rangeOptions = ref([ { value: 0, text: '推荐' }, { value: 1, text: '最热' }, { value: 2, text: '最新发布' }, - { value: 3, text: '疆外' }, + // { value: 3, text: '疆外' }, ]); function choosePosition(index) { diff --git a/packageA/pages/nearby/components/one.vue b/packageA/pages/nearby/components/one.vue index cc7277c..7958740 100644 --- a/packageA/pages/nearby/components/one.vue +++ b/packageA/pages/nearby/components/one.vue @@ -160,7 +160,7 @@ const rangeOptions = ref([ { value: 0, text: '推荐' }, { value: 1, text: '最热' }, { value: 2, text: '最新发布' }, - { value: 3, text: '疆外' }, + // { value: 3, text: '疆外' }, ]); function changeRangeShow() { diff --git a/packageA/pages/nearby/components/three.vue b/packageA/pages/nearby/components/three.vue index 779c511..58ff43d 100644 --- a/packageA/pages/nearby/components/three.vue +++ b/packageA/pages/nearby/components/three.vue @@ -190,7 +190,7 @@ const rangeOptions = ref([ { value: 0, text: '推荐' }, { value: 1, text: '最热' }, { value: 2, text: '最新发布' }, - { value: 3, text: '疆外' }, + // { value: 3, text: '疆外' }, ]); onLoad(() => { getSubway(); diff --git a/packageA/pages/nearby/components/two.vue b/packageA/pages/nearby/components/two.vue index 616c11e..7943a22 100644 --- a/packageA/pages/nearby/components/two.vue +++ b/packageA/pages/nearby/components/two.vue @@ -134,7 +134,7 @@ const rangeOptions = ref([ { value: 0, text: '推荐' }, { value: 1, text: '最热' }, { value: 2, text: '最新发布' }, - { value: 3, text: '疆外' }, + // { value: 3, text: '疆外' }, ]); function choosePosition(index) { diff --git a/packageRc/components/PopupLists.vue b/packageRc/components/PopupLists.vue index 19f2a40..a52a462 100644 --- a/packageRc/components/PopupLists.vue +++ b/packageRc/components/PopupLists.vue @@ -1,5 +1,5 @@