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

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

@@ -17,8 +17,8 @@
           <span class="name">{{ info.name }}</span>
           <template v-if="info.enterpriseId">
             <span>{{ info.postNameCn }}</span>
-            <span v-if="info.postNameCn && info.enterpriseName" class="septal-line"></span>
-            <span>{{ info.enterpriseName }}</span>
+            <span v-if="info.postNameCn && info.enterpriseAnotherName" class="septal-line"></span>
+            <span>{{ info.enterpriseAnotherName }}</span>
           </template>
         </p>
       </div>
@@ -136,17 +136,17 @@
             <div v-else-if="val.payload.type === 105">
               <v-chip class="ma-2" label color="primary" v-if="val.from_uid === IM.uid">
                 <v-icon icon="mdi-check" start></v-icon>
-                {{ val.payload.content.type === 1 ? '附件简历已发送' : '简历请求已发送' }}
+                {{ val.payload.content?.type === 1 ? '附件简历已发送' : '简历请求已发送' }}
               </v-chip>
               <v-card v-else width="300" class="pa-3 ma-2" color="teal" variant="tonal" :elevation="3">
                 <v-card-text class="d-flex">
-                  <p v-if="val.payload.content.type === 1">{{ val.payload.content.query.title || t('resume.attachmentResume') }}</p>
-                  <p v-if="val.payload.content.type === 2">{{ t('resume.requestResume') }}</p>
+                  <p v-if="val.payload.content?.type === 1">{{ val.payload.content?.query?.title || t('resume.attachmentResume') }}</p>
+                  <p v-if="val.payload.content?.type === 2">{{ t('resume.requestResume') }}</p>
                 </v-card-text>
                 <v-card-actions class="justify-center">
                   <!-- <v-btn variant="tonal" flat size="small" color="error" @click="handleRejectReceive(val.payload)">拒绝</v-btn> -->
-                  <v-btn v-if="val.payload.content.type === 1" block  variant="tonal" flat size="small" color="success" @click="handlePreview(val.payload)">点击预览附件简历</v-btn>
-                  <v-btn v-if="val.payload.content.type === 2" block  variant="tonal" flat size="small" color="success" @click="handleSendResume(val.payload)">点击发送附件简历</v-btn>
+                  <v-btn v-if="val.payload.content?.type === 1" block  variant="tonal" flat size="small" color="success" @click="handlePreview(val.payload)">点击预览附件简历</v-btn>
+                  <v-btn v-if="val.payload.content?.type === 2" block  variant="tonal" flat size="small" color="success" @click="handleSendResume(val.payload)">点击发送附件简历</v-btn>
                 </v-card-actions>
               </v-card>
             </div>

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

@@ -42,6 +42,17 @@
               :title="val.userInfoVo ? (val.userInfoVo.userInfoResp.name ? val.userInfoVo.userInfoResp.name : '游客') : '系统消息'"
               :subtitle="timesTampChange(+val.timestamp.padEnd(13, '0'))"
             >
+              <template v-slot:title="{ title }">
+                <div v-if="!isEnterprise" class="mt-2 d-flex align-center">
+                  {{ title }}
+                  <div class="ml-3 color-666 font-size-14 enterprise-name ellipsis" :style="{'color': val.channel.channelID === info?.channel?.channelID ? '#00897B' : '#666'}">
+                    {{ val.userInfoVo?.userInfoResp?.enterpriseAnotherName }}
+                    <span class="line" v-if="val.userInfoVo?.userInfoResp?.postNameCn && val.userInfoVo?.userInfoResp?.enterpriseAnotherName"></span>
+                    {{ val.userInfoVo?.userInfoResp?.postNameCn }}
+                  </div>
+                </div>
+                <div v-else class="mt-2">{{ title }}</div>
+              </template>
               <template v-slot:subtitle="{ subtitle }">
                 <div class="mt-2">{{ subtitle }}</div>
               </template>
@@ -561,4 +572,15 @@ const handleRefuse = (val) => {
     }
   }
 }
+.enterprise-name {
+  max-width: 150px;
+  .line {
+    display: inline-block;
+    width: 1px;
+    height: 12px;
+    vertical-align: middle;
+    background-color: #e0e0e0;
+    margin: 0 3px;
+  }
+}
 </style>

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

@@ -31,6 +31,7 @@ import advertisementPage from './components/advertisement.vue'
 import { useRouter } from 'vue-router'
 import { nextTick, ref } from 'vue'
 import { useUserStore } from '@/store/user'
+import { getToken } from '@/utils/auth'
 
 const store = useUserStore()
 // const updateBaseInfo = async () => {
@@ -40,9 +41,10 @@ const store = useUserStore()
 
 const router = useRouter()
 const simple = localStorage.getItem('simpleCompleteDialogHaveBeenShow')
-const showSimplePage = ref(simple? false : true) // 只提示一次
+const showSimplePage = ref(false) // 只提示一次
+if (!getToken() && !simple) showSimplePage.value = true
 nextTick(() => {
-  localStorage.setItem('simpleCompleteDialogHaveBeenShow', true)
+  if (getToken()) localStorage.setItem('simpleCompleteDialogHaveBeenShow', true)
 })
 
 const handleSearch = (val) => {

src/views/recruit/personal/shareJob/sendResume/simple.vue

@@ -20,8 +20,11 @@ import simpleInfoForm from '../form/simpleInfo.vue'
 import { savePersonSimpleInfo } from '@/api/recruit/personal/shareJob'
 import { useI18n } from '@/hooks/web/useI18n'; const { t } = useI18n()
 import Snackbar from '@/plugins/snackbar'
+import { useUserStore } from '@/store/user'
+import { useRouter } from 'vue-router'
 import { ref } from 'vue'
 defineOptions({name: 'shareJob-sendResume-simple'})
+
 const emit = defineEmits(['simpleInfoReady'])
 const props = defineProps({
   closeable: {
@@ -36,6 +39,8 @@ const props = defineProps({
 
 const openDialog = ref(false) // 默认不打开弹窗，先检验simpleInfoReady
 const info = ref(null)
+const store = useUserStore()
+const router = useRouter()
 
 // 查询用户基本信息
 const timer = ref(null)
@@ -68,6 +73,10 @@ const getUserInfoVerify = () => {
 const getUserInfoFail = () => {
   if (timer.value) clearInterval(timer.value); timer.value = null
   Snackbar.error(t('login.getUserInfoFailed')+'，'+t('login.loginAgain'))
+  setTimeout(() => {
+    store.userLogout(1)
+    router.push('/login')
+  }, 3000)
 }
 
 const formRef = ref()