diff --git a/public/tools/map/main.js b/public/tools/map/main.js
index 4ffbfbd63..b297e110c 100644
--- a/public/tools/map/main.js
+++ b/public/tools/map/main.js
@@ -527,7 +527,7 @@ class BaiduMapPicker {
// 按距离排序(如果有距离信息)
pois.sort((a, b) => {
if (a.distance_current && b.distance_current) {
- return a.distance_current - b.distance_current;
+ return $A.sortFloat(a.distance_current, b.distance_current);
}
return 0;
});
diff --git a/resources/assets/js/components/SearchBox.vue b/resources/assets/js/components/SearchBox.vue
index c92e5985c..6cca59172 100755
--- a/resources/assets/js/components/SearchBox.vue
+++ b/resources/assets/js/components/SearchBox.vue
@@ -18,7 +18,9 @@
-
+
diff --git a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue
index 7164ea7ac..4efc78c07 100644
--- a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue
+++ b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue
@@ -1,8 +1,10 @@
-
{{$L('群名')}}
-
-
{{dialogData.name}}
+
+
{{$L('群名')}}
+
+ {{dialogData.name}}
+
{{$L('群组 ID')}}
diff --git a/resources/assets/sass/components/search-box.scss b/resources/assets/sass/components/search-box.scss
index 82226b9d1..80577886b 100755
--- a/resources/assets/sass/components/search-box.scss
+++ b/resources/assets/sass/components/search-box.scss
@@ -6,9 +6,6 @@
max-width: none;
.ivu-modal-content {
- margin-top: 46px;
- border-top-left-radius: 18px !important;
- border-top-right-radius: 18px !important;
.ivu-modal-body {
@@ -84,13 +81,23 @@
}
.search-close {
- font-size: 16px;
- color: #808695;
cursor: pointer;
padding: 0 16px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ > i {
+ color: #808695;
+ font-size: 16px;
+ transition: transform 0.3s;
+ }
&:hover {
- color: #303133;
+ > i {
+ color: #303133;
+ transform: rotate(-90deg);
+ }
}
}
}
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 1dca7cd13..3f0fd6c62 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -290,6 +290,7 @@ body {
padding-bottom: 0;
.ivu-modal-content {
border-radius: 0;
+ box-shadow: none;
}
}
diff --git a/resources/assets/sass/pages/components/dialog-group-info.scss b/resources/assets/sass/pages/components/dialog-group-info.scss
index 1910d3658..146fff3f2 100644
--- a/resources/assets/sass/pages/components/dialog-group-info.scss
+++ b/resources/assets/sass/pages/components/dialog-group-info.scss
@@ -8,13 +8,22 @@
bottom: 0;
overflow: auto;
+ .dialog-group-head {
+ position: sticky;
+ top: 0;
+ z-index: 2;
+ margin-bottom: -8px;
+ padding-bottom: 8px;
+ background: #fff;
+ }
+
.group-info-title {
color: #b7b1b1;
margin: 18px 24px 0;
}
.group-info-value {
- margin: 4px 24px 0;
+ margin: 2px 24px 0;
line-height: 34px;
.quick-text {
@@ -33,11 +42,7 @@
}
.group-info-search {
- background: #fff;
- margin: 24px 24px 0;
- position: sticky;
- top: 0;
- z-index: 9;
+ margin: 20px 24px 0;
}
.group-info-user {