diff --git a/docker-compose.yml b/docker-compose.yml index bb8179551..2374d8710 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,7 +96,7 @@ services: appstore: container_name: "dootask-appstore-${APP_ID}" privileged: true - image: "dootask/appstore:0.1.1" + image: "dootask/appstore:0.1.2" volumes: - shared_data:/usr/share/dootask - /var/run/docker.sock:/var/run/docker.sock diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue index 30d8ff13c..713e10a03 100644 --- a/resources/assets/js/pages/manage/components/TeamManagement.vue +++ b/resources/assets/js/pages/manage/components/TeamManagement.vue @@ -3,8 +3,12 @@
{{$L('团队管理')}}
- - + + + + + +
diff --git a/resources/assets/sass/components/img-update.scss b/resources/assets/sass/components/img-update.scss index 6295c33f9..0ade2f80e 100644 --- a/resources/assets/sass/components/img-update.scss +++ b/resources/assets/sass/components/img-update.scss @@ -12,20 +12,22 @@ } } +.common-img-update { + display: flex; + flex-wrap: wrap; + gap: 12px; +} + .imgcomp-upload-list { display: inline-block; width: 60px; height: 60px; text-align: center; line-height: 60px; - border: 1px solid transparent; border-radius: 4px; overflow: hidden; background: #fff; position: relative; - box-shadow: 0 1px 1px rgba(0, 0, 0, .2); - margin-right: 4px; - vertical-align: top; .imgcomp-upload-img { position: absolute; @@ -48,19 +50,19 @@ flex-direction: row; align-items: center; justify-content: center; - } - .imgcomp-upload-list-cover i { - color: #fff; - font-size: 24px; - cursor: pointer; - vertical-align: middle; - margin: 0; - transition: all .2s; - } + i { + color: #fff; + font-size: 24px; + cursor: pointer; + vertical-align: middle; + margin: 0; + transition: all .2s; - .imgcomp-upload-list-cover i:hover { - font-size: 28px; + &:hover { + font-size: 28px; + } + } } .ivu-progress { @@ -119,6 +121,10 @@ justify-content: center; width: 100%; height: 100%; + + > i { + pointer-events: none; + } } .add-box-upload { diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 92fc77b0b..b1eee3668 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -378,6 +378,7 @@ background-color: #ffffff; display: flex; align-items: center; + border-radius: 18px; .search-location { margin-left: 14px; display: flex; diff --git a/resources/assets/sass/pages/components/team-management.scss b/resources/assets/sass/pages/components/team-management.scss index 50d9033b6..7cbc62571 100644 --- a/resources/assets/sass/pages/components/team-management.scss +++ b/resources/assets/sass/pages/components/team-management.scss @@ -23,11 +23,27 @@ align-items: center; height: 20px; line-height: 20px; - margin-left: 6px; + margin-left: 12px; - > i { + > span { cursor: pointer; - font-size: 24px; + border: 1px solid #d9d9d9; + border-radius: 6px; + width: 26px; + height: 26px; + padding: 4px; + display: flex; + align-items: center; + justify-content: center; + + &:hover { + background-color: #f5f5f5; + } + + > svg { + width: 18px; + height: 18px; + } } } diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss index 8fb35ab77..819b70915 100644 --- a/resources/assets/sass/pages/page-apply.scss +++ b/resources/assets/sass/pages/page-apply.scss @@ -88,8 +88,6 @@ } @media (max-width: 510px) { - background-color: #FFFFFF; - .apply-row-title { margin-bottom: 8px !important; } @@ -128,7 +126,6 @@ } } } - } } @@ -513,17 +510,21 @@ body.window-portrait { .page-apply { - .apply-head { - margin: 24px 24px 0 24px; - } + .apply-wrapper { + background-color: #FFFFFF; - .apply-content { - padding: 16px 20px; + .apply-head { + margin: 24px 24px 0 24px; + } - .apply-col { - > div { - font-size: 12px; - font-weight: 500; + .apply-content { + padding: 16px 20px; + + .apply-col { + > div { + font-size: 12px; + font-weight: 500; + } } } } diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss index 8d465e683..f10d466fd 100644 --- a/resources/assets/sass/pages/page-manage.scss +++ b/resources/assets/sass/pages/page-manage.scss @@ -488,6 +488,12 @@ body.window-portrait { .manage-box-menu { display: none; } + .manage-box-main { + .manage-status-bar, + .manage-navigation-bar { + display: none; + } + } &.show-tabbar { .manage-box-main { margin-bottom: 60px;