From becf4b68d07cc3248cba8c652768a8be41875410 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Mar 2021 11:35:40 +0800
Subject: [PATCH] 部分弹框样式修改，省-区三级联动，部分接口调整
---
src/styles/real.scss | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/src/styles/real.scss b/src/styles/real.scss
index c4a4106..ed7c488 100644
--- a/src/styles/real.scss
+++ b/src/styles/real.scss
@@ -1,5 +1,4 @@
.opt-btn {
-<<<<<<< HEAD
margin-bottom: 0px;
height: 100%;
text-align: center;
@@ -17,21 +16,5 @@
}
}
-=======
- text-align: center;
- .el-form-item__content {
- margin-left: 0 !important;
- .el-button {
- width: 80px;
- height: 40px;
- margin: 0 40px;
- }
- .push-nmb-btn {
- width: 80px;
- height: 80px;
- border-radius: 50%;
- }
- }
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
}
--
Gitblit v1.9.3