mirror of
https://github.com/continew-org/continew-admin.git
synced 2025-11-03 12:57:11 +08:00
Merge branch '1.0.x' into dev
# Conflicts: # continew-admin-ui/components.d.ts # continew-admin-ui/src/components/footer/index.vue
This commit is contained in:
@@ -1,12 +1,27 @@
|
||||
<template>
|
||||
<a-layout-footer class="footer">
|
||||
{{ `Copyright © 2022-${new Date().getFullYear()}` }}
|
||||
<a href="https://blog.charles7c.top/about/me" target="_blank" rel="noopenner noreferrer">Charles7c</a>
|
||||
<a
|
||||
href="https://blog.charles7c.top/about/me"
|
||||
target="_blank"
|
||||
rel="noopenner noreferrer"
|
||||
>Charles7c</a
|
||||
>
|
||||
<span> ⋅ </span>
|
||||
<a href="https://github.com/Charles7c/continew-admin" target="_blank" rel="noopenner noreferrer">{{ $t('title') }}</a>
|
||||
v1.1.0-SNAPSHOT
|
||||
<a
|
||||
href="https://github.com/Charles7c/continew-admin"
|
||||
target="_blank"
|
||||
rel="noopenner noreferrer"
|
||||
>{{ $t('title') }}</a
|
||||
> v1.1.0-SNAPSHOT
|
||||
<span> ⋅ </span>
|
||||
<a href="https://beian.miit.gov.cn" target="_blank" rel="noopenner noreferrer">津ICP备2022005864号-2</a>
|
||||
<a
|
||||
href="https://beian.miit.gov.cn"
|
||||
target="_blank"
|
||||
rel="noopenner noreferrer"
|
||||
>
|
||||
津ICP备2022005864号-2
|
||||
</a>
|
||||
</a-layout-footer>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -160,7 +160,10 @@
|
||||
:size="32"
|
||||
:style="{ marginRight: '8px', cursor: 'pointer' }"
|
||||
>
|
||||
<img alt="avatar" :src="getAvatar(loginStore.avatar, loginStore.gender)" />
|
||||
<img
|
||||
alt="avatar"
|
||||
:src="getAvatar(loginStore.avatar, loginStore.gender)"
|
||||
/>
|
||||
</a-avatar>
|
||||
<template #content>
|
||||
<a-doption>
|
||||
|
||||
@@ -2,10 +2,14 @@
|
||||
<div class="header-operation-right">
|
||||
<a-button-group>
|
||||
<a-tooltip :content="showQuery ? '隐藏搜索栏' : '显示搜索栏'">
|
||||
<a-button @click="toggleSearch"><template #icon><icon-search /></template></a-button>
|
||||
<a-button @click="toggleSearch"
|
||||
><template #icon><icon-search /></template
|
||||
></a-button>
|
||||
</a-tooltip>
|
||||
<a-tooltip content="刷新">
|
||||
<a-button @click="handleRefresh"><template #icon><icon-refresh /></template></a-button>
|
||||
<a-button @click="handleRefresh"
|
||||
><template #icon><icon-refresh /></template
|
||||
></a-button>
|
||||
</a-tooltip>
|
||||
</a-button-group>
|
||||
</div>
|
||||
@@ -42,4 +46,4 @@
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="less"></style>
|
||||
<style scoped lang="less"></style>
|
||||
|
||||
Reference in New Issue
Block a user