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 | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 23 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 0672fc1..fffb0e8 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -57,6 +57,7 @@
width: 100%;
border-color: #E5E6EB;
+ margin-bottom: 20px;
&-title {
color: #86909C;
@@ -72,9 +73,9 @@
}
&-personRemark {
- color: rgb(26, 111, 184);
+ color: #879AAB;
+ background-color: #EDEEF0;
padding: 0px 8px;
- border: 1px solid rgb(26, 111, 184);
border-radius: 4px;
font-size: 14px;
margin-left: 8px;
@@ -88,6 +89,11 @@
margin-right: 4px;
margin-top: -5px;
}
+
+ &-register {
+ width: 12px;
+ margin-left: 4px;
+ }
}
.dataSync {
@@ -95,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;
@@ -129,10 +135,27 @@
&-hasTabPage {
background-color: #fff;
- margin: 8px 8px 0px 16px;
+ margin: 8px 16px 0px 16px;
padding: 12px 16px 64px 16px;
height: calc(100vh - 288px);
- overflow-y: scroll;
+
+ .arco-tabs-header-nav {
+ margin-left: 0 !important;
+ }
+
+ .scrollTabContent {
+ overflow-y: scroll;
+ }
+ }
+
+ &-noBackTabPage {
+ margin: 0 16px 0px 16px;
+ height: calc(100vh - 219px);
+
+ .whiteBox {
+ background-color: #fff;
+ padding: 12px;
+ }
}
}
@@ -178,11 +201,11 @@
}
}
-// .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;
+.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;
-// }
+}
.unitDialogResult {
font-size: 16px;
@@ -367,21 +390,23 @@
margin-right: 16px;
}
-.tabs-container .arco-tabs-header {
- position: relative;
- display: inline-block;
- transition: transform .2s cubic-bezier(.34, .69, .1, 1);
- white-space: nowrap;
- transform: translateX(0px);
- width: 300px;
- flex: 1;
- display: flex;
- justify-content: space-evenly;
-}
+.tabs-container {
+ .arco-tabs-header {
+ position: relative;
+ display: inline-block;
+ transition: transform .2s cubic-bezier(.34, .69, .1, 1);
+ white-space: nowrap;
+ transform: translateX(0px);
+ width: 300px;
+ flex: 1;
+ display: flex;
+ justify-content: space-evenly;
+ }
-.tabs-container .arco-tabs-header-ink {
- left: 83.988px;
- width: 82px;
+ .arco-tabs-header-ink {
+ left: 83.988px;
+ width: 82px;
+ }
}
.progress {
@@ -434,4 +459,28 @@
display: flex;
gap: 8px;
margin-bottom: 8px;
+}
+
+.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