Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/layout/index.vue

@@ -5,7 +5,7 @@
       <router-view></router-view>
     </div>
     <Footers class="mt-10"></Footers>
-    <Slider class="slider"></Slider>
+    <Slider v-if="whiteList.indexOf(router.currentRoute.value.path) === -1" class="slider"></Slider>
   </div>
 </template>
 
@@ -14,8 +14,13 @@ import Headers from './personal/navBar.vue'
 import Footers from './personal/footer.vue'
 import Slider from './personal/slider.vue'
 import { useSharedState } from '@/store/sharedState'
+import { useRouter } from 'vue-router'
 defineOptions({ name: 'layout-index' })
 
+// 不展示侧边栏名单
+const whiteList = ['/login', '/privacyPolicy', '/userAgreement', '/register']
+const router = useRouter()
+
 const sharedState = useSharedState()
 
 const layoutClick = () => {

src/layout/personal/footer.vue

@@ -3,18 +3,18 @@
     <div class="top wid d-flex justify-space-between">
       <div class="left">
         <h4>联系我们</h4>
-        <div class="mt-5 size second">
-          <div>广州辞图科技有限公司</div>
-          <div class="my-3">公司地址&nbsp;先烈中路100号大院8栋203室</div>
-          <div>服务热线/举报渠道&nbsp;4000000xxx</div>
+        <div class="mt-5 size">
+          <div>苏州识喜识谊信息科技有限公司</div>
+          <div class="my-3">公司地址&nbsp;苏州工业园区林泉街399号东南大学国家大学科技园（苏州）南工院（2#）304室</div>
+          <div>服务热线/举报渠道&nbsp;4000xxxx</div>
         </div>
       </div>
       <div class="center">
         <h4>使用与帮助</h4>
-        <div class="mt-5 size second">
-          <div>协议与规则</div>
-          <div class="my-3">隐私协议</div>
-          <div>使用与帮助</div>
+        <div class="mt-5 size">
+          <a href="/userAgreement">用户协议</a>
+          <a class="my-3" href="/privacyPolicy">隐私协议</a>
+          <a>使用与帮助</a>
         </div>
       </div>
       <div class="right size d-flex">
@@ -38,10 +38,10 @@
 defineOptions({ name: 'personal-footer' })
 const list = [
   { label: 'Copyright © 2024招聘人才网', path: '' },
-  { label: '粤ICP备xxxx号-x', path: '' },
-  { label: '粤ICP备xxxx号-x', path: '' },
+  { label: '苏ICP备2021021762号-1', path: '' },
+  { label: '苏ICP备18037702号-1', path: '' },
   { label: '电子营业执照', path: '', img: '' },
-  { label: '粤公网安管 10110110110', path: '', img: '' },
+  { label: '公安备案号 32059002001928', path: '', img: '' },
   { label: '人力资源服务许可证', path: '' }
 ]
 </script>
@@ -66,6 +66,15 @@ const list = [
 .second {
   cursor: pointer;
 }
+a {
+  display: block;
+  cursor: pointer;
+  color: #ffffff80;
+  text-decoration: none;
+  &:hover {
+    color: var(--v-primary-base);
+  }
+}
 .bottom span:hover {
   color: var(--v-primary-base);
 }

src/layout/personal/slider.vue

@@ -1,13 +1,9 @@
 <template>
   <div class="slider-box">
     <div v-for="item in list" :key="item.mdi" class="slider-box-item">
-      <v-btn size="30" class="icons" variant="text">
-        <v-icon>{{item.mdi}}</v-icon>
-        <v-tooltip
-          activator="parent"
-          location="start"
-          :text="item.tips"
-        >
+      <v-btn size="30" class="icons" icon variant="text">
+        <v-icon class="icons" size="30">{{ item.mdi }}</v-icon>
+        <v-tooltip :text="item.tips" location="start" activator="parent">
           <div v-if="item.showImg" class="ma-3" style="text-align: center">
             <v-img cover aspect-ratio="1/1" src="https://minio.citupro.com/dev/static/mendunerCode.jpg" :width="170" style="height: 170px;"></v-img>
             <span class="tips-text">关注门墩儿直聘微信公众号</span>

src/router/modules/remaining.js

@@ -22,21 +22,31 @@ const remainingRouter = [
   },
   {
     path: '/userAgreement',
-    component: () => import('@/views/login/components/userAgreement.vue'),
+    component: Layout,
     name: 'userAgreement',
-    meta: {
-      hidden: true,
-      title: '用户协议'
-    }
+    children: [
+      {
+        path: '/userAgreement',
+        component: () => import('@/views/login/components/userAgreement.vue'),
+        meta: {
+          title: '用户协议'
+        }
+      }
+    ]
   },
   {
     path: '/privacyPolicy',
-    component: () => import('@/views/login/components/privacyPolicy.vue'),
+    component: Layout,
     name: 'privacyPolicy',
-    meta: {
-      hidden: true,
-      title: '隐私政策'
-    }
+    children: [
+      {
+        path: '/privacyPolicy',
+        component: () => import('@/views/login/components/privacyPolicy.vue'),
+        meta: {
+          title: '隐私政策'
+        }
+      }
+    ]
   },
   {
     path: '',

src/views/Home/personal/components/jobTypeCard.vue

@@ -47,8 +47,14 @@
         </div>
       </div>
     </v-card>
-    <v-card v-if="!isFloat && !rightObj.show" class="card rightCardBox ml-1">
-      <div class="rightCard" style="color: red;">轮播</div>
+    <v-card height="392px" v-if="!isFloat && !rightObj.show" class="card rightCardBox ml-1">
+      <v-carousel show-arrows="hover" cycle :hide-delimiters="false">
+        <v-carousel-item v-for="(item, i) in carouselList" :key="i">
+          <div style="height: 392px; overflow: hidden;">
+            <v-img :src="item.src" cover style="height: 100%; overflow: hidden;"></v-img>
+          </div>
+        </v-carousel-item>
+      </v-carousel>
     </v-card>
   </div>
 </template>
@@ -105,6 +111,11 @@ const handleMouseLeave = () => { // 鼠标移出
   rightObj.show = false // true false
   leftIndex.value = null
 }
+// 轮播图片
+const carouselList = ref([
+  { src: 'https://img0.baidu.com/it/u=3769341087,3426515789&fm=253&fmt=auto&app=138&f=JPEG?w=1180&h=472', },
+  { src: 'https://img.kinpan.com/Files/design/detailimages/20161228/6361853956839262507798973.jpg', },
+])
 
 </script>