From bd3f2bc5adce86f03c46da3e086e60d19f5c78f6 Mon Sep 17 00:00:00 2001
From: mengyxu <kekeningxiaobai@sina.com>
Date: Wed, 23 Apr 2025 20:03:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E6=A1=86z=E8=BD=B4?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog.vue         | 8 ++++++--
 src/components/popover-menu.vue   | 2 +-
 src/views/backpack/equip-menu.vue | 4 ++--
 src/views/shop/shop.vue           | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/dialog.vue b/src/components/dialog.vue
index 88c90b5..3815db5 100644
--- a/src/components/dialog.vue
+++ b/src/components/dialog.vue
@@ -5,7 +5,7 @@
                 <span>{{ title }}</span>
             </div>
             <slot />
-            <img :src="lock_close" class="close" @click="show = false; emit('close')"></img>
+            <img v-if="showHeader" :src="lock_close" class="close" @click="show = false; emit('close')"></img>
         </div>
     </teleport>
 </template>
@@ -54,6 +54,10 @@ const prop = defineProps({
         type: String,
         default: '0'
     },
+    z: {
+        type: Number,
+        default: 9
+    }
 })
 watch(show, (n, o) => {
     emit('update:modelValue', n);
@@ -78,7 +82,7 @@ onMounted(() => {
     bottom: v-bind('prop.bottom');
     padding: v-bind('prop.padding');
     position: absolute;
-    z-index: 9;
+    z-index: v-bind('z');
     border: 2px solid #fff;
     border-radius: 6px;
     box-shadow: 0 0 5px 5px rgba(0, 0, 0, 0.7);
diff --git a/src/components/popover-menu.vue b/src/components/popover-menu.vue
index bd46719..0aa7a9a 100644
--- a/src/components/popover-menu.vue
+++ b/src/components/popover-menu.vue
@@ -22,7 +22,7 @@ const { state, commit, dispatch } = useStore();
 
 const prop = defineProps({
     items: {
-        type: Array<PopoverMenuItem>(),
+        type: Array as () => PopoverMenuItem[],
         default: []
     }
 })
diff --git a/src/views/backpack/equip-menu.vue b/src/views/backpack/equip-menu.vue
index d04b452..724fc29 100644
--- a/src/views/backpack/equip-menu.vue
+++ b/src/views/backpack/equip-menu.vue
@@ -1,5 +1,5 @@
 <template>
-    <Dialog :show-header="false" v-model="show" :left="left" :top="top" padding="0">
+    <Dialog :show-header="false" v-model="show" :left="left" :top="top" padding="0" :z="10">
         <PopoverMenu :items="[
             { label: t('use'), onClick: useEquip },
             { label: t('strengthen'), onClick: strengthenEquip },
@@ -9,7 +9,7 @@
         ]" />
     </Dialog>
 
-    <Dialog :title="t('strengthen') + t('equip')" v-model="showStrengthen" top="10rem" left="2rem" padding="0">
+    <Dialog :title="t('strengthen') + t('equip')" v-model="showStrengthen" top="10rem" left="2rem" padding="0" :z="11">
         <Strengthen :equip="state.grid[index]" />
     </Dialog>
 
diff --git a/src/views/shop/shop.vue b/src/views/shop/shop.vue
index 25a424c..0f621de 100644
--- a/src/views/shop/shop.vue
+++ b/src/views/shop/shop.vue
@@ -30,7 +30,7 @@
         </div>
     </Dialog>
 
-    <Dialog :show-header="false" v-model="show" :left="left" :top="top" padding="0">
+    <Dialog :show-header="false" v-model="show" :left="left" :top="top" padding="0" :z="10">
         <PopoverMenu :items="[
             { label: t('buy'), onClick: () => buyEquip(index) },
         ]" />