冲突合并

src/views/recruit/personal/shareJob/components/deliveryForm.vue

@@ -38,22 +38,22 @@ const handleUpload = async (e) => {
 
 const items = ref({
   options: [
-    {
-      type: 'text',
-      key: 'name',
-      value: '',
-      clearable: true,
-      label: '姓名 *',
-      rules: [v => !!v || '请填写姓名']
-    },
-    {
-      type: 'text',
-      key: 'phone',
-      value: '',
-      clearable: true,
-      label: '手机号码 *',
-      rules: [v => !!v || '请填写手机号码']
-    },
+    // {
+    //   type: 'text',
+    //   key: 'name',
+    //   value: '',
+    //   clearable: true,
+    //   label: '姓名 *',
+    //   rules: [v => !!v || '请填写姓名']
+    // },
+    // {
+    //   type: 'text',
+    //   key: 'phone',
+    //   value: '',
+    //   clearable: true,
+    //   label: '手机号码 *',
+    //   rules: [v => !!v || '请填写手机号码']
+    // },
     {
       type: 'upload',
       key: 'url',

src/views/recruit/personal/shareJob/components/handleDeliveryCom.vue

@@ -1,6 +1,16 @@
 <!-- 选择简历 -->
 <template>
   <selectResumeDialog v-model="showResume" :list="resumeList" @submit="handleSubmit" @close="handleClose"></selectResumeDialog>
+  <CtDialog
+    :visible="showUploadFile"
+    :widthType="2"
+    titleClass="text-h6"
+    title="简历投递"
+    @close="showQuickResumeDialog = false"
+    @submit="null"
+  >
+    <DeliveryForm ref="deliveryForm"></DeliveryForm>
+  </CtDialog>
 </template>
 
 <script setup>
@@ -11,6 +21,7 @@ import Snackbar from '@/plugins/snackbar'
 import { useI18n } from '@/hooks/web/useI18n'; const { t } = useI18n()
 import { jobCvRelCheckSend, jobCvRelSend } from '@/api/position'
 import { hireJobCvDelivery } from '@/api/recruit/personal/shareJob'
+import DeliveryForm from './deliveryForm.vue'
 import { getPersonResumeCv } from '@/api/resume'
 
 const props = defineProps({
@@ -28,6 +39,7 @@ const props = defineProps({
   }
 })
 const showResume = ref(false)
+const showUploadFile = ref(false)
 const resumeList = ref([])
 
 const inspectionProcess = async () => {
@@ -40,7 +52,7 @@ const inspectionProcess = async () => {
     resumeList.value = data
     //
     if (data?.length) showResume.value = true // 简历选择
-    else console.log('已登录但未上传简历')
+    else showUploadFile.value = true // 已登录但未上传简历
   } catch (error) {
     console.error('error', error)
   }

src/views/recruit/personal/shareJob/components/login.vue

@@ -0,0 +1,38 @@
+<!--  -->
+<template>
+  <div class="my-5">
+    <phoneFrom ref="phoneRef" @handleEnter="handleLogin"></phoneFrom>
+    <v-btn  :loading="loginLoading" color="primary" class="white--text mt-5" min-width="350" @click="handleLogin">
+      {{ $t('login.register') }}
+    </v-btn>
+  </div>
+</template>
+
+<script setup>
+import phoneFrom from '@/components/VerificationCode'
+import { useUserStore } from '@/store/user'; const userStore = useUserStore()
+import { ref } from 'vue'
+defineOptions({name: 'shareJob-login'})
+
+// 验证码登录
+const phoneRef = ref()
+const loginLoading = ref(false)
+
+const handleLogin = async () => {
+  localStorage.removeItem('currentRole')
+  const { valid } = await phoneRef.value.phoneForm.validate()
+  if (!valid) return
+  loginLoading.value = true
+  try {
+    const params = { ...phoneRef.value.loginData } // 只能验证码登录
+    await userStore.handleSmsLogin(params)
+    // Snackbar.success(t('login.loginSuccess'))
+    // router.push({ path })
+  }
+  finally {
+    loginLoading.value = false
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

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

@@ -66,12 +66,13 @@
     <CtDialog
       :visible="showQuickResumeDialog"
       :widthType="2"
+      :footer="false"
       titleClass="text-h6"
-      title="简历投递"
+      title="快速登录"
       @close="showQuickResumeDialog = false"
       @submit="null"
     >
-      <quickResume ></quickResume>
+      <login ></login>
     </CtDialog>
   </div>
 </template>
@@ -82,7 +83,7 @@ import { onMounted, ref } from 'vue';
 import { getPositionDetails } from '@/api/position'
 import { dealDictObjData } from '@/utils/position'
 import handleDeliveryCom from './components/handleDeliveryCom.vue'
-import quickResume from './components/quickResumeDialog.vue'
+import login from './components/login.vue'
 import { getPersonalToken } from '@/utils/auth'
 import Snackbar from '@/plugins/snackbar'