From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/js/popup.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/js/popup.js b/gx_tieta/WebRoot/js/popup.js
index 75df55c..6742ee0 100644
--- a/gx_tieta/WebRoot/js/popup.js
+++ b/gx_tieta/WebRoot/js/popup.js
@@ -8,7 +8,10 @@
 Popup.prototype.showPopup = function() {
 	var winHt = $(window).height();
 	var popupMask = $('<div class="popup-mask"></div>');
-	$('body').append(popupMask);
+	if($('body .popup-mask').length == 0) {
+		$('body').append(popupMask);
+	}
+	
 	$('.popup-mask').animate({height: winHt+"px"});
 	this.centerPopup();
 	this.popup.css('visibility', 'visible');

--
Gitblit v1.9.1