Browse Source

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

Xiao_123 6 months ago
parent
commit
cdce78424e

+ 1 - 1
src/api/recruit/personal/membershipPackage.js

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-// 获取用户积分明细
+// 套餐列表
 export const getMembershipPackageList = async (params) => {
 export const getMembershipPackageList = async (params) => {
   return await request.get({
   return await request.get({
     url: 'app-api/menduner/system/user-package/list',
     url: 'app-api/menduner/system/user-package/list',

+ 3 - 3
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>
             <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>
             <span @click="enterpriseClick(1)" class="ml-3 commonHover">{{ baseInfo?.enterpriseAnotherName || baseInfo?.enterpriseName || '--' }}</span>
           </div>
           </div>
-          <div class="ml-3 cursor-pointer border-left border-right px-3 commonHover" @click="handleLogout">我要求职</div>
+          <div class="ml-3 cursor-pointer border-left border-right px-3 commonHover" @click="handleLogout(false)">我要求职</div>
           <div class="d-flex align-center px-3 border-right">
           <div class="d-flex align-center px-3 border-right">
             <div>{{ $t('enterprise.account.remainingPoints') }}:{{ enterpriseUserAccount?.balance || 0 }}点</div>
             <div>{{ $t('enterprise.account.remainingPoints') }}:{{ enterpriseUserAccount?.balance || 0 }}点</div>
           </div>
           </div>
@@ -121,8 +121,8 @@ const enterpriseClick = (tabKey = 1) => {
 }
 }
 
 
 // 退出登录、切换求职者
 // 退出登录、切换求职者
-const handleLogout = async () => {
-  await userStore.userLogout(2)
+const handleLogout = async (exit = true) => {
+  if (exit) await userStore.userLogout(2)
   router.push({ path: '/recruitHome' })
   router.push({ path: '/recruitHome' })
 }
 }
 const enterpriseList = ref([])
 const enterpriseList = ref([])

+ 5 - 1
src/views/recruit/entRegister/register.vue

@@ -72,7 +72,7 @@
               <div v-else style="font-size: 12px; color: #999">不可删除</div>
               <div v-else style="font-size: 12px; color: #999">不可删除</div>
             </div>
             </div>
             <TextUI v-model="item.contactName" :item="{...contactNameObj}"></TextUI>
             <TextUI v-model="item.contactName" :item="{...contactNameObj}"></TextUI>
-            <TextUI v-model="item.phone" :item="{...phoneObj}"></TextUI>
+            <TextUI v-model="item.phone" :item="{...phoneObj, disabled: (!index&&bossPhone !== '')}"></TextUI>
             <TextUI v-model="item.email" :item="{...emailObj}"></TextUI>
             <TextUI v-model="item.email" :item="{...emailObj}"></TextUI>
             <TextUI v-model="item.password" :item="{...passwordObj}"></TextUI>
             <TextUI v-model="item.password" :item="{...passwordObj}"></TextUI>
             <TextUI v-model="item.passwordConfirm" :item="{...passwordConfirmObj}"></TextUI>
             <TextUI v-model="item.passwordConfirm" :item="{...passwordConfirmObj}"></TextUI>
@@ -123,8 +123,12 @@ import { useRoute } from 'vue-router'; const route = useRoute()
 const pageType = route?.query?.type || '' // type: noLoginToRegister:->登录页注册企业
 const pageType = route?.query?.type || '' // type: noLoginToRegister:->登录页注册企业
 
 
 const showContactList = ref(false)
 const showContactList = ref(false)
+
 const contactInfo = { contactName: '', phone: '', email: '', password: '', passwordConfirm:'' }
 const contactInfo = { contactName: '', phone: '', email: '', password: '', passwordConfirm:'' }
 let contactList = [{ ...contactInfo }]
 let contactList = [{ ...contactInfo }]
+const bossPhone = localStorage.getItem('userInfo') ? JSON.parse(localStorage.getItem('userInfo')).phone : ''
+contactList[0].phone = bossPhone // 管理员手机号不能改
+
 const contactCopy = ref([])
 const contactCopy = ref([])
 
 
 // 注册信息保存
 // 注册信息保存