0 ? 'unset' : 'none',
- }}>
+ display: props.remindTagArray.length > 0 ? 'unset' : 'none',
+ }}>
{/* {props.tagArray.map((item: any) => {
diff --git a/src/components/card/card-proj.css b/src/components/card/card-proj.css
index 34eeab7..5816e2f 100644
--- a/src/components/card/card-proj.css
+++ b/src/components/card/card-proj.css
@@ -1,20 +1,37 @@
@media (min-width: 1571px) {
- .option{
+ .selectTagmin {
+
+ display: none;
+ }
+
+ .selectTagmax {
+ display: flex;
+
+
+
+ }
+ .option {
display: flex;
/* background-color: red; */
align-items: flex-start;
}
- .downloadBox{
- display: flex;
- flex-direction: column;
- align-items: center;
- margin-left: 10px;
- margin-top: 2px;
+
+ .downloadBox {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin-left: 10px;
+ margin-top: 2px;
}
- .zpibtn{margin-left: 10px;}
- .down-pdf{
+
+ .zpibtn {
+ margin-left: 10px;
+ }
+
+ .down-pdf {
margin-left: 5px;
}
+
.card-proj {
border-radius: 6px;
background-color: var(--color-light);
@@ -38,7 +55,8 @@
padding-left: 21px;
padding-right: 29px;
}
- .promptTags{
+
+ .promptTags {
padding-left: 21px;
display: flex;
/* background-color: red; */
@@ -46,6 +64,7 @@
/* justify-content: center; */
margin-top: 10px;
}
+
.cpt-left {
display: flex;
/* align-items: center; */
@@ -598,13 +617,15 @@
padding-left: 21px;
padding-right: 29px;
}
- .promptTags{
+
+ .promptTags {
padding-left: 21px;
display: flex;
/* background-color: red; */
align-items: center;
/* justify-content: center; */
}
+
.cpt-left {
display: flex;
/* align-items: center; */
@@ -625,6 +646,13 @@
color: #292929;
margin-left: 18px;
cursor: pointer;
+ /* width: 300px; */
+ /* 超出部分勇...代替 */
+ /* overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap; */
+
+ /* background-color: pink; */
}
.cp-tag {
@@ -783,7 +811,7 @@
}
.cpbl-money {
- min-width: 270px;
+ width: 230px;
padding: 0 20px;
box-sizing: border-box;
@@ -834,15 +862,30 @@
.moneyBox {}
+ .cpbl-btn-box {
+ display: flex;
+ }
+
.cpbl-btn {
display: flex;
/* background-color: red; */
flex-direction: column;
align-items: flex-start;
- margin-left: 60px;
+ margin-left: 20px;
margin-top: 5px;
}
+ .selectTagmin {
+ display: flex;
+ flex-direction: column;
+ margin-top: 10px;
+ margin-left: 20px;
+ }
+
+ .selectTagmax {
+ display: none;
+ }
+
.threeBtn {
display: flex;
cursor: pointer;
@@ -1128,13 +1171,13 @@
margin-bottom: 10px;
}
- .downloadBox{
+ .downloadBox {
display: flex;
-
+
align-items: center;
/* justify-content: flex-start; */
margin-left: 8px;
- }
+ }
diff --git a/src/components/menu/MenuWithTopButton.tsx b/src/components/menu/MenuWithTopButton.tsx
index 6895c26..b966b27 100644
--- a/src/components/menu/MenuWithTopButton.tsx
+++ b/src/components/menu/MenuWithTopButton.tsx
@@ -46,33 +46,33 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
chargeAdditionals: props.chargeAdditionals,
tagDataId: props.tagDataId,
authorId: props.authorId,
- payStatus:props.payStatus
+ payStatus: props.payStatus
}
})
}
- if (item.id == 'REFUN') {
+ if (item.id == 'REFUN') {
// props.disableBelongpeople()
navugate('/refun', {
state: {
keywords: props.refunKeywords,
applyStatus: props.applyStatus,
- authorId:props.authorId
+ authorId: props.authorId
}
})
}
- if (item.id == 'CORRECTION') {
+ if (item.id == 'CORRECTION') {
// props.disableBelongpeople()
navugate('/correction', {
state: {
keywords: props.correctionKeywords,
- correctionNumType:props.correctionNumType,
- correctionType:props.correctionType,
+ correctionNumType: props.correctionNumType,
+ correctionType: props.correctionType,
applyStatus: props.correctionApplyStatus,
authorId: props.authorId
}
})
}
- if (item.id == 'CONTRACT') {
+ if (item.id == 'CONTRACT') {
// props.disableBelongpeople()
navugate('/contract', {
state: {
@@ -89,7 +89,7 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
{item.icon ? (

) : <>>}
{item.name}
-
+
));
@@ -98,11 +98,13 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
{/* button 是三个黄色按钮 */}
-

+
+

+
{/*

*/}
{/*

*/}
-
{props.button.name}
+
{props.button.name}
{
props.button.handle(e);
@@ -133,7 +135,9 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
// }
}}>
{/* refunimg */}
-

+ {/*
*/}
+

+ {/*
*/}
创建
{/*
申请
*/}
{/*
申请
*/}
diff --git a/src/components/menu/menu-with-top-button.css b/src/components/menu/menu-with-top-button.css
index 89f5bbf..7bb6d76 100644
--- a/src/components/menu/menu-with-top-button.css
+++ b/src/components/menu/menu-with-top-button.css
@@ -1,82 +1,190 @@
-.menu-with-top-button {
- /* padding: 15px; */
+@media (max-width: 1550px) {
+ .menu-with-top-button {
+ /* padding: 15px; */
+ }
+
+ .menu-with-top-button .top {
+ width: 231px;
+ /* 修改 */
+ width: 191px;
+
+ height: 56px;
+ font-size: 18px;
+ /* color: #FFAF22; */
+ background: #FFFBEF;
+
+ color: #FFAF22;
+ display: flex;
+ align-items: center;
+ border-top: 1px solid #fde9ab;
+ border-bottom: 1px solid #fde9ab;
+ }
+
+ .menu-with-top-button .top .top-lift {
+ display: flex;
+ align-items: center;
+ font-size: 18px;
+ }
+
+
+
+ .menu-with-top-button .top .top-lift img {
+ width: 19px;
+ height: 19px;
+ margin-left: 14px;
+ margin-right: 13px;
+ }
+
+ .menu-with-top-button .top .top-right {
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ cursor: pointer;
+ width: 53px;
+ /* background-color: red; */
+ margin-left: 82px;
+ /* 修改 */
+ margin-left: 32px;
+
+ }
+
+ /* 修改添加 */
+ .objimg{
+ /* display: none; */
+ }
+ .menu-with-top-button .top .top-right img {
+ /* margin-left: 96px; */
+ margin-right: 10px;
+ width: 14px;
+ height: 13px;
+ }
+
+ .menu-with-top-button ul {
+ padding-top: 12px;
+ padding-bottom: 12px;
+ width: 230px;
+ /* 修改 */
+ width: 190px;
+ /* background-color:pink; */
+ }
+
+ .menu-with-top-button ul li {
+ height: 50px;
+ margin-left: 35px;
+ font-weight: 400;
+ font-size: 16px;
+ color: #313131;
+ line-height: 50px;
+ cursor: pointer;
+ /* background-color: red; */
+ text-indent: 32px;
+ /* 修改 */
+ text-indent: 22px;
+ }
+
+ .menu-with-top-button ul li.active {
+
+ width: 213px;
+ /* 修改 */
+ width: 171px;
+ height: 50px;
+ background: #FF9F08;
+ border-radius: 25px;
+ color: white;
+ text-indent: 50px;
+
+ }
+ .topIcon{
+ display: none;
+ color: white;
+ margin-left: 150px;
+
+ }
+
}
-
-.menu-with-top-button .top {
- width: 231px;
- height: 56px;
- font-size: 18px;
- /* color: #FFAF22; */
- background: #FFFBEF;
-
- color: #FFAF22;
- display: flex;
- align-items: center;
- border-top: 1px solid #fde9ab;
- border-bottom: 1px solid #fde9ab;
-}
-
-.menu-with-top-button .top .top-lift {
- display: flex;
- align-items: center;
- font-size: 18px;
-}
-
-.menu-with-top-button .top .top-lift img {
- width: 19px;
- height: 19px;
- margin-left: 14px;
- margin-right: 13px;
-}
-
-.menu-with-top-button .top .top-right {
- display: flex;
- align-items: center;
- font-size: 14px;
- cursor: pointer;
- width: 53px;
- /* background-color: red; */
- margin-left: 82px;
-
-}
-
-.menu-with-top-button .top .top-right img {
- /* margin-left: 96px; */
- margin-right: 10px;
- width: 14px;
- height: 13px;
-}
-
-.menu-with-top-button ul {
- padding-top: 12px;
- padding-bottom: 12px;
- width: 230px;
- /* background-color:pink; */
-}
-
-.menu-with-top-button ul li {
- height: 50px;
- margin-left: 35px;
- font-weight: 400;
- font-size: 16px;
- color: #313131;
- line-height: 50px;
- cursor: pointer;
- /* background-color: red; */
- text-indent: 32px;
-}
-
-.menu-with-top-button ul li.active {
- width: 213px;
- height: 50px;
- background: #FF9F08;
- border-radius: 25px;
- color: white;
- text-indent: 59px;
-}
-.topIcon{
- color: white;
- margin-left: 68px;
+@media (min-width: 1551px){
+ .menu-with-top-button {
+ /* padding: 15px; */
+ }
+
+ .menu-with-top-button .top {
+ width: 231px;
+
+
+ height: 56px;
+ font-size: 18px;
+ /* color: #FFAF22; */
+ background: #FFFBEF;
+
+ color: #FFAF22;
+ display: flex;
+ align-items: center;
+ border-top: 1px solid #fde9ab;
+ border-bottom: 1px solid #fde9ab;
+ }
+
+ .menu-with-top-button .top .top-lift {
+ display: flex;
+ align-items: center;
+ font-size: 18px;
+ }
+
+ .menu-with-top-button .top .top-lift img {
+ width: 19px;
+ height: 19px;
+ margin-left: 14px;
+ margin-right: 13px;
+ }
+
+ .menu-with-top-button .top .top-right {
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ cursor: pointer;
+ width: 53px;
+ /* background-color: red; */
+ margin-left: 82px;
+
+ }
+
+ .menu-with-top-button .top .top-right img {
+ /* margin-left: 96px; */
+ margin-right: 10px;
+ width: 14px;
+ height: 13px;
+ }
+
+ .menu-with-top-button ul {
+ padding-top: 12px;
+ padding-bottom: 12px;
+ width: 230px;
+ /* background-color:pink; */
+ }
+
+ .menu-with-top-button ul li {
+ height: 50px;
+ margin-left: 35px;
+ font-weight: 400;
+ font-size: 16px;
+ color: #313131;
+ line-height: 50px;
+ cursor: pointer;
+ /* background-color: red; */
+ text-indent: 32px;
+ }
+
+ .menu-with-top-button ul li.active {
+ width: 213px;
+ height: 50px;
+ background: #FF9F08;
+ border-radius: 25px;
+ color: white;
+ text-indent: 59px;
+ }
+ .topIcon{
+ color: white;
+ margin-left: 68px;
+ }
}
@@ -89,29 +197,3 @@
-
-
-
-
-/* .menu-with-top-button .top-button {
- width: 268px;
- height: 56px;
- background: #FFFBEF;
- font-size: 18px;
- color: #FFAF22;
-}
-
-
-
-.menu-with-top-button ul li:last-child {
- margin-bottom: 0;
-}
-
-.menu-with-top-button ul li .menu-icon {
- width: 30px;
- height: 30px;
-}
-
-.menu-with-top-button ul li .menu-name {
- padding-left: 5px;
-} */
\ No newline at end of file
diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx
index 721504a..9d2f634 100644
--- a/src/route/index/Index.tsx
+++ b/src/route/index/Index.tsx
@@ -990,7 +990,9 @@ export default function Index() {
{/*
*/}
{/*
*/}
-
+
{
setType(value)
diff --git a/src/route/index/index.css b/src/route/index/index.css
index adfd91c..21419f9 100644
--- a/src/route/index/index.css
+++ b/src/route/index/index.css
@@ -1,4 +1,9 @@
@media (min-width: 1671px) {
+ .mediaBox{
+ height: 15px;
+ width: 230px;
+ }
+
.index {
height: 100vh;
display: flex;
@@ -258,6 +263,10 @@
}
@media (max-width: 1670px) {
+ .mediaBox{
+ height: 15px;
+ width: 230px;
+ }
.index {
height: 100vh;
display: flex;
@@ -518,6 +527,10 @@
}
@media (max-width: 1550px) {
+ .mediaBox{
+ height: 15px;
+ width: 150px;
+ }
.index {
height: 100vh;
display: flex;
@@ -621,6 +634,8 @@
/* position: fixed; */
/* width: 267px; */
width: 230px;
+ /* 修改 */
+ width: 190px;
min-height: calc(100vh - 65px);
/* overflow: auto; */
/* top: 65px; */
@@ -647,6 +662,9 @@
.belongPeopleMenu-box {
min-height: 200px;
+ /* 修改 */
+ min-height: 160px;
+
/* background-color: pink; */
border-bottom: 1px solid #fde9ab;
@@ -656,6 +674,8 @@
.belongpeopleName {
color: #313131;
width: 230px;
+ /* 修改 */
+ width: 190px;
height: 40px;
text-align: left;
font-size: 16px;
@@ -675,10 +695,14 @@
.index .right {
margin-left: 250px;
+ /* 修改 */
+ margin-left: 210px;
box-sizing: border-box;
height: 100%;
position: fixed;
width: calc(100vw - 270px);
+ /* 修改 */
+ width: calc(100vw - 230px);
/* width: 1575px; */
}
@@ -785,4 +809,4 @@
.custom-pagination .ant-pagination-next {
display: inline-block;
}
-}
\ No newline at end of file
+}