From 3715b37f77b8f43e7267518aa748bea3efda1989 Mon Sep 17 00:00:00 2001
From: xzs02 <service02@dcloud.io>
Date: Mon, 7 Jan 2019 11:34:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3picker=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8CactionSheet=E7=BB=84=E4=BB=B6=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=97=B6=E5=9C=A8Safari=E5=86=85=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../h5/components/app/popup/actionSheet.vue   | 46 ++++++++-----------
 .../h5/components/app/popup/picker.vue        | 26 ++++-------
 2 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/src/platforms/h5/components/app/popup/actionSheet.vue b/src/platforms/h5/components/app/popup/actionSheet.vue
index e7cec733..8d84427e 100644
--- a/src/platforms/h5/components/app/popup/actionSheet.vue
+++ b/src/platforms/h5/components/app/popup/actionSheet.vue
@@ -1,26 +1,26 @@
 <template>
   <uni-actionsheet @touchmove.prevent>
     <transition name="uni-fade">
-      <div
-        v-show="visible"
-        class="uni-mask"
+      <div
+        v-show="visible"
+        class="uni-mask"
         @click="_close(-1)" />
     </transition>
-    <div
-      :class="{'uni-actionsheet_toggle':visible}"
+    <div
+      :class="{'uni-actionsheet_toggle':visible}"
       class="uni-actionsheet">
       <div class="uni-actionsheet__menu">
-        <div
-          v-for="(title,index) in itemList"
-          :key="index"
-          :style="{color:itemColor}"
-          class="uni-actionsheet__cell"
+        <div
+          v-for="(title,index) in itemList"
+          :key="index"
+          :style="{color:itemColor}"
+          class="uni-actionsheet__cell"
           @click="_close(index)">{{ title }}</div>
       </div>
       <div class="uni-actionsheet__action">
-        <div
-          :style="{color:itemColor}"
-          class="uni-actionsheet__cell"
+        <div
+          :style="{color:itemColor}"
+          class="uni-actionsheet__cell"
           @click="_close(-1)">取消</div>
       </div>
     </div>
@@ -67,10 +67,13 @@ export default {
 		z-index: 999;
 		width: 100%;
 		background-color: #efeff4;
-		transition: transform .3s;
+    visibility: hidden;
+    transition-property: transform, visibility;
+		transition-duration: 0.3s, 0.3s;
 	}
 
 	uni-actionsheet .uni-actionsheet.uni-actionsheet_toggle {
+    visibility: visible;
 		transform: translate(0, 0);
 	}
 
@@ -78,19 +81,6 @@ export default {
 		box-sizing: border-box;
 	}
 
-	uni-actionsheet .uni-actionsheet {
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		transform: translate(0, 100%);
-		backface-visibility: hidden;
-		z-index: 999;
-		width: 100%;
-		background-color: #efeff4;
-		transition: transform .3s;
-		transition: transform 0.3s;
-	}
-
 	uni-actionsheet .uni-actionsheet__menu {
 		background-color: #fcfcfd;
 	}
@@ -127,4 +117,4 @@ export default {
 	uni-actionsheet .uni-actionsheet__cell:first-child:before {
 		display: none;
 	}
-</style>
+</style>
diff --git a/src/platforms/h5/components/app/popup/picker.vue b/src/platforms/h5/components/app/popup/picker.vue
index 2cb44585..a9f23954 100644
--- a/src/platforms/h5/components/app/popup/picker.vue
+++ b/src/platforms/h5/components/app/popup/picker.vue
@@ -357,22 +357,6 @@ uni-picker {
   box-sizing: border-box;
 }
 
-uni-picker .uni-picker {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  transform: translate(0, 100%);
-  backface-visibility: hidden;
-  z-index: 999;
-  width: 100%;
-  background-color: #efeff4;
-  transition: transform 0.3s;
-}
-
-uni-picker .uni-picker.uni-picker-toggle {
-  transform: translate(0, 0);
-}
-
 uni-picker .uni-picker * {
   box-sizing: border-box;
 }
@@ -386,8 +370,14 @@ uni-picker .uni-picker {
   z-index: 999;
   width: 100%;
   background-color: #efeff4;
-  transition: transform 0.3s;
-  transition: transform 0.3s;
+  visibility: hidden;
+  transition-property: transform,visibility;
+  transition-duration: 0.3s, 0.3s;
+}
+
+uni-picker .uni-picker.uni-picker-toggle {
+  visibility: visible;
+  transform: translate(0, 0);
 }
 
 uni-picker .uni-picker-content {
-- 
GitLab