From 497583fe37d894095ea03b2ee87d43468b8eed6c Mon Sep 17 00:00:00 2001
From: gongjinbao <gongjinbao@163.com>
Date: 星期三, 08 一月 2025 18:20:37 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/americanContainer
---
src/component/Header.vue | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/component/Header.vue b/src/component/Header.vue
index ec15f68..8f7c022 100644
--- a/src/component/Header.vue
+++ b/src/component/Header.vue
@@ -1,24 +1,27 @@
<template>
- <div class="header_content">
- <div class="color1 fs--24 font-bold">{{ userInfo.companyName }}</div>
- <div class="flex a-center j-between">
- <div @click="userInfoShow = true" class="flex a-center mr--55 shrink0 pointer">
- <div class="mr--24 fs--20 font-bold shrink0 color2">{{ userInfo.userName }}</div>
- <img @click="$emit('edit')" src="../assets/img/bianji@2x.png" class="w--23 h--23" />
+ <div>
+ <div class="header_content">
+ <div class="color1 fs--24 font-bold">{{ userInfo.companyName }}</div>
+ <div class="flex a-center j-between">
+ <div @click="userInfoShow = true" class="flex a-center mr--55 shrink0 pointer">
+ <div class="mr--24 fs--20 font-bold shrink0 color2">{{ userInfo.userName }}</div>
+ <img src="../assets/img/bianji@2x.png" class="w--23 h--23" />
+ </div>
+ <img @click="logOutShow = true" src="../assets/img/tuichu@2x.png" class="w--40 h--40 shrink0 pointer" />
</div>
- <img @click="logOutShow = true" src="../assets/img/tuichu@2x.png" class="w--40 h--40 shrink0 pointer" />
</div>
- <el-dialog v-if="logOutShow" :visible.sync="logOutShow" :show-close="false" width="518px"
- top="51px"></el-dialog>
- <UserInfoComponent :show="userInfoShow" @close="userInfoShow = false" />
+ <LogOutComponent v-if="logOutShow" :show="logOutShow" @close="logOutShow = false" />
+ <UserInfoComponent v-if="userInfoShow" :show="userInfoShow" @close="userInfoShow = false" />
</div>
</template>
<script>
import UserInfoComponent from '@/component/userInfo.vue'
+import LogOutComponent from '@/component/LogOut.vue'
export default {
components: {
- UserInfoComponent
+ UserInfoComponent,
+ LogOutComponent
},
props: {},
data() {
@@ -52,18 +55,5 @@
.color2 {
color: #EDEDF3;
-}
-
-::v-deep .el-dialog {
- border-radius: 8px;
-
- .el-dialog__header {
- display: none !important;
- }
-
- .el-dialog__body {
- padding: 0 !important;
-
- }
}
</style>
\ No newline at end of file
--
Gitblit v1.7.1