diff --git a/resources/assets/js/pages/manage/components/ProjectDialog.vue b/resources/assets/js/pages/manage/components/ProjectDialog.vue
index c6581415f..edd8448e7 100644
--- a/resources/assets/js/pages/manage/components/ProjectDialog.vue
+++ b/resources/assets/js/pages/manage/components/ProjectDialog.vue
@@ -4,8 +4,10 @@
-
{{$L('项目成员')}}({{projectData.project_user.length}})
-
{{$L('查看所有')}}
+
{{$L('项目成员')}}({{projectData.project_user.length}})
+
+
+
-
@@ -45,6 +47,9 @@ export default {
methods: {
onInputBack() {
Store.set('onProjectDialogBack', null);
+ },
+ onClose() {
+ this.$store.dispatch('toggleProjectParameter', 'chat');
}
}
}
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 36b8fed37..01462d96a 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -2027,6 +2027,9 @@ export default {
* @param dialog_id
*/
getDialogMsgs({state, dispatch}, dialog_id) {
+ if (!dialog_id) {
+ return;
+ }
let dialog = state.cacheDialogs.find(({id}) => id == dialog_id);
if (!dialog) {
dialog = {
diff --git a/resources/assets/sass/pages/components/project-dialog.scss b/resources/assets/sass/pages/components/project-dialog.scss
index 6d27f7381..5c099dd35 100644
--- a/resources/assets/sass/pages/components/project-dialog.scss
+++ b/resources/assets/sass/pages/components/project-dialog.scss
@@ -7,8 +7,8 @@
position: relative;
.project-dialog-wrapper {
.dialog-user {
- margin-top: 36px;
- padding: 0 32px;
+ margin-top: 26px;
+ padding: 0 22px;
.member-head {
display: flex;
align-items: center;
@@ -21,12 +21,20 @@
color: $primary-color;
}
}
- .member-view-all {
- color: #999;
- font-size: 13px;
+ .member-close {
cursor: pointer;
+
+ .ivu-icon-ios-close {
+ font-size: 38px;
+ top: 3px;
+ right: 2px;
+ transition: all 0.2s;
+ }
+
&:hover {
- color: #777;
+ .ivu-icon-ios-close {
+ transform: rotate(-90deg);
+ }
}
}
}
@@ -55,6 +63,9 @@
}
}
}
+ .dialog-title {
+ padding: 0 20px;
+ }
.dialog-footer {
.dialog-back {
display: none;
@@ -67,11 +78,12 @@
.project-dialog {
.project-dialog-wrapper {
.dialog-user {
- margin-top: 24px;
- padding: 0 20px;
+ margin-top: 16px;
+ padding: 0 12px;
}
.dialog-title {
- padding: 0 20px;
+ padding: 0 12px;
+ height: 58px;
}
.dialog-scroller {
padding: 0 20px;
diff --git a/resources/assets/sass/pages/page-project.scss b/resources/assets/sass/pages/page-project.scss
index 08fa65fc4..0d08179c4 100644
--- a/resources/assets/sass/pages/page-project.scss
+++ b/resources/assets/sass/pages/page-project.scss
@@ -27,7 +27,7 @@
}
}
.project-dialog {
- position: absolute;
+ position: fixed;
top: 0;
left: 0;
height: 100%;