+
@@ -163,10 +163,13 @@ export default {
},
computed: {
- ...mapState(['userId', 'cacheDialogs']),
+ ...mapState(['userId', 'cacheDialogs', 'windowMax768']),
dialogId() {
const {dialogId} = this.$route.params;
+ if (dialogId && !/^\d+$/.test(dialogId)) {
+ this.tabActive = dialogId
+ }
return parseInt(/^\d+$/.test(dialogId) ? dialogId : 0);
},
@@ -314,7 +317,9 @@ export default {
},
openContacts(user) {
- this.tabActive = 'dialog';
+ if (!this.windowMax768) {
+ this.tabActive = 'dialog';
+ }
this.$store.dispatch("openDialogUserid", user.userid).then(({data}) => {
this.openDialog(data.id)
});
diff --git a/resources/assets/js/pages/manage/project.vue b/resources/assets/js/pages/manage/project.vue
index b148b5390..00fe33504 100644
--- a/resources/assets/js/pages/manage/project.vue
+++ b/resources/assets/js/pages/manage/project.vue
@@ -1,7 +1,10 @@
@@ -9,8 +12,9 @@
import {mapState, mapGetters} from "vuex";
import ProjectList from "./components/ProjectList";
import ProjectDialog from "./components/ProjectDialog";
+import ProjectAll from "./components/ProjectAll";
export default {
- components: {ProjectDialog, ProjectList},
+ components: {ProjectAll, ProjectDialog, ProjectList},
deactivated() {
this.$store.dispatch("forgetTaskCompleteTemp", true);
@@ -20,6 +24,10 @@ export default {
...mapState(['cacheProjects', 'wsOpenNum']),
...mapGetters(['projectData']),
+ routeName() {
+ return this.$route.name
+ },
+
projectId() {
const {projectId} = this.$route.params;
return parseInt(/^\d+$/.test(projectId) ? projectId : 0);
diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue
index b2a1e5dd1..7ef196c3f 100644
--- a/resources/assets/js/pages/manage/setting/index.vue
+++ b/resources/assets/js/pages/manage/setting/index.vue
@@ -5,8 +5,8 @@
@@ -46,17 +46,22 @@ import {Store} from "le5le-store";
export default {
data() {
return {
- routeName: this.$route.name,
show768Menu: true,
version: window.systemInfo.version
}
},
+
mounted() {
},
+
computed: {
- ...mapState(['userInfo', 'userIsAdmin', 'clientNewVersion']),
+ ...mapState(['userInfo', 'userIsAdmin', 'clientNewVersion', 'windowMax768']),
+
+ routeName() {
+ return this.$route.name
+ },
menu() {
let menu = [
@@ -83,11 +88,21 @@ export default {
return name || '设置';
}
},
+
watch: {
- '$route' (route) {
- this.routeName = route.name;
+ routeName: {
+ handler(name) {
+ if (name === 'manage-setting') {
+ if (!this.windowMax768) {
+ this.goForward({name: 'manage-setting-personal'}, true);
+ }
+ this.show768Menu = true;
+ }
+ },
+ immediate: true
}
},
+
methods: {
toggleRoute(path) {
if (path == 'version') {
@@ -100,7 +115,7 @@ export default {
classNameRoute(path, divided) {
return {
- "active": this.routeName === `manage-setting-${path}`,
+ "active": !this.windowMax768 && this.routeName === `manage-setting-${path}`,
"divided": !!divided
};
},
diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js
index 46312b551..d14c513ca 100755
--- a/resources/assets/js/routes.js
+++ b/resources/assets/js/routes.js
@@ -28,14 +28,10 @@ export default [
component: () => import('./pages/manage/messenger.vue'),
},
{
+ name: 'manage-setting',
path: 'setting',
component: () => import('./pages/manage/setting/index.vue'),
children: [
- {
- name: 'manage-setting',
- path: '',
- redirect: 'personal',
- },
{
name: 'manage-setting-personal',
path: 'personal',
diff --git a/resources/assets/sass/components/_.scss b/resources/assets/sass/components/_.scss
index 1c3ac5523..04a41cf6b 100644
--- a/resources/assets/sass/components/_.scss
+++ b/resources/assets/sass/components/_.scss
@@ -3,6 +3,7 @@
@import "drawer-overlay";
@import "img-update";
@import "loading";
+@import "mobile";
@import "scroller-y";
@import "spinner";
@import "t-editor";
diff --git a/resources/assets/sass/components/mobile.scss b/resources/assets/sass/components/mobile.scss
new file mode 100644
index 000000000..38425cb45
--- /dev/null
+++ b/resources/assets/sass/components/mobile.scss
@@ -0,0 +1,47 @@
+.mobile-tabbar {
+ display: none;
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ background-color: #f3f6fe;
+ box-shadow: 0 0 2px rgba(28, 34, 43, 0.15);
+ z-index: 99;
+ > ul {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 0;
+ margin: 0;
+ height: 60px;
+ > li {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ color: $primary-text-color;
+ .taskfont {
+ font-size: 24px;
+ line-height: 34px;
+ }
+ .tabbar-title {
+ font-size: 12px;
+ line-height: 18px;
+ }
+ &.active {
+ color: $primary-color;
+ }
+ }
+ }
+}
+
+@media (max-width: 640px) {
+ .mobile-tabbar {
+ display: block;
+ }
+}
diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss
index 2d50fd1a8..9797e8665 100644
--- a/resources/assets/sass/pages/page-dashboard.scss
+++ b/resources/assets/sass/pages/page-dashboard.scss
@@ -281,3 +281,17 @@
}
}
}
+@media (max-width: 640px) {
+ .page-dashboard {
+ .dashboard-wrapper {
+ max-height: 96%;
+ .dashboard-hello,
+ .dashboard-desc ,
+ .dashboard-block ,
+ .dashboard-list .dashboard-title,
+ .dashboard-list .dashboard-ul {
+ max-width: 96%;
+ }
+ }
+ }
+}
diff --git a/resources/assets/sass/pages/page-login.scss b/resources/assets/sass/pages/page-login.scss
index a6649c505..58b4d41f5 100644
--- a/resources/assets/sass/pages/page-login.scss
+++ b/resources/assets/sass/pages/page-login.scss
@@ -18,8 +18,8 @@
overflow: auto;
.login-logo {
flex-shrink: 0;
- width: 68px;
- height: 68px;
+ width: 84px;
+ height: 84px;
background: url("../images/logo.svg") no-repeat center center;
background-size: contain;
&.can-click {
@@ -27,8 +27,9 @@
}
}
.login-box {
- margin-top: 32px;
+ margin-top: 36px;
width: 400px;
+ max-width: 90%;
border-radius: 12px;
background-color: #ffffff;
box-shadow: 0 0 10px #e6ecfa;
@@ -105,6 +106,7 @@
display: flex;
align-items: center;
width: 388px;
+ max-width: 90%;
.login-setting {
flex-shrink: 0;
display: flex;
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index d528061b5..60ab1505d 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -416,3 +416,15 @@
}
}
}
+@media (max-width: 640px) {
+ .page-manage {
+ &.show-tabbar {
+ .manage-box-main {
+ margin-bottom: 60px;
+ }
+ }
+ .manage-mini-menu {
+ display: none;
+ }
+ }
+}
diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss
index 1a552acc4..29c644a6b 100644
--- a/resources/assets/sass/pages/page-messenger.scss
+++ b/resources/assets/sass/pages/page-messenger.scss
@@ -439,3 +439,16 @@
}
}
}
+
+@media (max-width: 640px) {
+ .page-messenger {
+ .messenger-wrapper {
+ .messenger-select {
+ .messenger-menu {
+ height: 60px;
+ border-top: 0;
+ }
+ }
+ }
+ }
+}
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index f4b7767c6..f350801ec 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -302,3 +302,20 @@
}
}
}
+
+@media (max-width: 640px) {
+ .page-setting {
+ .setting-item {
+ .setting-footer {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ > button {
+ flex: 1;
+ height: 42px;
+ line-height: 40px;
+ }
+ }
+ }
+ }
+}
diff --git a/resources/assets/statics/public/css/fonts/taskfont.ttf b/resources/assets/statics/public/css/fonts/taskfont.ttf
index a7886ef23..523a6fa2c 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont.ttf and b/resources/assets/statics/public/css/fonts/taskfont.ttf differ
diff --git a/resources/assets/statics/public/css/fonts/taskfont.woff b/resources/assets/statics/public/css/fonts/taskfont.woff
index f40f4161c..b7d38974e 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont.woff and b/resources/assets/statics/public/css/fonts/taskfont.woff differ
diff --git a/resources/assets/statics/public/css/fonts/taskfont.woff2 b/resources/assets/statics/public/css/fonts/taskfont.woff2
index 532c1ed41..b7feab22f 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont.woff2 and b/resources/assets/statics/public/css/fonts/taskfont.woff2 differ