From 65c8026eaeff3d769a1d168933e13035708233e0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 10:00:48 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/index.less | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 814959a..fffb0e8 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -89,6 +89,11 @@
margin-right: 4px;
margin-top: -5px;
}
+
+ &-register {
+ width: 12px;
+ margin-left: 4px;
+ }
}
.dataSync {
@@ -96,7 +101,7 @@
&-page {
background-color: #fff;
- margin: 8px 8px 0px 16px;
+ margin: 0px 8px 0px 16px;
padding: 12px 16px 16px 16px;
height: calc(100vh - 228px);
overflow-y: scroll;
@@ -140,6 +145,16 @@
.scrollTabContent {
overflow-y: scroll;
+ }
+ }
+
+ &-noBackTabPage {
+ margin: 0 16px 0px 16px;
+ height: calc(100vh - 219px);
+
+ .whiteBox {
+ background-color: #fff;
+ padding: 12px;
}
}
}
@@ -188,7 +203,7 @@
.arco-upload-list-type-text .arco-upload-list-item:first-of-type,
.arco-upload-list-type-picture-list .arco-upload-list-item:first-of-type {
- margin-top: 34px;
+ // margin-top: 34px;
}
@@ -446,8 +461,26 @@
margin-bottom: 8px;
}
-.MyDrawer{
- position:absolute;
+.MyDrawer {
+ position: absolute;
z-index: 9999;
}
+.myTag {
+ border: 1px solid rgb(229, 230, 235);
+ border-radius: 2px;
+ display: inline-block;
+ padding: 3px 6px;
+ cursor: pointer;
+
+ &:hover {
+ border: 1px solid #1A6FB8;
+ color: #1A6FB8;
+ }
+}
+
+.gap {
+ height: 8px;
+ background-color: #F2F3F5;
+ margin: 16px -18px 0px -16px;
+}
\ No newline at end of file
--
Gitblit v1.8.0