Skip to content

Q
quasar-web-base
Commit c3c8b3f7 authored by Tình Trương's avatar Tình Trương
Browse files
Options

Merge branch 'master' of http://103.147.34.20:30081/son.nguyen/quasar-web-base

parents fa59777d 65681c33
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 30 deletions
quasar.conf.js
View file @ c3c8b3f7
......@@ -148,29 +148,29 @@ module.exports = configure(function (ctx) {
icons: [
{
src: 'icons/VAN_Favicon.png',
sizes: '128x128',
type: 'image/png',
},
{
src: 'icons/VAN_Favicon.png',
sizes: '192x192',
type: 'image/png',
},
{
src: 'icons/VAN_Favicon.png',
sizes: '256x256',
type: 'image/png',
},
{
src: 'icons/VAN_Favicon.png',
sizes: '384x384',
type: 'image/png',
},
{
src: 'icons/VAN_Favicon.png',
sizes: '512x512',
sizes: '16x16',
type: 'image/png',
},
// {
// src: 'icons/VAN_Favicon.png',
// sizes: '192x192',
// type: 'image/png',
// },
// {
// src: 'icons/VAN_Favicon.png',
// sizes: '256x256',
// type: 'image/png',
// },
// {
// src: 'icons/VAN_Favicon.png',
// sizes: '384x384',
// type: 'image/png',
// },
// {
// src: 'icons/VAN_Favicon.png',
// sizes: '512x512',
// type: 'image/png',
// },
],
},
},
......
src/assets/type.ts
View file @ c3c8b3f7
......@@ -35,13 +35,13 @@ export type ArtistInfoType = {
artistName: string | null;
birthday: string | null;
sex: number;
nationality: string;
address: string | null;
status: number;
field: string | null;
work: string | null;
qualification: string | null;
artistLevel: string | null;
nationality: NationalityType;
field: FieldType;
work: WorkType;
qualification: QualificationType;
artistLevel: FieldType;
phoneNumber: string | null;
email: string | null;
facebook: string | null;
......@@ -93,3 +93,21 @@ export type ArtistOwner = {
phoneNumber: number;
status: number;
};
export type SchedulesType = {
id: number;
artistId: number;
bookingId: number;
scheduleTime: string;
description: string;
status: number;
};
export type StoriesType = {
id: number;
artistId: number;
title: string;
content: string;
imageUrl: string;
status: number;
};
src/components/menu-list/menu-item/index.vue
View file @ c3c8b3f7
......@@ -23,6 +23,7 @@
:to="item.pageUrl || '/'"
exact
active-class="bg-primary text-white"
style="max-height: 40px"
></q-expansion-item>
</template>
......
src/index.template.html
View file @ c3c8b3f7
......@@ -12,7 +12,7 @@
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
/>
<link
<!-- <link
rel="icon"
type="image/png"
sizes="128x128"
......@@ -36,7 +36,7 @@
sizes="16x16"
href="icons/VAN_Favicon.png"
/>
<link rel="icon" type="image/ico" href="favicon.ico" />
<link rel="icon" type="image/ico" href="favicon.ico" /> -->
</head>
<body>
<!-- DO NOT touch the following DIV -->
......
src/layouts/MainLayout.vue
View file @ c3c8b3f7
<template>
<q-layout view="hHh Lpr lFf">
<q-header v-if="showHeader" elevated>
<q-header v-if="showHeader" elevated style="height: 50px; display: flex">
<q-toolbar>
<q-btn
flat
......@@ -14,7 +14,7 @@
<q-toolbar-title
><q-img
src="../assets/logo_van.png"
style="width: 7.5rem"
style="width: 6.5rem"
fit="contain"
:ratio="16 / 9"
/></q-toolbar-title>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment