From c4c5880d64a6c6fcbd8947c320bf8547eec9ef97 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 21:11:53 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/index.less | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index deb928e..d88a16c 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -85,9 +85,10 @@
}
&-file {
- width: 12px;
- margin-right: 4px;
- margin-top: -5px;
+ width: 14px;
+ height: 14px;
+ margin-right: 4px;
+ margin-top: 4px;
}
&-register {
@@ -336,12 +337,21 @@
align-items: center;
background-color: #FAFAFA;
border-radius: 8px;
+ position: relative;
&-icon {
width: 12px;
height: 12px;
margin-right: 12px;
+ }
+
+ &-edit {
+ position: absolute;
+ right: 25px;
+ top: 15px;
+ width: 18px;
+ cursor: pointer;
}
&-remark {
@@ -530,4 +540,72 @@
color: #86909c;
line-height: 22px;
}
+}
+
+.Supervising {
+ background: #ffffff;
+ border: 1px solid #e5e6eb;
+ border-radius: 8px;
+ margin: 12px 16px 0px 16px;
+ padding: 12px 16px;
+
+ &-item {
+ display: flex;
+ margin-bottom: 4px;
+
+ &-title {
+ color: #86909C;
+ }
+
+ }
+
+ &-info{
+ display: flex;
+
+ &-time{
+ margin-right: 8px;
+ }
+
+ &-detail{
+ color: #1A6FB8;
+ }
+ }
+
+ &-btn {
+ margin-top: 12px;
+ color: rgb(26, 111, 184);
+ border: 1px solid rgb(26, 111, 184);
+ background-color: rgb(255, 255, 255);
+ }
+
+}
+
+.modal {
+ display: flex;
+ justify-content: center;
+ margin-bottom: 24px;
+
+ &-mark{
+ color: rgb(26, 111, 184);
+ border: 1px solid rgb(26, 111, 184);
+ padding: 0px 8px;
+ margin-right: 8px;
+ border-radius: 4px;
+ }
+
+ &-title{
+ color: #1D2129;
+ font-size: 16px;
+ font-weight: 500;
+ }
+}
+
+.icon{
+// width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px'
+ &-register{
+ width: 14px;
+ height: 14px;
+ margin-left: 8px;
+ margin-top: -2px;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0