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

components.d.ts

@@ -49,6 +49,7 @@ declare module 'vue' {
     InitPay: typeof import('./src/components/personalRecharge/initPay.vue')['default']
     Item: typeof import('./src/components/Position/item.vue')['default']
     JobTypeCard: typeof import('./src/components/jobTypeCard/index.vue')['default']
+    Knowledge: typeof import('./src/components/Knowledge/index.vue')['default']
     ListGroup: typeof import('./src/components/FormUI/nestedListGroup/components/listGroup.vue')['default']
     Loading: typeof import('./src/components/Loading/index.vue')['default']
     LongCompany: typeof import('./src/components/Position/longCompany.vue')['default']
@@ -67,6 +68,7 @@ declare module 'vue' {
     SimilarPositions: typeof import('./src/components/Position/similarPositions.vue')['default']
     SuNumberBox: typeof import('./src/components/FormUI/su-number-box/su-number-box.vue')['default']
     SvgIcon: typeof import('./src/components/SvgIcon/index.vue')['default']
+    Talk: typeof import('./src/components/Knowledge/talk.vue')['default']
     TextArea: typeof import('./src/components/FormUI/textArea/index.vue')['default']
     TextInput: typeof import('./src/components/FormUI/TextInput/index.vue')['default']
     TipDialog: typeof import('./src/components/CtDialog/tipDialog.vue')['default']

src/views/login/index.vue

@@ -296,6 +296,7 @@ const handleAuthorize = async (stop) => {
     
     // 授权成功，返回登录信息
     await userStore.handleWeXinQrCodeLogin(data.appMdeAuthLoginRespVO)
+    Snackbar.success('登录成功')
     router.push('/')
   } catch (error) {
     console.log(error, 'error')

src/views/recruit/personal/jobFair/details/components/entCard1.vue

@@ -4,7 +4,7 @@
 			<v-card v-bind="props" :elevation="isHovering ? 10 : 5" class="cursor-pointer" @click="handleClickEnterprise(val.id)">
 				<div class="d-flex pa-4 pb-2">
 					<img class="entLogoImg" :src="val.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" style="width: 100px; height: 100px;" />
-					<div style="max-width: 445px;">
+					<div style="max-width: calc(100% - 100px);">
 						<h3 v-ellipse-tooltip class="enterprise-name ml-3 font-weight-medium">{{ formatName(val.anotherName || val.name) }}</h3>
 						<p class="font-size-15 color-999 mt-1 mb-2 ml-3" style="height: 30px;">
 							<span>{{ val.industryName }}</span>

src/views/recruit/personal/jobFair/details/components/jobCard1.vue

@@ -8,6 +8,12 @@
 							<svg-icon name="jobFair" class="mr-1" size="25"></svg-icon>
 							<p class="job-name MiSans-Semibold" v-ellipse-tooltip :style="{'max-width': !val.payFrom && !val.payTo ? '450px' : '320px'}">{{ formatName(val.name) }}</p>
 						</div>
+						<div v-if="!isMobile">
+							<p v-if="!val.payFrom && !val.payTo" class="salary">面议</p>
+							<p v-else class="salary ml-3">{{ val.payFrom ? val.payFrom + '-' : '' }}{{ val.payTo }}{{ val.payName ? '/' + val.payName : '' }}</p>
+						</div>
+					</div>
+					<div v-if="isMobile" class="text-end">
 						<p v-if="!val.payFrom && !val.payTo" class="salary">面议</p>
 						<p v-else class="salary ml-3">{{ val.payFrom ? val.payFrom + '-' : '' }}{{ val.payTo }}{{ val.payName ? '/' + val.payName : '' }}</p>
 					</div>
@@ -29,7 +35,7 @@
 				<div class="d-flex align-center pt-4" @click="handleClickEnterprise(val.enterprise.id)" style="cursor: text;">
 					<img class="entLogoImg" :src="val.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" style="width: 60px; height: 60px;" />
 					<div class="ml-3" style="flex: 1;">
-						<h3 v-ellipse-tooltip class="font-weight-medium enterprise-name" style="max-width: 480px;">{{ formatName(val.enterprise.anotherName || val.enterprise.name) }}</h3>
+						<h3 v-ellipse-tooltip class="font-weight-medium enterprise-name" style="max-width: calc(100% - 40px);">{{ formatName(val.enterprise.anotherName || val.enterprise.name) }}</h3>
 						<p class="font-size-15 color-999 mt-1">
 							<span>{{ val.enterprise.industryName }}</span>
 							<span class="septal-line" v-if="val.enterprise.industryName && val.enterprise.scaleName"></span>