From 792a7de9550294e9ab2df42402402ef966153ff2 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 12 八月 2024 13:45:40 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA

---
 pages/modal/3018.vue |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index b925b29..5653b7c 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -2351,7 +2351,24 @@
 		}
 	}
 </script>
-<style lang="less">
+<style>
+	
+	.popup-content {
+		@include flex;
+		align-items: center;
+		justify-content: center;
+		padding: 30rpx;
+		background-color: #fff;
+		/* height: 150px; */
+		/* border: 1px solid red; */
+	}
+	.popup-height {
+		@include height;
+		/* width: 200px; */
+	}
+</style>
+
+<style lang="scss">
 	.uni-page-modal-3018 {
 		display: flex;
 		height: calc(100vh - 30rpx);
@@ -2614,26 +2631,14 @@
 		.view-popup {
 			position: relative;
 		}
-
-		.popup-content {
-			@include flex;
-			align-items: center;
-			justify-content: center;
-			padding: 30rpx;
-			background-color: #fff;
-			/* height: 150px; */
-			/* border: 1px solid red; */
-		}
+              
 
 		.popup-cont {
 			overflow-y: auto;
 			/* border: 1px solid red; */
 		}
 
-		.popup-height {
-			@include height;
-			/* width: 200px; */
-		}
+		
 
 		.popup-header {
 			font-size: 42rpx;

--
Gitblit v1.9.1