修改

src/components/custom/custom-layout.vue

@@ -101,17 +101,11 @@
 </template>
 
 <script setup>
-<<<<<<< HEAD
 import { ArrowDown } from '@element-plus/icons-vue'
-=======
-import { cloneDeep, get  } from 'lodash-es'
->>>>>>> 1ca2acf0d7f4f794b5a38e94e1c7dbc04629b113
+import { cloneDeep, get } from 'lodash-es'
 import { siteInfo, footInfo, menuList } from '@/layout/site'
 // 接口
 import { DesignStore } from '@/store/api/platform/design'
-import { UserStore } from '@/store/user'
-const userStore = UserStore()
-const user = computed(() => userStore.user)
 const designStore = DesignStore()
 import { UserStore } from '@/store/user'
 const userStore = UserStore()
@@ -139,7 +133,7 @@ const search = async () => {
   let menus = cloneDeep(menuList)
   // 判断,如果没有孵化器角色,则不显示孵化器菜单
   let isIncubator = false
-  if (user) {
+  if (user.value) {
     const hasIncubator = get(user, 'role', []).find((f) => f === 'Incubator')
     if (hasIncubator) isIncubator = true
   }