diff --git a/src/assets/icons/CSearch.svg b/src/assets/icons/CSearch.svg
new file mode 100644
index 00000000..96a25348
--- /dev/null
+++ b/src/assets/icons/CSearch.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/component/common/TableSearchBar.vue b/src/component/common/TableSearchBar.vue
index 8e17d8d6..d377f12c 100644
--- a/src/component/common/TableSearchBar.vue
+++ b/src/component/common/TableSearchBar.vue
@@ -19,7 +19,8 @@
@keydown.enter="handleSearch"
:placeholder="placeholder"
/>
-
+
+
@@ -109,17 +110,21 @@ const handleSearch = () => {
height: 100%;
padding-left: 3rem;
border-radius: 4rem;
+ // line-height: 4rem;
width: calc(100% - 2rem);
// placeholder的fontsize设置为1.4rem
&::placeholder {
- font-size: 1.4rem;
+ font-size: 1.6rem;
}
&::-webkit-input-placeholder{
- font-size: 1.4rem;
+ font-size: 1.6rem;
}
}
.search_input_icon {
font-size: 2rem;
+ color: #000;
+ width: initial;
+ height: initial;
}
}
}
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 7758eea1..3c665bb8 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -55,14 +55,20 @@
-
- {{ $t('Habit.currentProject') }}
-
{
- if(!currentProjectPath.value) return true
- if(route.fullPath === currentProjectPath.value) return true
- return false
+ const disabledCurrentProject = computed(() => {
+ if (!currentProjectPath.value) return true
+
+ return false
})
- const handleNavigateToCurrentProject = () => {
- console.log('store地址',currentProjectPath.value,'当前路径',route.fullPath)
+ const currentProjectActive = computed(() => {
+ return currentProjectPath.value === route.fullPath
+ })
+
+ const handleNavigateToCurrentProject = () => {
+ if (currentProjectActive.value) return
if (currentProjectPath.value) {
router.push(currentProjectPath.value)
}
@@ -1047,8 +1058,9 @@ export default defineComponent({
newProject,
bathGeneration,
toUserManual,
- currentProjectPath,
- disabledCurrentProject,
+ currentProjectPath,
+ disabledCurrentProject,
+ currentProjectActive,
handleNavigateToCurrentProject
}
},
@@ -2190,23 +2202,42 @@ export default defineComponent({
}
.current-projct {
- // text-align: center;
- padding: 1.2rem;
- font-size: 1.8rem;
+ font-size: 2rem;
cursor: pointer;
- font-weight: 500;
+ border: 2px solid rgba(0, 0, 0, 0.1);
border-radius: 2rem;
- border: 2px solid #000;
- text-align: center;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 25.1rem;
+ padding: calc(2rem - 2px) 0;
+ margin-top: 2rem;
+ &.filled {
+ background-color: #fff;
+ }
+
+ .current-project-icon {
+ margin-right: 1.3rem;
+ }
&.disabled {
- color: #a5b0c2;
- border-color: #a5b0c2;
+ color: #9a9a9a;
+ border-color: rgba(0, 0, 0, 0.1);
+ background: #f5f5f5;
+ cursor: not-allowed;
+ }
+ &.active {
cursor: not-allowed;
}
- &:hover {
- background: #fff;
+ &.filled:hover {
+ border-color: rgba(0, 0, 0, 0.5);
}
}
+.divider {
+ width: 100%;
+ height: 1px;
+ margin-top: 3rem;
+ background-color: rgba(0, 0, 0, 0.1);
+}