From 4bdfc97818a775a1bc04f7c39a61a60561b7fcd8 Mon Sep 17 00:00:00 2001 From: Jorge Baumann Date: Sun, 26 Jan 2020 18:13:49 +0100 Subject: [PATCH] v1 --- src/views/Hero/HeroItems/Index.vue | 1 + src/views/Hero/HeroItems/ItemDetail.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/Hero/HeroItems/Index.vue b/src/views/Hero/HeroItems/Index.vue index b1fdee6..a92caa5 100644 --- a/src/views/Hero/HeroItems/Index.vue +++ b/src/views/Hero/HeroItems/Index.vue @@ -126,6 +126,7 @@ export default { }, computed: { itemsData () { + // Merge Objects return { ...defaultItems, ...this.items diff --git a/src/views/Hero/HeroItems/ItemDetail.vue b/src/views/Hero/HeroItems/ItemDetail.vue index 464f483..715f70f 100644 --- a/src/views/Hero/HeroItems/ItemDetail.vue +++ b/src/views/Hero/HeroItems/ItemDetail.vue @@ -21,7 +21,7 @@ -

+

{{item.slotName}}