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 | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 113 insertions(+), 3 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 6a077e0..d88a16c 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -85,9 +85,15 @@
}
&-file {
+ width: 14px;
+ height: 14px;
+ margin-right: 4px;
+ margin-top: 4px;
+ }
+
+ &-register {
width: 12px;
- margin-right: 4px;
- margin-top: -5px;
+ margin-left: 4px;
}
}
@@ -331,6 +337,7 @@
align-items: center;
background-color: #FAFAFA;
border-radius: 8px;
+ position: relative;
&-icon {
@@ -342,8 +349,9 @@
&-edit {
position: absolute;
right: 25px;
- top: 45px;
+ top: 15px;
width: 18px;
+ cursor: pointer;
}
&-remark {
@@ -468,10 +476,70 @@
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;
+}
+
+.reviewProgress {
+ .reviewCircle {
+ width: 14px;
+ height: 14px;
+ border: 2px solid #3491fa;
+ border-radius: 50%;
+ margin-top: 4px;
+ }
+
+ .reviewLine {
+ height: calc(100% - 19px);
+ width: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+
+ &::before {
+ content: '';
+ height: 100%;
+ width: 1px;
+ background-color: #e5e6eb;
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+ }
+
+ .deepTitle {
+ font-size: 14px;
+ font-family: PingFang SC, PingFang SC-400;
+ font-weight: 400;
+ text-align: LEFT;
+ color: #1d2129;
+ line-height: 22px;
+ }
+
+ .shallowTitle {
+ font-size: 14px;
+ font-family: PingFang SC, PingFang SC-400;
+ font-weight: 400;
+ text-align: LEFT;
+ color: #86909c;
+ line-height: 22px;
+ }
}
.Supervising {
@@ -491,6 +559,18 @@
}
+ &-info{
+ display: flex;
+
+ &-time{
+ margin-right: 8px;
+ }
+
+ &-detail{
+ color: #1A6FB8;
+ }
+ }
+
&-btn {
margin-top: 12px;
color: rgb(26, 111, 184);
@@ -498,4 +578,34 @@
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