处理冲突

黄何裕

2024-07-12 ca9a92cfc2f2bd8c724020ee5e46094633eb80a5

 src/views/home/components/user-panel/index.vue

@@ -8,15 +8,8 @@
                        class="avatar-container w-40 h-40 rounded-full overflow-hidden el-dropdown-link"
                        @click="stateClick()"
                    >
                        <div
                            class="avatar-content"
                            v-if="userInfo.imagePath"
                        >
                            <img
                                :src="userInfo.imagePath"
                                class="avatar-img"
                                alt=""
                            />
            <div class="avatar-content" v-if="userInfo.imagePath">
              <img :src="'/api/files/'+userInfo.imagePath" class="avatar-img" alt="" />
                        </div>
                        <div
                            class="avatar-content"
@@ -31,10 +24,10 @@
                    <template #dropdown>
                        <el-dropdown-menu>
                            <el-dropdown-item>修改密码</el-dropdown-item>
                            <el-dropdown-item>个人中心</el-dropdown-item>
                            <el-dropdown-item @click="quit()"
                                >退出登录</el-dropdown-item
              <el-dropdown-item @click="goPersonalCenter()"
                >个人中心</el-dropdown-item
                            >
              <el-dropdown-item @click="quit()">退出登录</el-dropdown-item>
                        </el-dropdown-menu>
                    </template>
                </el-dropdown>
@@ -54,11 +47,7 @@
                        @click="toolClick(item)"
                    >
                        <div class="tool-icon mb-1">
                            <img
                                :src="item.iconPath"
                                class="width-img"
                                alt=""
                            />
              <img :src="item.iconPath" class="width-img" alt="" />
                        </div>
                        <div class="tool-title">
                            {{ item.title }}
@@ -134,6 +123,9 @@
            console.log("退出登录失败,失败原因;", err);
        });
};
const goPersonalCenter = () => {
  router.push("/personal-center");
};
</script>

<style lang="scss" scoped>