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

src/views/recruit/entRegister/inReview.vue

@@ -12,7 +12,7 @@
         <!-- 提交企业注册以后跳转显示页面 -->
         <div v-if="!applyInfo || !(Object.keys(applyInfo).length)" class="d-flex flex-column align-center">
           <svg-icon name="submit" size="300"></svg-icon>
-          <div>提交成功，审核时间在1~3个工作日内，申请结果会以短信方式通知到您的手机上，请注意查收。</div>
+          <div>提交成功，已收到您的企业账号申请，审核时间预计在1~3个工作日内，申请结果会以短信方式通知到您的手机上，请注意查收。</div>
           <!-- <div>提交成功，审核时间在1~3个工作日内，申请结果会通过邮件的方式通知到您，请注意查看邮箱</div> -->
         </div>
 

src/views/recruit/entRegister/register.vue

@@ -183,7 +183,8 @@ const formItems = ref({
       type: 'text',
       key: 'email',
       value: email ? email : '',
-      label: '企业邮箱 * (此邮箱将作为企业登录的账号)',
+      label: '企业邮箱 *（此邮箱将用于日后“登录邮箱”）',
+      // label: '企业邮箱 * (此邮箱将作为企业登录的账号)',
       rules: [
         value => {
           if (value) return true

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

@@ -3,7 +3,7 @@
     <div v-for="val in items" :key="val.id" class="itemBox mb-3" style="height: 162px;">
       <div class="d-flex justify-space-between" style="padding: 10px 20px;">
         <div class="position">
-          <div :class="['d-flex' ,'align-center']">
+          <div class="d-flex align-center" :class="{'cursor-pointer': tab === 1}" @click="handleEdit(val)">
             <svg-icon class="mr-3" name="pin" size="25"></svg-icon>
             <span v-if="val.name.indexOf('style')" v-html="val.name" class="position-name"></span>
             <span v-else class="position-name">{{ val.name }}</span>
@@ -77,7 +77,7 @@ import confirmPaymentDialog from '@/components/pay/confirmPaymentDialog.vue'
 
 const { t } = useI18n()
 const emit = defineEmits(['refresh'])
-defineProps({
+const props = defineProps({
   items: Array,
   tab: Number
 })
@@ -144,6 +144,7 @@ const handleAction = async (index, { id }) => {
 const router = useRouter()
 // 职位编辑
 const handleEdit = (val) => {
+  if (props.tab !== 1) return
   router.push(`/recruit/enterprise/hirePosition/edit?id=${val.id}`)
 }
 

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="props.items.length" class="d-flex align-center mb-1">
-      <v-checkbox v-model="selectAll" :label="!selectAll ? $t('common.selectAll') : `已选中${selectList.length}条`" hide-details color="primary" @update:model-value="handleChangeSelectAll"></v-checkbox>
+      <v-checkbox v-if="tab !== 3" v-model="selectAll" :label="!selectAll ? $t('common.selectAll') : `已选中${selectList.length}条`" hide-details color="primary" @update:model-value="handleChangeSelectAll"></v-checkbox>
       <div v-if="tab === 1" class="ml-8">
         <v-btn :disabled="!selectAll" color="primary" variant="tonal" size="small" @click="handleAction(2, 'batch', {})">{{ $t('common.refresh') }}</v-btn>
         <v-btn class="mx-3" :disabled="!selectAll" color="primary" variant="tonal" size="small" @click="handleAction(3, 'top', {})">{{ $t('common.topping') }}</v-btn>
@@ -12,10 +12,10 @@
     <div v-for="val in items" :key="val.id" class="itemBox mb-3" style="height: 134px;">
       <div class="d-flex justify-space-between" style="padding: 10px 20px;">
         <div class="position">
-          <div class="item-select">
+          <div class="item-select" v-if="tab !== 3">
             <v-checkbox v-model="val.select" hide-details color="primary" @update:model-value="handleChangeSelect"></v-checkbox>
           </div>
-          <div :class="['ml-10' ,'d-flex' ,'align-center']">
+          <div class="d-flex align-center" :class="{'cursor-pointer': tab === 1, 'ml-10': tab !== 3}" @click="handleEdit(val)">
             <span v-if="val.name.indexOf('style')" v-html="val.name" class="position-name"></span>
             <span v-else class="position-name">{{ val.name }}</span>
           </div>
@@ -191,6 +191,7 @@ const handleSubmit = async () => {
 const router = useRouter()
 // 职位编辑
 const handleEdit = (val) => {
+  if (props.tab !== 1) return
   router.push(`/recruit/enterprise/position/edit?id=${val.id}`)
 }
 </script>