diff --git a/components/Salary-Expectation/Salary-Expectation.vue b/components/Salary-Expectation/Salary-Expectation.vue index a986375..ffb3382 100644 --- a/components/Salary-Expectation/Salary-Expectation.vue +++ b/components/Salary-Expectation/Salary-Expectation.vue @@ -1,17 +1,37 @@ + + diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index 6de61d6..45a519a 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -148,14 +148,14 @@ - + @@ -183,7 +183,7 @@ const waterfallsFlowRef = ref(null); const loadmoreRef = ref(null); const conditionSearch = ref({}); const waterfallcolumn = ref(2); -const maskFristEntry = ref(false); +const maskFristEntry = ref(true); const state = reactive({ tabIndex: 'all', }); diff --git a/pages/index/components/index-refactor.vue b/pages/index/components/index-refactor.vue new file mode 100644 index 0000000..7b3c82c --- /dev/null +++ b/pages/index/components/index-refactor.vue @@ -0,0 +1,906 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 209ee71..37e0143 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -47,11 +47,13 @@ import { reactive, inject, watch, ref, onMounted } from 'vue'; import Tabbar from '@/components/tabbar/midell-box.vue'; import { onLoad, onShow } from '@dcloudio/uni-app'; +import IndexRefactor from './components/index-refactor.vue'; import IndexOne from './components/index-one.vue'; import IndexTwo from './components/index-two.vue'; const loadedMap = reactive([false, false]); const swiperRefs = [ref(null), ref(null)]; -const components = [IndexOne, IndexTwo]; +// const components = [IndexOne, IndexTwo]; +const components = [IndexRefactor, IndexTwo]; import { storeToRefs } from 'pinia'; import { useReadMsg } from '@/stores/useReadMsg'; const { unreadCount } = storeToRefs(useReadMsg()); diff --git a/static/icon/add-circle.png b/static/icon/add-circle.png new file mode 100644 index 0000000..b903d1e Binary files /dev/null and b/static/icon/add-circle.png differ diff --git a/static/icon/flame3.png b/static/icon/flame3.png new file mode 100644 index 0000000..5b065dd Binary files /dev/null and b/static/icon/flame3.png differ diff --git a/static/icon/pintDate2.png b/static/icon/pintDate2.png new file mode 100644 index 0000000..367681a Binary files /dev/null and b/static/icon/pintDate2.png differ diff --git a/static/icon/polygon-down.png b/static/icon/polygon-down.png new file mode 100644 index 0000000..6d0aec7 Binary files /dev/null and b/static/icon/polygon-down.png differ diff --git a/static/icon/position-icon.png b/static/icon/position-icon.png new file mode 100644 index 0000000..94a29ef Binary files /dev/null and b/static/icon/position-icon.png differ diff --git a/static/icon/work-bg1.png b/static/icon/work-bg1.png new file mode 100644 index 0000000..1cb329a Binary files /dev/null and b/static/icon/work-bg1.png differ diff --git a/static/icon/work-bg2.png b/static/icon/work-bg2.png new file mode 100644 index 0000000..808fe7c Binary files /dev/null and b/static/icon/work-bg2.png differ diff --git a/static/icon/work-img1.png b/static/icon/work-img1.png new file mode 100644 index 0000000..e2dc516 Binary files /dev/null and b/static/icon/work-img1.png differ diff --git a/static/icon/work-img2.png b/static/icon/work-img2.png new file mode 100644 index 0000000..726b980 Binary files /dev/null and b/static/icon/work-img2.png differ diff --git a/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue b/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue index 2b18e1a..429edb2 100644 --- a/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue +++ b/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue @@ -3,7 +3,7 @@