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

src/layout/company/navBar.vue

@@ -95,14 +95,12 @@ import { useRouter } from 'vue-router'
 const router = useRouter()
 const handleLogoClick = () => { router.push({ path: '/enterprise/home'}) }
 
-const show = ref(false)
 const userType = ref(0) // 0企业用户、1个人用户
 const changeRole = () => {
   if (userType.value) {
-    show.value = true
     router.push({ path: '/enterprise/register' })
   } else {
-    // 重新走登录拿数据
+    router.push({ path: '/' })
   }
 }
 

src/layout/personal/navBar.vue

@@ -102,7 +102,6 @@ import { reactive, ref } from 'vue'
 import { getToken } from '@/utils/auth'
 import { useUserStore } from '@/store/user'
 import { useLocaleStore } from '@/store/locale'
-import { useLoginType } from '@/store/loginType'
 defineOptions({ name: 'personal-navbar' })
 
 defineProps({
@@ -112,7 +111,6 @@ defineProps({
   }
 })
 
-const changeLoginType = useLoginType()
 const localeStore = useLocaleStore()
 const userStore = useUserStore()
 
@@ -132,7 +130,6 @@ const changeRole = () => {
     router.push({ path: '/enterprise/register' })
   } else {
     router.push({ path: '/enterprise/talentPool' })
-    changeLoginType.change(0)
   }
 }
 

src/router/modules/remaining.js

@@ -2,10 +2,6 @@ import personal from './personal'
 import enterprise from './enterprise'
 import recruit from './recruit'
 import Layout from '@/layout'
-// import { useSharedState } from '@/store/sharedState'
-// const sharedState = useSharedState()
-// const loginType = sharedState.loginType
-const loginType = 0
 
 // const type  = 0
 const routeArray = [
@@ -54,7 +50,7 @@ const remainingRouter = [
   },
   {
     path: '',
-    component: loginType === 0 ? Layout : null,
+    component: Layout,
     children: [
       {
         path: '',

src/views/enterprise/components/binding.vue

@@ -21,7 +21,7 @@
       </div>
       <!-- 底部 -->
       <div class="text-center mt-5">
-        <v-btn color="primary" variant="text" to="/enterprise/binding">注册新企业</v-btn>
+        <v-btn color="primary" variant="text" to="/enterprise/register">注册新企业</v-btn>
       </div>
     </v-card>
   </div>
@@ -35,14 +35,6 @@ const loginLoading = ref(false)
 
 const formItems = ref({
   options: [
-    {
-      type: 'text',
-      key: 'name',
-      value: '',
-      label: '姓名 *',
-      counter: 15,
-      rules: [v => !!v || '请输入姓名']
-    },
     {
       type: 'text',
       key: 'phone',
@@ -57,6 +49,14 @@ const formItems = ref({
       label: '职务 *',
       rules: [v => !!v || '请输入职务']
     },
+    {
+      type: 'text',
+      key: 'name',
+      value: '',
+      label: '姓名 *',
+      counter: 15,
+      rules: [v => !!v || '请输入姓名']
+    },
   ]
 })