![]()
+ v-if="true" :src="`` + order.product.img" :alt="order.product.name" :class="myimgclass">
{{ order.product.name }}
diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts
index 63805c5b..f430a89e 100755
--- a/src/layouts/menuone/menuOne.ts
+++ b/src/layouts/menuone/menuOne.ts
@@ -38,7 +38,7 @@ export default defineComponent({
watch(path, (to: string, from: string) => {
const mymenu = globalStore.getmenu
- console.log('watch:', mymenu)
+ // console.log('watch:', mymenu)
Object.keys(mymenu).forEach((parentName: any) => {
console.log('parentName', parentName)
// @ts-ignore
diff --git a/src/mixins/mixin-events.ts b/src/mixins/mixin-events.ts
index d327e030..52452792 100755
--- a/src/mixins/mixin-events.ts
+++ b/src/mixins/mixin-events.ts
@@ -12,9 +12,9 @@ import { useI18n } from '@/boot/i18n'
export default function () {
function getImgEvent(event: IEvents) {
if (!!event.img)
- return 'public/' + event.img
+ return event.img
else
- return 'public/images/noimg.png'
+ return 'images/noimg.png'
}
function getStyleByEvent(event: IEvents, visu: boolean) {
diff --git a/src/mixins/mixin-operator.ts b/src/mixins/mixin-operator.ts
index 4c7441a0..0aaf4cdf 100755
--- a/src/mixins/mixin-operator.ts
+++ b/src/mixins/mixin-operator.ts
@@ -23,7 +23,7 @@ export default function () {
function getImgTeacherByUsername(username: string) {
const calendarStore = useCalendarStore()
- return 'public/images/' + calendarStore.getImgTeacherByUsername(username)
+ return 'images/' + calendarStore.getImgTeacherByUsername(username)
}
function getTeacherByUsername(username: string) {
diff --git a/src/mixins/mixin-users.ts b/src/mixins/mixin-users.ts
index 50b35bd6..042ba3d4 100755
--- a/src/mixins/mixin-users.ts
+++ b/src/mixins/mixin-users.ts
@@ -12,7 +12,7 @@ export default function () {
function getImgByUsername(username: string) {
const userStore = useUserStore()
- return `public/${userStore.getImgByUsername(username)}`
+ return `${userStore.getImgByUsername(username)}`
}
function isValidUsername(username: string) {
@@ -52,13 +52,13 @@ export default function () {
function getImgByMsg(msg: IMessage) {
const userStore = useUserStore()
// @ts-ignore
- return `public/${userStore.getImgByUsername(this.getUsernameChatByMsg(msg))}`
+ return `${userStore.getImgByUsername(this.getUsernameChatByMsg(msg))}`
}
function getMyImg() {
const userStore = useUserStore()
const ris = userStore.getImgByUsername(userStore.my.username)
- const out = (ris !== '') ? `public/${ris}` : ''
+ const out = (ris !== '') ? `${ris}` : ''
console.log('getMyImg = ', out)
return out
}
@@ -66,7 +66,7 @@ export default function () {
function getMyImgforIcon() {
const userStore = useUserStore()
const ris = userStore.getImgByUsername(userStore.my.username)
- return (ris !== '') ? `img:public/${ris}` : 'fas fa-user'
+ return (ris !== '') ? `img:${ris}` : 'fas fa-user'
}
function getIconCart() {
diff --git a/src/root/ciao/ciao.scss b/src/root/ciao/ciao.scss
index db7b581d..3c6bee2c 100755
--- a/src/root/ciao/ciao.scss
+++ b/src/root/ciao/ciao.scss
@@ -27,7 +27,7 @@ h4 {
}
.landing_background {
- background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed;
+ background: #000 url(../../../images/foto1.jpg) no-repeat 50% fixed;
background-size: cover
}
@@ -179,7 +179,7 @@ h4 {
background-repeat: no-repeat !important;
background-position: top;
background-size: contain !important;
- background-image: url(../../../public/images/landing_first_section.png) !important
+ background-image: url(../../../images/landing_first_section.png) !important
}
.feat-descr {
@@ -209,7 +209,7 @@ body.mobile .landing:before {
right: 0;
bottom: 0;
z-index: -1;
- //background: #000 url(../../public/images/cover.jpg) 50%;
+ //background: #000 url(../../images/cover.jpg) 50%;
background-size: cover
}
diff --git a/src/root/mypage/mypage.ts b/src/root/mypage/mypage.ts
index c1876076..da1d6370 100755
--- a/src/root/mypage/mypage.ts
+++ b/src/root/mypage/mypage.ts
@@ -3,9 +3,11 @@ import { defineComponent, ref, onMounted, watch, computed } from 'vue'
import { useGlobalStore } from '@store/globalStore'
import { useRoute } from 'vue-router'
import MixinMetaTags from '@/mixins/mixin-metatags'
+import { CMyPage } from '@/components/CMyPage'
export default defineComponent({
name: 'Mypage',
+ components: { CMyPage },
setup() {
const rec = ref({})
const globalStore = useGlobalStore()
diff --git a/src/root/mypage/mypage.vue b/src/root/mypage/mypage.vue
index c241c781..a647d8d7 100755
--- a/src/root/mypage/mypage.vue
+++ b/src/root/mypage/mypage.vue
@@ -14,7 +14,7 @@
-
+
@@ -22,14 +22,14 @@
-
+
-
+
diff --git a/src/rootgen/admin/sendpushnotif/sendpushnotif.ts b/src/rootgen/admin/sendpushnotif/sendpushnotif.ts
index 76e83de0..2c63e0ef 100755
--- a/src/rootgen/admin/sendpushnotif/sendpushnotif.ts
+++ b/src/rootgen/admin/sendpushnotif/sendpushnotif.ts
@@ -90,13 +90,13 @@ export default defineComponent({
if (actiontype.value === shared_consts.TypeMsg_Actions.YESNO) {
param.actions = [
- { action: 'confirm', title: 'Si', icon: '/public/images/opz1-icon-96x96.jpg' },
- { action: 'cancel', title: 'No', icon: '/public/images/opz2-icon-96x96.jpg' }
+ { action: 'confirm', title: 'Si', icon: '/images/opz1-icon-96x96.jpg' },
+ { action: 'cancel', title: 'No', icon: '/images/opz2-icon-96x96.jpg' }
]
} else if (actiontype.value === shared_consts.TypeMsg_Actions.OPZ1_2) {
param.actions = [
- { action: 'opz1', title: opz1.value, icon: '/public/images/opz1-icon-96x96.jpg' },
- { action: 'opz2', title: opz2.value, icon: '/public/images/opz2-icon-96x96.jpg' }
+ { action: 'opz1', title: opz1.value, icon: '/images/opz1-icon-96x96.jpg' },
+ { action: 'opz2', title: opz2.value, icon: '/images/opz2-icon-96x96.jpg' }
]
}
diff --git a/src/rootgen/admin/tablesList/tablesList.vue b/src/rootgen/admin/tablesList/tablesList.vue
index 84a37723..13f753d9 100755
--- a/src/rootgen/admin/tablesList/tablesList.vue
+++ b/src/rootgen/admin/tablesList/tablesList.vue
@@ -1,5 +1,6 @@
-
+
+
+
+
+
+