From f38cd658cbf34e2e186f7e7732dbe39b0d889980 Mon Sep 17 00:00:00 2001
From: Eiinu <eiinu@qq.com>
Date: Thu, 2 Nov 2023 16:29:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20popup=20=E5=85=B3=E8=81=94=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=20z-index=20=E5=B1=9E=E6=80=A7=20(#?=
 =?UTF-8?q?2632)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/__VUE/actionsheet/index.taro.vue |  1 +
 src/packages/__VUE/actionsheet/index.vue      |  1 +
 src/packages/__VUE/address/index.taro.vue     |  1 +
 src/packages/__VUE/address/index.vue          |  1 +
 src/packages/__VUE/cascader/index.taro.vue    |  1 +
 src/packages/__VUE/cascader/index.vue         |  1 +
 src/packages/__VUE/dialog/index.taro.vue      |  1 +
 src/packages/__VUE/dialog/index.vue           |  1 +
 src/packages/__VUE/sku/index.vue              | 24 ++++++++++---------
 9 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/packages/__VUE/actionsheet/index.taro.vue b/src/packages/__VUE/actionsheet/index.taro.vue
index 416a9925e2..f9b6edada4 100644
--- a/src/packages/__VUE/actionsheet/index.taro.vue
+++ b/src/packages/__VUE/actionsheet/index.taro.vue
@@ -6,6 +6,7 @@
     :close-on-click-overlay="closeAbled"
     :lock-scroll="lockScroll"
     :catch-move="lockScroll"
+    :z-index="zIndex"
     @click-overlay="close"
   >
     <view :class="classes">
diff --git a/src/packages/__VUE/actionsheet/index.vue b/src/packages/__VUE/actionsheet/index.vue
index 127d5ad81d..598d90f02f 100644
--- a/src/packages/__VUE/actionsheet/index.vue
+++ b/src/packages/__VUE/actionsheet/index.vue
@@ -5,6 +5,7 @@
     round
     :close-on-click-overlay="closeAbled"
     :lock-scroll="lockScroll"
+    :z-index="zIndex"
     @click-overlay="close"
   >
     <view :class="classes">
diff --git a/src/packages/__VUE/address/index.taro.vue b/src/packages/__VUE/address/index.taro.vue
index 74342a7278..e551a619e7 100644
--- a/src/packages/__VUE/address/index.taro.vue
+++ b/src/packages/__VUE/address/index.taro.vue
@@ -5,6 +5,7 @@
     :lock-scroll="lockScroll"
     :catch-move="lockScroll"
     :round="round"
+    :z-index="zIndex"
     @close="close"
     @click-overlay="clickOverlay"
     @open="closeWay = 'self'"
diff --git a/src/packages/__VUE/address/index.vue b/src/packages/__VUE/address/index.vue
index b6c0513f0b..8b346ad59e 100644
--- a/src/packages/__VUE/address/index.vue
+++ b/src/packages/__VUE/address/index.vue
@@ -6,6 +6,7 @@
     :round="round"
     :teleport-disable="teleportDisable"
     :teleport="teleport"
+    :z-index="zIndex"
     @close="close"
     @click-overlay="clickOverlay"
     @open="closeWay = 'self'"
diff --git a/src/packages/__VUE/cascader/index.taro.vue b/src/packages/__VUE/cascader/index.taro.vue
index b9e194f686..a50c8f9331 100644
--- a/src/packages/__VUE/cascader/index.taro.vue
+++ b/src/packages/__VUE/cascader/index.taro.vue
@@ -11,6 +11,7 @@
       :close-icon-position="closeIconPosition"
       :lock-scroll="lockScroll"
       :catch-move="lockScroll"
+      :z-index="zIndex"
     >
       <template v-if="title">
         <view class="nut-cascader__bar" v-html="title"></view>
diff --git a/src/packages/__VUE/cascader/index.vue b/src/packages/__VUE/cascader/index.vue
index f9359309c9..f4d9921617 100644
--- a/src/packages/__VUE/cascader/index.vue
+++ b/src/packages/__VUE/cascader/index.vue
@@ -8,6 +8,7 @@
       :closeable="closeable"
       :destroy-on-close="false"
       :close-icon-position="closeIconPosition"
+      :z-index="zIndex"
     >
       <template v-if="title">
         <view class="nut-cascader__bar" v-html="title"></view>
diff --git a/src/packages/__VUE/dialog/index.taro.vue b/src/packages/__VUE/dialog/index.taro.vue
index 25f152dbec..fd7428c695 100644
--- a/src/packages/__VUE/dialog/index.taro.vue
+++ b/src/packages/__VUE/dialog/index.taro.vue
@@ -10,6 +10,7 @@
     :overlay-style="overlayStyle"
     :style="popStyle"
     round
+    :z-index="zIndex"
     @click-overlay="onClickOverlay"
     @click-close-icon="closed"
   >
diff --git a/src/packages/__VUE/dialog/index.vue b/src/packages/__VUE/dialog/index.vue
index 30d1b250b2..c07fd6f0fb 100644
--- a/src/packages/__VUE/dialog/index.vue
+++ b/src/packages/__VUE/dialog/index.vue
@@ -9,6 +9,7 @@
     :overlay-style="overlayStyle"
     :style="popStyle"
     round
+    :z-index="zIndex"
     @click-overlay="onClickOverlay"
     @click-close-icon="closed"
   >
diff --git a/src/packages/__VUE/sku/index.vue b/src/packages/__VUE/sku/index.vue
index c74dc747e3..9c7e607aa1 100644
--- a/src/packages/__VUE/sku/index.vue
+++ b/src/packages/__VUE/sku/index.vue
@@ -6,8 +6,7 @@
     round
     style="height: 75%"
     :lock-scroll="lockScroll"
-    :teleport-disable="teleportDisable"
-    :teleport="teleport"
+    :catch-move="lockScroll"
     @click-close-icon="closePopup('icon')"
     @click-overlay="closePopup('overlay')"
     @close="closePopup('close')"
@@ -48,8 +47,8 @@
       </view>
 
       <sku-operate
-        :btn-options="btnOptions"
         :btn-extra-text="btnExtraText"
+        :btn-options="btnOptions"
         :buy-text="buyText || translate('buyNow')"
         :add-cart-text="addCartText || translate('addToCart')"
         :confirm-text="confirmText || translate('confirm')"
@@ -63,19 +62,21 @@
   </nut-popup>
 </template>
 <script lang="ts">
-import { ref, watch, onMounted, PropType } from 'vue';
+import { ref, watch, PropType } from 'vue';
 import SkuHeader from './components/SkuHeader.vue';
 import SkuSelect from './components/SkuSelect.vue';
 import SkuStepper from './components/SkuStepper.vue';
 import SkuOperate from './components/SkuOperate.vue';
-import { createComponent } from '@/packages/utils/create';
-import { popupProps } from '../popup/props';
 import Popup from '../popup/index.vue';
+import { createComponent } from '@/packages/utils/create';
 const { create, translate } = createComponent('sku');
 
 export default create({
   props: {
-    ...popupProps,
+    visible: {
+      type: Boolean,
+      default: false
+    },
 
     sku: {
       type: Array,
@@ -138,6 +139,11 @@ export default create({
     confirmText: {
       type: String,
       default: ''
+    },
+
+    lockScroll: {
+      type: Boolean,
+      default: true
     }
   },
   emits: [
@@ -182,10 +188,6 @@ export default create({
       }
     );
 
-    onMounted(() => {
-      // console.log('更新参数');
-    });
-
     const getSlots = (name: string) => slots[name];
 
     // 商品规格 sku 选择