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

src/components/Upload/img.vue

@@ -58,7 +58,7 @@ const accept = ['jpg', 'png', 'webp', 'jpeg']
 const handleUploadFile = async (e) => {
   const file = e.target.files[0]
   const size = file.size
-  if (size / (1024*1024) > 10) {
+  if (size / (1024*1024) > 20) {
     Snackbar.warning(t('common.fileSizeExceed'))
     return
   }

src/views/recruit/components/message/components/chatting.vue

@@ -14,7 +14,7 @@
     <div class="top-info">
       <div class="user-info d-flex align-center">
         <p class="d-flex align-center float-left">
-          <span class="name">{{ info.name }}</span>
+          <span class="name">{{ info.name || info?.phone }}</span>
           <template v-if="info.enterpriseId">
             <span>{{ info.postNameCn }}</span>
             <span v-if="info.postNameCn && info.enterpriseAnotherName" class="septal-line"></span>

src/views/recruit/enterprise/entInfoSetting/informationSettingsComponents/basicInfo.vue

@@ -3,12 +3,6 @@
   <div>
     <div class="topTip">丰富详尽的企业介绍能提高求职者对贵企业的关注和了解，有助于达到更好的招聘效果</div>
     <CtForm ref="CtFormRef" :items="formItems" style="width: 900px;margin: 0 auto">
-      <!-- <template #name="{ item }">
-        <div v-show="!item.show" class="text-right" style="width: 80px; line-height: 40px;">
-          <v-icon :color="statusInfo.color" size="20">{{ statusInfo.mdi }}</v-icon>
-          <span class="cursor-pointer text-decoration-underline" :style="{'color': statusInfo.color,'font-size': '14px'}" @click="emit('change', 6)">{{ statusInfo.label }}</span>
-        </div>
-      </template> -->
       <template #industryId="{ item }">
         <v-menu :close-delay="1" :open-delay="0" v-bind="$attrs" :close-on-content-click="true">
           <template v-slot:activator="{  props }">
@@ -35,7 +29,6 @@
 defineOptions({name: 'informationSettingsComponents-basicInfo'})
 import { ref, reactive } from 'vue'
 import { getEnterpriseBaseInfo, updateEnterpriseBaseInfo } from '@/api/enterprise'
-// import { getEnterpriseAuth } from '@/api/recruit/enterprise/information'
 import { getDict } from '@/hooks/web/useDictionaries'
 import { useI18n } from '@/hooks/web/useI18n'
 import industryTypeCard from '@/components/industryTypeCard'
@@ -159,27 +152,6 @@ getDict('menduner_industry_type', {}, 'industryList').then(({ data }) => {
   industryList.value = data
 })
 
-// 获取企业实名信息
-// const authInfo = ref({})
-// const statusList = [
-//   { label: '未认证', color: '#fb8c00', value: null, mdi: 'mdi-shield-remove' },
-//   { label: '审核中', color: '#fb8c00', value: '0', mdi: 'mdi-shield-half-full' },
-//   { label: '已认证', color: '#00897B', value: '1', mdi: 'mdi-shield-check' },
-//   { label: '已驳回', color: '#fe574a', value: '2', mdi: 'mdi-shield-off' }
-// ]
-// const getAuthInfo = async () => {
-//   const data = await getEnterpriseAuth()
-//   if (!data) return
-//   authInfo.value = data
-// }
-// getAuthInfo()
-
-// const statusInfo = computed(() => {
-//   const obj = (authInfo.value && Object.keys(authInfo.value).length) ? statusList.find(e => e.value === authInfo.value.status) : statusList[0]
-//   return obj
-// })
-
-
 // 获取基本信息
 const getBaseInfo = async () => {
   let completeCount = 0
@@ -228,10 +200,6 @@ const handleSave = async () => {
   await user.getEnterpriseInfo()
   getBaseInfo()
 }
-
-// defineExpose({
-//   getBaseInfo
-// })
 </script>
 
 <style lang="scss" scoped>

src/views/recruit/enterprise/entInfoSetting/informationSettingsComponents/enterpriseLogo.vue

@@ -107,7 +107,7 @@ const handleUploadFile = async (e) => {
   const file = e.target.files[0]
 
   const size = file.size
-  if (size / (1024*1024) > 10) {
+  if (size / (1024*1024) > 20) {
     Snackbar.warning(t('common.fileSizeExceed'))
     return
   }

src/views/recruit/enterprise/interviewManagement/components/item.vue

@@ -4,7 +4,7 @@
       <div class="mr-5 font-size-16" style="color: orange; width: 96px;">{{ timesTampChange(item.time, 'Y-M-D h:m') }}</div>
       <v-avatar class="mr-2" size=40 :image="getUserAvatar(item?.person?.avatar, item?.person?.sex)"></v-avatar>
       <div class="d-flex flex-column mr-3" style="width: 110px;">
-        <span class="ellipsis mb-1">{{ item?.person?.name }}</span>
+        <span class="ellipsis mb-1">{{ item?.person?.name || item?.phone }}</span>
         <span class="ellipsis" style="color: var(--color-999);">{{ item?.job?.name }}</span>
       </div>
     </div>
@@ -30,10 +30,10 @@
       </div>
       <!-- 面试状态: '待接受'/'已取消' -->
       <div :style="{ 'color': colorData[item.status] }">
-        <v-icon v-if="statusList.find(e => e.value === item.status)?.label" size="30">mdi mdi-circle-small</v-icon>
+        <v-icon v-if="statusList.find(e => e.value === item.status)?.label && item?.job?.status !== '1'" size="30">mdi mdi-circle-small</v-icon>
         <span>
-          {{ statusList.find(e => e.value === item.status)?.label }}
           <span v-if="item?.job?.status === '1'" style="font-size: 13px; color: grey;">[职位已关闭]</span>
+          <span v-else>{{ statusList.find(e => e.value === item.status)?.label }}</span>
         </span>
       </div>
       <div>

src/views/recruit/enterprise/staffInfoSetting/index.vue

@@ -140,6 +140,12 @@ const handleUploadFile = async (e) => {
   const fileType = file.name.split('.')[1]
   if (!accept.includes(fileType)) return Snackbar.warning('请上传图片格式文件')
 
+  const size = file.size
+  if (size / (1024*1024) > 20) {
+    Snackbar.warning(t('common.fileSizeExceed'))
+    return
+  }
+
   const reader = new FileReader()
   reader.readAsDataURL(file)
   reader.onload = () => {

src/views/recruit/personal/PersonalCenter/jobFeedback/components/interview/item.vue

@@ -95,9 +95,9 @@ const handleAgree = (val) => {
   const query = {
     id: val.id
   }
-  const baseInfo = localStorage.getItem('baseInfo')
-  if (baseInfo) {
-    const { phone } = JSON.parse(baseInfo)
+  const userInfo = localStorage.getItem('userInfo')
+  if (userInfo) {
+    const { phone } = JSON.parse(userInfo)
     query.phone = phone
   }