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:
2023-06-28 22:55:08 +08:00
28 changed files with 593 additions and 228 deletions

View File

@@ -2,7 +2,10 @@ import Unknown from '../assets/images/avatar/unknown.png';
import Male from '../assets/images/avatar/male.png';
import Female from '../assets/images/avatar/female.png';
export default function getAvatar(avatar: string | undefined, gender: number | undefined) {
export default function getAvatar(
avatar: string | undefined,
gender: number | undefined
) {
if (avatar) {
const baseUrl = import.meta.env.VITE_API_BASE_URL;
return `${baseUrl}/avatar/${avatar}`;