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

src/layout/personal/navBar.vue

@@ -113,7 +113,7 @@
 
     <CtDialog :visible="show" title="请选择要切换的公司账号" :footer="true" widthType="2" @close="show = false" @submit="switchSubmit">
       <v-radio-group v-model="radios" :hide-details="true">
-        <v-radio v-for="item in enterpriseList" :key="item.enterpriseId" color="primary" :label="item.enterpriseName" :value="item.enterpriseId"></v-radio>
+        <v-radio v-for="item in enterpriseList" :key="item.enterpriseId" color="primary" :label="formatName(item.enterpriseName)" :value="item.enterpriseId"></v-radio>
       </v-radio-group>
       <div class="text-end pr-5 pt-5">
         <span class="color-error cursor-pointer border-bottom-error" @click="newRegistering">{{ btnType ? '都不是我要的？去注册新企业' : '查看申请进度' }}</span>
@@ -136,6 +136,7 @@ import MessageNotification from '../message.vue'
 import { getUserAvatar } from '@/utils/avatar'
 import defineListPage from '@/views/entrances/navBar/components/defineListPage'
 import { update } from 'lodash'
+import { formatName } from '@/utils/getText'
 
 defineOptions({ name: 'personal-navbar' })
 

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

@@ -39,6 +39,7 @@ import companyItem from './components/companyItem'
 import MPagination from '@/components/CtPagination'
 import cityCascadeSelect from '@/views/recruit/personal/position/components/conditionFilter/cityCascadeSelect.vue'
 // F:\work\menduner\src\views\recruit\personal\position\components\conditionFilter\cityCascadeSelect.vue
+import Snackbar from '@/plugins/snackbar'
 
 const route = useRoute()
 const router = useRouter()
@@ -63,10 +64,12 @@ const dealRouteQuery = (data) => {
   if (str) router.push(`${route.path}?${str}`)
 }
 
-const content = ref(route.query.name || '')
+const content = ref(route?.query?.name ? route.query?.name.includes('&') ? decodeURIComponent(route.query.name) : route.query.name : '')
+
 // 搜索
 const handleSearch = async (val, key) => {
   if (!val && key !== 'name') return
+  if (key === 'name' && val === '&') return Snackbar.warning('请输入要查询的公司名称！')
   if (key === 'name') content.value = val
   pages.value.pageNo = 1
   query.value[key] = val

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

@@ -107,6 +107,7 @@ const handleLeftClick = (val) => {
 
 const router = useRouter()
 const handleSearch = (val) => {
+  val = val?.includes('&') ? encodeURIComponent(val) : val
   window.open(val ? `/recruit/personal/position?content=${val}` : `/recruit/personal/position`)
 }