From e2539cd3004681ab431907365f3707b44b76b625 Mon Sep 17 00:00:00 2001 From: RainSun Date: Thu, 20 Feb 2020 22:49:19 +0800 Subject: [PATCH] finish add --- src/views/Add/Add.vue | 398 +++++++++++++++++++++++----------------- src/views/Home/Home.vue | 45 ++++- 2 files changed, 263 insertions(+), 180 deletions(-) diff --git a/src/views/Add/Add.vue b/src/views/Add/Add.vue index 660278f..05fb06e 100644 --- a/src/views/Add/Add.vue +++ b/src/views/Add/Add.vue @@ -1,188 +1,246 @@ \ No newline at end of file + diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue index 4cb587a..89ddd97 100644 --- a/src/views/Home/Home.vue +++ b/src/views/Home/Home.vue @@ -16,8 +16,11 @@ +
+ +
- +
face @@ -45,12 +48,12 @@ settings Settings - + reply Share - + beenhere Lock Now @@ -59,6 +62,7 @@ +
- add + add {{ snakebar_msg }} @@ -101,7 +105,10 @@ export default { unlock: false, show_snackbar: false, snakebar_msg: '', - web_addr: 'https://codebook.canary.moe' + web_addr: 'https://codebook.canary.moe', + employees: [], + selectedEmployee: null, + search_start: false }; }, computed: { @@ -127,7 +134,7 @@ export default { if (Object.keys(this.row_pwd).length != 0) { // 有密码,已经输入过了 let now = new Date().getTime(); - if (now - this.row_pwd.create_time < 1000) { + if (now - this.row_pwd.create_time < 1000 * 60 * 5) { // 上次写入时间距离现在在五分钟之内 this.unlock = true; // 判断有无密码本 @@ -152,7 +159,6 @@ export default { } console.log(this.show_list.length != 0 ? '密码本存在' : '空密码本'); console.log(this.unlock ? '已解锁' : '未解锁'); - }, // 初始化用户信息 @@ -199,8 +205,8 @@ export default { // this.setRowPwd([row_pwd, this]); // console.log('主密码设置完成,返回init'); // this.init(); - if(type == '密码超时') this.$router.push({ name: "Unlock", params: { msg: 'Password validity period has expired, please re-enter.' } }) - else this.$router.push('/unlock') + if (type == '密码超时') this.$router.push({ name: 'Unlock', params: { msg: 'Password validity period has expired, please re-enter.' } }); + else this.$router.push('/unlock'); }, // 跳转到搜索界面 @@ -210,7 +216,7 @@ export default { console.log('点击搜索无内容拦截'); return; } - this.$router.push({ name: 'Search', params: { list: this.show_list } }); + this.search_start = !this.search_start }, // 跳转到添加界面 @@ -290,6 +296,25 @@ export default { padding: 0.3rem 0; border-bottom: 1px #eee solid; } + .md-toolbar { + position: fixed; + top: 0; + } + .md-toolbar-row { + order: 12; + // margin-bottom: .3rem !important; + } + .md-toolbar-section-start, + .md-toolbar-section-end, + .md-toolbar-row { + min-height: 56px; + } + .md-toolbar-row { + margin-top: -10px; + } + .md-speed-dial.md-bottom-right { + position: fixed !important; + } } // Demo purposes only .md-drawer {