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

.env.development

@@ -3,7 +3,7 @@ NODE_ENV = 'development'
 VITE_APP_TITLE = 门墩儿直聘
 
 # 请求路径
-VITE_BASE_URL = 'http://192.168.3.80'
+VITE_BASE_URL = 'http://menduner.citupro.com:7878/'
 
 # 接口地址
 VITE_API_URL = '/admin-api'

package.json

@@ -2,9 +2,8 @@
   "name": "vuetify-project",
   "version": "0.0.0",
   "scripts": {
-    "dev": "vite --host 0.0.0.0",
-    "build:dev": "vite build --mode dev",
-    "build": "vite build",
+    "dev": "vite --mode local-dev --host 0.0.0.0",
+    "build:dev": "vite build --mode development",
     "preview": "vite preview",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore",
     "format": "prettier --write src/"

src/components/Enterprise/components/introduction.vue

@@ -14,8 +14,10 @@
     <div>
       <h4>公司相册</h4>
       <v-slide-group :show-arrows="true" class="mt-3 img-box">
-        <v-slide-group-item v-for="val in props.info.enterprise.albumList" :key="val">
-          <v-img class="mr-3" width="200" height="120" :src="val" cover rounded></v-img>
+        <!-- props.info.enterprise.albumList -->
+        <v-slide-group-item v-for="val in list" :key="val">
+          <v-img v-if="isImage(val)" class="mr-3" width="200" height="115" :src="val" cover rounded></v-img>
+          <video v-else class="videos-radius" :src="val" controls height="118" width="200" preload="preload"></video>
         </v-slide-group-item>
       </v-slide-group>
     </div>
@@ -30,6 +32,19 @@ const props = defineProps({
     default: () => {}
   }
 })
+const list = [
+  'https://img.bosszhipin.com/beijin/upload/com/img/20190823/9ed988f78163bf3784fa162764d429124d4ba1fec2b1a061e4a46fb61ddab12d.jpg',
+  'https://img.bosszhipin.com/beijin/upload/com/img/20190823/f01c227906f5c15554d19904cf5009944d4ba1fec2b1a061e4a46fb61ddab12d.jpg',
+  'https://img.bosszhipin.com/beijin/upload/com/img/20190823/154f6a1bc139eea59bf2610c3115fc664d4ba1fec2b1a061e4a46fb61ddab12d.jpg',
+  'https://img.bosszhipin.com/beijin/upload/com/img/20190823/644c82121f1d19cb120c1e4c2836d1004d4ba1fec2b1a061e4a46fb61ddab12d.jpg',
+  'https://img.bosszhipin.com/beijin/upload/com/img/20190823/4b867202f288d6512dac50856bae61194d4ba1fec2b1a061e4a46fb61ddab12d.jpg',
+  'https://zhipin-company-1251955568.file.myqcloud.com/zhipin-company/99/20240411/fp0316a40013_f2abd6bc44254064931620a9a1dbdf21-OSS11.30.go15.fmHblack.mp4?sign=8bbdf46fa8ec4f97a742edf59e559379&t=1716168952'
+]
+
+const isImage = (url) => {
+  var reg = /\.(png|jpg|gif|jpeg|webp)$/
+  return reg.test(url)
+}
 </script>
 
 <style scoped lang="scss">
@@ -42,4 +57,7 @@ const props = defineProps({
   text-align: justify;
   letter-spacing: 0;
 }
+.videos-radius {
+  border-radius: 8px;
+}
 </style>

src/components/Enterprise/components/positions.vue

@@ -1,17 +1,63 @@
 <template>
-  <div>在招职位
-    <!-- <div class="banner-tools my-4" style="height: 98px;"> -->
-      <!-- <div class="float-left" style="line-height: 40px;">
-        <v-chip size="small" label v-for="(k, i) in info.tagList" :key="i" class="mr-1" color="primary">{{ k }}</v-chip>
-      </div> -->
-    <!-- </div> -->
+  <div>
+    <div class="top">检索</div>
+    <div class="bottom">
+      <div v-for="(val, i) in list" :key="i">
+        <div class="d-flex justify-space-between">
+          <p :class="['name', {'default-active': val.active }]">{{ val.name }}</p>
+          <p class="salary">{{ val.payFrom }}-{{ val.payTo }}k/{{ val.payName }}</p>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup>
 defineOptions({ name: 'recruitment-positions'})
+const list = [
+  {
+    name: '产品经理',
+    payFrom: 6,
+    payTo: 11,
+    payName: '月',
+    updateTime: 1716175909224,
+    areaName: '广州',
+    eduName: '本科',
+    expName: '1-3年',
+    active: false
+  },
+  {
+    name: '产品经理',
+    payFrom: 6,
+    payTo: 11,
+    payName: '月',
+    updateTime: 1716175909224,
+    areaName: '广州',
+    eduName: '本科',
+    expName: '1-3年',
+    active: false
+  }
+]
 </script>
 
 <style scoped lang="scss">
-
+.name {
+  position: relative;
+  max-width: 200px;
+  margin-right: 8px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-weight: 600;
+  &:hover {
+    color: var(--v-primary-base);
+  }
+}
+.salary {
+  font-size: 16px;
+  font-weight: 700;
+  color: #fe574a;
+  line-height: 22px;
+  flex: none;
+}
 </style>

src/components/Enterprise/details.vue

@@ -145,9 +145,9 @@ const recruitmentSpecialist = [
   line-height: 60px;
 }
 .contact-name {
-  font-size: 20px;
+  font-size: 28px;
   font-weight: 700;
-  color: #444;
+  color: #37576c;
   line-height: 28px;
 }
 .contact-info {

src/components/jobTypeCard/index.vue

@@ -32,7 +32,7 @@
         </div>
       </div>
     </v-card>
-    <v-card v-if="rightObj.show" class="card rightCardBox ml-1">
+    <v-card v-if="rightObj.show" class="card rightCardBox ml-3">
       <div class="rightCard">
         <div class="categoryName">{{ rightObj.data.nameCn }}</div>
         <div v-for="(item, index) in rightObj.data.children" :key="item.id">
@@ -47,7 +47,7 @@
         </div>
       </div>
     </v-card>
-    <v-card height="392px" v-if="isPage && !rightObj.show" class="card rightCardBox ml-1">
+    <v-card height="392px" v-if="isPage && !rightObj.show" class="card rightCardBox ml-3">
       <v-carousel show-arrows="hover" cycle>
         <v-carousel-item v-for="(item, i) in carouselList" :key="i">
           <div style="height: 392px; overflow: hidden;">

src/config/axios/service.js

@@ -54,10 +54,12 @@ service.interceptors.request.use(
       ;(config).headers.Authorization = 'Bearer ' + getToken() // 让每个请求携带自定义token
     }
     // 设置租户
+    console.log('tenantEnable', import.meta.env.VITE_TENANTCODE)
     if (tenantEnable && tenantEnable === 'true') {
       const tenantId = import.meta.env.VITE_TENANTCODE
-      if (tenantId) (config).headers['tenant-id'] = tenantId
+      if (tenantId) config.headers['tenant-id'] = tenantId
     }
+    console.log(config)
     const params = config.params || {}
     const data = config.data || false
     if (

src/views/login/index.vue

@@ -59,7 +59,7 @@ import Snackbar from '@/plugins/snackbar'
 defineOptions({ name: 'login-index' })
 
 const router = useRouter()
-
+console.log('更新')
 const phone = ref()
 let isPhone = ref(false)
 const handlePhone = () => {

src/views/recruit/position/components/dict.js

@@ -27,7 +27,10 @@ const getDictList = async () => {
     dictObj[val.value] = data
   })
 }
-getDictList()
+const getData = async () => {
+  await getDictList()
+}
+getData()
 
 export const dealDictData = (res, list) => {
   dictList.forEach(item => {