From c41fc28f58c7f3048aaee2fdf1ef775b9cf00f9d Mon Sep 17 00:00:00 2001
From: xiaoyucoding <xiaoyucoding@126.com>
Date: Wed, 14 Nov 2018 12:28:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20popup=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=20top=20=E5=80=BC=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E5=A4=8D=20popup=20?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E7=A4=BA=E4=BE=8B=E5=8F=82=E6=95=B0=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hello-uniapp/components/uni-popup.vue     | 136 ++++++++++--------
 .../pages/template/popup/popup.vue            |  38 ++---
 2 files changed, 92 insertions(+), 82 deletions(-)

diff --git a/examples/hello-uniapp/components/uni-popup.vue b/examples/hello-uniapp/components/uni-popup.vue
index 614ddddb9..0115acd02 100644
--- a/examples/hello-uniapp/components/uni-popup.vue
+++ b/examples/hello-uniapp/components/uni-popup.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="uni-mask" v-show="show" :style="{top:titleHeight}" @click="hide"></view>
+		<view class="uni-mask" v-show="show" :style="{top:offsetTop + 'px'}" @click="hide"></view>
 		<view :class="['uni-popup','uni-popup-'+type]" v-show="show">
 			{{msg}}
 			<slot></slot>
@@ -9,75 +9,85 @@
 </template>
 
 <script>
-export default {
-	props : {
-		show : {
-			type : Boolean,
-			default : false
+	export default {
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			type: {
+				type: String,
+				//top - 顶部， middle - 居中, bottom - 底部
+				default: 'middle'
+			},
+			msg: {
+				type: String,
+				default: ""
+			}
 		},
-		type : {
-			type : String,
-			//top - 顶部， middle - 居中, bottom - 底部
-			default : 'middle'
+		data() {
+			let offsetTop = 0;
+			//#ifdef H5
+			offsetTop = 44;
+			//#endif
+			return {
+				offsetTop: offsetTop
+			}
 		},
-		msg :{
-			type : String,
-			default : ""
-		}
-	},
-	methods:{
-		hide : function(){
-			this.$emit('hidePopup');
+		methods: {
+			hide: function() {
+				this.$emit('hidePopup');
+			}
 		}
 	}
-}
 </script>
 <style>
-.uni-mask {
-	position: fixed;
-	z-index: 998;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	background-color: rgba(0, 0, 0, .3);
-}
+	.uni-mask {
+		position: fixed;
+		z-index: 998;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		background-color: rgba(0, 0, 0, .3);
+	}
 
-.uni-popup {
-	position: absolute;
-	z-index: 999;
-	background-color: #ffffff;
-	box-shadow: 0 0 30upx rgba(0, 0, 0, .1);
-}
+	.uni-popup {
+		position: absolute;
+		z-index: 999;
+		background-color: #ffffff;
+		box-shadow: 0 0 30upx rgba(0, 0, 0, .1);
+	}
 
-.uni-popup-middle {
-	display:flex;
-	flex-direction: column;
-	align-items:center;
-	width: 380upx;
-	height: 380upx;
-	border-radius: 10upx;
-	top:50%;
-	left:50%;
-	transform: translate(-50%, -50%);
-	justify-content:center;
-	padding:30upx;
-}
+	.uni-popup-middle {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 380upx;
+		height: 380upx;
+		border-radius: 10upx;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		justify-content: center;
+		padding: 30upx;
+	}
 
-.uni-popup-top {
-	top: 0;
-	left:0;
-	width: 100%;
-	height: 100upx;
-	line-height:100upx;
-	text-align: center;
-}
-.uni-popup-bottom {
-	left:0;
-	bottom: 0;
-	width: 100%;
-	height: 100upx;
-	line-height:100upx;
-	text-align: center;
-}
+	.uni-popup-top {
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100upx;
+		line-height: 100upx;
+		text-align: center;
+	}
+
+	.uni-popup-bottom {
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 100upx;
+		line-height: 100upx;
+		text-align: center;
+	}
 </style>
diff --git a/examples/hello-uniapp/pages/template/popup/popup.vue b/examples/hello-uniapp/pages/template/popup/popup.vue
index 21246f3f5..5dd4987d2 100644
--- a/examples/hello-uniapp/pages/template/popup/popup.vue
+++ b/examples/hello-uniapp/pages/template/popup/popup.vue
@@ -27,51 +27,51 @@
 	</view>
 </template>
 <script>
-	import uniPopup from "../../../components/uni-popup.vue";
+	import uniPopup from '../../../components/uni-popup.vue';
 	export default {
 		data() {
 			return {
-				popType : 'middle',
-				title : "popup",
-				showPopupMiddle : false,
-				showPopupTop : false,
-				showPopupBottom : false,
-				msg : ""
+				popType: 'middle',
+				title: 'popup',
+				showPopupMiddle: false,
+				showPopupTop: false,
+				showPopupBottom: false,
+				msg: ''
 			}
 		},
 		methods: {
 			//统一的关闭popup方法
-			hidePopup : function(){
+			hidePopup: function() {
 				this.showPopupMiddle = false;
-				this.showPopupTop    = false;
+				this.showPopupTop = false;
 				this.showPopupBottom = false;
 			},
 			//展示居中 popup
-			showMiddlePopup : function(){
+			showMiddlePopup: function() {
 				this.hidePopup();
-				this.popType   = "middle";
+				this.popType = 'middle';
 				this.showPopupMiddle = true;
 			},
 			//展示顶部 popup
-			showTopPopup: function(){
+			showTopPopup: function() {
 				this.hidePopup();
 				this.popType = 'top';
-				this.msg = "顶部 popup 信息内容";
+				this.msg = '顶部 popup 信息内容';
 				this.showPopupTop = true;
 			},
 			//展示底部 popup
-			showBottomPopup: function(){
+			showBottomPopup: function() {
 				this.hidePopup();
-				this.popType = 'top';
-				this.msg = "底部 popup 信息内容";
+				this.popType = 'bottom';
+				this.msg = '底部 popup 信息内容';
 				this.showPopupBottom = true;
 			}
 		},
-		components:{
+		components: {
 			uniPopup
 		}
 	}
 </script>
 <style>
-	
-</style>
\ No newline at end of file
+
+</style>
-- 
GitLab