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

components.d.ts

@@ -31,6 +31,7 @@ declare module 'vue' {
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElWatermark: typeof import('element-plus/es')['ElWatermark']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

src/components/PreviewImg/index.vue

@@ -1,7 +1,7 @@
 <template>
   <v-overlay v-model="overlay" class="align-center justify-center" @update:model-value="handleChange">
     <div class="close" @click="overlay = false; handleChange(false)">
-      <v-icon color="#fff" size="60" class="mr-15" @click.stop="emits('download')">mdi-arrow-down-bold-box-outline</v-icon>
+      <v-icon color="#fff" size="60" class="mr-15" v-if="!props.hideDownload" @click.stop="emits('download')">mdi-arrow-down-bold-box-outline</v-icon>
       <v-icon color="#fff" size="60">mdi-close-circle</v-icon>
       <!-- <v-btn class="ml-3" color="primary" variant="outlined" prepend-icon="mdi-arrow-down-bold-box-outline" @click="handleDownloadImage" style="width: 133px">保存到本地</v-btn> -->
     </div>
@@ -32,6 +32,10 @@ const props = defineProps({
     type: Number,
     default: 0
   },
+  hideDownload: {
+    type: Boolean,
+    default: false
+  },
   isImage: {
     type: Boolean,
     default: false

src/layout/personal/footer.vue

@@ -45,21 +45,38 @@
       </div>
     </div>
     <div class="bottom wid mt-3 d-flex justify-space-between">
-      <span class="size second mb-3" v-for="(item, i) in list" :key="i">{{ item.label }}</span>
+      <div v-for="(item, i) in list" :key="i" class="d-flex align-center mb-3" @click="handleClick(item)">
+        <v-img v-if="item.iconImg" cover aspect-ratio="16/9" :src="item.iconImg" :width="12" style="height: 12px; margin-right: 2px;"></v-img>
+        <span class="size second">{{ item.label }}</span>
+      </div>
     </div>
   </div>
+  <PreviewImg v-if="showPreview" :list="[imgUrl]" :hideDownload="true" @close="showPreview = !showPreview"></PreviewImg>
 </template>
 
 <script setup>
+import { ref } from 'vue'
+
 defineOptions({ name: 'personal-footer' })
 const list = [
   // { label: 'Copyright © 2024招聘人才网', path: '' },
-  { label: '苏ICP备2021021762号-1', path: '' },
-  { label: '苏ICP备18037702号-1', path: '' },
-  { label: '电子营业执照', path: '', img: '' },
-  { label: '公安备案号 32059002001928', path: '', img: '' },
-  { label: '人力资源服务许可证', path: '' }
+  { label: '苏ICP备2024103111号-1', openPath: 'https://beian.miit.gov.cn/#/Integrated/index' },
+  { label: '苏ICP备2024103111号-4', openPath: 'https://beian.miit.gov.cn/#/Integrated/index' },
+  { label: '电子营业执照', path: '', img: 'https://minio.citupro.com/dev/menduner/businessLicense.jpg' },
+  { label: '公安备案号 32059002001928', openPath: 'https://beian.mps.gov.cn/#/query/webSearch?code=32059002001928', iconImg: 'https://minio.citupro.com/dev/menduner/RecordIcon.png' },
+  { label: '人力资源服务许可证', img: 'https://minio.citupro.com/dev/menduner/humanResourcesLicense.jpg' }
 ]
+
+const showPreview = ref(false)
+let imgUrl = ''
+const handleClick = (item) => {
+  if (item.img) {
+    imgUrl = item.img
+    showPreview.value = true
+  } else if (item.openPath) {
+    window.open(item.openPath)
+  }
+}
 </script>
 
 <style scoped lang="scss">

src/views/recruit/personal/home/index.vue

@@ -16,7 +16,7 @@
       </div>
       <div v-else class="advertise-box cursor-pointer" @mouseenter="showFullAdvertise = true"></div>
     </div>
-    <div class="default-width content-box">
+    <div class="default-width content-box mb-5">
       <homeJobTypeCard></homeJobTypeCard>
       <advertisementPage class="my-3"></advertisementPage>
       <hotPromotedPositions></hotPromotedPositions>