+
+
+
+
-
-
-
-
-
+ clearable/>
-
-
-
-
-
+ clearable/>
@@ -496,9 +490,13 @@ export default {
}
},
- dialogLoading({loadDialogs, dialogSearchLoad}) {
- return loadDialogs > 0 || dialogSearchLoad > 0
- }
+ searchLoading({tabActive, loadDialogs, dialogSearchLoad, contactsLoad}) {
+ if (tabActive==='dialog') {
+ return loadDialogs > 0 || dialogSearchLoad > 0
+ } else {
+ return contactsLoad > 0
+ }
+ },
},
watch: {
diff --git a/resources/assets/sass/components/user-select.scss b/resources/assets/sass/components/user-select.scss
index 1c6f604c7..4d63e706c 100755
--- a/resources/assets/sass/components/user-select.scss
+++ b/resources/assets/sass/components/user-select.scss
@@ -152,15 +152,21 @@
}
.search-input {
- .ivu-input {
- height: 36px;
- border-color: #f4f5f7;
- background-color: #f4f5f7;
- }
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #f4f5f7;
+ border-radius: 6px;
+ height: 36px;
+ padding: 0 6px;
.search-pre {
- width: 100%;
- height: 100%;
+ width: 32px;
+ height: 32px;
+ margin-right: -6px;
+ font-size: 16px;
+ color: #808695;
display: flex;
align-items: center;
justify-content: center;
@@ -171,6 +177,15 @@
margin: 0;
}
}
+
+ .ivu-input {
+ border-color: transparent;
+ background-color: transparent;
+ &:hover,
+ &:focus {
+ box-shadow: none;
+ }
+ }
}
}
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 32c0efea3..c0a96a5c6 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -390,6 +390,7 @@
}
.search-input {
flex: 1;
+ padding: 0 6px;
margin-left: 12px;
border-radius: 12px;
background-color: #F7F7F7;
@@ -397,13 +398,18 @@
position: relative;
display: flex;
align-items: center;
+ justify-content: center;
.search-pre {
- width: 100%;
- height: 100%;
+ width: 32px;
+ height: 32px;
+ margin-right: -6px;
+ font-size: 16px;
+ color: #808695;
display: flex;
align-items: center;
justify-content: center;
+
.common-loading {
width: 14px;
height: 14px;
diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
index 8a0a476ea..10c5c84f0 100644
--- a/resources/assets/sass/pages/components/project-list.scss
+++ b/resources/assets/sass/pages/components/project-list.scss
@@ -18,14 +18,20 @@
.search-wrapper {
flex: 1;
background-color: #ffffff;
- padding: 0 8px;
+ padding: 0 6px;
margin: 0 4px;
border-radius: 12px;
overflow: hidden;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.search-pre {
- width: 100%;
- height: 100%;
+ width: 32px;
+ height: 32px;
+ margin-right: -6px;
+ font-size: 16px;
+ color: #808695;
display: flex;
align-items: center;
justify-content: center;
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index ec2e592e8..e1dd07edb 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -216,23 +216,20 @@
}
.manage-project-search {
width: 80%;
- padding: 0 3px;
+ padding: 0 6px;
margin: 8px 0 -2px;
border-radius: 12px;
background-color: #ffffff;
overflow: hidden;
- .ivu-input {
- padding-left: 30px;
- border-color: transparent;
- background-color: transparent;
- &:hover,
- &:focus {
- box-shadow: none;
- }
- }
+ display: flex;
+ align-items: center;
+ justify-content: center;
.search-pre {
- width: 100%;
- height: 100%;
+ width: 32px;
+ height: 32px;
+ margin-right: -6px;
+ font-size: 16px;
+ color: #808695;
display: flex;
align-items: center;
justify-content: center;
@@ -242,6 +239,14 @@
margin: 0;
}
}
+ .ivu-input {
+ border-color: transparent;
+ background-color: transparent;
+ &:hover,
+ &:focus {
+ box-shadow: none;
+ }
+ }
}
.manage-box-new-group {
width: 80%;
diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss
index 63230fc1d..3442c532d 100644
--- a/resources/assets/sass/pages/page-messenger.scss
+++ b/resources/assets/sass/pages/page-messenger.scss
@@ -33,13 +33,19 @@
.search-wrapper {
flex: 1;
background-color: #F7F7F7;
- padding: 0 8px;
+ padding: 0 6px;
margin: 0 4px;
border-radius: 12px;
overflow: hidden;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.search-pre {
- width: 100%;
- height: 100%;
+ width: 32px;
+ height: 32px;
+ margin-right: -6px;
+ font-size: 16px;
+ color: #808695;
display: flex;
align-items: center;
justify-content: center;