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

src/layout/company/navBar.vue

@@ -17,7 +17,7 @@
             <v-img @click="enterpriseClick(2)" rounded width="40" height="40" :src="baseInfo?.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" ></v-img>
             <span @click="enterpriseClick(1)" class="ml-3 commonHover">{{ baseInfo?.enterpriseAnotherName || baseInfo?.enterpriseName || '--' }}</span>
           </div>
-          <div class="ml-3 cursor-pointer border-left border-right px-3 commonHover" @click="router.push('/recruitHome')">我要求职</div>
+          <div class="ml-3 cursor-pointer border-left border-right px-3 commonHover" @click="handleLogout">我要求职</div>
           <div class="cursor-pointer border-right px-3 commonHover" @click="router.push('/recruit/enterprise/hirePosition')">全员猎聘</div>
           <div class="d-flex align-center px-3 border-right">
             <div>{{ $t('enterprise.account.remainingPoints') }}：{{ enterpriseUserAccount?.balance || 0 }}点</div>
@@ -121,7 +121,7 @@ const enterpriseClick = (tabKey = 1) => {
   router.push({ path, query: { tabKey } })
 }
 
-// 退出登录
+// 退出登录、切换求职者
 const handleLogout = async () => {
   await userStore.userLogout(2)
   router.push({ path: '/recruitHome' })

src/views/recruit/enterprise/personnelManagement/components/table.vue

@@ -13,12 +13,14 @@
       <template v-slot:item.name="{ item }">
         <div class="d-flex align-center cursor-pointer" @click="handleToPersonDetail(item)">
           <v-badge
+            v-if="item?.person?.sex === '1' || item?.person?.sex === '2'"
             bordered
             offset-y="6"
             :color="badgeColor(item)"
             :icon="badgeIcon(item)">
             <v-avatar size="40" :image="item.person.avatar || 'https://minio.citupro.com/dev/menduner/7.png'"></v-avatar>
           </v-badge>
+          <v-avatar v-else size="40" :image="item.person.avatar || 'https://minio.citupro.com/dev/menduner/7.png'"></v-avatar>
           <span class="defaultLink ml-3">{{ item?.person?.name }}</span>
         </div>
       </template>

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

@@ -19,12 +19,14 @@
       <template v-slot:[`item.name`]="{ item }">
         <div class="d-flex align-center cursor-pointer" @click="null">
           <v-badge
+            v-if="item?.sex === '1' || item?.sex === '2'"
             bordered
             offset-y="6"
             :color="badgeColor(item)"
             :icon="badgeIcon(item)">
             <v-avatar size="40" :image="getUserAvatar(item.avatar, item.sex)"></v-avatar>
           </v-badge>
+          <v-avatar v-else size="40" :image="getUserAvatar(item.avatar, item.sex)"></v-avatar>
           <span class="defaultLink ml-3">{{ item?.name }}</span>
         </div>
       </template>

src/views/recruit/enterprise/talentPool/components/details/baseInfo.vue

@@ -3,7 +3,8 @@
   <div class="d-flex">
     <!-- 头像 -->
     <div class="avatarsBox">
-      <v-badge 
+      <v-badge
+        v-if="info?.sex === '1' || info?.sex === '2'"
         bordered 
         offset-x="-25" 
         offset-y="33" 
@@ -11,6 +12,7 @@
         :icon="info?.sex ? (info?.sex === '1' ? 'mdi-gender-male' : 'mdi-gender-female') : 'mdi-gender-female'">
         <v-avatar size=80 :image="info?.avatar || 'https://minio.citupro.com/dev/menduner/7.png'"></v-avatar>
       </v-badge>
+      <v-avatar v-else size=80 :image="info?.avatar || 'https://minio.citupro.com/dev/menduner/7.png'"></v-avatar>
     </div>
     <!-- 信息 -->
     <div style="flex: 1;">

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

@@ -17,12 +17,14 @@
         <template v-slot:[`item.name`]="{ item }">
           <div class="d-flex align-center cursor-pointer" @click="talentPoolDetails(item)">
             <v-badge
+              v-if="item?.sex === '1' || item?.sex === '2'"
               bordered
               offset-y="6"
               :color="badgeColor(item)"
               :icon="badgeIcon(item)">
               <v-avatar size="40" :image="getUserAvatar(item.avatar, item.sex)"></v-avatar>
             </v-badge>
+            <v-avatar v-else size="40" :image="getUserAvatar(item.avatar, item.sex)"></v-avatar>
             <span class="defaultLink ml-3">{{ item?.name }}</span>
           </div>
         </template>

src/views/recruit/enterprise/talentRecruitment/components/table.vue

@@ -13,12 +13,14 @@
       <template v-slot:[`item.name`]="{ item }">
         <div class="d-flex align-center cursor-pointer" @click="handleToPersonDetail(item)">
           <v-badge
+            v-if="item?.person?.sex === '1' || item?.person?.sex === '2'"
             bordered
             offset-y="6"
             :color="badgeColor(item)"
             :icon="badgeIcon(item)">
             <v-avatar size="40" :image="getUserAvatar(item.person.avatar, item.person.sex)"></v-avatar>
           </v-badge>
+          <v-avatar v-else size="40" :image="getUserAvatar(item.person.avatar, item.person.sex)"></v-avatar>
           <span class="defaultLink ml-3">{{ item?.person?.name }}</span>
         </div>
       </template>

src/views/recruit/personal/PersonalCenter/resume/online/components/basicInfo.vue

@@ -7,7 +7,8 @@
     <div class="d-flex align-start mt-5">
       <!-- 头像 -->
       <div class="avatarsBox" @mouseover="showIcon = true" @mouseleave="showIcon = false">
-        <v-badge 
+        <v-badge
+          v-if="baseInfo?.sex === '1' || baseInfo?.sex === '2'"
           bordered 
           :color="baseInfo?.sex ? (baseInfo?.sex === '1' ? '#1867c0' : 'error') : 'error'" 
           :icon="baseInfo?.sex ? (baseInfo?.sex === '1' ? 'mdi-gender-male' : 'mdi-gender-female') : 'mdi-gender-female'">
@@ -22,6 +23,18 @@
             />
           </div>
         </v-badge>
+        <div v-else style="width: 130px; height: 130px;">
+          <v-img :src="getUserAvatar(baseInfo?.avatar, baseInfo?.sex)" width="130" height="130" style="border-radius: 6px;"></v-img>
+          <div v-show="showIcon" @click="openFileInput" class="mdi mdi-camera-outline camera">
+            <input
+              type="file"
+              ref="fileInput"
+              accept="image/png, image/jpg, image/jpeg"
+              style="display: none;"
+              @change="handleUploadFile"
+            />
+          </div>
+        </div>
       </div>
       <!-- 基础信息 -->
       <div style="flex: 1;" class="mr-8">