From 909fd6ae6a76ce893b8bbdd62bbe834f99d9a8ea Mon Sep 17 00:00:00 2001 From: RainSun Date: Thu, 20 Feb 2020 18:20:02 +0800 Subject: [PATCH] finish unlock --- package.json | 1 + src/App.vue | 18 +- src/assets/canary.png | Bin 0 -> 1986 bytes src/main.js | 4 + src/svg/canary.svg | 1 + src/views/Home/Home.vue | 35 ++-- src/views/Unlock/Unlock.vue | 343 ++++++++++++++++++------------------ src/views/test.js | 88 ++++----- 8 files changed, 249 insertions(+), 241 deletions(-) create mode 100644 src/assets/canary.png create mode 100644 src/svg/canary.svg diff --git a/package.json b/package.json index 1214ef6..ae3200e 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "vue-clipboard2": "^0.3.1", "vue-material": "^1.0.0-beta-11", "vue-router": "^3.1.5", + "vue-svg-icon": "^1.2.9", "vuex": "^3.1.2" }, "devDependencies": { diff --git a/src/App.vue b/src/App.vue index a33e107..25bd39f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ @@ -126,15 +126,13 @@ button { user-select: none; } .bg { - position: fixed; - top: 0; - left: 0; + position: absolute; + top: 50%; + left: 50%; z-index: -100; - height: 100%; - width: 100%; - object-fit: cover; - background-image: linear-gradient(to bottom, #eaeaea, #ababab); - background-repeat: no-repeat; - background-size: 100% 100%; + height: 5rem; + width: 5rem; + margin-top: -2.5rem; + margin-left: -2.5rem; } diff --git a/src/assets/canary.png b/src/assets/canary.png new file mode 100644 index 0000000000000000000000000000000000000000..b947ca2960fba5f234d5ec5e51edaf946ce9ceca GIT binary patch literal 1986 zcmbVNi93{Q8y}OC8NwJoDO>M&ZP7OsbB-d*B-@1ID1#%V8X`p5myxjy;Wft+mC2HW zv1VtQ7NdyBp3_V?M1{$A3KP!j`wPzXJ=gU-zvsE{-*ey3a$Uche#XvHQhdKS0)ddU zwla5sv2&-RcEe+(b5%Y9Ax5`0H~Tg8{sRBa**PPHgo`;4)()L%iq?+BY5~e;km{Ga z43_VZ9wK~MG~IpMJ!`HWYrV1N;DGRT@XZT)E;S-zKOV+tcf%3?MWeC@((c7A2$swF zD&>ObL;RxJO~;FgvuwYRF#e7;uW5@@KXp|w`_oWXFmKwa?a=(9Z{C(yUNpNf^W``D znaZb3VGyFQ$2G=3Z);dhZZ>6s={_%HwwNeRTo<>{mQU6*%M}J8&xh51jS)ATcZxGR zQ)A&+35;g8RUtIcltL@$qCFaM_8a|)*RAPeU{mOP#W7z+ZKxKC834)w`WlZ1K zFh+}$1)nNt+Yf3kBNHMNP-yvAL;NY8$N|u~IM2!PV-)QJU!7@}==@h1`OU7+hFc#g|Kg}{%14KYBp{2B*SCPAjBp9M0CRxSSU zzMBhq>?`SQ8I=evZ52zU!0bEJ8K<&!H=1b51YeL|lXxHU2+rS3A9e1tv^uQAoaDd5 z=dItRYl2DL-=7A3y8ntmOn8V!vz2{AC`LKiT%KxGLs14aQ2_iPcSrKshW9d3M66v5Hx49IB zg5!o8SPXu$lMh!hyBU}+4p{S)CJ(0y+>&M+Bq&V?Sq3fYgQbcC+g-jRLzhYYF@nc| zi!*vLXWmVc=faGnGlaJk4+F7#`!rHrEcto|_MVUio)1UfBfA(%MD?LLt3p|E1q0G_auK}XHu0;6rI*V4?RrWs ztk$8>(Npg$`u7V6`H3CtyR)HZ+8)x)HhSGc;sa{zE+SI1Zyl56gPA#gD<7KB9bdh<|#70J+#D^)6g+&BvY|GS7&T#{=0{(OXz%q>*}tlc_euBUF|82IU5 z-A~35t+4Xp%6TuNa3a6w3N8sX$7j_+w1lrPCH>l!+%3ZOc;#=f97s8R_xP|OgykYy z@t_7s$F8-D;mu6e-L^=7oj;4}N~Znnqrah6sOBnhh;~^Wbhk*|>eQ!O+1_5K*VktG zbvey7k6B5pk7ihwkvB-Y*sZn)U2;}YtrV{o5WP@01 z?$d6cJJDVKQjKkT{+m(m4X*Tv&-Ndj@N0eXkna7Zw%&zE`n%~oS<*+@BZpMvB&{zd zQYz;@WYZwfoULJ9{4)Te&;I#$Qxb=+L1bVi(}dd{-|U-s^ElYfXWeKw+aZjzZWQfI z=(Y0Yuo#UnvYb)YL^x@RJ}HX*$R!>EEh<-{TQlKDA2HrIWrfunTwd{nbHO*tyVp>U zVQ_n%oM`mg?fP!=SoQngV2vUS9i@S0B*R9EcrT}>y$;rK_og;jF-rt0(oWwOTS9MC z;nsyXP)DYAmpuT^-C{*_=D4G}Uh7tlWf1{TC#Z)1+cYpaEdh`VTuqML@Q#Nn-tzFa z*I?}7;ZG;S*vZ3_%30;uEhCM(Fnjv!RV+Uuuixu3>1p%`90yXkAD|l|DPR{sfz%eA!0E2lJOGQYD ziUu4wK;0!GqJ% \ No newline at end of file diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue index 1c8e614..69dcb22 100644 --- a/src/views/Home/Home.vue +++ b/src/views/Home/Home.vue @@ -45,10 +45,16 @@ settings Settings + reply Share + + + beenhere + Lock Now + @@ -72,7 +78,6 @@ {{ snakebar_msg }} - 重试 @@ -142,12 +147,12 @@ export default { this.turnToUnlock('密码超时'); } } else { - // 没有密码，留存本页 - this.show_list = []; - this.unlock = false; + // 没有密码，跳转到解锁界面创建密码 + this.turnToUnlock('无密码'); } console.log(this.show_list.length != 0 ? '密码本存在' : '空密码本'); console.log(this.unlock ? '已解锁' : '未解锁'); + }, // 初始化用户信息 @@ -184,15 +189,17 @@ export default { // 跳转到解锁界面 turnToUnlock(type) { console.log(type); - let main_code = '10aeff'; - let main_code_aes = encryptMainCode(main_code); - let row_pwd = { - main_code: main_code_aes, - create_time: new Date().getTime() - }; - this.setRowPwd([row_pwd, this]); - console.log('主密码设置完成，返回init'); - this.init(); + // let main_code = '10aeff'; + // let main_code_aes = encryptMainCode(main_code); + // let row_pwd = { + // main_code: main_code_aes, + // create_time: new Date().getTime() + // }; + // 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') }, // 跳转到搜索界面 @@ -228,7 +235,7 @@ export default { // 复制失败 onErrorUrl(e) { - this.snakebar_msg = '复制失败'; + this.snakebar_msg = '复制失败，夸克等浏览器复制成功仍会显示失败'; this.show_snackbar = true; } }, diff --git a/src/views/Unlock/Unlock.vue b/src/views/Unlock/Unlock.vue index 660278f..67594b1 100644 --- a/src/views/Unlock/Unlock.vue +++ b/src/views/Unlock/Unlock.vue @@ -1,188 +1,179 @@ \ No newline at end of file + diff --git a/src/views/test.js b/src/views/test.js index 552488f..9a4e0f2 100644 --- a/src/views/test.js +++ b/src/views/test.js @@ -1,41 +1,47 @@ -this.show_list = [ - { - open_count: 1, - title: 'QQ', - user_name: '1144131090', - password: 'test', - node: '测试用' - }, - { - open_count: 2, - title: '微信', - user_name: '15143211127', - password: 'test', - node: '测试用' - }, - { - open_count: 3, - title: 'WIFI', - user_name: 'admin', - password: 'test', - node: '测试用' - }, - { - open_count: 4, - title: 'WeGame', - user_name: '1144131090', - password: 'test', - node: '测试用' - } - ]; - test() { - // - // let main_code = '10aeff' - // let data_aes = encrypt(main_code, this.show_list); - // if(!this.row_data) this.setRowData([data_aes, this]) - // let main_code_aes = encryptMainCode(main_code) - // if(!this.row_pwd) this.setRowPwd([main_code_aes, this]) - // let main_code_decrpt = decryptMainCode(main_code_aes) - // let data_decrpt = decrypt(main_code_decrpt, data_aes) - // console.log(data_aes, main_code_aes, main_code_decrpt,data_decrpt) - }, \ No newline at end of file +this.show_list = [{ + open_count: 1, + title: 'QQ', + user_name: '1144131090', + password: 'test', + node: '测试用' + }, + { + open_count: 2, + title: '微信', + user_name: '15143211127', + password: 'test', + node: '测试用' + }, + { + open_count: 3, + title: 'WIFI', + user_name: 'admin', + password: 'test', + node: '测试用' + }, + { + open_count: 4, + title: 'WeGame', + user_name: '1144131090', + password: 'test', + node: '测试用' + } +]; + +function test() { + // + // let main_code = '10aeff' + // let data_aes = encrypt(main_code, this.show_list); + // if(!this.row_data) this.setRowData([data_aes, this]) + // let main_code_aes = encryptMainCode(main_code) + // if(!this.row_pwd) this.setRowPwd([main_code_aes, this]) + // let main_code_decrpt = decryptMainCode(main_code_aes) + // let data_decrpt = decrypt(main_code_decrpt, data_aes) + // console.log(data_aes, main_code_aes, main_code_decrpt,data_decrpt) +} + +let test_encode = encrypt('10aeff', '这是一段测试文本'); +console.log('加密后', test_encode) +let test_decode = decrypt('10aefs', test_encode) +console.log('解密后', test_decode) +console.log('类型', typeof(test_decode)) // 密码错误就是空字符串