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

src/views/headhunting/components/content.vue

@@ -108,9 +108,9 @@ const service = [
 ]
 // 办公地点
 const countryOffice = [
-  { name: '苏州', desc: '苏州识喜识谊信息科技有限公司', url: 'https://cn.spencerstuart.com/-/media/offices-search/beijing-office.jpg' },
-  { name: '北京', desc: '苏州识喜识谊信息科技有限公司', url: 'https://cn.spencerstuart.com/-/media/offices-search/hong-kong-office.jpg' },
-  { name: '广州', desc: '苏州识喜识谊信息科技有限公司', url: 'https://cn.spencerstuart.com/-/media/offices-search/shanghai-1597-15257628-office-hdr.jpg' }
+  { name: '苏州', desc: '苏州识喜识谊信息科技有限公司', url: 'https://minio.menduner.com/dev/menduner/suzhou.png' },
+  { name: '北京', desc: '苏州识喜识谊信息科技有限公司', url: 'https://minio.menduner.com/dev/menduner/beijin.png' },
+  { name: '广州', desc: '广州辞图科技有限公司', url: 'https://minio.menduner.com/dev/menduner/guangzhou.png' }
 ]
 // 我们的顾问
 const consultant = [
@@ -374,7 +374,7 @@ const handleClick = (type, id) => {
     width: 100%;
     margin-bottom: 40px;
     &-item {
-      width: calc((100% - 150px) / 3);
+      width: calc((100% - 110px) / 3);
       height: 385px;
       margin-right: 50px;
       position: relative;

src/views/mall/exchange.vue

@@ -76,11 +76,11 @@ const formItems = ref({
 
 // 数据
 const dataList = ref([
-  { name: '房券', point: 12000, url: 'http://www.51lip.com/public/images/17/64/c2/bd52d2072e4304a43d383069fe63d15cb12fddf6.jpg', type: 1 },
-  { name: '门墩儿酒店英语学习年卡', point: 8000, url: 'http://www.51lip.com/public/images/72/9b/de/42d8056bdd889217793f84cb68936d5682ea72dc.png', type: 0 },
-  { name: '红酒', point: 5000, url: 'http://www.51lip.com/public/images/34/fb/dd/dfc8757b4204fc79352490478e6be8ae71fd748a.jpg', type: 1 },
-  { name: '瑞幸电子咖啡券', point: 2000, url: 'http://www.51lip.com/public/images/68/0a/f4/53d5f128b19d22c04ed4538360ae0db0a388f5f8.jpg', type: 0 },
-  { name: '减压捏捏乐', point: 500, url: 'http://www.51lip.com/public/images/07/4c/e3/0917d02b646e9a5eeec427f70197d4915007ddbe.jpg', type: 1 }
+  { name: '房券-高端酒店房券', point: 12000, url: 'https://minio.menduner.com/dev/menduner/hotalRoomVoucher.png', type: 1 },
+  { name: '门墩儿酒店英语学习年卡', point: 8000, url: 'https://minio.menduner.com/dev/menduner/englishCourses.png', type: 0 },
+  { name: '红酒-经典年份葡萄酒', point: 5000, url: 'https://minio.menduner.com/dev/menduner/redWine.png', type: 1 },
+  { name: '瑞幸咖啡券-瑞幸咖啡精致享受券', point: 2000, url: 'https://minio.menduner.com/dev/menduner/coffee.png', type: 0 },
+  { name: '减压捏捏乐', point: 500, url: 'https://minio.menduner.com/dev/menduner/pinchMusic.png', type: 1 }
 ])
 
 // 详情说明弹窗

src/views/recruit/personal/PersonalCenter/resume/template/index.vue

@@ -4,20 +4,20 @@
       <div class="resume-title">简历模板下载</div>
     </div>
     <div style="height: calc(100% - 58px);  width: 100%;" class="mt-3">
-    <div v-if="list.length" class="mt-5">
-      <div
-        :class="['position-item', 'mx-n2', 'px-2']" 
-        v-for="(k, i) in list" 
-        :key="i" 
-        @mouseenter="k.active = true" 
-        @mouseleave="k.active = false"
+    <div v-if="vip" class="mt-5">
+      <CtTable
+        :items="list"
+        :headers="headers"
+        :loading="false"
+        :elevation="0"
+        :isTools="false"
+        :showPage="false"
       >
-        <div>{{ k.title }}</div>
-        <div class="float-right" v-if="k.active">
-          <v-btn variant="text" color="primary" prepend-icon="mdi-eye-outline" @click="previewFile(k.url)">预览</v-btn>
-          <v-btn variant="text" color="primary" prepend-icon="mdi-square-edit-outline" @click="handleDownload(k)">下载</v-btn>
-        </div>
-      </div>
+        <template #actions="{ item }">
+          <v-btn variant="text" color="primary" prepend-icon="mdi-eye-outline" @click="previewFile(item.url)">预览</v-btn>
+          <v-btn variant="text" color="primary" prepend-icon="mdi-square-edit-outline" @click="handleDownload(item)">下载</v-btn>
+        </template>
+      </CtTable>
     </div>
       <div v-else class="mt-8">
         <span class="color-error">
@@ -29,19 +29,37 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
 defineOptions({name: 'resume-template'})
+import { ref, computed } from 'vue'
 import { previewFile, getBlob, saveAs } from '@/utils'
-import { useRouter } from 'vue-router'; const router = useRouter()
-import { getPersonResumeCv } from '@/api/recruit/personal/resume'
-
-// 获取附件
-const attachmentList = ref([])
-const getList = async () => {
-  const data = await getPersonResumeCv()
-  attachmentList.value = data
-}
-getList()
+import { useRouter } from 'vue-router'
+import { useUserStore } from '@/store/user'
+
+const router = useRouter()
+const userStore = useUserStore()
+// 简历模板列表
+const list = ref([
+  { active: false, title: '创新精英简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E5%88%9B%E6%96%B0%E7%B2%BE%E8%8B%B1%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx' },
+  { active: false, title: '顶尖人才简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E9%A1%B6%E5%B0%96%E4%BA%BA%E6%89%8D%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx' },
+  { active: false, title: '高级职业经理人简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E9%AB%98%E7%BA%A7%E8%81%8C%E4%B8%9A%E7%BB%8F%E7%90%86%E4%BA%BA%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx' },
+  { active: false, title: '高效职场精英简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E9%AB%98%E6%95%88%E8%81%8C%E5%9C%BA%E7%B2%BE%E8%8B%B1%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.doc' },
+  { active: false, title: '领导力简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E9%A2%86%E5%AF%BC%E5%8A%9B%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx' },
+  { active: false, title: '行业精英专属简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E8%A1%8C%E4%B8%9A%E7%B2%BE%E8%8B%B1%E4%B8%93%E5%B1%9E%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx' },
+  { active: false, title: '行业领袖简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E8%A1%8C%E4%B8%9A%E9%A2%86%E8%A2%96%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx' },
+  { active: false, title: '专业卓越简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E4%B8%93%E4%B8%9A%E5%8D%93%E8%B6%8A%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.doc' },
+  { active: false, title: '卓越成就简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E5%8D%93%E8%B6%8A%E6%88%90%E5%B0%B1%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx' },
+  { active: false, title: '卓越职业轨迹简历模板', url: 'https://minio.menduner.com/dev/menduner/resumeTemplate/%E5%8D%93%E8%B6%8A%E8%81%8C%E4%B8%9A%E8%BD%A8%E8%BF%B9%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx' },
+])
+
+const headers = [
+  { title: '简历模板名称', key: 'title', sortable: false },
+  { title: '操作', key: 'actions', sortable: false, align: 'center' }
+]
+
+const vip = computed(() => {
+  return new Date().getTime() < userStore.userInfo?.vipExpireDate
+})
+
 
 // 下载附件
 const handleDownload = (k) => {
@@ -50,7 +68,6 @@ const handleDownload = (k) => {
   })
 }
 
-const list = ref([])
 const goBuy = () => {
   router.push('/recruit/personal/personalCenter/memberBenefits/membershipPackage')
 }

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

@@ -30,9 +30,9 @@
     max-width="900"
     :persistent="false"
   >
-    <div style="cursor: pointer; margin: 0 auto; position: relative;" @click="adClick">
-      <v-img src="./img/adImg.jpg" :width="adImgWidth" style="height: auto;border-radius: 4px;"></v-img>
-      <span style="color: white; font-size: 28px; position: absolute; right: 0px; top: 0px;" class="mdi mdi-close-circle-outline cursor-pointer px-3" @click="adDialog = false"></span>
+    <div style="cursor: pointer; margin: 0 auto; position: relative;">
+      <v-img src="./img/adImg.jpg" :width="adImgWidth" style="height: auto;border-radius: 4px;" @click="adClick"></v-img>
+      <span style="color: white; font-size: 40px; position: absolute; right: 0px; top: 0px;" class="mdi mdi-close-circle-outline cursor-pointer px-3" @click="adDialog = false"></span>
     </div>
   </v-dialog>
 </template>
@@ -119,9 +119,20 @@ const adClick = () => {
   width: 180px; 
   height: 360px;
   &-box {
+    position: relative;
     width: 15px;
     height: 100%;
     background-color: #00897B;
+    &::after {  
+      content: "";  
+      position: absolute;  
+      right: -50px;
+      top: 50%;
+      transform: translateY(-50%);
+      border-width: 25px;
+      border-style: solid; 
+      border-color: transparent transparent transparent #00897B;
+    }
   }
   &-title {
     width: 100%;