Merge branch 'feat-20220718' of http://120.77.149.83/root/bkunyun into feat-20220718

src/components/BusinessComponents/SearchInput/index.tsx

@@ -17,7 +17,7 @@ interface SearchInputProps extends OutlinedInputProps {
 const SearchInput = (props: SearchInputProps) => {
     const {
         size = "small",
-        placeholder = "输入关键词搜索",
+        placeholder = "输入关键词按回车搜索",
         fullWidth = true,
         ...other
     } = props;

src/views/Project/ProjectSetting/BaseInfo/index.module.css

@@ -41,6 +41,7 @@
   height: 82px;
   padding: 7px 12px;
   resize: none;
+  font-size: 14px;
 }
 .projectInfoSelect {
   width: 560px;

src/views/Project/ProjectSetting/BaseInfo/index.tsx

@@ -395,6 +395,14 @@ const BaseInfo = observer(() => {
 								<InputAdornment position="start">¥</InputAdornment>
 							),
 						}}
+						sx={{
+							"& .MuiOutlinedInput-input": {
+								padding: "6.5px 2px",
+							},
+							"& .MuiTypography-root": {
+								fontSize: '14px'
+							}
+						}}
 					/>
 				</div>
 				<div className={style.projectInfoListLi}>

src/views/Project/ProjectSetting/ProjectMembers/index.tsx

@@ -154,7 +154,7 @@ const ProjectMembers = observer(() => {
 			<Box className={styles.headerBox}>
 				<SearchInput
 					onKeyUp={handleKeyWordChangeKeyUp}
-					placeholder="搜索项目成员"
+					placeholder="输入项目成员按回车搜索"
 					sx={{ width: 340 }}
 				/>
 				{currentProjectStore?.currentProjectInfo?.projectRole === "OWNER" ? (

src/views/Project/ProjectWorkbench/workbenchTemplate/index.module.css

@@ -17,8 +17,7 @@
 }
 
 .templateBlock {
-	width: 21.4876%;
-	height: 160px;
+	height: 194px;
 	background: #ffffff;
 	border-radius: 4px;
 	border: 1px solid #ebedf0;
@@ -26,8 +25,39 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: space-between;
-	margin: 8px;
+	margin-bottom: 16px;
 	position: relative;
+	box-sizing: border-box;
+}
+
+@media screen and (max-width:1220px) {
+    .templateBlock {
+        width: 49%;
+		margin-right: 2%;
+    }
+	.templateBlock:nth-child(2n){
+		margin-right: 0;
+	}
+}
+
+@media screen and (min-width:1220px) and (max-width:1600px) {
+    .templateBlock {
+        width: 32.423%;
+		margin-right: 1.365%;
+    }
+	.templateBlock:nth-child(3n){
+		margin-right: 0;
+	}
+}
+
+@media screen and (min-width:1600px) {
+    .templateBlock {
+        width: 24%;
+		margin-right: 1.333%;
+    }
+	.templateBlock:nth-child(4n){
+		margin-right: 0;
+	}
 }
 
 .addTemplateMask {

src/views/Project/ProjectWorkbench/workbenchTemplate/index.tsx

@@ -101,12 +101,12 @@ const ProjectMembers = observer(() => {
 		}, 300);
 	}, [templateName, getTemplateInfo, projectIdData]);
 
-    // 回车搜索
+	// 回车搜索
 	const handleKeyWordChangeKeyUp = (e: any) => {
-        if (e.keyCode === 13) {
-            setTemplateName(e.target.value);
-        }
-    }
+		if (e.keyCode === 13) {
+			setTemplateName(e.target.value);
+		}
+	}
 
 	return (
 		<Box className={styles.headerBox}>
@@ -145,7 +145,7 @@ const ProjectMembers = observer(() => {
 				</Box>
 			)}
 			{templateList.length > 0 && (
-				<Box sx={{ display: "flex", flexWrap: "wrap", marginLeft: "-8px" }}>
+				<Box sx={{ display: "flex", flexWrap: "wrap" }}>
 					{templateList &&
 						templateList.length > 0 &&
 						templateList.map((item, key) => {