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

src/components/PositionLongStrip/item.vue

@@ -111,7 +111,7 @@ const handleEnterprise = (item) => {
 <style lang="scss" scoped>
 .title1 {
   position: relative;
-  max-width: 200px;
+  max-width: 440px;
   margin-right: 8px;
   overflow: hidden;
   text-overflow: ellipsis;

src/components/headSearch/index.vue

@@ -53,7 +53,7 @@ const defineProps = defineProps({
   modelValue: [String, Number],
   placeholder: {
     type: String,
-    default: '搜索职位/公司'
+    default: '搜索职位/公司关键字'
   },
   text: {
     type: String,

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

@@ -3,7 +3,7 @@
     <buttons :current="2" style="position: sticky;"></buttons>
     <div class="company-content">
       <div class="white-bgc pb-3 pt-5">
-        <headSearch placeholder="搜索公司" tipsText="公司关键字搜索" @handleSearch="val => handleSearch(val, 'name')"></headSearch>
+        <headSearch placeholder="搜索公司关键字" @handleSearch="val => handleSearch(val, 'name')"></headSearch>
         <div class="px-5 mt-3 clear-parent">
           <areaType :isClear="clear" @handleClick="handleSearch"></areaType>
           <financingStatus class="my-5" :isClear="clear" @clear="clear = false" @handleClick="handleSearch"></financingStatus>

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

@@ -41,7 +41,7 @@
           >暂无数据</div>
           <div 
             v-else 
-            class="jobItem"
+            class="jobItem ma-3"
             v-for="val in rightObj.data.children" 
             :key="val.id" 
             @click="handleJobClick(val)"

src/views/recruit/personal/home/components/hotJobs.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="default-width mb-6 d-flex align-center justify-center">
-    <span class="mr-2 color-666" style="width: 68px; min-width: 68px;">{{ $t('position.popularPosition') }}:</span>
+    <span class="mr-2 color-primary" style="width: 80px; min-width: 80px;">{{ $t('position.popularPosition') }}：</span>
     <div style="overflow: hidden; height: 40px; ">
       <span v-for="(item, index) in jobs" :key="index" label size="small" class="mr-2 my-1 tag"  @click="handleClick(item)">{{ item.nameCn }}</span>
     </div>
@@ -36,7 +36,7 @@ getTreeData()
 <style lang="scss" scoped>
 .tag {
   background-color: #fff !important;
-  color: #666;
+  color: var(--v-primary-base);
   padding: 5px 20px;
   display: inline-block;
   border-radius: 6px;

src/views/recruit/personal/position/components/conditionFilter/cityCascadeSelect.vue

@@ -22,7 +22,7 @@ const selectItems = {
   size: 'default', // large default
   required: false,
   clearable: true,
-  multiple: false,
+  multiple: true,
   hideDetails: true,
   checkStrictly: true,
   placeholder: '请选择工作城市',

src/views/recruit/personal/position/components/conditionFilter/commonPath.vue

@@ -113,7 +113,7 @@ else if (props.provideData?.length) { // 自定义下拉数据
   show.value = true
 }
 else if (props.displayDictName) {
-  getDict(props.displayDictName, props.displayParams, props.displayApiType || props.displayDictName).then(({ data }) => {
+  getDict(props.displayDictName, props.displayParams, props.displayApiType || 'dict').then(({ data }) => {
     data = data?.length && data || []
     items.value = data
     show.value = true

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

@@ -6,7 +6,6 @@
       <div class="pb-3 pt-5" style="z-index: 998; background-color: #fff">
         <div class="stickyBox mb-5">
           <headSearch
-            tipsText="职位/公司关键字搜索"
             v-model="headSearchText"
             @handleSearch="val => handleQueryChange('content', val)"
           ></headSearch>