flat: 菜单

Merge pull request !1 from Apcallover/ycode

App.vue

@@ -7,12 +7,9 @@ const { $api, navTo, appendScriptTagElement } = inject('globalFunction');
 
 onLaunch((options) => {
     useDictStore().getDictData();
-    // uni.onTabBarMidButtonTap(() => {
-    //     uni.navigateTo({
-    //         url: '/pages/chat/chat',
-    //     });
-    // });
+    // uni.hideTabBar();
 
+    // 登录
     let token = uni.getStorageSync('token') || ''; // 同步获取 缓存信息
     if (token) {
         useUserStore()
@@ -52,6 +49,7 @@ onHide(() => {
 
 <style>
 /*每个页面公共css */
+@import '@/common/animation.css';
 @import '@/common/common.css';
 /* 修改pages tabbar样式 H5有效 */
 .uni-tabbar .uni-tabbar__item:nth-child(4) .uni-tabbar__bd .uni-tabbar__icon {
@@ -77,6 +75,29 @@ uni-modal,
 
 @font-face {
     font-family: DingTalk JinBuTi;
-    src: url('@/static/font/DingTalk JinBuTi_min.ttf');
+    src: url('/static/font/DingTalk JinBuTi_min.woff2') format('woff2');
+    font-display: swap;
+}
+
+@font-face {
+    font-family: PingFangSC-Regular;
+    src: url('/static/font/PingFangSC-Regular.woff2') format('woff2');
+    font-display: swap;
+}
+
+@font-face {
+    font-family: PingFangSC-Medium;
+    src: url('/static/font/PingFangSC-Medium.woff2') format('woff2');
+    font-display: swap;
+}
+
+@font-face {
+    font-family: DIN-Medium;
+    src: url('/static/font/DIN-Medium.woff2') format('woff2');
+    font-display: swap;
+}
+
+body {
+    font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 </style>

common/animation.css

@@ -0,0 +1,193 @@
+/*base code*/
+.animated {
+    -webkit-animation-duration: 1s;
+    animation-duration: 1s;
+    -webkit-animation-fill-mode: both;
+    animation-fill-mode: both;
+}
+
+.animated.infinite {
+    -webkit-animation-iteration-count: infinite;
+    animation-iteration-count: infinite;
+}
+
+.animated.hinge {
+    -webkit-animation-duration: 2s;
+    animation-duration: 2s;
+}
+
+/*the animation definition*/
+@-webkit-keyframes tada {
+    0% {
+        -webkit-transform: scale3d(1, 1, 1);
+        transform: scale3d(1, 1, 1)
+    }
+
+    10%,
+    20% {
+        -webkit-transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg);
+        transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg)
+    }
+
+    30%,
+    50%,
+    70%,
+    90% {
+        -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+        transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg)
+    }
+
+    40%,
+    60%,
+    80% {
+        -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+        transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg)
+    }
+
+    100% {
+        -webkit-transform: scale3d(1, 1, 1);
+        transform: scale3d(1, 1, 1)
+    }
+}
+
+@keyframes tada {
+    0% {
+        -webkit-transform: scale3d(1, 1, 1);
+        -ms-transform: scale3d(1, 1, 1);
+        transform: scale3d(1, 1, 1)
+    }
+
+    10%,
+    20% {
+        -webkit-transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg);
+        -ms-transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg);
+        transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg)
+    }
+
+    30%,
+    50%,
+    70%,
+    90% {
+        -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+        -ms-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+        transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg)
+    }
+
+    40%,
+    60%,
+    80% {
+        -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+        -ms-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+        transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg)
+    }
+
+    100% {
+        -webkit-transform: scale3d(1, 1, 1);
+        -ms-transform: scale3d(1, 1, 1);
+        transform: scale3d(1, 1, 1)
+    }
+}
+
+.tada {
+    -webkit-animation-name: tada;
+    animation-name: tada
+}
+
+
+.btn-tada:active {
+    -webkit-animation-name: tada;
+    animation-name: tada
+}
+
+/*the animation definition*/
+@-webkit-keyframes rubberBand {
+    0% {
+        -webkit-transform: scale3d(1, 1, 1);
+        transform: scale3d(1, 1, 1)
+    }
+
+    30% {
+        -webkit-transform: scale3d(1.25, .75, 1);
+        transform: scale3d(1.25, .75, 1)
+    }
+
+    40% {
+        -webkit-transform: scale3d(0.75, 1.25, 1);
+        transform: scale3d(0.75, 1.25, 1)
+    }
+
+    50% {
+        -webkit-transform: scale3d(1.15, .85, 1);
+        transform: scale3d(1.15, .85, 1)
+    }
+
+    65% {
+        -webkit-transform: scale3d(.95, 1.05, 1);
+        transform: scale3d(.95, 1.05, 1)
+    }
+
+    75% {
+        -webkit-transform: scale3d(1.05, .95, 1);
+        transform: scale3d(1.05, .95, 1)
+    }
+
+    100% {
+        -webkit-transform: scale3d(1, 1, 1);
+        transform: scale3d(1, 1, 1)
+    }
+}
+
+@keyframes rubberBand {
+    0% {
+        -webkit-transform: scale3d(1, 1, 1);
+        -ms-transform: scale3d(1, 1, 1);
+        transform: scale3d(1, 1, 1)
+    }
+
+    30% {
+        -webkit-transform: scale3d(1.25, .75, 1);
+        -ms-transform: scale3d(1.25, .75, 1);
+        transform: scale3d(1.25, .75, 1)
+    }
+
+    40% {
+        -webkit-transform: scale3d(0.75, 1.25, 1);
+        -ms-transform: scale3d(0.75, 1.25, 1);
+        transform: scale3d(0.75, 1.25, 1)
+    }
+
+    50% {
+        -webkit-transform: scale3d(1.15, .85, 1);
+        -ms-transform: scale3d(1.15, .85, 1);
+        transform: scale3d(1.15, .85, 1)
+    }
+
+    65% {
+        -webkit-transform: scale3d(.95, 1.05, 1);
+        -ms-transform: scale3d(.95, 1.05, 1);
+        transform: scale3d(.95, 1.05, 1)
+    }
+
+    75% {
+        -webkit-transform: scale3d(1.05, .95, 1);
+        -ms-transform: scale3d(1.05, .95, 1);
+        transform: scale3d(1.05, .95, 1)
+    }
+
+    100% {
+        -webkit-transform: scale3d(1, 1, 1);
+        -ms-transform: scale3d(1, 1, 1);
+        transform: scale3d(1, 1, 1)
+    }
+}
+
+.rubberBand {
+    -webkit-animation-name: rubberBand;
+    animation-name: rubberBand
+}
+
+
+.btn-rubberBand:active {
+    -webkit-animation-name: tada;
+    animation-name: tada
+}

common/common.css

@@ -56,6 +56,7 @@ html {
     background-color: rgba(189, 197, 254, 0.15);
 }
 
+
 .btn-incline {
     transition: transform 0.2s ease;
     transform-style: preserve-3d;
@@ -74,6 +75,23 @@ html {
     transform: perspective(600px) rotateX(6deg) scale(0.98);
 }
 
+.press-button {
+    padding: 10px 20px;
+    background: #3A4750;
+    /* 深灰蓝 */
+    color: #ffffff;
+    font-size: 16px;
+    border: none;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: transform 0.1s ease, box-shadow 0.1s ease;
+    /* box-shadow: 0 4px 0 #2C3E50; */
+}
+
+.press-button:active {
+    transform: scale(0.95) translateY(2px);
+    /* box-shadow: 0 2px 0 #1C2833; */
+}
 
 /* 动画效果 */
 .btn-shaky:active {

common/globalFunction.js

@@ -539,6 +539,10 @@ function isInWechatMiniProgramWebview() {
     return ua.includes('miniprogram') || window.__wxjs_environment === 'miniprogram'
 }
 
+function isEmptyObject(obj) {
+    return obj && typeof obj === 'object' && !Array.isArray(obj) && Object.keys(obj).length === 0;
+}
+
 export const $api = {
     msg,
     prePage,
@@ -579,5 +583,6 @@ export default {
     parseQueryParams,
     appendScriptTagElement,
     insertSortData,
-    isInWechatMiniProgramWebview
+    isInWechatMiniProgramWebview,
+    isEmptyObject
 }

common/queue.js

@@ -1 +0,0 @@
-const _count=Symbol("count");const _lowestCount=Symbol("lowestCount");const _items=Symbol("items");class Queue{constructor(){this[_count]=0;this[_lowestCount]=0;this[_items]={}}enqueue(element){this[_items][this[_count]]=element;this[_count]++}dequeue(){if(this.isEmpty())return undefined;const result=this[_items][this[_lowestCount]];delete this[_items][this[_lowestCount]];this[_lowestCount]++;return result}peek(){return this.isEmpty()?undefined:this[_items][this[_lowestCount]]}isEmpty(){return this[_count]-this[_lowestCount]===0}size(){return this[_count]-this[_lowestCount]}clear(){this[_count]=0;this[_lowestCount]=0;this[_items]={}}toString(){return Object.values(this[_items]).join(",")}}Object.freeze(Queue.prototype);const _dequeItems=Symbol("dequeItems");class Deque{constructor(){this[_items]={};this[_lowestCount]=0;this[_count]=0}addFront(element){if(this.isEmpty()){this.addBack(element)}else if(this[_lowestCount]>0){this[_lowestCount]--;this[_items][this[_lowestCount]]=element}else{for(let i=this[_count];i>0;i--){this[_items][i]=this[_items][i-1]}this[_items][0]=element;this[_count]++}}addBack(element){this[_items][this[_count]]=element;this[_count]++}removeFront(){if(this.isEmpty())return undefined;const result=this[_items][this[_lowestCount]];delete this[_items][this[_lowestCount]];this[_lowestCount]++;return result}removeBack(){if(this.isEmpty())return undefined;this[_count]--;const result=this[_items][this[_count]];delete this[_items][this[_count]];return result}peekFront(){return this.isEmpty()?undefined:this[_items][this[_lowestCount]]}peekBack(){return this.isEmpty()?undefined:this[_items][this[_count]-1]}isEmpty(){return this[_count]-this[_lowestCount]===0}size(){return this[_count]-this[_lowestCount]}clear(){this[_items]={};this[_lowestCount]=0;this[_count]=0}toString(){return Object.values(this[_items]).join(",")}}Object.freeze(Deque.prototype);export{Queue,Deque};

components/AppLayout/AppLayout.vue

@@ -110,9 +110,11 @@ const handleScrollToLower = () => {
         align-items: center;
         padding: 7rpx 3rpx;
         .header-title {
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             color: #000000;
             font-weight: bold;
             .subtitle-text {
+                font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
                 font-weight: 400;
                 font-size: 28rpx;
                 color: #333333;

components/TikTok/TikTok.vue

@@ -0,0 +1,312 @@
+<template>
+    <swiper
+        class="m-tiktok-video-swiper"
+        circular
+        @change="swiperChange"
+        :current="state.current"
+        :vertical="true"
+        duration="300"
+    >
+        <swiper-item v-for="(item, index) in state.displaySwiperList" :key="index">
+            <view class="swiper-item" @click="(e) => handleClick(index, e)">
+                <video
+                    :id="`video__${index}`"
+                    :controls="controls"
+                    :autoplay="false"
+                    :loop="loop"
+                    @ended="ended"
+                    @controlstoggle="controlstoggle"
+                    @play="onPlay"
+                    @error="emits('error')"
+                    class="m-tiktok-video-player"
+                    :src="item.src || item.explainUrl"
+                    v-if="index === 0 || !state.isFirstLoad"
+                ></video>
+                <view class="cover-triangle" v-if="pause"></view>
+                <image
+                    v-if="item.poster && state.displayIndex != index"
+                    :src="item.poster"
+                    class="m-tiktok-video-poster"
+                    mode="aspectFit"
+                ></image>
+                <slot :item="item"></slot>
+            </view>
+        </swiper-item>
+    </swiper>
+</template>
+
+<script setup>
+import { ref, reactive, getCurrentInstance, watch, nextTick } from 'vue';
+import { onLoad, onUnload } from '@dcloudio/uni-app';
+const _this = getCurrentInstance();
+const emits = defineEmits(['play', 'error', 'loadMore', 'change', 'controlstoggle', 'click', 'ended']);
+
+const lastTapTime = ref(0);
+const pause = ref(false);
+const props = defineProps({
+    /**
+     * 视频列表
+     */
+    videoList: {
+        type: Array,
+        default: () => [],
+    },
+    /**
+     * 是否循环播放一个视频
+     */
+    loop: {
+        type: Boolean,
+        default: true,
+    },
+    /**
+     * 显示原生控制栏
+     */
+    controls: {
+        type: Boolean,
+        default: true,
+    },
+    /**
+     * 是否自动播放
+     */
+    autoplay: {
+        type: Boolean,
+        default: true,
+    },
+    /**
+     * 是否自动滚动播放
+     */
+    autoChange: {
+        type: Boolean,
+        default: false,
+    },
+    /**
+     * 滚动加载阈值（即播放到剩余多少个之后触发加载更多
+     */
+    loadMoreOffsetCount: {
+        type: Number,
+        default: 2,
+    },
+    /**
+     * 暂停 1 单机暂停； 2 双击暂停； 0关闭
+     */
+    pauseType: {
+        type: Number,
+        default: 2,
+    },
+});
+
+const state = reactive({
+    originList: [], // 源数据
+    displaySwiperList: [], // swiper需要的数据
+    displayIndex: 0, // 用于显示swiper的真正的下标数值只有：0，1，2。
+    originIndex: 0, // 记录源数据的下标
+    current: 0,
+    oid: 0,
+    showControls: '',
+    toggleShow: true, // 显示面板
+    videoContexts: [],
+    isFirstLoad: true,
+});
+
+const initVideoContexts = () => {
+    state.videoContexts = [
+        uni.createVideoContext('video__0', _this),
+        uni.createVideoContext('video__1', _this),
+        uni.createVideoContext('video__2', _this),
+    ];
+};
+
+const onPlay = (e) => {
+    emits('play', e);
+};
+
+const setVideoRef = (el, index) => {
+    if (el) {
+        videoRefs.value[index] = el;
+    }
+};
+
+function handleClick(index, e) {
+    const now = Date.now();
+    switch (props.pauseType) {
+        case 1:
+            if (pause.value) {
+                state.videoContexts[index].play();
+                pause.value = false;
+            } else {
+                state.videoContexts[index].pause();
+                pause.value = true;
+            }
+            break;
+        case 2:
+            if (now - lastTapTime.value < 300) {
+                if (pause.value) {
+                    state.videoContexts[index].play();
+                    pause.value = false;
+                } else {
+                    state.videoContexts[index].pause();
+                    pause.value = true;
+                }
+            }
+            break;
+    }
+    lastTapTime.value = now;
+    state.toggleShow = !state.toggleShow;
+    emits('click', e);
+}
+function ended() {
+    // 自动切换下一个视频
+    if (props.autoChange) {
+        if (state.displayIndex < 2) {
+            state.current = state.displayIndex + 1;
+        } else {
+            state.current = 0;
+        }
+    }
+    emits('ended');
+}
+/**
+ * 初始一个显示的swiper数据
+ * @originIndex  从源数据的哪个开始显示默认0，如从其他页面跳转进来，要显示第n个，这个参数就是他的下标
+ */
+function initSwiperData(originIndex = state.originIndex) {
+    const originListLength = state.originList.length; // 源数据长度
+    const displayList = [];
+    displayList[state.displayIndex] = state.originList[originIndex];
+    displayList[state.displayIndex - 1 == -1 ? 2 : state.displayIndex - 1] =
+        state.originList[originIndex - 1 == -1 ? originListLength - 1 : originIndex - 1];
+    displayList[state.displayIndex + 1 == 3 ? 0 : state.displayIndex + 1] =
+        state.originList[originIndex + 1 == originListLength ? 0 : originIndex + 1];
+    state.displaySwiperList = displayList;
+
+    if (state.oid >= state.originList.length) {
+        state.oid = 0;
+    }
+    if (state.oid < 0) {
+        state.oid = state.originList.length - 1;
+    }
+    // 暂停所有视频
+    state.videoContexts.map((item) => item?.stop());
+    setTimeout(() => {
+        // 当前视频
+        if (props.autoplay) {
+            uni.createVideoContext(`video__${state.displayIndex}`, _this).play();
+        }
+    }, 500);
+    // 数据改变
+    emits('change', {
+        index: originIndex,
+        detail: state.originList[originIndex],
+    });
+    // 加载更多
+    var pCount = state.originList.length - props.loadMoreOffsetCount;
+    if (originIndex == pCount) {
+        emits('loadMore');
+    }
+}
+/**
+ * swiper滑动时候
+ */
+function swiperChange(event) {
+    const { current } = event.detail;
+    state.isFirstLoad = false;
+    const originListLength = state.originList.length; // 源数据长度
+    // 向后滚动
+    if (state.displayIndex - current == 2 || state.displayIndex - current == -1) {
+        state.originIndex = state.originIndex + 1 == originListLength ? 0 : state.originIndex + 1;
+        state.displayIndex = state.displayIndex + 1 == 3 ? 0 : state.displayIndex + 1;
+        state.oid = state.originIndex - 1;
+        initSwiperData(state.originIndex);
+    }
+    // 如果两者的差为-2或者1则是向前滑动
+    else if (state.displayIndex - current == -2 || state.displayIndex - current == 1) {
+        state.originIndex = state.originIndex - 1 == -1 ? originListLength - 1 : state.originIndex - 1;
+        state.displayIndex = state.displayIndex - 1 == -1 ? 2 : state.displayIndex - 1;
+        state.oid = state.originIndex + 1;
+        initSwiperData(state.originIndex);
+    }
+    state.toggleShow = true;
+}
+
+function controlstoggle(e) {
+    state.showControls = e.detail.show;
+    emits('controlstoggle', e);
+}
+
+watch(
+    () => props.videoList,
+    () => {
+        if (props.videoList?.length) {
+            state.originList = props.videoList;
+            if (state.isFirstLoad || !state.videoContexts?.length) {
+                initSwiperData();
+                initVideoContexts();
+            }
+        }
+    },
+    {
+        immediate: true,
+    }
+);
+
+let loadTimer = null;
+onLoad(() => {
+    // 为了首次只加载一条视频（提高首次加载性能），延迟加载后续视频
+    loadTimer = setTimeout(() => {
+        state.isFirstLoad = false;
+        clearTimeout(loadTimer);
+    }, 5000);
+});
+
+onUnload(() => {
+    clearTimeout(loadTimer);
+});
+
+defineExpose({
+    initSwiperData,
+});
+</script>
+
+<style lang="stylus" scoped>
+.m-tiktok-video-swiper,
+.m-tiktok-video-player {
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+}
+.m-tiktok-video-swiper {
+    .swiper-item {
+        position: relative;
+        height: 100%;
+    }
+    .m-tiktok-video-poster {
+        background-color: #000;
+        position: absolute;
+        width: 100%;
+        height: 100%;
+    }
+}
+
+.cover-triangle{
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%)
+    width: 132rpx
+    height: 132rpx
+    border-radius: 50%;
+    background: rgba(0,0,0,0.3)
+}
+.cover-triangle::after {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-40%, -50%) rotate(90deg);
+    width: 0;
+    height: 0;
+    border-left: 40rpx solid transparent;
+    border-right: 40rpx solid transparent;
+    border-bottom: 60rpx solid #fff;
+}
+</style>

components/md-render/md-render.vue

@@ -276,11 +276,13 @@ ol {
         align-items: center;
         justify-content: space-between
         .title-text
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             max-width: calc(100% - 160rpx);
             overflow: hidden
             text-overflow: ellipsis
             font-size: 30rpx
         .card-salary
+            font-family: DIN-Medium;
             font-size: 28rpx;
             color: #FF6E1C;
 

components/renderCompanys/renderCompanys.vue

@@ -9,8 +9,12 @@
                     <dict-tree-Label class="mar_ri10" dictType="industry" :value="job.industry"></dict-tree-Label>
                     <dict-Label dictType="scale" :value="job.scale"></dict-Label>
                 </view>
-                <view>
-                    <text class="color_256BFA fs_14">在招职位·{{ job.totalRecruitment || '-' }}个</text>
+                <view class="ris">
+                    <text class="fs_14">
+                        在招职位·
+                        <text class="color_256BFA">{{ job.totalRecruitment || '-' }}</text>
+                        个
+                    </text>
                 </view>
             </view>
             <view class="card-tags">
@@ -76,6 +80,7 @@ function nextDetail(company) {
         justify-content: space-between
         align-items: flex-start
         .company{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             font-weight: 500;
             font-size: 32rpx;
             color: #333333;
@@ -97,6 +102,7 @@ function nextDetail(company) {
         display: flex
         flex-wrap: wrap
         .tag{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             width: fit-content;
             height: 30rpx;
             background: #F4F4F4;
@@ -121,4 +127,7 @@ function nextDetail(company) {
         color: #6C7282;
     }
 }
+.ris{
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+}
 </style>

components/renderJobs/renderJobs.vue

@@ -99,11 +99,13 @@ function nextDetail(job) {
         justify-content: space-between
         align-items: flex-start
         .company{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             font-weight: 500;
             font-size: 32rpx;
             color: #333333;
         }
         .salary{
+            font-family: DIN-Medium;
             font-weight: 500;
             font-size: 28rpx;
             color: #4C6EFB;
@@ -120,6 +122,7 @@ function nextDetail(job) {
         display: flex
         flex-wrap: wrap
         .tag{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             width: fit-content;
             height: 30rpx;
             background: #F4F4F4;

components/selectFilter/selectFilter.vue

@@ -6,6 +6,7 @@
         background-color="#FFFFFF"
         @maskClick="maskClickFn"
         :mask-click="maskClick"
+        class="popup-fix"
     >
         <view class="popup-content">
             <view class="popup-header">
@@ -183,6 +184,15 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
+.popup-fix {
+    position: fixed !important;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 0;
+    height: 100vh;
+    z-index: 9999;
+}
 .popup-content {
     color: #000000;
     height: 80vh;
@@ -320,7 +330,7 @@ defineExpose({
             font-weight: 400;
             font-size: 28rpx;
             color: #333333;
-			margin-bottom: 15rpx;
+            margin-bottom: 15rpx;
         }
     }
     .content-item:first-child {
@@ -329,8 +339,8 @@ defineExpose({
 
     .check-content {
         display: grid;
-		gap:16rpx;
-        grid-template-columns:  repeat(auto-fill, minmax(180rpx, 1fr));
+        gap: 16rpx;
+        grid-template-columns: repeat(auto-fill, minmax(180rpx, 1fr));
         place-items: stretch;
 
         .checkbox-item {
@@ -338,9 +348,9 @@ defineExpose({
             align-items: center;
             text-align: center;
             background-color: #d9d9d9;
-            
-			min-width: 0;
-			padding: 0 10rpx; 
+
+            min-width: 0;
+            padding: 0 10rpx;
             height: 80rpx;
             background: #e8eaee;
             border-radius: 12rpx 12rpx 12rpx 12rpx;
@@ -348,12 +358,11 @@ defineExpose({
             .option-label {
                 font-size: 28rpx;
                 width: 100%;
-				white-space: nowrap;
-				overflow: hidden;
+                white-space: nowrap;
+                overflow: hidden;
             }
         }
         .checkedstyle {
-            
             height: 76rpx;
             background: rgba(37, 107, 250, 0.06);
             border-radius: 12rpx 12rpx 12rpx 12rpx;
@@ -362,4 +371,4 @@ defineExpose({
         }
     }
 }
-</style>
+</style>

components/tabbar/midell-box.vue

@@ -1,7 +1,13 @@
 <template>
     <view class="tabbar_container">
         <view class="tabbar_item" v-for="(item, index) in tabbarList" :key="index" @click="changeItem(item)">
-            <view class="item-top" :class="[item.centerItem ? 'center-item-img' : '']">
+            <view
+                class="item-top"
+                :class="[
+                    item.centerItem ? 'center-item-img ' : '',
+                    item.centerItem && currentItem === item.id ? 'rubberBand animated' : '',
+                ]"
+            >
                 <image :src="currentItem == item.id ? item.selectedIconPath : item.iconPath"></image>
             </view>
             <view class="item-bottom" :class="[currentItem == item.id ? 'item-active' : '']">
@@ -27,7 +33,7 @@ export default {
                 },
                 {
                     id: 1,
-                    text: '招聘会',
+                    text: '精选',
                     path: '/pages/careerfair/careerfair',
                     iconPath: '../../static/tabbar/post.png',
                     selectedIconPath: '../../static/tabbar/posted.png',
@@ -35,14 +41,6 @@ export default {
                 },
                 {
                     id: 2,
-                    text: '',
-                    path: '/pages/chat/chat',
-                    iconPath: '../../static/tabbar/logo2copy.png',
-                    selectedIconPath: '../../static/tabbar/logo2copy.png',
-                    centerItem: true,
-                },
-                {
-                    id: 3,
                     text: '消息',
                     path: '/pages/msglog/msglog',
                     iconPath: '../../static/tabbar/chat4.png',
@@ -50,7 +48,7 @@ export default {
                     centerItem: false,
                 },
                 {
-                    id: 4,
+                    id: 3,
                     text: '我的',
                     path: '/pages/mine/mine',
                     iconPath: '../../static/tabbar/mine.png',
@@ -84,17 +82,18 @@ export default {
 <style lang="scss" scoped>
 .tabbar_container {
     background-color: #ffffff;
-    position: fixed;
-    bottom: 0rpx;
-    left: 0rpx;
     width: 100%;
-    height: 126rpx;
-    // box-shadow: 0 0 5px #999;
+    height: 88rpx;
     display: flex;
     align-items: center;
     padding: 5rpx 0;
-    padding-bottom: env(safe-area-inset-bottom);
-    z-index: 998;
+    overflow: hidden;
+    // position: fixed;
+    // bottom: 0rpx;
+    // left: 0rpx;
+    // box-shadow: 0 0 5px #999;
+    // padding-bottom: env(safe-area-inset-bottom);
+    // z-index: 998;
     .tabbar_item {
         width: 33.33%;
         height: 100rpx;
@@ -120,12 +119,12 @@ export default {
     }
 }
 .center-item-img {
-    position: absolute;
-    top: 0rpx;
-    left: 50%;
-    transform: translate(-50%, 0);
-    width: 96rpx !important;
-    height: 96rpx !important;
+    // position: absolute;
+    // top: 0rpx;
+    // left: 50%;
+    // transform: translate(-50%, 0);
+    width: 108rpx !important;
+    height: 98rpx !important;
 }
 .item-active {
     color: #256bfa;

config.js

@@ -14,6 +14,8 @@ export default {
     DBversion: 2,
     // 只使用本地缓寸的数据
     OnlyUseCachedDB: true,
+    // 使用模拟定位
+    UsingSimulatedPositioning: false,
     // 应用信息
     appInfo: {
         // 应用名称
@@ -39,7 +41,9 @@ export default {
             }
         ]
     },
+    // AI -> 上传文件数量
     allowedFileNumber: 2,
+    // AI -> 上传文件类型
     allowedFileTypes: [
         "text/plain", // .txt
         "text/markdown", // .md
@@ -52,5 +56,12 @@ export default {
         "text/csv", // .csv
         "application/vnd.ms-excel", // .xls
         "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" // .xlsx
-    ]
+    ],
+    // 首页询问 -> 推荐权重
+    weights: {
+        categories: 1, //岗位
+        experience: 0.3, //经验
+        salary: 0.5, // 薪资
+        areas: 0.5 // 区域
+    }
 }

hook/usePagination.js

@@ -0,0 +1,173 @@
+import {
+    ref,
+    reactive,
+    watch,
+    isRef,
+    nextTick
+} from 'vue'
+
+export function usePagination(
+    requestFn,
+    transformFn,
+    options = {}
+) {
+    const list = ref([])
+    const loading = ref(false)
+    const error = ref(false)
+    const finished = ref(false)
+    const firstLoading = ref(true)
+    const empty = ref(false)
+
+    const {
+        pageSize = 10,
+            search = {},
+            autoWatchSearch = false,
+            debounceTime = 300,
+            autoFetch = false,
+
+            // 字段映射
+            dataKey = 'rows',
+            totalKey = 'total',
+
+            // 分页字段名映射
+            pageField = 'current',
+            sizeField = 'pageSize',
+
+            onBeforeRequest,
+            onAfterRequest
+    } = options
+
+    const pageState = reactive({
+        page: 1,
+        pageSize: isRef(pageSize) ? pageSize.value : pageSize,
+        total: 0,
+        maxPage: 1,
+        search: isRef(search) ? search.value : search
+    })
+
+    let debounceTimer = null
+
+    const fetchData = async (type = 'refresh') => {
+        if (loading.value) return Promise.resolve()
+
+        loading.value = true
+        error.value = false
+
+        if (typeof onBeforeRequest === 'function') {
+            try {
+                onBeforeRequest(type, pageState)
+            } catch (err) {
+                console.warn('onBeforeRequest 执行异常:', err)
+            }
+        }
+
+        if (type === 'refresh') {
+            pageState.page = 1
+            finished.value = false
+            if (list.value.length === 0) {
+                firstLoading.value = true
+            }
+        } else if (type === 'loadMore') {
+            if (pageState.page >= pageState.maxPage) {
+                loading.value = false
+                finished.value = true
+                return Promise.resolve('no more')
+            }
+            pageState.page += 1
+        }
+
+        const params = {
+            [pageField]: pageState.page,
+            [sizeField]: pageState.pageSize,
+            ...pageState.search
+        }
+
+        try {
+            const res = await requestFn(params)
+
+            const rawData = res[dataKey]
+            const total = res[totalKey]
+
+            const data = typeof transformFn === 'function' ? transformFn(rawData) : rawData
+
+            if (type === 'refresh') {
+                list.value = data
+            } else {
+                list.value.push(...data)
+            }
+
+            pageState.total = total
+            pageState.maxPage = Math.ceil(total / pageState.pageSize)
+
+            finished.value = list.value.length >= total
+            empty.value = list.value.length === 0
+        } catch (err) {
+            console.error('分页请求失败:', err)
+            error.value = true
+        } finally {
+            loading.value = false
+            firstLoading.value = false
+
+            if (typeof onAfterRequest === 'function') {
+                try {
+                    onAfterRequest(type, pageState, {
+                        error: error.value
+                    })
+                } catch (err) {
+                    console.warn('onAfterRequest 执行异常:', err)
+                }
+            }
+        }
+    }
+
+    const refresh = () => fetchData('refresh')
+    const loadMore = () => fetchData('loadMore')
+
+    const resetPagination = () => {
+        list.value = []
+        pageState.page = 1
+        pageState.total = 0
+        pageState.maxPage = 1
+        finished.value = false
+        error.value = false
+        firstLoading.value = true
+        empty.value = false
+    }
+
+    if (autoWatchSearch && isRef(search)) {
+        watch(search, (newVal) => {
+            pageState.search = newVal
+            // clearTimeout(debounceTimer)
+            // debounceTimer = setTimeout(() => {
+            //     refresh()
+            // }, debounceTime)
+        }, {
+            deep: true
+        })
+    }
+
+    watch(pageSize, (newVal) => {
+        pageState.pageSize = newVal
+    }, {
+        deep: true
+    })
+
+    if (autoFetch) {
+        nextTick(() => {
+            refresh()
+        })
+    }
+
+    return {
+        list,
+        loading,
+        error,
+        finished,
+        firstLoading,
+        empty,
+        pageState,
+        refresh,
+        loadMore,
+        resetPagination
+    }
+}

packageA/pages/choiceness/choiceness.vue

@@ -88,6 +88,7 @@ function seeDetail(item) {
                 font-weight: 600;
                 font-size: 32rpx;
                 color: #333333;
+                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             }
             .card-text{
                 margin-top: 16rpx

packageA/pages/exhibitors/exhibitors.vue

@@ -251,6 +251,7 @@ image {
                 font-weight: 500;
                 font-size: 32rpx;
                 color: #333333;
+                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             }
             .row2{
                 font-weight: 400;

packageA/pages/myResume/myResume.vue

@@ -54,7 +54,7 @@
                 <text>{{ userInfo.salaryMin / 1000 }}k-{{ userInfo.salaryMax / 1000 }}k</text>
             </view>
             <view class="mys-text">
-                <text>期望工资地：</text>
+                <text>期望工作地：</text>
                 <text>青岛市-</text>
                 <dict-Label dictType="area" :value="Number(userInfo.area)"></dict-Label>
             </view>
@@ -91,6 +91,7 @@ image{
         padding: 52rpx 48rpx
         .tops-left{
             .name{
+                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                 font-weight: 600;
                 font-size: 44rpx;
                 color: #333333;
@@ -140,6 +141,7 @@ image{
     .mys-info{
         padding: 28rpx
         .mys-h4{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             font-weight: 600;
             font-size: 32rpx;
             color: #000000;

packageA/pages/post/component/videoPlayer.vue

@@ -6,8 +6,8 @@
         :style="{
             left: position.x + 'px',
             top: position.y + 'px',
-            width: isFullScreen ? '100%' : '300rpx',
-            height: isFullScreen ? '100vh' : '200rpx',
+            width: isFullScreen ? '100%' : videoWidth + 'rpx',
+            height: isFullScreen ? '100vh' : videoHeight + 'rpx',
         }"
         @touchstart="handleTouchStart"
         @touchmove="handleTouchMove"
@@ -24,8 +24,10 @@
                 height: '100%',
             }"
             id="myVideo"
+            ref="videoRef"
             @play="onPlay"
             @pause="onPause"
+            @loadedmetadata="onLoadedMetadata"
         ></video>
 
         <!-- 控制栏 -->
@@ -41,6 +43,8 @@
 import { ref, reactive, onMounted } from 'vue';
 import { nextTick } from 'vue';
 
+const videoRef = ref(null);
+
 const visible = ref(false);
 const isPlaying = ref(false);
 const isFullScreen = ref(false);
@@ -49,6 +53,8 @@ const position = reactive({ x: 20, y: 100 });
 const videoContext = ref(null);
 const startPos = reactive({ x: 0, y: 0 });
 const moving = ref(false);
+const videoWidth = ref(0);
+const videoHeight = ref(0);
 
 // 初始化视频上下文
 onMounted(() => {
@@ -71,8 +77,8 @@ const handleTouchMove = (e) => {
     const newY = e.touches[0].clientY - startPos.y;
 
     // 边界检测
-    const maxX = window.innerWidth - 150; // 300rpx换算后的值
-    const maxY = 50 + window.innerHeight - 200;
+    const maxX = window.innerWidth - videoWidth.value / 2; // 300rpx换算后的值
+    const maxY = window.innerHeight - videoHeight.value / 2;
 
     position.x = Math.max(0, Math.min(newX, maxX));
     position.y = Math.max(0, Math.min(newY, maxY));
@@ -124,6 +130,32 @@ const open = (url) => {
     });
 };
 
+const onLoadedMetadata = (e) => {
+    const video = e.detail;
+    const width = video.width;
+    const height = video.height;
+    const ratio = width / height;
+
+    // 设置宽度：横屏宽 300，竖屏宽 180（可自定义）
+    if (ratio >= 1) {
+        videoWidth.value = 300; // 横屏
+        videoHeight.value = 300 * (height / width); // 保持比例
+    } else {
+        videoWidth.value = 180; // 竖屏
+        videoHeight.value = 180 * (height / width); // 保持比例
+    }
+    // console.log(`宽高: ${width}x${height}`);
+    // console.log(`比例: ${ratio.toFixed(2)} (${getRatioName(ratio)})`);
+};
+
+function getRatioName(ratio) {
+    const rounded = Math.round(ratio * 100) / 100;
+    if (Math.abs(rounded - 16 / 9) < 0.01) return '16:9';
+    if (Math.abs(rounded - 4 / 3) < 0.01) return '4:3';
+    if (Math.abs(rounded - 1) < 0.01) return '1:1';
+    return `${rounded.toFixed(2)}:1`;
+}
+
 // 暴露方法
 defineExpose({ open });
 </script>
@@ -155,4 +187,4 @@ defineExpose({ open });
     background: rgba(255, 255, 255, 0.2);
     border-radius: 4rpx;
 }
-</style>
+</style>

packageA/pages/post/post.vue

@@ -11,9 +11,15 @@
                 <image src="@/static/icon/collect2.png" v-else @click="jobCollection"></image>
             </view>
         </template>
-        <view class="content">
+        <view class="content" v-show="!isEmptyObject(jobInfo)">
             <view class="content-top btn-feel">
-                <view class="top-salary">{{ jobInfo.minSalary }}-{{ jobInfo.maxSalary }}/月</view>
+                <view class="top-salary">
+                    <Salary-Expectation
+                        :max-salary="jobInfo.maxSalary"
+                        :min-salary="jobInfo.minSalary"
+                        :is-month="true"
+                    ></Salary-Expectation>
+                </view>
                 <view class="top-name">{{ jobInfo.jobTitle }}</view>
                 <view class="top-info">
                     <view class="info-img"><image src="/static/icon/post12.png"></image></view>
@@ -107,10 +113,7 @@
                                 v-for="(item, index) in matchingDegree"
                                 :key="index"
                                 class="progress-item"
-                                :class="{
-                                    active: index < currentStep - 1,
-                                    half: index < currentStep && currentStep < index + 1, // 半条
-                                }"
+                                :class="getClass(index)"
                             />
                         </view>
                     </view>
@@ -136,7 +139,7 @@ import VideoPlayer from './component/videoPlayer.vue';
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
-const { $api, navTo, getLenPx, parseQueryParams, navBack } = inject('globalFunction');
+const { $api, navTo, getLenPx, parseQueryParams, navBack, isEmptyObject } = inject('globalFunction');
 import RadarMap from './component/radarMap.vue';
 const matchingDegree = ref(['一般', '良好', '优秀', '极好']);
 const currentStep = ref(1);
@@ -167,7 +170,6 @@ function initLoad(option) {
     if (jobId !== jobIdRef.value) {
         jobIdRef.value = jobId;
         getDetail(jobId);
-        getCompetivetuveness(jobId);
     }
 }
 
@@ -184,6 +186,7 @@ function getDetail(jobId) {
         const { latitude, longitude, companyName, companyId } = resData.data;
         jobInfo.value = resData.data;
         getCompanyIsAJobs(companyId);
+        getCompetivetuveness(jobId);
         if (latitude && longitude) {
             mapCovers.value = [
                 {
@@ -257,6 +260,21 @@ function jobCollection() {
         });
     }
 }
+
+function getClass(index) {
+    const current = currentStep.value;
+    const floorIndex = Math.floor(current);
+
+    if (index < floorIndex) {
+        return 'active';
+    } else if (index === floorIndex) {
+        const decimal = current % 1;
+        const percent = Math.round(decimal * 100);
+        return `half${percent}`;
+    } else {
+        return '';
+    }
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -307,17 +325,19 @@ image {
 }
 
 /* 当前进度进行中的格子 */
-.progress-item.half::before {
-  content: '';
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  width: 100%; /* 根据 currentStep 小数动态控制 */
-  // background: linear-gradient(to right, #256bfa, #8c68ff);
-  background: linear-gradient(to right, #256bfa 50%, #eaeaea 50%);
-  border-radius: 24rpx;
-}
+for i in 0..100
+    .progress-item.half{i}::before
+        content ''
+        position absolute
+        left 0
+        top 0
+        bottom 0
+        width 100%
+        background linear-gradient(to right, #256bfa (i)%, #eaeaea (i)%)
+        border-radius 24rpx
+
+
+
 .card-footer{
     .footer-title{
         font-weight: 600;

packageA/pages/reservation/component/countdown.vue

@@ -125,6 +125,7 @@ onUnmounted(() => {
 }
 
 .time-block {
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
     text-align: center;
     font-weight: 500;
     font-size: 28rpx;

packageA/pages/reservation/reservation.vue

@@ -141,6 +141,7 @@ function getList(type = 'add', loading = true) {
             color: #666D7F;
         }
         .active{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             font-weight: 500;
             font-size: 32rpx;
             color: #000000;
@@ -167,6 +168,7 @@ function getList(type = 'add', loading = true) {
                 }
             }
             .card-Title{
+                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                 font-weight: 500;
                 font-size: 32rpx;
                 line-height: 70rpx

packageA/pages/tiktok/tiktok.vue

@@ -0,0 +1,136 @@
+<template>
+    <div class="video-container">
+        <view class="back-box">
+            <view class="btn">
+                <uni-icons type="left" size="26" color="#FFFFFF" @click="navBack"></uni-icons>
+            </view>
+        </view>
+        <mTikTok :video-list="state.videoList" :pause-type="1" :controls="false" @loadMore="loadMore" @change="change">
+            <template v-slot="data">
+                <view class="video-layer">
+                    <view class="title line_1">{{ currentItem.companyName }}</view>
+                    <view class="discription">
+                        <text class="line_1">
+                            {{ currentItem.jobTitle }}
+                        </text>
+                        <view class="seedetail" @click="nextDetail">
+                            查看详情
+                            <uni-icons type="right" color="#FFFFFF" size="14"></uni-icons>
+                        </view>
+                    </view>
+                </view>
+            </template>
+        </mTikTok>
+    </div>
+</template>
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navBack, navTo } = inject('globalFunction');
+import mTikTok from '@/components/TikTok/TikTok.vue';
+import useUserStore from '@/stores/useUserStore';
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const state = reactive({
+    videoList: [],
+});
+const currentItem = ref(null);
+
+onLoad(() => {
+    const jobInfo = uni.getStorageSync(`job-Info`);
+    if (jobInfo) {
+        currentItem.value = jobInfo;
+        state.videoList.push(jobInfo);
+    }
+    getNextVideoSrc(2);
+});
+
+function nextDetail() {
+    const job = currentItem.value;
+    // 记录岗位类型，用作数据分析
+    if (job.jobCategory) {
+        const recordData = recommedIndexDb.JobParameter(job);
+        recommedIndexDb.addRecord(recordData);
+    }
+    console.log(job.jobId);
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+}
+
+function getNextVideoSrc(num) {
+    let params = {
+        uuid: useUserStore().seesionId,
+        count: num || 1,
+    };
+    $api.createRequest('/app/job/littleVideo/random', params).then((resData) => {
+        const { data, code } = resData;
+        state.videoList.push(...data);
+    });
+}
+
+const loadMore = () => {
+    // 触发加载更多
+    console.log('加载更多');
+    getNextVideoSrc();
+};
+
+const change = (e) => {
+    currentItem.value = e.detail;
+    console.log('🚀 ~ file: index.vue:53 ~ change ~ data:', e);
+};
+</script>
+<style lang="stylus" scoped>
+.video-container{
+    width: 100%;
+    height: 100vh;
+    position: relative
+    .back-box{
+        position: absolute;
+        left: 20rpx;
+        top: 20rpx
+        color: #FFFFFF
+        z-index: 2
+    }
+}
+.video-layer {
+    position: absolute;
+    left: 24rpx;
+    right: 24rpx;
+    bottom: 30rpx;
+    color: #fff;
+    .title{
+        font-weight: 500;
+        font-size: 30rpx;
+        line-height: 100%;
+        letter-spacing: 0%;
+    }
+    .discription{
+        font-weight: 400;
+        font-size: 28rpx;
+        letter-spacing: 0%;
+        margin-top: 20rpx
+        display: flex
+        align-items: center
+        .seedetail{
+            font-weight: 500;
+            font-size: 32rpx;
+            line-height: 100%;
+            letter-spacing: 0%;
+            white-space: nowrap
+            padding-left: 20rpx
+        }
+    }
+}
+
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+
+    image {
+        height: 100%;
+        width: 100%;
+    }
+}
+</style>

pages.json

@@ -47,18 +47,18 @@
                 "navigationStyle": "custom"
             }
         },
-        {
-            "path": "pages/chat/chat",
-            "style": {
-                "navigationBarTitleText": "AI+",
-                "navigationBarBackgroundColor": "#4778EC",
-                "navigationBarTextStyle": "white",
-                "enablePullDownRefresh": false,
-                // #ifdef H5
-                "navigationStyle": "custom"
-                //#endif
-            }
-        },
+        // {
+        //     "path": "pages/chat/chat",
+        //     "style": {
+        //         "navigationBarTitleText": "AI+",
+        //         "navigationBarBackgroundColor": "#4778EC",
+        //         "navigationBarTextStyle": "white",
+        //         "enablePullDownRefresh": false,
+        //         // #ifdef H5
+        //         "navigationStyle": "custom"
+        //         //#endif
+        //     }
+        // },
         {
             "path": "pages/search/search",
             "style": {
@@ -186,10 +186,20 @@
                     "navigationBarTitleText": "系统通知",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
+            },
+            {
+                "path": "pages/tiktok/tiktok",
+                "style": {
+                    "navigationBarTitleText": "",
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
+                }
             }
         ]
     }],
     "tabBar": {
+        "custom": true,
+        "display": "none",
         "color": "#5E5F60",
         "selectedColor": "#256BFA",
         "borderStyle": "black",
@@ -211,11 +221,11 @@
                 "selectedIconPath": "static/tabbar/posted.png",
                 "text": "招聘会"
             },
-            {
-                "pagePath": "pages/chat/chat",
-                "iconPath": "static/tabbar/logo3.png",
-                "selectedIconPath": "static/tabbar/logo3.png"
-            },
+            // {
+            //     "pagePath": "pages/chat/chat",
+            //     "iconPath": "static/tabbar/logo3.png",
+            //     "selectedIconPath": "static/tabbar/logo3.png"
+            // },
             {
                 "pagePath": "pages/msglog/msglog",
                 "iconPath": "static/tabbar/chat4.png",

pages/careerfair/careerfair.vue

@@ -39,7 +39,7 @@
                 <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
                     <view class="cards" v-if="fairList.length">
                         <view
-                            class="card btn-incline"
+                            class="card press-button"
                             v-for="(item, index) in fairList"
                             :key="index"
                             @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.jobFairId)"
@@ -83,6 +83,7 @@
                     <empty v-else pdTop="200"></empty>
                 </scroll-view>
             </view>
+            <Tabbar :currentpage="1"></Tabbar>
         </view>
     </view>
 </template>
@@ -90,6 +91,7 @@
 <script setup>
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+import Tabbar from '@/components/tabbar/midell-box.vue';
 import useLocationStore from '@/stores/useLocationStore';
 import { storeToRefs } from 'pinia';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
@@ -371,6 +373,7 @@ function getNextDates({ startDate = '', count = 6 }) {
                 flex-wrap: nowrap
                 overflow: hidden
                 .weel-days{
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                     display: flex
                     justify-content: center
                     flex-direction: column
@@ -424,6 +427,7 @@ function getNextDates({ startDate = '', count = 6 }) {
         box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
         border-radius: 20rpx 20rpx 20rpx 20rpx;
         .card-title{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             font-weight: 500;
             font-size: 32rpx;
             color: #333333;
@@ -448,6 +452,7 @@ function getNextDates({ startDate = '', count = 6 }) {
                     font-weight: 500;
                     font-size: 48rpx;
                     color: #333333;
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                 }
                 .left-dateDay{
                     font-weight: 400;

pages/chat/chat.vue

@@ -62,10 +62,11 @@
             <view class="chatmain-warpper">
                 <ai-paging ref="paging"></ai-paging>
             </view>
+            <!-- 自定义tabbar -->
+            <view class="chatmain-footer" v-show="!isDrawerOpen">
+                <Tabbar :currentpage="2"></Tabbar>
+            </view>
         </view>
-
-        <!-- 自定义tabbar -->
-        <!-- <tabbar-custom :currentpage="2"></tabbar-custom> -->
     </view>
 </template>
 
@@ -73,6 +74,7 @@
 import { ref, inject, nextTick, computed } from 'vue';
 const { $api, navTo, insertSortData } = inject('globalFunction');
 import { onLoad, onShow, onHide } from '@dcloudio/uni-app';
+import Tabbar from '@/components/tabbar/midell-box.vue';
 import useChatGroupDBStore from '@/stores/userChatGroupStore';
 import useUserStore from '@/stores/useUserStore';
 import aiPaging from './components/ai-paging.vue';
@@ -88,6 +90,7 @@ const paging = ref(null);
 
 // 实时过滤
 const filteredList = computed(() => {
+    // console.log(tabeList.value);
     if (!searchText.value) return tabeList.value;
     const list = tabeList.value.filter((item) => !item.isTitle && item.title.includes(searchText.value));
     const [result, lastData] = $api.insertSortData(list);
@@ -108,16 +111,16 @@ onHide(() => {
     paging.value?.handleTouchCancel();
     if (isDrawerOpen.value) {
         isDrawerOpen.value = false;
-        uni.showTabBar();
+        // uni.showTabBar();
     }
 });
 
 const toggleDrawer = () => {
     isDrawerOpen.value = !isDrawerOpen.value;
     if (isDrawerOpen.value) {
-        uni.hideTabBar();
+        // uni.hideTabBar();
     } else {
-        uni.showTabBar();
+        // uni.showTabBar();
     }
 };
 
@@ -144,6 +147,7 @@ function updateSetting() {
 
 <style lang="stylus" scoped>
 header-height = 88rpx
+footer-height = 98rpx
 
 /* 页面容器 */
 .container {
@@ -277,6 +281,8 @@ header-height = 88rpx
     transition: margin-left 0.3s ease-in-out;
     position: relative
     background: #FFFFFF
+    display: flex
+    flex-direction: column
     .head
         display: block;
         box-sizing: border-box;
@@ -304,15 +310,20 @@ header-height = 88rpx
             height: 37rpx;
 
 .chatmain-warpper
-    height: 'calc(100% - %s)' % header-height
+    height: 'calc(100% - %s)' %( header-height + footer-height)
     position: relative;
     display: block;
     box-sizing: border-box;
     width: 100%;
     border-top: 2rpx solid #F4F4F4;
+    flex: 1
 
 /* 页面被挤压时向右移动 */
 .main-content.shift {
     margin-left: 500rpx;
 }
-</style>
+
+.chatmain-footer{
+    height: footer-height;
+}
+</style>

pages/index/components/index-one.vue

@@ -0,0 +1,887 @@
+<template>
+    <view class="app-container">
+        <view class="nav-hidden hidden-animation" :class="{ 'hidden-height': isScrollingDown }">
+            <view class="container-search">
+                <view class="search-input button-click" @click="navTo('/pages/search/search')">
+                    <uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
+                    <text class="inpute">职位名称、薪资要求等</text>
+                </view>
+                <view class="chart button-click">职业图谱</view>
+            </view>
+            <view class="cards">
+                <view class="card press-button" @click="navTo('/pages/nearby/nearby')">
+                    <view class="card-title">附近工作</view>
+                    <view class="card-text">好岗职等你来</view>
+                </view>
+                <view class="card press-button" @click="navTo('/packageA/pages/choiceness/choiceness')">
+                    <view class="card-title">精选企业</view>
+                    <view class="card-text">优选职得信赖</view>
+                </view>
+            </view>
+        </view>
+        <view class="nav-filter">
+            <view class="filter-top" @touchmove.stop.prevent>
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
+                        >
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
+                        </view>
+                    </view>
+                </scroll-view>
+                <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                    <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                    <text>添加</text>
+                </view>
+            </view>
+            <view class="filter-bottom">
+                <view class="btm-left">
+                    <view
+                        class="button-click filterbtm"
+                        :class="{ active: pageState.search.order === item.value }"
+                        v-for="item in rangeOptions"
+                        @click="handelHostestSearch(item)"
+                        :key="item.value"
+                    >
+                        {{ item.text }}
+                    </view>
+                </view>
+                <view class="btm-right button-click" @click="openFilter">
+                    筛选
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
+            </view>
+        </view>
+        <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"
+                        :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)">
+                                    <view class="falls-card-pay">
+                                        <view class="pay-text">
+                                            <Salary-Expectation
+                                                :max-salary="job.maxSalary"
+                                                :min-salary="job.minSalary"
+                                                :is-month="true"
+                                            ></Salary-Expectation>
+                                        </view>
+                                        <image v-if="job.isHot" class="flame" src="/static/icon/flame.png"></image>
+                                    </view>
+                                    <view class="falls-card-title">{{ job.jobTitle }}</view>
+                                    <view class="fl_box fl_warp">
+                                        <view class="falls-card-education mar_ri10" v-if="job.education">
+                                            <dict-Label dictType="education" :value="job.education"></dict-Label>
+                                        </view>
+                                        <view class="falls-card-experience" v-if="job.experience">
+                                            <dict-Label dictType="experience" :value="job.experience"></dict-Label>
+                                        </view>
+                                    </view>
+                                    <view class="falls-card-company">
+                                        青岛
+                                        <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
+                                    </view>
+                                    <view class="falls-card-pepleNumber">
+                                        <view>
+                                            <image class="point2" src="/static/icon/pintDate.png"></image>
+                                            <view class="fl_1">
+                                                {{ job.postingDate || '发布日期' }}
+                                            </view>
+                                        </view>
+                                        <view>
+                                            <image class="point3" src="/static/icon/pointpeople.png"></image>
+                                            <view class="fl_1">
+                                                {{ vacanciesTo(job.vacancies) }}
+                                            </view>
+                                        </view>
+                                    </view>
+                                    <view class="falls-card-company2">
+                                        <image class="point3" src="/static/icon/point3.png"></image>
+                                        <view class="fl_1">
+                                            {{ job.companyName }}
+                                        </view>
+                                    </view>
+                                    <!--  <view class="falls-card-matchingrate">
+                                        <view class=""><matchingDegree :job="job"></matchingDegree></view>
+                                        <uni-icons type="star" size="30"></uni-icons>
+                                    </view> -->
+                                </view>
+                            </view>
+                            <view class="item" :class="{ isBut: job.isBut }" v-else>
+                                <view class="recommend-card">
+                                    <view class="card-content">
+                                        <view class="recommend-card-title">在找「{{ job.jobCategory }}」工作吗？</view>
+                                        <view class="recommend-card-tip">{{ job.tip }}</view>
+                                        <view class="recommend-card-line"></view>
+                                        <view class="recommend-card-controll">
+                                            <view class="controll-no" @click="clearfindJob(job)">不是</view>
+                                            <view class="controll-yes" @click="findJob(job)">是的</view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </template>
+                    </custom-waterfalls-flow>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+                <empty v-else pdTop="200"></empty>
+            </scroll-view>
+        </view>
+        <!-- 筛选 -->
+        <select-filter ref="selectFilterModel"></select-filter>
+
+        <!--        <view class="maskFristEntry" v-if="maskFristEntry">
+            <view class="entry-content">
+                <text class="text1">左滑查看视频</text>
+                <text class="text2">左滑查看视频</text>
+                <view class="goExperience">去体验</view>
+                <view class="maskFristEntry-Close" @click="closeFristEntry">1</view>
+            </view>
+        </view> -->
+    </view>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
+import img from '@/static/icon/filter.png';
+import dictLabel from '@/components/dict-Label/dict-Label.vue';
+const { $api, navTo, vacanciesTo, formatTotal } = inject('globalFunction');
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+const { userInfo } = storeToRefs(useUserStore());
+import useDictStore from '@/stores/useDictStore';
+const { getTransformChildren, oneDictData } = useDictStore();
+import useLocationStore from '@/stores/useLocationStore';
+import selectFilter from '@/components/selectFilter/selectFilter.vue';
+import { useRecommedIndexedDBStore, jobRecommender } from '@/stores/useRecommedIndexedDBStore.js';
+import { useScrollDirection } from '@/hook/useScrollDirection';
+import { useColumnCount } from '@/hook/useColumnCount';
+const { isScrollingDown, handleScroll } = useScrollDirection();
+const recommedIndexDb = useRecommedIndexedDBStore();
+const emits = defineEmits(['onShowTabbar']);
+
+const waterfallsFlowRef = ref(null);
+const loadmoreRef = ref(null);
+const conditionSearch = ref({});
+const waterfallcolumn = ref(2);
+const maskFristEntry = ref(false);
+const state = reactive({
+    tabIndex: 'all',
+});
+const list = ref([]);
+const pageState = reactive({
+    page: 0,
+    total: 0,
+    maxPage: 2,
+    pageSize: 10,
+    search: {
+        order: 0,
+    },
+});
+const inputText = ref('');
+const showFilter = ref(false);
+const selectFilterModel = ref(null);
+const showModel = ref(false);
+const rangeOptions = ref([
+    { value: 0, text: '推荐' },
+    { value: 1, text: '最热' },
+    { value: 2, text: '最新发布' },
+]);
+const isLoaded = ref(false);
+
+const { columnCount, columnSpace } = useColumnCount(() => {
+    pageState.pageSize = 10 * (columnCount.value - 1);
+    getJobRecommend('refresh');
+    nextTick(() => {
+        waterfallsFlowRef.value?.refresh?.();
+        useLocationStore().getLocation();
+    });
+});
+
+async function loadData() {
+    try {
+        if (isLoaded.value) return;
+        isLoaded.value = true;
+    } catch (err) {
+        isLoaded.value = false; // 重置状态允许重试
+        throw err;
+    }
+}
+
+function scrollBottom() {
+    loadmoreRef.value.change('loading');
+    if (state.tabIndex === 'all') {
+        getJobRecommend();
+    } else {
+        getJobList();
+    }
+}
+
+function findJob(job) {
+    if (job.isBut) {
+        $api.msg('已确认');
+    } else {
+        list.value = list.value.map((item) => {
+            if (item.recommend && item.jobCategory === job.jobCategory) {
+                return {
+                    ...item,
+                    isBut: true,
+                };
+            }
+            return item;
+        });
+        const jobstr = job.jobCategory;
+        const jobsObj = {
+            地区: 'area',
+            岗位: 'jobTitle',
+            经验: 'experience',
+        };
+        const [name, value] = jobstr.split(':');
+        const nameAttr = jobsObj[name];
+        if (name === '岗位') {
+            conditionSearch.value[nameAttr] = value;
+        } else {
+            const valueAttr = oneDictData(nameAttr).filter((item) => item.label === value);
+            if (valueAttr.length) {
+                const val = valueAttr[0].value;
+                conditionSearch.value[nameAttr] = val;
+            }
+        }
+    }
+}
+
+function clearfindJob(job) {
+    if (job.isBut) {
+        $api.msg('已确认');
+    } else {
+        list.value = list.value.map((item) => {
+            if (item.recommend && item.jobCategory === job.jobCategory) {
+                return {
+                    ...item,
+                    isBut: true,
+                };
+            }
+            return item;
+        });
+        recommedIndexDb.deleteRecords(job);
+    }
+}
+
+function nextDetail(job) {
+    // 记录岗位类型，用作数据分析
+    if (job.jobCategory) {
+        const recordData = recommedIndexDb.JobParameter(job);
+        recommedIndexDb.addRecord(recordData);
+    }
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+}
+
+function openFilter() {
+    showFilter.value = true;
+    emits('onShowTabbar', false);
+    selectFilterModel.value?.open({
+        title: '筛选',
+        maskClick: true,
+        success: (values) => {
+            pageState.search = {
+                ...pageState.search,
+            };
+            for (const [key, value] of Object.entries(values)) {
+                pageState.search[key] = value.join(',');
+            }
+            showFilter.value = false;
+            getJobList('refresh');
+        },
+        cancel: () => {
+            showFilter.value = false;
+            emits('onShowTabbar', true);
+        },
+    });
+}
+
+function handleFilterConfirm(e) {
+    console.log(e);
+}
+
+function choosePosition(index) {
+    state.tabIndex = index;
+    list.value = [];
+    if (index === 'all') {
+        pageState.search = {
+            order: pageState.search.order,
+        };
+        inputText.value = '';
+        getJobRecommend('refresh');
+    } else {
+        // const id = useUserStore().userInfo.jobTitleId.split(',')[index];
+        pageState.search.jobTitle = userInfo.value.jobTitle[index];
+        inputText.value = '';
+        getJobList('refresh');
+    }
+}
+
+function handelHostestSearch(val) {
+    pageState.search.order = val.value;
+    if (state.tabIndex === 'all') {
+        getJobRecommend('refresh');
+    } else {
+        getJobList('refresh');
+    }
+}
+
+function getJobRecommend(type = 'add') {
+    if (type === 'refresh') {
+        list.value = [];
+        if (waterfallsFlowRef.value) waterfallsFlowRef.value.refresh();
+    }
+    let params = {
+        pageSize: pageState.pageSize,
+        sessionId: useUserStore().seesionId,
+        ...pageState.search,
+        ...conditionSearch.value,
+    };
+    let comd = { recommend: true, jobCategory: '', tip: '确认你的兴趣，为您推荐更多合适的岗位' };
+    $api.createRequest('/app/job/recommend', params).then((resData) => {
+        const { data, total } = resData;
+        pageState.total = 0;
+        if (type === 'add') {
+            // 记录系统
+            recommedIndexDb.getRecord().then((res) => {
+                if (res.length) {
+                    // 数据分析系统
+                    const resultData = recommedIndexDb.analyzer(res);
+                    const { sort, result } = resultData;
+                    // 岗位询问系统
+                    const conditionCounts = Object.fromEntries(
+                        sort.filter((item) => item[1] > 1) // 过滤掉次数为 1 的项
+                    );
+                    jobRecommender.updateConditions(conditionCounts);
+
+                    const question = jobRecommender.getNextQuestion();
+
+                    if (question) {
+                        comd.jobCategory = question;
+                        data.unshift(comd);
+                    }
+                }
+                const reslist = dataToImg(data);
+                list.value.push(...reslist);
+            });
+        } else {
+            list.value = dataToImg(data);
+        }
+        // 切换状态
+        if (data.length < pageState.pageSize) {
+            loadmoreRef.value.change('noMore');
+        } else {
+            loadmoreRef.value.change('more');
+        }
+        // 当没有岗位，刷新sessionId重新啦
+        if (!data.length) {
+            useUserStore().initSeesionId();
+        }
+    });
+}
+
+function getJobList(type = 'add') {
+    if (type === 'add' && pageState.page < pageState.maxPage) {
+        pageState.page += 1;
+    }
+    if (type === 'refresh') {
+        list.value = [];
+        pageState.page = 1;
+        pageState.maxPage = 2;
+        waterfallsFlowRef.value.refresh();
+    }
+    let params = {
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+        ...pageState.search,
+        // ...conditionSearch.value,
+    };
+
+    $api.createRequest('/app/job/list', params).then((resData) => {
+        const { rows, total } = resData;
+        if (type === 'add') {
+            const str = pageState.pageSize * (pageState.page - 1);
+            const end = list.value.length;
+            const reslist = dataToImg(rows);
+            list.value.splice(str, end, ...reslist);
+        } else {
+            list.value = dataToImg(rows);
+        }
+        pageState.total = resData.total;
+        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+        if (rows.length < pageState.pageSize) {
+            loadmoreRef.value?.change('noMore');
+        } else {
+            loadmoreRef.value?.change('more');
+        }
+    });
+}
+
+function dataToImg(data) {
+    return data.map((item) => ({
+        ...item,
+        image: img,
+        hide: true,
+    }));
+}
+
+defineExpose({ loadData });
+</script>
+
+<style lang="stylus" scoped>
+// .maskFristEntry
+//     position: fixed;
+//     // right: 20rpx;
+//     // bottom: calc(50% - 200rpx);
+//     height: 100vh
+//     width: 100vw
+//     background: rgba(0,0,0,0.3)
+//     .entry-content
+//         display: flex;
+//         align-items: center
+//         position: absolute
+//         left: 50%
+//         top: 40%
+//         transform: translate(-50%, -50%)
+//         flex-direction: column
+//         background: url('@/static/imgs/fristEntry.png') 0 0 no-repeat;
+//         background-size: 100% 100%;
+//         width: 480rpx
+//         height: 584rpx
+//         // padding-left: 80rpx
+//         .text1
+//             margin-top: 370rpx
+//             font-size: 36rpx
+//             background: linear-gradient(273.34deg, #356CFA 3.58%, #A47FFD 85.84%);
+//             -webkit-background-clip: text;
+//             -webkit-text-fill-color: transparent;
+//             background-clip: text; /* 有些浏览器兼容用 */
+//             text-fill-color: transparent;
+//             padding-left: 28rpx
+//         .text2
+//             padding-left: 28rpx
+//             margin-top: 8rpx
+//             font-size: 20rpx;
+//             color: #666666;
+//             text-align: center;
+//         .indicateArrow
+//             height: 76rpx
+//             width: 68rpx
+//         .indicatefristEntry
+//             width: 244rpx
+//             height: 244rpx
+//         .goExperience
+//             margin-left: 28rpx
+//             margin-top: 28rpx
+//             width: 160rpx;
+//             height: 60rpx;
+//             background: linear-gradient( 180deg, #9974FD 0%, #286BFA 100%);
+//             border-radius: 12rpx 12rpx 12rpx 12rpx;
+//             font-size: 28rpx;
+//             color: #FFFFFF;
+//             text-align: center;
+//             line-height: 60rpx
+//         .maskFristEntry-Close
+//             position: absolute;
+//             left: calc(50% - 10rpx);
+//             bottom: -130rpx
+//             width: 42rpx
+//             height: 42rpx
+//             background: linear-gradient(273.34deg, #356CFA 3.58%, #A47FFD 85.84%);
+//             border-radius: 50%;
+//         .maskFristEntry-Close::before
+//             position: absolute;
+//             left: calc( 50% - 2rpx)
+//             top: calc( 50% - 10rpx)
+//             transform: rotate(45deg);
+//             content: ''
+//             background: #FFFFFF
+//             width: 4rpx
+//             height: 20rpx
+//         .maskFristEntry-Close::after
+//             position: absolute;
+//             left: calc( 50% - 2rpx)
+//             top: calc( 50% - 10rpx)
+//             transform: rotate(-45deg);
+//             content: ''
+//             background: #FFFFFF
+//             width: 4rpx
+//             height: 20rpx
+
+
+.app-container
+    width: 100%;
+    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    background: url('@/static/icon/background2.png') 0 0 no-repeat;
+    background-size: 100% 728rpx;
+    background-color: #FFFFFF;
+    display: flex;
+    flex-direction: column
+    .hidden-animation
+        max-height: 1000px;
+        transition: all 0.3s ease;
+        overflow: hidden;
+    .hidden-height
+        max-height: 0;
+        padding-top: 0;
+        padding-bottom: 0;
+.container-search
+    padding: 16rpx 24rpx
+    display: flex
+    justify-content: space-between
+    .search-input
+        display: flex
+        align-items: center;
+        width: 100%
+        height: 80rpx;
+        line-height: 80rpx
+        margin-right: 24rpx
+        background: #FFFFFF;
+        border-radius: 75rpx 75rpx 75rpx 75rpx;
+        .iconsearch
+            padding-left: 36rpx
+        .inpute
+            margin-left: 20rpx
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #B5B5B5;
+            width: 100%
+    .chart
+        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+        width: 170rpx;
+        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%);
+        box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(210,210,210,0.14);
+        border-radius: 80rpx 80rpx 80rpx 80rpx;
+        border: 2rpx solid #FFFFFF;
+        text-align: center
+        font-weight: 500;
+        font-size: 28rpx;
+        height: 36rpx;
+        color: #000000;
+        padding: 20rpx 30rpx
+.cards
+    padding: 10rpx 28rpx
+    display: grid
+    grid-gap: 38rpx;
+    grid-template-columns: 1fr 1fr;
+    .card
+        height: calc(158rpx - 40rpx);
+        padding: 22rpx 26rpx
+        box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(210,210,210,0.14);
+        border-radius: 16rpx 16rpx 16rpx 16rpx;
+        border: 2rpx solid #FFFFFF;
+        .card-title
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+        .card-text
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #9E9E9E;
+            margin-top: 4rpx
+    .card:first-child
+        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%),
+            url('@/static/icon/fujin.png');
+        background-size: 100%, 100%
+    .card:last-child
+        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%),
+            url('@/static/icon/jinxuan.png');
+        background-size: 100%, 100%
+        background-size: cover;
+        background-position: center;
+
+.nav-filter
+    padding: 16rpx 28rpx 0 28rpx
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
+                display: flex
+                flex-wrap: nowrap
+                .job
+                    font-weight: 400;
+                    font-size: 36rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            .filterbtm
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #666D7F;
+                margin-right: 24rpx
+                padding: 0rpx 16rpx
+            .active
+                font-weight: 500;
+                font-size: 32rpx;
+                color: #256BFA;
+        .btm-right
+            font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
+.table-list
+    background: #F4F4F4
+    flex: 1
+    overflow: hidden
+    .falls-scroll
+        width: 100%
+        height: 100%
+        .falls
+            padding: 28rpx 28rpx;
+            .item
+                position: relative;
+                // background: linear-gradient( 180deg, rgba(19, 197, 124, 0.4) 0%, rgba(255, 255, 255, 0) 30%), rgba(255, 255, 255, 0);
+                .falls-card
+                    padding: 30rpx;
+                    .falls-card-title
+                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                        color: #606060;
+                        text-align: left;
+                        word-break:break-all
+                        font-weight: 500;
+                        font-size: 32rpx;
+                        color: #333333;
+                        margin-top: 10rpx
+                    .falls-card-pay
+                        // height: 50rpx;
+                        word-break:break-all
+                        color: #002979;
+                        text-align: left;
+                        display: flex;
+                        align-items: end;
+                        position: relative
+                        .pay-text
+                            font-family: DIN-Medium;
+                            color: #4C6EFB;
+                            padding-right: 10rpx
+                            font-weight: 500;
+                            font-size: 28rpx;
+                            color: #4C6EFB;
+                            line-height: 45rpx;
+                            text-align: left;
+                        .flame
+                            position: absolute
+                            bottom: 0
+                            right: -10rpx
+                            transform: translate(0, -30%)
+                            width: 24rpx
+                            height: 31rpx
+                    .falls-card-education,.falls-card-experience
+                        width: fit-content;
+                        height: 30rpx;
+                        background: #F4F4F4;
+                        border-radius: 4rpx;
+                        padding: 6rpx 20rpx;
+                        line-height: 30rpx;
+                        font-weight: 400;
+                        font-size: 24rpx;
+                        color: #6C7282;
+                        text-align: center;
+                        margin-top: 20rpx;
+                        white-space: nowrap
+
+                    .falls-card-company,.falls-card-pepleNumber
+                        margin-top: 20rpx;
+                        font-size: 24rpx;
+                        color: #999999;
+                        line-height: 25rpx;
+                        text-align: left;
+                    .falls-card-pepleNumber
+                        display: flex;
+                        justify-content: space-between;
+                        align-items: center;
+                        margin-top: 20rpx;
+                        font-weight: 400;
+                        font-size: 24rpx;
+                        color: #999999;
+                        view
+                            display:flex
+                            align-items: center
+                            .point2
+                                margin: 4rpx 6rpx 0 2rpx
+                                height: 22rpx
+                                width: 22rpx
+                            .point3
+                                margin: 4rpx 4rpx 0 0
+                                height: 28rpx
+                                width: 28rpx
+                    .falls-card-matchingrate
+                        margin-top: 10rpx;
+                        display: flex;
+                        justify-content: space-between;
+                        align-items: center;
+                        font-size: 21rpx;
+                        color: #4778EC;
+                        text-align: left;
+                    .falls-card-company2
+                        margin-top: 8rpx;
+                        font-size: 24rpx;
+                        color: #999999;
+                        text-align: left;
+                        display: flex
+                        .point3
+                            margin: 4rpx 4rpx 0 0
+                            height: 26rpx
+                            width: 26rpx
+// 推荐卡片
+.recommend-card::before
+    position: absolute
+    left: 0
+    top: 0
+    content: ''
+    height: 60rpx
+    width: 100%
+    height: 8rpx;
+    background: linear-gradient( to left, #9E74FD 0%, #256BFA 100%);
+    box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(0,54,170,0.15);
+.recommend-card::after
+    content ''
+    position absolute
+    z-index 0
+    left 50%
+    top 40%
+    transform: translate(-50%, -50%)
+    width 250rpx
+    height 250rpx
+    background url('@/static/icon/backAI.png') no-repeat center center
+    opacity 0.6
+    background-size contain
+    pointer-events none
+    filter: blur(3rpx)
+.recommend-card
+    padding 36rpx 24rpx
+    background: linear-gradient( 360deg, #DFE9FF 0%, #FFFFFF 52%, #FFFFFF 100%);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    position relative
+    box-shadow 0rpx 4rpx 8rpx 0rpx rgba(72, 89, 123, 0.3)
+    .card-content
+        position: relative;
+        z-index: 2;
+        .recommend-card-title
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #333333;
+        .recommend-card-tip
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+            margin-top: 28rpx
+        .recommend-card-line
+            width: calc(100%);
+            height: 0rpx;
+            border-radius: 0rpx 0rpx 0rpx 0rpx;
+            border: 2rpx dashed rgba(0,0,0,0.14);
+            margin-top: 50rpx
+            position: relative
+        // .recommend-card-line::before
+        //     position: absolute
+        //     content: ''
+        //     left: 0
+        //     top: 0
+        //     transform: translate(-50% - 90rpx, -50%)
+        //     width: 28rpx;
+        //     height: 28rpx;
+        //     background: #F4F4F4;
+        //     border-radius: 50%;
+        // .recommend-card-line::after
+        //     position: absolute
+        //     content: ''
+        //     right: 0
+        //     top: 0
+        //     transform: translate(50% + 90rpx, -50%)
+        //     width: 28rpx;
+        //     height: 28rpx;
+        //     background: #F4F4F4;
+        //     border-radius: 50%;
+        .recommend-card-controll
+            display: flex
+            align-items: center
+            justify-content: space-between
+            margin-top: 40rpx
+            padding: 0 6rpx;
+            .controll-yes
+                width: 124rpx;
+                height: 60rpx;
+                background: rgba(37,107,250,0.1);
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                text-align: center;
+                line-height: 60rpx
+                color: #256BFA
+            .controll-no
+                width: 124rpx;
+                height: 56rpx;
+                line-height: 56rpx
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                border: 2rpx solid #DEDEDE;
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #333333;
+                text-align: center;
+            .controll-yes:active, .controll-no:active
+                width: 120rpx;
+                height: 66rpx;
+                line-height: 66rpx
+                background: #e8e8e8
+                border: 2rpx solid #e8e8e8
+.isBut{
+    filter: grayscale(100%);
+}
+</style>

pages/index/components/index-two.vue

@@ -0,0 +1,333 @@
+<template>
+    <view class="app-container">
+        <view class="nav-filter">
+            <view class="filter-top" @touchmove.stop.prevent>
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
+                        >
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
+                        </view>
+                    </view>
+                </scroll-view>
+                <view class="jobs-add button-click" @click="navTo('/pages/search/search')">
+                    <uni-icons class="iconsearch" color="#666D7F" type="search" size="18"></uni-icons>
+                    <text>搜索</text>
+                </view>
+            </view>
+        </view>
+        <view class="cards">
+            <scroll-view :scroll-y="true" class="tab-scroll" @scrolltolower="scrollBottom">
+                <view class="scroll-content">
+                    <custom-waterfalls-flow
+                        ref="waterfallsFlowRef"
+                        :column="columnCount"
+                        :columnSpace="columnSpace"
+                        @loaded="imageloaded"
+                        :value="list"
+                    >
+                        <template v-slot:default="job">
+                            <view class="slot-item">
+                                <view class="job-image btn-feel" @click="nextVideo(job)">
+                                    <image class="cover-image" :src="job.cover" mode="aspectFill"></image>
+                                    <view class="cover-triangle"></view>
+                                </view>
+                                <view class="job-info" @click="nextDetail(job)">
+                                    <view class="salary">
+                                        <Salary-Expectation
+                                            :max-salary="job.maxSalary"
+                                            :min-salary="job.minSalary"
+                                            :is-month="true"
+                                        ></Salary-Expectation>
+                                        <image v-if="job.isHot" class="flame" src="/static/icon/flame.png"></image>
+                                    </view>
+                                    <view class="title">{{ job.jobTitle }}</view>
+                                    <view class="desc">
+                                        <image class="point3" src="/static/icon/point3.png"></image>
+                                        <!-- <uni-icons type="location" size="14"></uni-icons> -->
+                                        <view class="descText">{{ job.companyName }}</view>
+                                    </view>
+                                </view>
+                            </view>
+                        </template>
+                    </custom-waterfalls-flow>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+            </scroll-view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
+import { usePagination } from '@/hook/usePagination';
+const { $api, navTo } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import img from '@/static/icon/filter.png';
+import useLocationStore from '@/stores/useLocationStore';
+import { useColumnCount } from '@/hook/useColumnCount';
+import { useRecommedIndexedDBStore, jobRecommender } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+// status
+const { userInfo } = storeToRefs(useUserStore());
+const isLoaded = ref(false);
+const waterfallsFlowRef = ref(null);
+const loadmoreRef = ref(null);
+const state = reactive({
+    tabIndex: 'all',
+});
+
+// 响应式搜索条件（可以被修改）
+const searchParams = ref({});
+const pageSize = ref(10);
+const { list, loading, refresh, loadMore } = usePagination(
+    (params) => $api.createRequest('/app/job/littleVideo', params),
+    dataToImg, // 转换函数
+    {
+        pageSize: pageSize,
+        search: searchParams,
+        dataKey: 'data',
+        onBeforeRequest: () => {
+            loadmoreRef.value?.change('loading');
+        },
+    }
+);
+
+function imageloaded() {
+    loadmoreRef.value?.change('more');
+}
+
+const { columnCount, columnSpace } = useColumnCount(() => {
+    pageSize.value = 10 * (columnCount.value - 1);
+    nextTick(() => {
+        waterfallsFlowRef.value?.refresh?.();
+        useLocationStore().getLocation();
+    });
+});
+
+async function loadData() {
+    try {
+        if (isLoaded.value) return;
+        isLoaded.value = true;
+        refresh();
+    } catch (err) {
+        isLoaded.value = false; // 重置状态允许重试
+        throw err;
+    }
+}
+
+async function choosePosition(index) {
+    state.tabIndex = index;
+    if (index === 'all') {
+        searchParams.value.jobTitle = '';
+    } else {
+        searchParams.value.jobTitle = userInfo.value.jobTitle[index];
+    }
+    console.log(searchParams.value);
+    refresh('refresh');
+    waterfallsFlowRef.value.refresh();
+}
+
+function scrollBottom() {
+    loadMore();
+}
+
+function nextDetail(job) {
+    // 记录岗位类型，用作数据分析
+    if (job.jobCategory) {
+        const recordData = recommedIndexDb.JobParameter(job);
+        recommedIndexDb.addRecord(recordData);
+    }
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+}
+
+function nextVideo(job) {
+    uni.setStorageSync(`job-Info`, job);
+    navTo(`/packageA/pages/tiktok/tiktok`);
+}
+
+function dataToImg(data) {
+    return data.map((item) => ({
+        ...item,
+        // image: item.cover,
+        image: img,
+        hide: true,
+    }));
+}
+
+defineExpose({ loadData });
+</script>
+
+<style lang="stylus" scoped>
+.app-container
+    width: 100%;
+    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    background: url('@/static/icon/background2.png') 0 0 no-repeat;
+    background-size: 100% 728rpx;
+    // background-color: #FFFFFF;
+    display: flex;
+    flex-direction: column
+    .cards
+        flex: 1;
+        overflow: hidden;
+        .tab-scroll
+            height: 100%;
+            white-space: nowrap;
+            text-overflow: clip;
+            .scroll-content{
+                padding: 24rpx
+            }
+
+.nav-filter
+    padding: 16rpx 28rpx 30rpx 28rpx
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
+                display: flex
+                flex-wrap: nowrap
+                align-items: center
+                .job
+                    font-weight: 400;
+                    font-size: 28rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+            .iconsearch
+                margin-right: 6rpx
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            .filterbtm
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #666D7F;
+                margin-right: 24rpx
+                padding: 0rpx 16rpx
+            .active
+                font-weight: 500;
+                font-size: 32rpx;
+                color: #256BFA;
+        .btm-right
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
+
+.slot-item
+    background: #f4f4f4;
+    // background: #f6f8fa;
+    .job-image{
+        width: 100%;
+        height: 280rpx;
+        position: relative;
+        .cover-image{
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+        .cover-triangle{
+            position: absolute;
+            right: 20rpx;
+            top: 20rpx
+            width: 36rpx
+            height: 36rpx
+            border-radius: 50%
+            background: rgba(0,0,0,0.3)
+        }
+        .cover-triangle::after {
+          content: '';
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          transform: translate(-40%, -50%) rotate(90deg);
+          width: 0;
+          height: 0;
+          border-left: 8rpx solid transparent;
+          border-right: 8rpx solid transparent;
+          border-bottom: 12rpx solid #fff;
+        }
+    }
+    .job-info{
+        padding: 10rpx 10rpx 24rpx 24rpx
+    }
+    .salary
+        color: #4C6EFB;
+        font-size: 28rpx
+        display: flex
+        align-items: flex-start
+        justify-content: space-between
+        font-family: DIN-Medium;
+        .flame
+            margin-top: 4rpx
+            margin-right: 4rpx
+            width: 24rpx
+            height: 31rpx
+    .title
+        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+        margin-top: 6rpx;
+        white-space: pre-wrap
+    .desc
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #6C7282;
+        margin-top: 6rpx;
+        display: flex
+        align-items: flex-start
+        .descText{
+            flex: 1
+            white-space: pre-wrap
+        }
+        .point3{
+            margin: 4rpx 4rpx 0 0
+            height: 26rpx
+            width: 26rpx
+        }
+</style>

pages/index/index.vue

@@ -1,734 +1,284 @@
 <template>
-    <view class="app-container">
-        <view class="nav-hidden hidden-animation" :class="{ 'hidden-height': isScrollingDown }">
-            <view class="container-search">
-                <view class="search-input button-click" @click="navTo('/pages/search/search')">
-                    <uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
-                    <text class="inpute">职位名称、薪资要求等</text>
-                </view>
-                <view class="chart button-click">职业图谱</view>
+    <view class="app-custom-root">
+        <view class="app-container">
+            <!-- 主体内容区域 -->
+            <view class="container-main">
+                <swiper class="swiper" :current="state.current" @change="changeSwiperType">
+                    <swiper-item class="swiper-item" v-for="(_, index) in 2" :key="index">
+                        <!-- #ifndef MP-WEIXIN -->
+                        <component
+                            :is="components[index]"
+                            @onShowTabbar="changeShowTabbar"
+                            :ref="(el) => handelComponentsRef(el, index)"
+                        />
+                        <!-- #endif -->
+                        <!-- #ifdef MP-WEIXIN -->
+                        <IndexOne
+                            v-show="currentIndex === 0"
+                            @onShowTabbar="changeShowTabbar"
+                            :ref="(el) => handelComponentsRef(el, index)"
+                        />
+                        <IndexTwo
+                            v-show="currentIndex === 1"
+                            @onShowTabbar="changeShowTabbar"
+                            :ref="(el) => handelComponentsRef(el, index)"
+                        />
+                        <!-- #endif -->
+                    </swiper-item>
+                </swiper>
             </view>
-            <view class="cards">
-                <view class="card btn-feel" @click="navTo('/pages/nearby/nearby')">
-                    <view class="card-title">附近工作</view>
-                    <view class="card-text">好岗职等你来</view>
-                </view>
-                <view class="card btn-feel" @click="navTo('/packageA/pages/choiceness/choiceness')">
-                    <view class="card-title">精选企业</view>
-                    <view class="card-text">优选职得信赖</view>
+
+            <Tabbar v-show="showTabbar" :currentpage="0"></Tabbar>
+
+            <!-- maskFristEntry -->
+            <view class="maskFristEntry" v-if="maskFristEntry">
+                <view class="entry-content">
+                    <text class="text1">左滑查看视频</text>
+                    <text class="text2">快去体验吧～</text>
+                    <view class="goExperience" @click="goExperience">去体验</view>
+                    <view class="maskFristEntry-Close" @click="closeFristEntry">1</view>
                 </view>
             </view>
         </view>
-        <view class="nav-filter">
-            <view class="filter-top">
-                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                    <view class="jobs-left">
-                        <view
-                            class="job button-click"
-                            :class="{ active: state.tabIndex === 'all' }"
-                            @click="choosePosition('all')"
-                        >
-                            全部
-                        </view>
-                        <view
-                            class="job button-click"
-                            :class="{ active: state.tabIndex === index }"
-                            v-for="(item, index) in userInfo.jobTitle"
-                            :key="index"
-                            @click="choosePosition(index)"
-                        >
-                            {{ item }}
-                        </view>
-                    </view>
-                </scroll-view>
-                <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                    <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                    <text>添加</text>
-                </view>
-            </view>
-            <view class="filter-bottom">
-                <view class="btm-left">
-                    <view
-                        class="button-click filterbtm"
-                        :class="{ active: pageState.search.order === item.value }"
-                        v-for="item in rangeOptions"
-                        @click="handelHostestSearch(item)"
-                        :key="item.value"
-                    >
-                        {{ item.text }}
-                    </view>
-                </view>
-                <view class="btm-right button-click" @click="openFilter">
-                    筛选
-                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                </view>
-            </view>
-        </view>
-        <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"
-                        :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)">
-                                    <view class="falls-card-pay">
-                                        <view class="pay-text">
-                                            <Salary-Expectation
-                                                :max-salary="job.maxSalary"
-                                                :min-salary="job.minSalary"
-                                                :is-month="true"
-                                            ></Salary-Expectation>
-                                        </view>
-                                        <image v-if="job.isHot" class="flame" src="/static/icon/flame.png"></image>
-                                    </view>
-                                    <view class="falls-card-title">{{ job.jobTitle }}</view>
-                                    <view class="fl_box fl_warp">
-                                        <view class="falls-card-education mar_ri10" v-if="job.education">
-                                            <dict-Label dictType="education" :value="job.education"></dict-Label>
-                                        </view>
-                                        <view class="falls-card-experience" v-if="job.experience">
-                                            <dict-Label dictType="experience" :value="job.experience"></dict-Label>
-                                        </view>
-                                    </view>
-                                    <view class="falls-card-company">{{ job.companyName }}</view>
-                                    <view class="falls-card-company">
-                                        青岛
-                                        <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
-                                    </view>
-                                    <view class="falls-card-pepleNumber">
-                                        <view>{{ job.postingDate || '发布日期' }}</view>
-                                        <view>{{ vacanciesTo(job.vacancies) }}</view>
-                                    </view>
-                                    <!--  <view class="falls-card-matchingrate">
-                                        <view class=""><matchingDegree :job="job"></matchingDegree></view>
-                                        <uni-icons type="star" size="30"></uni-icons>
-                                    </view> -->
-                                </view>
-                            </view>
-                            <view class="item" :class="{ isBut: job.isBut }" v-else>
-                                <view class="recommend-card">
-                                    <view class="card-content">
-                                        <view class="recommend-card-title">在找「{{ job.jobCategory }}」工作吗？</view>
-                                        <view class="recommend-card-tip">{{ job.tip }}</view>
-                                        <view class="recommend-card-line"></view>
-                                        <view class="recommend-card-controll">
-                                            <view class="controll-no" @click="clearfindJob(job)">不是</view>
-                                            <view class="controll-yes" @click="findJob(job)">是的</view>
-                                        </view>
-                                    </view>
-                                </view>
-                            </view>
-                        </template>
-                    </custom-waterfalls-flow>
-                    <loadmore ref="loadmoreRef"></loadmore>
-                </view>
-                <empty v-else pdTop="200"></empty>
-            </scroll-view>
-        </view>
-        <!-- 筛选 -->
-        <select-filter ref="selectFilterModel"></select-filter>
     </view>
 </template>
 
 <script setup>
-import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
-import img from '@/static/icon/filter.png';
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-const { $api, navTo, vacanciesTo, formatTotal } = inject('globalFunction');
+import { reactive, inject, watch, ref, onMounted } from 'vue';
+import Tabbar from '@/components/tabbar/midell-box.vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+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];
 import { storeToRefs } from 'pinia';
-import useUserStore from '@/stores/useUserStore';
-const { userInfo } = storeToRefs(useUserStore());
-import useDictStore from '@/stores/useDictStore';
-const { getTransformChildren, oneDictData } = useDictStore();
-import useLocationStore from '@/stores/useLocationStore';
-import selectFilter from '@/components/selectFilter/selectFilter.vue';
-import { useRecommedIndexedDBStore, jobRecommender } from '@/stores/useRecommedIndexedDBStore.js';
-import { useScrollDirection } from '@/hook/useScrollDirection';
-import { useColumnCount } from '@/hook/useColumnCount';
-const { isScrollingDown, handleScroll } = useScrollDirection();
-const recommedIndexDb = useRecommedIndexedDBStore();
+import { useReadMsg } from '@/stores/useReadMsg';
+const { unreadCount } = storeToRefs(useReadMsg());
+const showTabbar = ref(true);
+const maskFristEntry = ref(false);
+
+onLoad(() => {
+    // 判断浏览器是否有 fristEntry 第一次进入
+    // let fristEntry = uni.getStorageSync('fristEntry') === false ? false : true; // 默认未读
+    // maskFristEntry.value = fristEntry ;
+    maskFristEntry.value = true;
+});
+
+onShow(() => {
+    // 获取消息列表
+    useReadMsg().fetchMessages();
+});
 
-const waterfallsFlowRef = ref(null);
-const loadmoreRef = ref(null);
-const conditionSearch = ref({});
-const waterfallcolumn = ref(2);
 const state = reactive({
-    tabIndex: 'all',
-});
-const list = ref([]);
-const pageState = reactive({
-    page: 0,
-    total: 0,
-    maxPage: 2,
-    pageSize: 10,
-    search: {
-        order: 0,
-    },
-});
-const inputText = ref('');
-const showFilter = ref(false);
-const selectFilterModel = ref(null);
-const showModel = ref(false);
-const rangeOptions = ref([
-    { value: 0, text: '推荐' },
-    { value: 1, text: '最热' },
-    { value: 2, text: '最新发布' },
-]);
-// const jobList = ref([
-//     { name: '销售顾问', highlight: true },
-//     { name: '销售管理', highlight: true },
-//     { name: '销售工程师', highlight: true },
-//     { name: '算法工程师', highlight: false },
-//     { name: '生产经理', highlight: false },
-//     { name: '市场策划', highlight: false },
-//     { name: '商务服务', highlight: false },
-//     { name: '客服', highlight: false },
-//     { name: '创意总监', highlight: false },
-// ]);
-
-const { columnCount, columnSpace } = useColumnCount(() => {
-    pageState.pageSize = 10 * (columnCount.value - 1);
-    getJobRecommend('refresh');
-    nextTick(() => {
-        waterfallsFlowRef.value?.refresh?.();
-        useLocationStore().getLocation();
-    });
+    current: 0,
+    all: [{}],
 });
 
-// onLoad(() => {
-//     getJobRecommend('refresh');
-// });
+onMounted(() => {
+    handleTabChange(state.current);
+});
 
-function scrollBottom() {
-    loadmoreRef.value.change('loading');
-    if (state.tabIndex === 'all') {
-        getJobRecommend();
-    } else {
-        getJobList();
+const handelComponentsRef = (el, index) => {
+    if (el) {
+        swiperRefs[index].value = el;
+    }
+};
+
+function changeShowTabbar(val) {
+    showTabbar.value = val;
+}
+
+//1  查看消息类型
+function changeSwiperType(e) {
+    const index = e.detail.current;
+    state.current = index;
+    handleTabChange(index);
+}
+function changeType(index) {
+    state.current = index;
+    handleTabChange(index);
+}
+
+function handleTabChange(index) {
+    if (!loadedMap[index]) {
+        swiperRefs[index].value?.loadData();
+        loadedMap[index] = true;
     }
 }
 
-function findJob(job) {
-    if (job.isBut) {
-        $api.msg('已确认');
-    } else {
-        list.value = list.value.map((item) => {
-            if (item.recommend && item.jobCategory === job.jobCategory) {
-                return {
-                    ...item,
-                    isBut: true,
-                };
-            }
-            return item;
-        });
-        const jobstr = job.jobCategory;
-        const jobsObj = {
-            地区: 'area',
-            岗位: 'jobTitle',
-            经验: 'experience',
-        };
-        const [name, value] = jobstr.split(':');
-        const nameAttr = jobsObj[name];
-        if (name === '岗位') {
-            conditionSearch.value[nameAttr] = value;
-        } else {
-            const valueAttr = oneDictData(nameAttr).filter((item) => item.label === value);
-            if (valueAttr.length) {
-                const val = valueAttr[0].value;
-                conditionSearch.value[nameAttr] = val;
-            }
-        }
-    }
+function changeSwiperMsgType(e) {
+    const currented = e.detail.current;
+    state.current = currented;
+}
+// mask
+function closeFristEntry() {
+    uni.setStorageSync('fristEntry', false);
+    maskFristEntry.value = false;
 }
 
-function clearfindJob(job) {
-    if (job.isBut) {
-        $api.msg('已确认');
-    } else {
-        list.value = list.value.map((item) => {
-            if (item.recommend && item.jobCategory === job.jobCategory) {
-                return {
-                    ...item,
-                    isBut: true,
-                };
-            }
-            return item;
-        });
-        recommedIndexDb.deleteRecords(job);
-    }
-}
-
-function nextDetail(job) {
-    // 记录岗位类型，用作数据分析
-    if (job.jobCategory) {
-        const recordData = recommedIndexDb.JobParameter(job);
-        recommedIndexDb.addRecord(recordData);
-    }
-    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
-}
-
-function openFilter() {
-    showFilter.value = true;
-    selectFilterModel.value?.open({
-        title: '筛选',
-        maskClick: true,
-        success: (values) => {
-            pageState.search = {
-                ...pageState.search,
-            };
-            for (const [key, value] of Object.entries(values)) {
-                pageState.search[key] = value.join(',');
-            }
-            showFilter.value = false;
-            getJobList('refresh');
-        },
-        cancel: () => {
-            showFilter.value = false;
-        },
-    });
-}
-
-function handleFilterConfirm(e) {
-    console.log(e);
-}
-
-function choosePosition(index) {
-    state.tabIndex = index;
-    list.value = [];
-    if (index === 'all') {
-        pageState.search = {
-            order: pageState.search.order,
-        };
-        inputText.value = '';
-        getJobRecommend('refresh');
-    } else {
-        // const id = useUserStore().userInfo.jobTitleId.split(',')[index];
-        pageState.search.jobTitle = userInfo.value.jobTitle[index];
-        inputText.value = '';
-        getJobList('refresh');
-    }
-}
-
-function handelHostestSearch(val) {
-    pageState.search.order = val.value;
-    if (state.tabIndex === 'all') {
-        getJobRecommend('refresh');
-    } else {
-        getJobList('refresh');
-    }
-}
-
-function getJobRecommend(type = 'add') {
-    if (type === 'refresh') {
-        list.value = [];
-        if (waterfallsFlowRef.value) waterfallsFlowRef.value.refresh();
-    }
-    let params = {
-        pageSize: pageState.pageSize,
-        sessionId: useUserStore().seesionId,
-        ...pageState.search,
-        ...conditionSearch.value,
-    };
-    let comd = { recommend: true, jobCategory: '', tip: '确认你的兴趣，为您推荐更多合适的岗位' };
-    $api.createRequest('/app/job/recommend', params).then((resData) => {
-        const { data, total } = resData;
-        pageState.total = 0;
-        if (type === 'add') {
-            // 记录系统
-            recommedIndexDb.getRecord().then((res) => {
-                if (res.length) {
-                    // 数据分析系统
-                    const resultData = recommedIndexDb.analyzer(res);
-                    const { sort, result } = resultData;
-                    // 岗位询问系统
-                    const conditionCounts = Object.fromEntries(
-                        sort.filter((item) => item[1] > 1) // 过滤掉次数为 1 的项
-                    );
-                    jobRecommender.updateConditions(conditionCounts);
-
-                    const question = jobRecommender.getNextQuestion();
-
-                    if (question) {
-                        comd.jobCategory = question;
-                        data.unshift(comd);
-                    }
-                }
-                const reslist = dataToImg(data);
-                list.value.push(...reslist);
-            });
-        } else {
-            list.value = dataToImg(data);
-        }
-        // 切换状态
-        if (data.length < pageState.pageSize) {
-            loadmoreRef.value.change('noMore');
-        } else {
-            loadmoreRef.value.change('more');
-        }
-        // 当没有岗位，刷新sessionId重新啦
-        if (!data.length) {
-            useUserStore().initSeesionId();
-        }
-    });
-}
-
-function getJobList(type = 'add') {
-    if (type === 'add' && pageState.page < pageState.maxPage) {
-        pageState.page += 1;
-    }
-    if (type === 'refresh') {
-        list.value = [];
-        pageState.page = 1;
-        pageState.maxPage = 2;
-        waterfallsFlowRef.value.refresh();
-    }
-    let params = {
-        current: pageState.page,
-        pageSize: pageState.pageSize,
-        ...pageState.search,
-    };
-
-    $api.createRequest('/app/job/list', params).then((resData) => {
-        const { rows, total } = resData;
-        if (type === 'add') {
-            const str = pageState.pageSize * (pageState.page - 1);
-            const end = list.value.length;
-            const reslist = dataToImg(rows);
-            list.value.splice(str, end, ...reslist);
-        } else {
-            list.value = dataToImg(rows);
-        }
-        pageState.total = resData.total;
-        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
-        if (rows.length < pageState.pageSize) {
-            loadmoreRef.value?.change('noMore');
-        } else {
-            loadmoreRef.value?.change('more');
-        }
-    });
-}
-
-function dataToImg(data) {
-    return data.map((item) => ({
-        ...item,
-        image: img,
-        hide: true,
-    }));
+function goExperience() {
+    closeFristEntry();
+    state.current = 1;
 }
 </script>
 
 <style lang="stylus" scoped>
-
-.app-container
-    width: 100%;
-    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    background: url('@/static/icon/background2.png') 0 0 no-repeat;
-    background-size: 100% 728rpx;
-    background-color: #FFFFFF;
-    display: flex;
-    flex-direction: column
-    .hidden-animation
-        max-height: 1000px;
-        transition: all 0.3s ease;
-        overflow: hidden;
-    .hidden-height
-        max-height: 0;
-        padding-top: 0;
-        padding-bottom: 0;
-.container-search
-    padding: 16rpx 24rpx
-    display: flex
-    justify-content: space-between
-    .search-input
-        display: flex
-        align-items: center;
-        width: 100%
-        height: 80rpx;
-        line-height: 80rpx
-        margin-right: 24rpx
-        background: #FFFFFF;
-        border-radius: 75rpx 75rpx 75rpx 75rpx;
-        .iconsearch
-            padding-left: 36rpx
-        .inpute
-            margin-left: 20rpx
-            font-weight: 400;
-            font-size: 28rpx;
-            color: #B5B5B5;
-            width: 100%
-    .chart
-        width: 170rpx;
-        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%);
-        box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(210,210,210,0.14);
-        border-radius: 80rpx 80rpx 80rpx 80rpx;
-        border: 2rpx solid #FFFFFF;
-        text-align: center
-        font-weight: 500;
-        font-size: 28rpx;
-        height: 36rpx;
-        color: #000000;
-        padding: 20rpx 30rpx
-.cards
-    padding: 10rpx 28rpx
-    display: grid
-    grid-gap: 38rpx;
-    grid-template-columns: 1fr 1fr;
-    .card
-        height: calc(158rpx - 40rpx);
-        padding: 22rpx 26rpx
-        box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(210,210,210,0.14);
-        border-radius: 16rpx 16rpx 16rpx 16rpx;
-        border: 2rpx solid #FFFFFF;
-        .card-title
-            font-weight: 600;
-            font-size: 32rpx;
-            color: #000000;
-        .card-text
-            font-weight: 400;
-            font-size: 24rpx;
-            color: #9E9E9E;
-            margin-top: 4rpx
-    .card:first-child
-        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%),
-            url('@/static/icon/fujin.png');
-        background-size: 100%, 100%
-    .card:last-child
-        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%),
-            url('@/static/icon/jinxuan.png');
-        background-size: 100%, 100%
-        background-size: cover;
-        background-position: center;
-
-.nav-filter
-    padding: 16rpx 28rpx 0 28rpx
-    .filter-top
-        display: flex
-        justify-content: space-between;
-        .tab-scroll
-            flex: 1;
-            overflow: hidden;
-            margin-right: 20rpx
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: clip;
-            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
-            mask-image: linear-gradient(to right, black 60%, transparent);
-            .jobs-left
-                display: flex
-                flex-wrap: nowrap
-                .job
-                    font-weight: 400;
-                    font-size: 36rpx;
-                    color: #666D7F;
-                    margin-right: 32rpx;
-                    white-space: nowrap
-                .active
-                    font-weight: 500;
-                    font-size: 36rpx;
-                    color: #000000;
-        .jobs-add
-            display: flex
-            align-items: center;
-            justify-content: center;
-            font-weight: 400;
-            font-size: 32rpx;
-            color: #666D7F;
-            line-height: 38rpx;
-    .filter-bottom
-        display: flex
-        justify-content: space-between
-        padding: 24rpx 0
-        .btm-left
-            display: flex
-            .filterbtm
-                font-weight: 400;
-                font-size: 32rpx;
-                color: #666D7F;
-                margin-right: 24rpx
-                padding: 0rpx 16rpx
-            .active
-                font-weight: 500;
-                font-size: 32rpx;
-                color: #256BFA;
-        .btm-right
-            font-weight: 400;
-            font-size: 32rpx;
-            color: #6C7282;
-            .right-sx
-                width: 26rpx;
-                height: 26rpx;
-            .active
-                transform: rotate(180deg)
-.table-list
-    background: #F4F4F4
-    flex: 1
-    overflow: hidden
-    .falls-scroll
-        width: 100%
-        height: 100%
-        .falls
-            padding: 28rpx 28rpx;
-            .item
-                position: relative;
-                // background: linear-gradient( 180deg, rgba(19, 197, 124, 0.4) 0%, rgba(255, 255, 255, 0) 30%), rgba(255, 255, 255, 0);
-                .falls-card
-                    padding: 30rpx;
-                    .falls-card-title
-                        color: #606060;
-                        line-height: 49rpx;
-                        text-align: left;
-                        word-break:break-all
-                        font-weight: 500;
-                        font-size: 32rpx;
-                        color: #333333;
-                    .falls-card-pay
-                        // height: 50rpx;
-                        word-break:break-all
-                        color: #002979;
-                        text-align: left;
-                        display: flex;
-                        align-items: end;
-                        position: relative
-                        .pay-text
-                            color: #4C6EFB;
-                            padding-right: 10rpx
-                            font-weight: 500;
-                            font-size: 28rpx;
-                            color: #4C6EFB;
-                            line-height: 45rpx;
-                            text-align: left;
-                        .flame
-                            position: absolute
-                            bottom: 0
-                            right: -10rpx
-                            transform: translate(0, -30%)
-                            width: 24rpx
-                            height: 31rpx
-                    .falls-card-education,.falls-card-experience
-                        width: fit-content;
-                        height: 30rpx;
-                        background: #F4F4F4;
-                        border-radius: 4rpx;
-                        padding: 6rpx 20rpx;
-                        line-height: 30rpx;
-                        font-weight: 400;
-                        font-size: 24rpx;
-                        color: #6C7282;
-                        text-align: center;
-                        margin-top: 14rpx;
-                        white-space: nowrap
-
-                    .falls-card-company,.falls-card-pepleNumber
-                        margin-top: 20rpx;
-                        font-size: 24rpx;
-                        color: #606060;
-                        line-height: 25rpx;
-                        text-align: left;
-                    .falls-card-pepleNumber
-                        display: flex;
-                        justify-content: space-between;
-                        align-items: center;
-                        margin-top: 38rpx;
-                        font-weight: 400;
-                        font-size: 28rpx;
-                        color: #6C7282;
-                    .falls-card-matchingrate
-                        margin-top: 10rpx;
-                        display: flex;
-                        justify-content: space-between;
-                        align-items: center;
-                        font-size: 21rpx;
-                        color: #4778EC;
-                        text-align: left;
-// 推荐卡片
-.recommend-card::before
-    position: absolute
-    left: 0
-    top: 0
-    content: ''
-    height: 60rpx
-    width: 100%
-    height: 8rpx;
-    background: linear-gradient( to left, #9E74FD 0%, #256BFA 100%);
-    box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(0,54,170,0.15);
-.recommend-card
-    padding: 24rpx
-    .card-content
-        position: relative;
-        z-index: 2;
-        .recommend-card-title
-            font-weight: 500;
-            font-size: 32rpx;
-            color: #333333;
-        .recommend-card-tip
-            font-weight: 400;
-            font-size: 28rpx;
-            color: #6C7282;
-            margin-top: 20rpx
-        .recommend-card-line
-            width: calc(100%);
-            height: 0rpx;
-            border-radius: 0rpx 0rpx 0rpx 0rpx;
-            border: 2rpx dashed rgba(0,0,0,0.14);
-            margin-top: 50rpx
-            position: relative
-        .recommend-card-line::before
-            position: absolute
-            content: ''
-            left: 0
-            top: 0
-            transform: translate(-50% - 90rpx, -50%)
-            width: 28rpx;
-            height: 28rpx;
-            background: #F4F4F4;
-            border-radius: 50%;
-        .recommend-card-line::after
-            position: absolute
-            content: ''
-            right: 0
-            top: 0
-            transform: translate(50% + 90rpx, -50%)
-            width: 28rpx;
-            height: 28rpx;
-            background: #F4F4F4;
-            border-radius: 50%;
-        .recommend-card-controll
-            display: flex
-            align-items: center
-            justify-content: space-between
-            margin-top: 40rpx
-            padding: 0 6rpx;
-            .controll-yes
-                width: 124rpx;
-                height: 70rpx;
-                background: rgba(37,107,250,0.1);
-                border-radius: 12rpx 12rpx 12rpx 12rpx;
-                text-align: center;
-                line-height:70rpx
-                color: #256BFA
-            .controll-no
-                width: 124rpx;
-                height: 66rpx;
-                line-height: 66rpx
-                border-radius: 12rpx 12rpx 12rpx 12rpx;
-                border: 2rpx solid #DEDEDE;
-                font-weight: 400;
-                font-size: 28rpx;
-                color: #333333;
-                text-align: center;
-            .controll-yes:active, .controll-no:active
-                width: 120rpx;
-                height: 66rpx;
-                line-height: 66rpx
-                background: #e8e8e8
-                border: 2rpx solid #e8e8e8
-.isBut{
-    filter: grayscale(100%);
+.app-custom-root {
+    position: fixed;
+    z-index: 10;
+    width: 100vw;
+    height: calc(100% - var(--window-bottom));
+    overflow: hidden;
 }
+.app-container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    width: 100%;
+    .container-header {
+        height: calc(88rpx - 14rpx);
+        text-align: center;
+        line-height: calc(88rpx - 14rpx);
+        font-size: 32rpx;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        padding: 16rpx 44rpx 36rpx 44rpx;
+        background: url('@/static/icon/msgTopbg.png') 0 0 no-repeat;
+        background-size: 100% 100%;
+        .header-title {
+            color: #000000;
+            font-weight: bold;
+        }
+        .header-btnLf {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            width: calc(60rpx * 3);
+            font-weight: 500;
+            font-size: 40rpx;
+            color: #696969;
+            margin-right: 44rpx;
+            position: relative;
+            .btns-wd{
+                position: absolute
+                top: 2rpx;
+                right: 2rpx
+                width: 16rpx;
+                height: 16rpx;
+                background: #F73636;
+                border-radius: 50%;
+                border: 4rpx solid #EEEEFF;
+            }
+        }
+        .active {
+            font-weight: 600;
+            font-size: 40rpx;
+            color: #000000;
+        }
+    }
+}
+
+.container-main {
+    flex: 1;
+    overflow: hidden;
+    background-color: #f4f4f4;
+}
+.main-scroll {
+    width: 100%
+    height: 100%;
+}
+.scrollmain{
+    padding: 28rpx
+}
+.swiper
+    height: 100%;
+    width: 100%
+    .list
+        width: 100%
+        display: flex;
+        flex-direction: column;
+
+// mask:
+.maskFristEntry
+    position: fixed;
+    // right: 20rpx;
+    // bottom: calc(50% - 200rpx);
+    height: 100vh
+    width: 100vw
+    background: rgba(0,0,0,0.3)
+    .entry-content
+        display: flex;
+        align-items: center
+        position: absolute
+        left: 50%
+        top: 35%
+        transform: translate(-50%, -50%)
+        flex-direction: column
+        background: url('@/static/imgs/fristEntry.png') 0 0 no-repeat;
+        background-size: 100% 100%;
+        width: 480rpx
+        height: 584rpx
+        // padding-left: 80rpx
+        .text1
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            margin-top: 370rpx
+            font-size: 36rpx
+            background: linear-gradient(273.34deg, #356CFA 3.58%, #A47FFD 85.84%);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            background-clip: text; /* 有些浏览器兼容用 */
+            text-fill-color: transparent;
+            padding-left: 28rpx
+        .text2
+            padding-left: 28rpx
+            margin-top: 8rpx
+            font-size: 20rpx;
+            color: #666666;
+            text-align: center;
+        .indicateArrow
+            height: 76rpx
+            width: 68rpx
+        .indicatefristEntry
+            width: 244rpx
+            height: 244rpx
+        .goExperience
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            margin-left: 28rpx
+            margin-top: 28rpx
+            width: 160rpx;
+            height: 60rpx;
+            background: linear-gradient( 180deg, #9974FD 0%, #286BFA 100%);
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+            font-size: 28rpx;
+            color: #FFFFFF;
+            text-align: center;
+            line-height: 60rpx
+        .maskFristEntry-Close
+            position: absolute;
+            left: calc(50% - 10rpx);
+            bottom: -130rpx
+            width: 42rpx
+            height: 42rpx
+            background: linear-gradient(273.34deg, #356CFA 3.58%, #A47FFD 85.84%);
+            border-radius: 50%;
+        .maskFristEntry-Close::before
+            position: absolute;
+            left: calc( 50% - 2rpx)
+            top: calc( 50% - 10rpx)
+            transform: rotate(45deg);
+            content: ''
+            background: #FFFFFF
+            width: 4rpx
+            height: 20rpx
+        .maskFristEntry-Close::after
+            position: absolute;
+            left: calc( 50% - 2rpx)
+            top: calc( 50% - 10rpx)
+            transform: rotate(-45deg);
+            content: ''
+            background: #FFFFFF
+            width: 4rpx
+            height: 20rpx
 </style>

pages/login/login.vue

@@ -3,7 +3,7 @@
         <tabcontrolVue :current="tabCurrent">
             <template v-slot:tab0>
                 <view class="login-content">
-                    <image class="logo" src="../../static/logo.png"></image>
+                    <image class="logo" src="@/static/logo.png"></image>
                     <view class="logo-title">就业</view>
                 </view>
                 <view class="btns">
@@ -245,6 +245,18 @@ function getTreeselect() {
 
 // 登录
 function loginTest() {
+    // uni.share({
+    //     provider: 'weixin',
+    //     scene: 'WXSceneSession',
+    //     type: 2,
+    //     imageUrl: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png',
+    //     success: function (res) {
+    //         console.log('success:' + JSON.stringify(res));
+    //     },
+    //     fail: function (err) {
+    //         console.log('fail:' + JSON.stringify(err));
+    //     },
+    // });
     const params = {
         username: 'test',
         password: 'test',
@@ -453,4 +465,4 @@ function complete() {
         color: #FFFFFF;
         text-align: center;
         line-height: 90rpx
-</style>
+</style>

pages/mine/mine.vue

@@ -96,12 +96,16 @@
                 ></uni-popup-dialog>
             </uni-popup>
         </view>
+        <template #footer>
+            <Tabbar :currentpage="4"></Tabbar>
+        </template>
     </AppLayout>
 </template>
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { storeToRefs } from 'pinia';
+import Tabbar from '@/components/tabbar/midell-box.vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 const { $api, navTo } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
@@ -153,6 +157,7 @@ function getUserstatistics() {
         padding: 36rpx 36rpx 64rpx 36rpx
         border-radius: 20rpx 20rpx 0rpx 0rpx;
         position: relative
+        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
         .top-title{
             font-weight: 500;
             font-size: 32rpx;
@@ -170,7 +175,7 @@ function getUserstatistics() {
             width: auto;
 			max-width: 60%;
 			white-space: nowrap
-			overflow:hidden;
+			overflow:hidden;
 			text-overflow: ellipsis;
         }
         .top-btn{
@@ -214,6 +219,7 @@ function getUserstatistics() {
                     margin: 32rpx 16rpx 32rpx 10rpx
                 }
                 .left-text{
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                     font-weight: 500;
                     font-size: 28rpx;
                     color: #333333;
@@ -248,8 +254,9 @@ function getUserstatistics() {
         justify-content: center
         align-items: center
         .mini-num{
+            font-family: DIN-Medium;
             font-weight: 500;
-            font-size: 44rpx;
+            font-size: 46rpx;
             color: #333333;
         }
         .mini-text{
@@ -279,6 +286,7 @@ function getUserstatistics() {
         flex-direction: column;
         align-items: flex-start;
         .userinfo-ls-name
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             font-weight: 600;
             font-size: 40rpx;
             color: #333333;
@@ -307,4 +315,4 @@ function getUserstatistics() {
     border-radius: 2rpx
     background: #A2A2A2;
     transform: rotate(45deg)
-</style>
+</style>

pages/msglog/msglog.vue

@@ -27,6 +27,8 @@
                     </swiper-item>
                 </swiper>
             </view>
+
+            <Tabbar :currentpage="3"></Tabbar>
         </view>
     </view>
 </template>
@@ -34,6 +36,7 @@
 <script setup>
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+import Tabbar from '@/components/tabbar/midell-box.vue';
 import ReadComponent from './read.vue';
 import UnreadComponent from './unread.vue';
 const loadedMap = reactive([false, false]);
@@ -115,6 +118,7 @@ function changeSwiperMsgType(e) {
             font-weight: bold;
         }
         .header-btnLf {
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             display: flex;
             justify-content: flex-start;
             align-items: center;

pages/msglog/read.vue

@@ -2,7 +2,7 @@
     <scroll-view scroll-y class="main-scroll">
         <view class="scrollmain">
             <view
-                class="list-card btn-feel"
+                class="list-card press-button"
                 v-for="(item, index) in msgList"
                 :key="index"
                 @click="seeDetail(item, index)"
@@ -133,6 +133,8 @@ defineExpose({ loadData });
             display: flex;
             justify-content: space-between;
             width: 100%
+            text
+                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             .card-time
                 font-weight: 400;
                 font-size: 28rpx;

pages/msglog/unread.vue

@@ -2,7 +2,7 @@
     <scroll-view scroll-y class="main-scroll">
         <view class="scrollmain">
             <view
-                class="list-card btn-feel"
+                class="list-card press-button"
                 v-for="(item, index) in unreadMsgList"
                 :key="index"
                 @click="seeDetail(item)"
@@ -119,6 +119,8 @@ defineExpose({ loadData });
             display: flex;
             justify-content: space-between;
             width: 100%
+            text
+                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             .card-time
                 font-weight: 400;
                 font-size: 28rpx;

pages/nearby/components/four.vue

@@ -294,6 +294,7 @@ defineExpose({ loadData, handleFilterConfirm });
             background: #F6F6F6;
             border-radius: 12rpx 12rpx 12rpx 12rpx;
         .active
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             color: #256BFA;
             background: #E9F0FF;
             border-radius: 12rpx 12rpx 12rpx 12rpx;
@@ -330,6 +331,7 @@ defineExpose({ loadData, handleFilterConfirm });
                         margin-right: 32rpx;
                         white-space: nowrap
                     .active
+                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                         font-weight: 500;
                         font-size: 36rpx;
                         color: #000000;

pages/nearby/components/one.vue

@@ -398,6 +398,7 @@ defineExpose({ loadData, handleFilterConfirm });
                         margin-right: 32rpx;
                         white-space: nowrap
                     .active
+                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                         font-weight: 500;
                         font-size: 36rpx;
                         color: #000000;

pages/nearby/components/three.vue

@@ -33,7 +33,14 @@
                                             donted: index === state.dont,
                                         }"
                                     ></view>
-                                    <view class="item-text">{{ item.stationName }}</view>
+                                    <view
+                                        class="item-text"
+                                        :class="{
+                                            textActive: index === state.dont,
+                                        }"
+                                    >
+                                        {{ item.stationName }}
+                                    </view>
                                 </view>
                             </view>
                         </view>
@@ -185,7 +192,6 @@ function openFilter() {
                 pageState.search[key] = value.join(',');
             }
             showFilter.value = false;
-            console.log(pageState.search);
             getJobList('refresh');
         },
         cancel: () => {
@@ -408,44 +414,43 @@ defineExpose({ loadData, handleFilterConfirm });
                                 border-radius: 50%;
                                 position: relative;
                                 margin-bottom: 20rpx;
-                            .donted::after
+                            .item-dont::before
                                 position: absolute;
                                 content: '';
                                 color: #FFFFFF;
                                 font-size: 20rpx;
                                 text-align: center;
-                                left: 0;
-                                top: -5rpx;
+                                left: 50%;
+                                top: 50%;
+                                transform: translate(-50%, -50%)
                                 width: 27rpx;
                                 height: 27rpx;
-                                line-height: 28rpx;
-                                background: blue !important;
+                                background: #F7B000;
                                 border-radius: 50%;
-                            .dontstart::after
+                            .item-dont::after
                                 position: absolute;
-                                content: '始';
-                                color: #FFFFFF;
+                                // content: '始';
+                                content: '';
                                 font-size: 20rpx;
                                 text-align: center;
-                                left: 0;
-                                top: -5rpx;
-                                width: 27rpx;
-                                height: 27rpx;
-                                line-height: 28rpx;
-                                background: #666666;
+                                left: 50%;
+                                top: 50%;
+                                transform: translate(-50%, -50%)
+                                width: 14rpx;
+                                height: 14rpx;
+                                background: #ffffff;
                                 border-radius: 50%;
-                            // .dontend::after
+                            // .donted::after
                             //     position: absolute;
-                            //     content: '终';
-                            //     color: #FFFFFF;
+                            //     content: '';
                             //     font-size: 20rpx;
                             //     text-align: center;
-                            //     left: 0;
-                            //     top: -5rpx;
-                            //     width: 27rpx;
-                            //     height: 27rpx;
-                            //     line-height: 28rpx;
-                            //     background: #666666;
+                            //     left: 50%;
+                            //     top: 50%;
+                            //     transform: translate(-50%, -50%)
+                            //     width: 14rpx;
+                            //     height: 14rpx;
+                            //     background: #F7B000 !important;
                             //     border-radius: 50%;
                             .item-text
                                 position: absolute
@@ -458,6 +463,8 @@ defineExpose({ loadData, handleFilterConfirm });
                                 text-align: center;
                                 white-space: nowrap
                                 transform: translate(-50% + 8rpx, 0)
+                            .textActive
+                                color: #F7B000
                         .three-item:nth-child(2n)
                             .item-text
                                 margin-top: -90rpx;
@@ -468,7 +475,7 @@ defineExpose({ loadData, handleFilterConfirm });
                     top: -17rpx;
                     width: 100%;
                     height: 17rpx;
-                    background: #FFCB47;
+                    background: #F7B000;
                     border-radius: 17rpx 17rpx 17rpx 17rpx;
                     z-index: 1;
 .nearby-list
@@ -503,6 +510,7 @@ defineExpose({ loadData, handleFilterConfirm });
                         margin-right: 32rpx;
                         white-space: nowrap
                     .active
+                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                         font-weight: 500;
                         font-size: 36rpx;
                         color: #000000;

pages/nearby/components/two.vue

@@ -276,6 +276,7 @@ defineExpose({ loadData, handleFilterConfirm });
             background: #F6F6F6;
             border-radius: 12rpx 12rpx 12rpx 12rpx;
         .active
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
             color: #256BFA;
             background: #E9F0FF;
             border-radius: 12rpx 12rpx 12rpx 12rpx;
@@ -311,6 +312,7 @@ defineExpose({ loadData, handleFilterConfirm });
                         margin-right: 32rpx;
                         white-space: nowrap
                     .active
+                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
                         font-weight: 500;
                         font-size: 36rpx;
                         color: #000000;

pages/search/search.vue

@@ -1,33 +1,70 @@
 <template>
     <view class="container">
-        <view class="top">
-            <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
-            <view class="search-box">
-                <uni-icons
-                    class="iconsearch"
-                    color="#666666"
-                    type="search"
-                    size="18"
-                    @confirm="searchCollection"
-                ></uni-icons>
-                <input
-                    class="inputed"
-                    type="text"
-                    focus
-                    v-model="searchValue"
-                    placeholder="搜索职位名称"
-                    placeholder-class="placeholder"
-                    @confirm="searchBtn"
-                />
+        <view>
+            <view class="top">
+                <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
+                <view class="search-box">
+                    <uni-icons
+                        class="iconsearch"
+                        color="#666666"
+                        type="search"
+                        size="18"
+                        @confirm="searchCollection"
+                    ></uni-icons>
+                    <input
+                        class="inputed"
+                        type="text"
+                        focus
+                        v-model="searchValue"
+                        placeholder="搜索职位名称"
+                        placeholder-class="placeholder"
+                        @confirm="searchBtn"
+                    />
+                </view>
+                <view class="search-btn button-click" @click="searchBtn">搜索</view>
+            </view>
+            <view class="view-top" v-show="listCom.length || list.length">
+                <view class="top-item" @click="changeType(0)" :class="{ active: currentTab === 0 }">综合</view>
+                <view class="top-item" @click="changeType(1)" :class="{ active: currentTab === 1 }">视频</view>
             </view>
-            <view class="search-btn button-click" @click="searchBtn">搜索</view>
         </view>
-        <scroll-view scroll-y class="Detailscroll-view" v-show="list.length" @scrolltolower="getJobList('add')">
-            <view class="cards-box">
-                <renderJobs :list="list" :longitude="longitudeVal" :latitude="latitudeVal"></renderJobs>
+        <scroll-view scroll-y class="Detailscroll-view" v-show="listCom.length" @scrolltolower="choosePosition">
+            <view class="cards-box" v-show="currentTab === 0">
+                <renderJobs :list="listCom" :longitude="longitudeVal" :latitude="latitudeVal"></renderJobs>
+            </view>
+            <view class="cards-box" style="padding-top: 24rpx" v-show="currentTab === 1">
+                <custom-waterfalls-flow
+                    ref="waterfallsFlowRef"
+                    :column="columnCount"
+                    :columnSpace="columnSpace"
+                    @loaded="imageloaded"
+                    :value="list"
+                >
+                    <template v-slot:default="job">
+                        <view class="slot-item">
+                            <view class="job-image btn-feel" @click="nextVideo(job)">
+                                <image class="cover-image" :src="job.cover" mode="aspectFill"></image>
+                                <view class="cover-triangle"></view>
+                            </view>
+                            <view class="job-info" @click="nextDetail(job)">
+                                <view class="salary">
+                                    <Salary-Expectation
+                                        :max-salary="job.maxSalary"
+                                        :min-salary="job.minSalary"
+                                        :is-month="true"
+                                    ></Salary-Expectation>
+                                    <image v-if="job.isHot" class="flame" src="/static/icon/flame.png"></image>
+                                </view>
+                                <view class="title">{{ job.jobTitle }}</view>
+                                <view class="desc">{{ job.companyName }}</view>
+                            </view>
+                        </view>
+                    </template>
+                </custom-waterfalls-flow>
+                <loadmore ref="loadmoreRef"></loadmore>
             </view>
         </scroll-view>
-        <view class="main-content" v-show="!list.length">
+        <view class="main-content" v-show="!listCom.length">
             <view class="content-top">
                 <view class="top-left">历史搜索</view>
                 <view class="top-right button-click" @click="remove">
@@ -44,16 +81,19 @@
 </template>
 
 <script setup>
-import { inject, ref, reactive } from 'vue';
+import { inject, ref, reactive, nextTick } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import SelectJobs from '@/components/selectJobs/selectJobs.vue';
-const { $api, navBack } = inject('globalFunction');
+const { $api, navBack, navTo } = inject('globalFunction');
 import useLocationStore from '@/stores/useLocationStore';
 import { storeToRefs } from 'pinia';
+import { useColumnCount } from '@/hook/useColumnCount';
+import { usePagination } from '@/hook/usePagination';
+import img from '@/static/icon/filter.png';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
 const searchValue = ref('');
 const historyList = ref([]);
-const list = ref([]);
+const listCom = ref([]);
 const pageState = reactive({
     page: 0,
     total: 0,
@@ -63,6 +103,47 @@ const pageState = reactive({
         order: 0,
     },
 });
+const isLoaded = ref(false);
+const waterfallsFlowRef = ref(null);
+const loadmoreRef = ref(null);
+const currentTab = ref(0);
+// 响应式搜索条件（可以被修改）
+const searchParams = ref({});
+const pageSize = ref(10);
+
+const { list, loading, refresh, loadMore } = usePagination(
+    (params) => $api.createRequest('/app/job/littleVideo', params),
+    dataToImg, // 转换函数
+    {
+        pageSize: pageSize,
+        search: searchParams,
+        dataKey: 'data',
+        autoWatchSearch: true,
+        onBeforeRequest: () => {
+            loadmoreRef.value?.change('loading');
+        },
+    }
+);
+
+async function choosePosition(index) {
+    if (currentTab.value === 0) {
+        getJobList('add');
+    } else {
+        loadMore();
+    }
+}
+
+function imageloaded() {
+    loadmoreRef.value?.change('more');
+}
+
+const { columnCount, columnSpace } = useColumnCount(() => {
+    pageSize.value = 10 * (columnCount.value - 1);
+    nextTick(() => {
+        waterfallsFlowRef.value?.refresh?.();
+        useLocationStore().getLocation();
+    });
+});
 
 onLoad(() => {
     let arr = uni.getStorageSync('searchList');
@@ -71,6 +152,20 @@ onLoad(() => {
     }
 });
 
+function changeType(type) {
+    if (currentTab.value === type) return;
+    switch (type) {
+        case 0:
+            currentTab.value = 0;
+            getJobList('refresh');
+            break;
+        case 1:
+            currentTab.value = 1;
+            refresh();
+            waterfallsFlowRef.value?.refresh?.();
+            break;
+    }
+}
 function searchFn(item) {
     searchValue.value = item;
     searchBtn();
@@ -83,7 +178,15 @@ function searchBtn() {
     historyList.value.unshift(searchValue.value);
     historyList.value = unique(historyList.value);
     uni.setStorageSync('searchList', historyList.value);
-    getJobList('refresh');
+    searchParams.value = {
+        jobTitle: searchValue,
+    };
+    if (currentTab.value === 0) {
+        getJobList('refresh');
+    } else {
+        refresh();
+        waterfallsFlowRef.value?.refresh?.();
+    }
 }
 
 function searchCollection(e) {
@@ -112,12 +215,25 @@ function remove() {
     historyList.value = [];
 }
 
+function nextDetail(job) {
+    // 记录岗位类型，用作数据分析
+    if (job.jobCategory) {
+        const recordData = recommedIndexDb.JobParameter(job);
+        recommedIndexDb.addRecord(recordData);
+    }
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+}
+
+function nextVideo(job) {
+    uni.setStorageSync(`job-Info`, job);
+    navTo(`/packageA/pages/tiktok/tiktok`);
+}
+
 function getJobList(type = 'add') {
     if (type === 'add' && pageState.page < pageState.maxPage) {
         pageState.page += 1;
     }
     if (type === 'refresh') {
-        list.value = [];
         pageState.page = 1;
         pageState.maxPage = 2;
     }
@@ -132,11 +248,11 @@ function getJobList(type = 'add') {
         const { rows, total } = resData;
         if (type === 'add') {
             const str = pageState.pageSize * (pageState.page - 1);
-            const end = list.value.length;
+            const end = listCom.value.length;
             const reslist = rows;
-            list.value.splice(str, end, ...reslist);
+            listCom.value.splice(str, end, ...reslist);
         } else {
-            list.value = rows;
+            listCom.value = rows;
         }
         pageState.total = resData.total;
         pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
@@ -147,6 +263,15 @@ function getJobList(type = 'add') {
         }
     });
 }
+
+function dataToImg(data) {
+    return data.map((item) => ({
+        ...item,
+        // image: item.cover,
+        image: img,
+        hide: true,
+    }));
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -156,12 +281,35 @@ function getJobList(type = 'add') {
 .Detailscroll-view{
     flex: 1
     overflow: hidden
+
 }
 .container{
     display: flex
     flex-direction: column
     background: #F4f4f4
     height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    .view-top{
+        display: flex;
+        justify-content: space-around
+        background: #FFFFFF;
+        .top-item{
+            padding: 6rpx 0 18rpx 0
+        }
+        .active{
+            color: #256BFA;
+            font-weight: 500;
+            position: relative;
+        }
+        .active::after{
+            position: absolute;
+            content: ''
+            left: calc(50% - 12rpx)
+            bottom: 10rpx
+            width: 24rpx
+            height: 6rpx
+            background: #256BFA
+        }
+    }
     .main-content{
         background: #FFFFFF
         height: 100%
@@ -244,4 +392,67 @@ function getJobList(type = 'add') {
 		}
 	}
 }
+
+.slot-item
+    // background: #f4f4f4;
+    background: #FFFFFF;
+    .job-info{
+        padding: 10rpx 24rpx 24rpx 24rpx
+    }
+    .job-image{
+        width: 100%;
+        height: 280rpx;
+        position: relative;
+        .cover-image{
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+        .cover-triangle{
+            position: absolute;
+            right: 20rpx;
+            top: 20rpx
+            width: 36rpx
+            height: 36rpx
+            border-radius: 50%
+            background: rgba(0,0,0,0.3)
+        }
+        .cover-triangle::after {
+          content: '';
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          transform: translate(-40%, -50%) rotate(90deg);
+          width: 0;
+          height: 0;
+          border-left: 8rpx solid transparent;
+          border-right: 8rpx solid transparent;
+          border-bottom: 12rpx solid #fff;
+        }
+    }
+    .salary
+        color: #4C6EFB;
+        font-size: 28rpx
+        display: flex
+        align-items: flex-start
+        justify-content: space-between
+        .flame
+            margin-top: 4rpx
+            margin-right: 4rpx
+            width: 24rpx
+            height: 31rpx
+    .title
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+        margin-top: 6rpx;
+        white-space: pre-wrap
+    .desc
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #6C7282;
+        margin-top: 6rpx;
 </style>

stores/useLocationStore.js

@@ -7,6 +7,8 @@ import {
 import {
     msg
 } from '@/common/globalFunction.js'
+import config from '../config';
+
 const useLocationStore = defineStore("location", () => {
     // 定义状态
     const longitudeVal = ref(null) // 经度
@@ -25,10 +27,17 @@ const useLocationStore = defineStore("location", () => {
                         longitude: 120.382665,
                         latitude: 36.066938
                     }
-                    longitudeVal.value = resd.longitude
-                    latitudeVal.value = resd.latitude
-                    msg('用户位置获取成功')
-                    resole(resd)
+                    if (config.UsingSimulatedPositioning) { // 使用模拟定位
+                        longitudeVal.value = resd.longitude
+                        latitudeVal.value = resd.latitude
+                        msg('用户位置获取成功')
+                        resole(resd)
+                    } else {
+                        longitudeVal.value = res.longitude
+                        latitudeVal.value = res.latitude
+                        msg('用户位置获取成功')
+                        resole(res)
+                    }
                 },
                 fail: function(err) {
                     // longitudeVal.value = ''

stores/useRecommedIndexedDBStore.js

@@ -10,7 +10,7 @@ import {
     msg
 } from '@/common/globalFunction.js'
 import baseDB from './BaseDBStore';
-
+import config from '../config';
 
 class JobRecommendation {
     constructor() {
@@ -62,6 +62,30 @@ class JobRecommendation {
     }
 }
 
+/**
+ * 计算加权用户行为偏好
+ * @param {Object} data - 用户行为数据，包括 categories、experience、areas、salary 等
+ * @param {Object} weights - 每一类行为的权重
+ * @returns {Object} 加权合并后的结果（key 为行为项，value 为权重后的分值）
+ */
+function applyWeightsToUserData(data, weights) {
+    const result = {}
+
+    for (const key in data) {
+        if (key === 'salary') {
+            result.salary = weights.salary
+        } else if (typeof data[key] === 'object') {
+            result[key] = {}
+            for (const itemKey in data[key]) {
+                const rawValue = data[key][itemKey]
+                result[key][itemKey] = parseFloat((rawValue * weights[key]).toFixed(2))
+            }
+        }
+    }
+
+    return result
+}
+
 // **🔹 创建推荐系统**
 export const jobRecommender = new JobRecommendation();
 
@@ -121,8 +145,9 @@ export const useRecommedIndexedDBStore = defineStore("indexedDB", () => {
     }
 
     function analyzer(jobsData) {
-        const result = jobAnalyzer.analyze(jobsData)
-        const sort = jobAnalyzer.printUnifiedResults(result)
+        const result = jobAnalyzer.analyze(jobsData) // 转换格式化
+        const result2 = applyWeightsToUserData(result, config.weights) // 添加权重
+        const sort = jobAnalyzer.printUnifiedResults(result2) // 转换格式化
         return {
             result,
             sort

stores/useUserStore.js

@@ -57,7 +57,7 @@ const useUserStore = defineStore("user", () => {
         hasLogin.value = true;
         userInfo.value = value;
         openId.value = value.wxOpenId;
-        token.value = value.token
+        token.value = value.token;
         uni.setStorage({
             key: 'token',
             data: value.token

uni_modules/uni-data-select/changelog.md

@@ -1,39 +0,0 @@
-## 1.0.8（2024-03-28）
-- 修复 在vue2下:style动态绑定导致编译失败的bug
-## 1.0.7（2024-01-20）
-- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
-## 1.0.6（2023-04-12）
-- 修复 微信小程序点击时会改变背景颜色的 bug
-## 1.0.5（2023-02-03）
-- 修复 禁用时会显示清空按钮
-## 1.0.4（2023-02-02）
-- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
-- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
-## 1.0.3（2023-01-16）
-- 修复 不关联服务空间报错的问题
-## 1.0.2（2023-01-14）
-- 新增  属性 `format` 可用于格式化显示选项内容
-## 1.0.1（2022-12-06）
-- 修复  当where变化时，数据不会自动更新的问题
-## 0.1.9（2022-09-05）
-- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
-## 0.1.8（2022-08-29）
-- 修复 点击的位置不准确
-## 0.1.7（2022-08-12）
-- 新增 支持 disabled 属性
-## 0.1.6（2022-07-06）
-- 修复 pc端宽度异常的bug
-## 0.1.5
-- 修复 pc端宽度异常的bug
-## 0.1.4（2022-07-05）
-- 优化 显示样式
-## 0.1.3（2022-06-02）
-- 修复 localdata 赋值不生效的 bug
-- 新增 支持  uni.scss 修改颜色
-- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
-## 0.1.2（2022-05-08）
-- 修复 当 value 为 0 时选择不生效的 bug
-## 0.1.1（2022-05-07）
-- 新增 记住上次的选项（仅 collection 存在时有效）
-## 0.1.0（2022-04-22）
-- 初始化

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -1,574 +0,0 @@
-<template>
-    <view class="uni-stat__select">
-        <span v-if="label" class="uni-label-text hide-on-phone">{{ label + '：' }}</span>
-        <view class="uni-stat-box" :class="{ 'uni-stat__actived': current }">
-            <view class="uni-select" :class="{ 'uni-select--disabled': disabled, 'uni-select--border': border }">
-                <view class="uni-select__input-box" @click="toggleSelector">
-                    <view v-if="current" class="uni-select__input-text" :style="viewStyle">{{ textShow }}</view>
-                    <view v-else class="uni-select__input-text uni-select__input-placeholder">
-                        {{ typePlaceholder }}
-                    </view>
-                    <view v-if="current && clear && !disabled" @click.stop="clearVal">
-                        <uni-icons type="clear" color="#c0c4cc" size="24" />
-                    </view>
-                    <view v-else>
-                        <uni-icons :type="showSelector ? 'top' : 'bottom'" size="14" color="#999" />
-                    </view>
-                </view>
-                <view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
-                <view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
-                    <view :class="placement == 'bottom' ? 'uni-popper__arrow_bottom' : 'uni-popper__arrow_top'"></view>
-                    <scroll-view scroll-y="true" class="uni-select__selector-scroll">
-                        <view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
-                            <text>{{ emptyTips }}</text>
-                        </view>
-                        <view
-                            v-else
-                            class="uni-select__selector-item"
-                            v-for="(item, index) in mixinDatacomResData"
-                            :key="index"
-                            @click="change(item)"
-                        >
-                            <text :class="{ 'uni-select__selector__disabled': item.disable }">
-                                {{ formatItemName(item) }}
-                            </text>
-                        </view>
-                    </scroll-view>
-                </view>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-/**
- * DataChecklist 数据选择器
- * @description 通过数据渲染的下拉框组件
- * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
- * @property {String} value 默认值
- * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
- * @property {Boolean} clear 是否可以清空已选项
- * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
- * @property {String} label 左侧标题
- * @property {String} placeholder 输入框的提示文字
- * @property {Boolean} disabled 是否禁用
- * @property {String} placement 弹出位置
- * 	@value top   		顶部弹出
- * 	@value bottom		底部弹出（default)
- * @event {Function} change  选中发生变化触发
- */
-
-export default {
-    name: 'uni-data-select',
-    mixins: [uniCloud.mixinDatacom || {}],
-    props: {
-        localdata: {
-            type: Array,
-            default() {
-                return [];
-            },
-        },
-        value: {
-            type: [String, Number],
-            default: '',
-        },
-        modelValue: {
-            type: [String, Number],
-            default: '',
-        },
-        label: {
-            type: String,
-            default: '',
-        },
-        placeholder: {
-            type: String,
-            default: '请选择',
-        },
-        emptyTips: {
-            type: String,
-            default: '无选项',
-        },
-        clear: {
-            type: Boolean,
-            default: true,
-        },
-        defItem: {
-            type: Number,
-            default: 0,
-        },
-        disabled: {
-            type: Boolean,
-            default: false,
-        },
-        // 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
-        format: {
-            type: String,
-            default: '',
-        },
-        placement: {
-            type: String,
-            default: 'bottom',
-        },
-        border: {
-            type: Boolean,
-            default: true,
-        },
-        viewStyle: {
-            type: String,
-            default: '',
-        },
-    },
-    data() {
-        return {
-            showSelector: false,
-            current: '',
-            mixinDatacomResData: [],
-            apps: [],
-            channels: [],
-            cacheKey: 'uni-data-select-lastSelectedValue',
-        };
-    },
-    created() {
-        this.debounceGet = this.debounce(() => {
-            this.query();
-        }, 300);
-        if (this.collection && !this.localdata.length) {
-            this.debounceGet();
-        }
-    },
-    computed: {
-        typePlaceholder() {
-            const text = {
-                'opendb-stat-app-versions': '版本',
-                'opendb-app-channels': '渠道',
-                'opendb-app-list': '应用',
-            };
-            const common = this.placeholder;
-            const placeholder = text[this.collection];
-            return placeholder ? common + placeholder : common;
-        },
-        valueCom() {
-            // #ifdef VUE3
-            return this.modelValue;
-            // #endif
-            // #ifndef VUE3
-            return this.value;
-            // #endif
-        },
-        textShow() {
-            // 长文本显示
-            let text = this.current;
-            if (text.length > 10) {
-                return text.slice(0, 25) + '...';
-            }
-            return text;
-        },
-        getOffsetByPlacement() {
-            switch (this.placement) {
-                case 'top':
-                    return 'bottom:calc(100% + 12px);';
-                case 'bottom':
-                    return 'top:calc(100% + 12px);';
-            }
-        },
-    },
-
-    watch: {
-        localdata: {
-            immediate: true,
-            handler(val, old) {
-                if (Array.isArray(val) && old !== val) {
-                    this.mixinDatacomResData = val;
-                }
-            },
-        },
-        valueCom(val, old) {
-            this.initDefVal();
-        },
-        mixinDatacomResData: {
-            immediate: true,
-            handler(val) {
-                if (val.length) {
-                    this.initDefVal();
-                }
-            },
-        },
-    },
-    methods: {
-        debounce(fn, time = 100) {
-            let timer = null;
-            return function (...args) {
-                if (timer) clearTimeout(timer);
-                timer = setTimeout(() => {
-                    fn.apply(this, args);
-                }, time);
-            };
-        },
-        // 执行数据库查询
-        query() {
-            this.mixinDatacomEasyGet();
-        },
-        // 监听查询条件变更事件
-        onMixinDatacomPropsChange() {
-            if (this.collection) {
-                this.debounceGet();
-            }
-        },
-        initDefVal() {
-            let defValue = '';
-            if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
-                defValue = this.valueCom;
-            } else {
-                let strogeValue;
-                if (this.collection) {
-                    strogeValue = this.getCache();
-                }
-                if (strogeValue || strogeValue === 0) {
-                    defValue = strogeValue;
-                } else {
-                    let defItem = '';
-                    if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
-                        defItem = this.mixinDatacomResData[this.defItem - 1].value;
-                    }
-                    defValue = defItem;
-                }
-                if (defValue || defValue === 0) {
-                    this.emit(defValue);
-                }
-            }
-            const def = this.mixinDatacomResData.find((item) => item.value === defValue);
-            this.current = def ? this.formatItemName(def) : '';
-        },
-
-        /**
-         * @param {[String, Number]} value
-         * 判断用户给的 value 是否同时为禁用状态
-         */
-        isDisabled(value) {
-            let isDisabled = false;
-
-            this.mixinDatacomResData.forEach((item) => {
-                if (item.value === value) {
-                    isDisabled = item.disable;
-                }
-            });
-
-            return isDisabled;
-        },
-
-        clearVal() {
-            this.emit('');
-            if (this.collection) {
-                this.removeCache();
-            }
-        },
-        change(item) {
-            if (!item.disable) {
-                this.showSelector = false;
-                this.current = this.formatItemName(item);
-                this.emit(item.value);
-            }
-        },
-        emit(val) {
-            this.$emit('input', val);
-            this.$emit('update:modelValue', val);
-            this.$emit('change', val);
-            if (this.collection) {
-                this.setCache(val);
-            }
-        },
-        toggleSelector() {
-            if (this.disabled) {
-                return;
-            }
-
-            this.showSelector = !this.showSelector;
-        },
-        formatItemName(item) {
-            let { text, value, channel_code } = item;
-            channel_code = channel_code ? `(${channel_code})` : '';
-
-            if (this.format) {
-                // 格式化输出
-                let str = '';
-                str = this.format;
-                for (let key in item) {
-                    str = str.replace(new RegExp(`{${key}}`, 'g'), item[key]);
-                }
-                return str;
-            } else {
-                return this.collection.indexOf('app-list') > 0
-                    ? `${text}(${value})`
-                    : text
-                    ? text
-                    : `未命名${channel_code}`;
-            }
-        },
-        // 获取当前加载的数据
-        getLoadData() {
-            return this.mixinDatacomResData;
-        },
-        // 获取当前缓存key
-        getCurrentCacheKey() {
-            return this.collection;
-        },
-        // 获取缓存
-        getCache(name = this.getCurrentCacheKey()) {
-            let cacheData = uni.getStorageSync(this.cacheKey) || {};
-            return cacheData[name];
-        },
-        // 设置缓存
-        setCache(value, name = this.getCurrentCacheKey()) {
-            let cacheData = uni.getStorageSync(this.cacheKey) || {};
-            cacheData[name] = value;
-            uni.setStorageSync(this.cacheKey, cacheData);
-        },
-        // 删除缓存
-        removeCache(name = this.getCurrentCacheKey()) {
-            let cacheData = uni.getStorageSync(this.cacheKey) || {};
-            delete cacheData[name];
-            uni.setStorageSync(this.cacheKey, cacheData);
-        },
-    },
-};
-</script>
-
-<style lang="scss">
-$uni-base-color: #6a6a6a !default;
-$uni-main-color: #333 !default;
-$uni-secondary-color: #909399 !default;
-$uni-border-3: #e5e5e5;
-
-/* #ifndef APP-NVUE */
-@media screen and (max-width: 500px) {
-    .hide-on-phone {
-        display: none;
-    }
-}
-
-/* #endif */
-.uni-stat__select {
-    display: flex;
-    align-items: center;
-    // padding: 15px;
-    /* #ifdef H5 */
-    cursor: pointer;
-    /* #endif */
-    width: 100%;
-    flex: 1;
-    box-sizing: border-box;
-}
-
-.uni-stat-box {
-    width: 100%;
-    flex: 1;
-}
-
-.uni-stat__actived {
-    width: 100%;
-    flex: 1;
-    // outline: 1px solid #2979ff;
-}
-
-.uni-label-text {
-    font-size: 14px;
-    font-weight: bold;
-    color: $uni-base-color;
-    margin: auto 0;
-    margin-right: 5px;
-}
-
-.uni-select {
-    font-size: 14px;
-    // border: 1px solid $uni-border-3;
-    box-sizing: border-box;
-    border-radius: 4px;
-    padding: 0 5px;
-    padding-left: 10px;
-    position: relative;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    user-select: none;
-    /* #endif */
-    flex-direction: row;
-    align-items: center;
-    // border-bottom: solid 1px $uni-border-3;
-    width: 100%;
-    flex: 1;
-    height: 35px;
-
-    &--disabled {
-        background-color: #f5f7fa;
-        cursor: not-allowed;
-    }
-
-    &--border {
-        border: 1px solid $uni-border-3;
-        border-bottom: solid 1px $uni-border-3;
-    }
-}
-
-.uni-select__label {
-    font-size: 16px;
-    // line-height: 22px;
-    height: 35px;
-    padding-right: 10px;
-    color: $uni-secondary-color;
-}
-
-.uni-select__input-box {
-    height: 35px;
-    position: relative;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex: 1;
-    flex-direction: row;
-    align-items: center;
-}
-
-.uni-select__input {
-    flex: 1;
-    font-size: 14px;
-    height: 22px;
-    line-height: 22px;
-}
-
-.uni-select__input-plac {
-    font-size: 14px;
-    color: $uni-secondary-color;
-}
-
-.uni-select__selector {
-    /* #ifndef APP-NVUE */
-    box-sizing: border-box;
-    /* #endif */
-    position: absolute;
-    left: 0;
-    width: 100%;
-    background-color: #ffffff;
-    border: 1px solid #ebeef5;
-    border-radius: 6px;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-    z-index: 3;
-    padding: 4px 0;
-    min-width: 300rpx;
-}
-
-.uni-select__selector-scroll {
-    /* #ifndef APP-NVUE */
-    max-height: 200px;
-    box-sizing: border-box;
-    /* #endif */
-}
-
-/* #ifdef H5 */
-@media (min-width: 768px) {
-    .uni-select__selector-scroll {
-        max-height: 600px;
-    }
-}
-
-/* #endif */
-
-.uni-select__selector-empty,
-.uni-select__selector-item {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    cursor: pointer;
-    /* #endif */
-    line-height: 35px;
-    font-size: 14px;
-    text-align: center;
-    /* border-bottom: solid 1px $uni-border-3; */
-    padding: 0px 10px;
-}
-
-.uni-select__selector-item:hover {
-    background-color: #f9f9f9;
-}
-
-.uni-select__selector-empty:last-child,
-.uni-select__selector-item:last-child {
-    /* #ifndef APP-NVUE */
-    border-bottom: none;
-    /* #endif */
-}
-
-.uni-select__selector__disabled {
-    opacity: 0.4;
-    cursor: default;
-}
-
-/* picker 弹出层通用的指示小三角 */
-.uni-popper__arrow_bottom,
-.uni-popper__arrow_bottom::after,
-.uni-popper__arrow_top,
-.uni-popper__arrow_top::after {
-    position: absolute;
-    display: block;
-    width: 0;
-    height: 0;
-    border-color: transparent;
-    border-style: solid;
-    border-width: 6px;
-}
-
-.uni-popper__arrow_bottom {
-    filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
-    top: -6px;
-    left: 10%;
-    margin-right: 3px;
-    border-top-width: 0;
-    border-bottom-color: #ebeef5;
-}
-
-.uni-popper__arrow_bottom::after {
-    content: ' ';
-    top: 1px;
-    margin-left: -6px;
-    border-top-width: 0;
-    border-bottom-color: #fff;
-}
-
-.uni-popper__arrow_top {
-    filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
-    bottom: -6px;
-    left: 10%;
-    margin-right: 3px;
-    border-bottom-width: 0;
-    border-top-color: #ebeef5;
-}
-
-.uni-popper__arrow_top::after {
-    content: ' ';
-    bottom: 1px;
-    margin-left: -6px;
-    border-bottom-width: 0;
-    border-top-color: #fff;
-}
-
-.uni-select__input-text {
-    // width: 280px;
-    width: 100%;
-    color: $uni-main-color;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    -o-text-overflow: ellipsis;
-    overflow: hidden;
-}
-
-.uni-select__input-placeholder {
-    color: $uni-base-color;
-    font-size: 12px;
-}
-
-.uni-select--mask {
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    right: 0;
-    left: 0;
-    z-index: 2;
-}
-</style>

uni_modules/uni-data-select/package.json

@@ -1,86 +0,0 @@
-{
-  "id": "uni-data-select",
-  "displayName": "uni-data-select 下拉框选择器",
-  "version": "1.0.8",
-  "description": "通过数据驱动的下拉框选择器",
-  "keywords": [
-    "uni-ui",
-    "select",
-    "uni-data-select",
-    "下拉框",
-    "下拉选"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": "^3.1.1"
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-"dcloudext": {
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-    "type": "component-vue"
-  },
-  "uni_modules": {
-    "dependencies": ["uni-load-more"],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y",
-        "alipay": "n"
-      },
-      "client": {
-        "App": {
-          "app-vue": "u",
-          "app-nvue": "n"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "u",
-          "百度": "u",
-          "字节跳动": "u",
-        "QQ": "u",
-        "京东": "u"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
-        }
-      }
-    }
-  }
-}

uni_modules/uni-data-select/readme.md

@@ -1,8 +0,0 @@
-## DataSelect 下拉框选择器
-> **组件名：uni-data-select**
-> 代码块： `uDataSelect`
-
-当选项过多时，使用下拉菜单展示并选择内容
-
-### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
-#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/zhuo-tianditu-MultiPoint-Mapper/components/zhuo-tianditu-MultiPoint-Mapper/tianditu-map.vue

@@ -1,268 +0,0 @@
-<template>
-    <view style="width: 100%; height: 100%">
-        <view id="mapDiv" class="mapDiv" :apikey="apiKey" :prop="option" :change:prop="Trenderjs.initTMap"></view>
-    </view>
-</template>
-
-<script>
-import tools from '../../tools.js';
-import iconPath from '../../static/point2.png';
-import iconRangePath from '../../static/range.png';
-export default {
-    name: 'TianDiTu-Map',
-    data() {
-        return {
-            Tmap: null,
-            option: {
-                type: '',
-                apikey: '',
-                cover: null,
-                lng: '',
-                lat: '',
-                png: iconPath,
-                rangePng: iconRangePath,
-                showLabel: true,
-                showCirle: false,
-                range: 0,
-            },
-        };
-    },
-    props: {
-        apiKey: {
-            type: String,
-            require: true,
-            default: '',
-        },
-        customIcon: {
-            type: String,
-            default: '',
-        },
-        showLabel: {
-            type: Boolean,
-            default: true,
-        },
-        showCirle: {
-            type: Boolean,
-            default: true,
-        },
-    },
-    methods: {
-        compliteonLoadTianDiTu() {
-            this.$emit('onLoadTianDiTu');
-        },
-        initCharts(lng, lat) {
-            this.option = {
-                ...this.option,
-                apikey: this.apiKey,
-                showLabel: this.showLabel,
-                showCirle: this.showCirle,
-                lng,
-                lat,
-                png: this.customIcon || this.option.png,
-                type: 'open',
-            };
-        },
-        upDataCharts(lng, lat) {
-            this.option = {
-                ...this.option,
-                type: 'Icon',
-                lng,
-                lat,
-                png: this.customIcon || this.option.png,
-                type: 'update',
-                showLabel: this.showLabel,
-            };
-        },
-        addFeature(cover) {
-            this.option = {
-                ...this.option,
-                type: 'Icon',
-                cover,
-                png: this.customIcon || this.option.png,
-                type: 'addFeature',
-                showLabel: this.showLabel,
-            };
-        },
-        changeRange(range) {
-            this.option = {
-                ...this.option,
-                type: 'Icon',
-                png: this.customIcon || this.option.png,
-                type: 'changeRange',
-                showLabel: this.showLabel,
-                showCirle: this.showCirle,
-                range: range,
-            };
-        },
-        selectItem(info) {
-            this.$emit('onSelect', info);
-        },
-    },
-};
-</script>
-
-<script module="Trenderjs" lang="renderjs">
-var Tmap = null;
-export default {
-    data() {
-        return {
-            options: {},
-            circle: [],
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        initTMap(newValue, oldValue, ownerInstance, instance) {
-            this.options = newValue
-            if (newValue.type === 'open' && newValue.apikey) {
-                if (!window.T) {
-                    const script = document.createElement('script')
-                    script.src = 'http://api.tianditu.gov.cn/api?v=4.0&tk=' + this.options.apikey
-                    script.onload = this.initChartsRender.bind(this)
-                    document.head.appendChild(script)
-                    console.log('open')
-                } else {
-                    const {
-                        lng,
-                        lat
-                    } = this.options
-                    Tmap = null;
-                    Tmap = new T.Map('mapDiv', {
-                        projection: 'EPSG:4326',
-                    });
-                    const control = new T.Control.Zoom({ position: T_ANCHOR_TOP_RIGHT});
-                    const scale = new T.Control.Scale({ position: T_ANCHOR_TOP_LEFT});
-                    Tmap.addControl(scale);
-                    Tmap.addControl(control);
-                    this.upDataChartsRender(lng, lat)
-                    this.$ownerInstance.callMethod('compliteonLoadTianDiTu')
-                }
-            } else {
-                const {
-                    lng,
-                    lat,
-                    cover,
-                    showLabel,
-                    showCirle,
-                    range
-                } = newValue
-
-                switch (newValue.type) {
-                    case 'update':
-                        this.upDataChartsRender(lng, lat)
-                        break;
-                    case 'addFeature':
-                        Tmap.clearOverLays()
-                        this.circle = []
-                        cover.map((item, index) => {
-                            this.setIcon(item.lon, item.lat, false, showLabel, false, showCirle, item)
-                        })
-                        break;
-                    case 'changeRange':
-                        this.setRange(range)
-                    default:
-                        break;
-                }
-            }
-        },
-        initChartsRender() {
-            this.$ownerInstance.callMethod('compliteonLoadTianDiTu')
-            const {
-                lng,
-                lat
-            } = this.options
-            var that = this;
-            Tmap = new T.Map('mapDiv', {
-                projection: 'EPSG:4326',
-            });
-            this.upDataChartsRender(lng, lat)
-            const control = new T.Control.Zoom({ position: T_ANCHOR_TOP_RIGHT});
-            const scale = new T.Control.Scale({ position: T_ANCHOR_TOP_LEFT});
-            Tmap.addControl(scale);
-            Tmap.addControl(control);
-            console.log('初始化1')
-        },
-        upDataChartsRender(lng, lat, zoom = 15) {
-            if (!Tmap) return
-            Tmap.centerAndZoom(new T.LngLat(lng, lat), zoom);
-        },
-        setRange(range) {
-            for (let item in this.circle) {
-                this.circle[item].setRadius(range * 1000)
-            }
-            // this.circle.setRadius(range * 1000)
-        },
-        setIcon(lng, lat, isClear, isClick = false, isLabel = false, isCirle = false, item) {
-            if (isClear) {
-                Tmap.clearOverLays()
-            }
-            const latlng = new T.LngLat(lng, lat)
-            const icon = new T.Icon({
-                iconUrl: this.options.png,
-                iconSize: new T.Point(30, 30),
-                iconAnchor: new T.Point(15, 30)
-            });
-            if (isLabel) {
-                const label = new T.Label({
-                    text: `<div style="max-width: 50px; overflow: hidden">${item.label}</div>`,
-                    position: latlng,
-                    offset: new T.Point(-50, 0)
-                });
-                Tmap.addOverLay(label);
-            }
-            if(isCirle) {
-                const circleObj = new T.Circle(latlng , parseFloat(50), {
-                  color:"#13C57C",weight:2,opacity:1,fillColor:"#13C57C",fillOpacity:0.24
-                })
-                this.circle.push(circleObj)
-                Tmap.addOverLay(circleObj);
-            }
-            const marker = new T.Marker(latlng, {
-                icon
-            });
-
-            if (isClick) {
-                this.removeMarkerClick(marker);
-                //注册标注的点击事件
-                marker.addEventListener("click", this.MarkerClick.bind(null, item));
-            }
-            Tmap.addOverLay(marker);
-        },
-        removeMarkerClick(marker) {
-            //移除标注的点击事件
-            marker.removeEventListener("click", this.MarkerClick);
-        },
-        MarkerClick(item, e) {
-            this.openInfo(item.label, e)
-            this.$ownerInstance.callMethod('selectItem', item)
-        },
-        openInfo(content, e) {
-            const point = e.lnglat;
-            const marker = new T.Marker(point); // 创建标注
-            const markerInfoWin = new T.InfoWindow(content, {
-                offset: new T.Point(0, -30)
-            }); // 创建信息窗口对象
-            Tmap.openInfoWindow(markerInfoWin, point); //开启信息窗口
-        }
-    },
-}
-</script>
-
-<style scoped>
-#mapDiv {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-
-/deep/ .tdt-control-copyright {
-    display: none;
-}
-
-/deep/ .tdt-label {
-    /*        background: transparent;
-        box-shadow: none;
-        border: 0; */
-}
-</style>

uni_modules/zhuo-tianditu-MultiPoint-Mapper/components/zhuo-tianditu-MultiPoint-Mapper/zhuo-tianditu-MultiPoint-Mapper.vue

@@ -1,214 +0,0 @@
-<template>
-    <view style="width: 100%; height: 100%">
-        <view class="mask" style="width: 100%; height: 100%">
-            <tiandituMap
-                ref="tiandituMapRefs"
-                @onLoadTianDiTu="initMaps"
-                @onSelect="selectPoint"
-                :apiKey="apiKey"
-                :customIcon="icon"
-                :showLabel="showLabel"
-                :showCirle="showCirle"
-            ></tiandituMap>
-        </view>
-    </view>
-</template>
-<script>
-import tiandituMap from './tianditu-map.vue';
-import tools from '../../tools.js';
-export default {
-    name: 'zhuozhuoTiandituPlugin',
-    components: {
-        tiandituMap,
-    },
-    props: {
-        apiKey: {
-            type: String,
-            require: true,
-            default: '',
-        },
-        icon: {
-            type: String,
-            default: '',
-        },
-        showLabel: {
-            type: Boolean,
-            default: true,
-        },
-        showCirle: {
-            type: Boolean,
-            default: true,
-        },
-    },
-    data() {
-        return {
-            winWidth: 0,
-            winHeight: 0,
-            winTop: 0,
-            visible: false,
-            datalist: [],
-            selectItem: {},
-            iStatusBarHeight: 0,
-            option: {
-                apikey: 123123,
-            },
-        };
-    },
-    created() {
-        var that = this;
-        // #ifdef APP
-        // 44 + 10 44: search Input height
-        const searchHeight = this.search ? 54 : 10;
-        const { statusBarHeight, screenHeight, windowHeight } = uni.getSystemInfoSync();
-        if (screenHeight === windowHeight) {
-            that.iStatusBarHeight = statusBarHeight + searchHeight;
-        } else {
-            that.iStatusBarHeight = 0;
-        }
-        // #endif
-        uni.getSystemInfo({
-            success: function (res) {
-                that.winWidth = res.windowWidth;
-                that.winHeight = res.windowHeight;
-                that.winTop = res.windowTop;
-            },
-        });
-    },
-    methods: {
-        open(lon, lat) {
-            if (lon && lat) {
-                this.visible = true;
-                this.$nextTick(() => {
-                    this.$refs.tiandituMapRefs.initCharts(lon, lat);
-                });
-            } else {
-                console.error('请传入lon, lat');
-            }
-        },
-        upDateLonLat(cover) {
-            if (lon && lat) {
-                this.$refs.tiandituMapRefs.upDataCharts(lon && lat);
-            } else {
-                console.error('请传入lon, lat');
-            }
-        },
-        addFeature(cover) {
-            if (cover && Array.isArray(cover) && cover.length) {
-                this.$refs.tiandituMapRefs.addFeature(cover);
-            } else {
-                console.error('请传入 cover', cover);
-            }
-        },
-        changeRange(range) {
-            this.$refs.tiandituMapRefs.changeRange(range);
-        },
-        selectPoint(e) {
-            this.$emit('onSelect', e);
-        },
-        initMaps() {
-            console.warn('--------天地图加载完成--------');
-            this.$emit('onLoad');
-        },
-    },
-};
-</script>
-
-<style scope>
-.mask {
-    /* overflow: hidden; */
-    /* position: fixed;
-        left: 0;
-        z-index: 399; */
-    background-color: #ffffff;
-}
-
-/* footer */
-.list-boxd {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    z-index: 401;
-    right: 0;
-    border-radius: 14px 14px 0 0;
-    background: #ffffff;
-    transition: all 1s;
-}
-
-.list-header {
-    height: 20px;
-    position: relative;
-    border-bottom: 1px solid #f3f4f6;
-    cursor: pointer;
-}
-
-.list-header::after {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    content: '';
-    height: 6px;
-    width: 60px;
-    border-top: 1px solid #e8e8e8;
-    border-bottom: 1px solid #e8e8e8;
-}
-
-.list-content {
-    max-height: 50vh;
-    overflow-y: scroll;
-}
-
-.card {
-    min-height: 44px;
-    padding: 12px;
-    position: relative;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.card-left {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-}
-
-.card-right {
-    padding-right: 10px;
-}
-
-.arrow {
-    border-top: 2px solid #666666;
-    border-right: 2px solid #666666;
-    width: 10px;
-    height: 10px;
-    transform: rotate(45deg);
-}
-
-.card:active {
-    background-color: #f3f4f6;
-}
-
-.card::after {
-    position: absolute;
-    content: '';
-    bottom: 0;
-    height: 1px;
-    background-color: #e8e8e8;
-    width: 90%;
-}
-
-.card:last-child::after {
-    height: 0;
-    background-color: #ffffff;
-}
-
-.card-title {
-    font-size: 18px;
-}
-
-.card-text {
-    color: #e8e8e8;
-    font-size: 13px;
-}
-</style>

uni_modules/zhuo-tianditu-MultiPoint-Mapper/package.json

@@ -1,83 +0,0 @@
-{
-  "id": "zhuo-tianditu-MultiPoint-Mapper",
-  "displayName": "zhuo-tianditu-MultiPoint-Mapper",
-  "version": "1.0.0",
-  "description": "zhuo-tianditu-MultiPoint-Mapper",
-  "keywords": [
-    "zhuo-tianditu-MultiPoint-Mapper"
-],
-  "repository": "",
-  "engines": {
-    "HBuilderX": "^3.1.0"
-  },
-  "dcloudext": {
-    "type": "component-vue",
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "",
-      "data": "",
-      "permissions": ""
-    },
-    "npmurl": ""
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "u",
-        "aliyun": "u",
-        "alipay": "u"
-      },
-      "client": {
-        "Vue": {
-          "vue2": "u",
-          "vue3": "u"
-        },
-        "App": {
-          "app-vue": "u",
-          "app-nvue": "u",
-          "app-uvue": "u"
-        },
-        "H5-mobile": {
-          "Safari": "u",
-          "Android Browser": "u",
-          "微信浏览器(Android)": "u",
-          "QQ浏览器(Android)": "u"
-        },
-        "H5-pc": {
-          "Chrome": "u",
-          "IE": "u",
-          "Edge": "u",
-          "Firefox": "u",
-          "Safari": "u"
-        },
-        "小程序": {
-          "微信": "u",
-          "阿里": "u",
-          "百度": "u",
-          "字节跳动": "u",
-          "QQ": "u",
-          "钉钉": "u",
-          "快手": "u",
-          "飞书": "u",
-          "京东": "u"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
-}

uni_modules/zhuo-tianditu-MultiPoint-Mapper/readme.md

@@ -1 +0,0 @@
-# zhuo-tianditu-MultiPoint-Mapper

uni_modules/zhuo-tianditu-MultiPoint-Mapper/tools.js

@@ -1,106 +0,0 @@
-/**
- * @param title  String，提示的内容
- * @param duration  String，提示的延迟时间，单位毫秒，默认：1500
- * @param mask  Boolean，是否显示透明蒙层，防止触摸穿透，默认：false
- * @param icon  String，图标：success、error、fail、exception、loading、none，默认：none
- **/
-export function createMessage(title, duration = 1500, mask = false, icon = "none") {
-    uni.showToast({
-        title,
-        duration: duration,
-        mask,
-        icon
-    });
-}
-
-/**
- * @param url  String，请求的地址，默认：none
- * @param data  Object，请求的参数，默认：{}
- * @param method  String，请求的方式，默认：GET
- * @param loading  Boolean，是否需要loading ，默认：false
- * @param header  Object，headers，默认：{}
- * @returns promise
- **/
-export function createRequest(url, data = {}, loading = false, method = 'GET', header = {}) {
-    if (loading) {
-        uni.showLoading({
-            title: '请稍后',
-            mask: true
-        })
-    }
-    return new Promise((resolve, reject) => {
-        uni.request({
-            url: url,
-            method: method,
-            data: data,
-            header: header,
-            success: res => {
-                if (res.statusCode === 200) {
-                    resolve(res.data)
-                } else {
-                    if (res.data.msg) {
-                        const str = typeof res.data.resolve === 'string' ? ',' + res.data.resolve :
-                            ''
-                        createMessage(res.data.msg + str)
-                    }
-                    throw new Error('请求错误 ' + url)
-                    reject()
-                }
-            },
-            fail: (err) => {
-                reject(err)
-            },
-            complete: () => {
-                uni.hideLoading();
-            }
-        });
-    })
-}
-
-/**
- * 数据格式化
- * @param obj  Object，响应的数据
- * @param type  Number 0 ｜ 1，处理类型
- * @returns Object {address = string, name = string, location = {lon, lat }, infomation = {}}
- */
-export function formatterAdressLocation(obj, type) {
-    switch (type) {
-        case 1:
-            return {
-                address: obj.formatted_address,
-                    name: '',
-                    location: obj.location,
-                    infomation: obj.addressComponent
-            }
-            break;
-        case 2:
-            const [lon, lat] = obj.lonlat.split(',')
-            return {
-                address: obj.address,
-                    name: obj.name,
-                    location: {
-                        lon,
-                        lat
-                    },
-                    infomation: obj
-            }
-            break
-        case 3:
-            return {
-                address: obj.location.keyWord,
-                    name: '',
-                    location: {
-                        lon: obj.location.lon,
-                        lat: obj.location.lat,
-                    },
-                    infomation: obj.location
-            }
-        default:
-            break;
-    }
-}
-export default {
-    createMessage,
-    createRequest,
-    formatterAdressLocation
-}

utils/wechatShare.js

@@ -0,0 +1,63 @@
+import wx from 'weixin-js-sdk'
+import config from "@/config.js"
+
+export function setupWechatShare({
+    title,
+    desc,
+    link,
+    imgUrl
+}) {
+    // 通过后端接口获取签名（必须）
+    fetch(`${config.baseUrl}/wechat-signature?url=${encodeURIComponent(location.href.split('#')[0])}`)
+        .then(res => res.json())
+        .then(({
+            appId,
+            timestamp,
+            nonceStr,
+            signature
+        }) => {
+            wx.config({
+                debug: false,
+                appId,
+                timestamp,
+                nonceStr,
+                signature,
+                jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData']
+            })
+
+            wx.ready(() => {
+                // 分享给好友
+                wx.updateAppMessageShareData({
+                    title,
+                    desc,
+                    link,
+                    imgUrl,
+                    success: () => {
+                        console.log('分享配置成功')
+                    }
+                })
+
+                // 分享到朋友圈
+                wx.updateTimelineShareData({
+                    title,
+                    link,
+                    imgUrl,
+                    success: () => {
+                        console.log('朋友圈分享配置成功')
+                    }
+                })
+            })
+        })
+}
+
+// 使用
+// import { setupWechatShare } from '@/utils/wechatShare.js'
+
+// onMounted(() => {
+//   setupWechatShare({
+//     title: '职位推荐：高级前端工程师',
+//     desc: '某知名互联网公司，年薪40W，点击查看详情',
+//     link: location.href,
+//     imgUrl: 'https://yourcdn.com/job-thumbnail.png'
+//   })
+// })