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

components.d.ts

@@ -30,9 +30,9 @@ declare module 'vue' {
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     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/AreaSelect/index.vue

@@ -71,15 +71,7 @@ if (props.select.length) idChecked.value = props.select.map(e => e + '') // 数
 
 getDict('areaTreeData', null, 'areaTreeData').then(({ data }) => {
   data = data?.length && data || []
-  // const china = data.find(e => e.id === '1')
-  // items.value = china?.children?.length ? china.children : []
-
-  items.value = data.length ? data.map(e => {
-    // 市辖区直接展示区
-    const municipality = e.children && e.children.length && e.children[0].name === '市辖区'
-    if (municipality && e.children[0].children?.length) e.children = e.children[0].children
-    return e
-  }) : []
+  items.value = data.length ? data : []
 })
 
 // 设置选中ids

src/hooks/web/useDictionaries.js

@@ -18,7 +18,12 @@ import {
 const setDict = (type, val) => {
   if (type === 'areaTreeData') {
     const obj = val.find(e => e.name === '中国')
-    val = obj?.children ? obj.children : []
+    val = obj?.children ? obj.children.map(e =>{
+      // 市辖区直接显示区
+      const municipality = e.children && e.children.length && e.children[0].name === '市辖区'
+      if (municipality && e.children[0].children?.length) e.children = e.children[0].children
+      return e
+    }) : []
   }
   // 一小时过期
   const currentTime = new Date()

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

@@ -21,7 +21,7 @@ defineOptions({ name: 'advertisementPage'})
 
 const list = [
   { url: 'https://minio.citupro.com/dev/menduner/preferredGroup/MARRIOTT.jpg', path: '/recruit/personal/advertisement/introduce/marriott/734173233779183616' },
-  { url: 'https://minio.citupro.com/dev/menduner/preferredGroup/IHG.jpg', path: '/recruit/personal/advertisement/introduce/582610176201330688' },
+  { url: 'https://minio.citupro.com/dev/menduner/preferredGroup/IHG.jpg', path: '/recruit/personal/advertisement/introduce/577540545828753408' },
   { url: 'https://minio.citupro.com/dev/menduner/preferredGroup/Yifei.jpg', path: '/recruit/personal/company/details/277182701256183808?key=briefIntroduction' }
 ]