From 8eef1d2a4b32963d55737064be6a62dc05a7ce7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Thu, 13 Jan 2022 17:23:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=92=B1=E5=8C=85=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=A9=E8=AE=B0=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/user.js | 2 +- apis/interfaces/wallet.js | 31 +++++- pages.json | 16 +++ pages/user/index.vue | 49 +++++++-- pages/wallet/create.vue | 7 +- pages/wallet/mnemonic.vue | 10 +- pages/wallet/privatekey.vue | 35 ++++--- pages/wallet/property.vue | 40 +++----- pages/wallet/resetPassword.vue | 182 ++++++++++++++++----------------- 9 files changed, 220 insertions(+), 152 deletions(-) diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index da02903..b94d2ab 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -10,7 +10,7 @@ import { request } from '../index' // 用户 const info = () =>{ return request({ - url: 'user/info' + url: 'user' }) } diff --git a/apis/interfaces/wallet.js b/apis/interfaces/wallet.js index 67c6e49..b40a74f 100644 --- a/apis/interfaces/wallet.js +++ b/apis/interfaces/wallet.js @@ -50,10 +50,39 @@ const securityCheck = (password) => { }) } +// 钱包私钥 +const privatekey = (code) => { + return request({ + url : "chain/safe/private_key", + data: { + code + } + }) +} + +// 私钥规则 +const keyrules = () => { + return request({ + url: 'cms/keyrules' + }) +} + +// 修改密码 +const securityReset = (data) => { + return request({ + url : "chain/safe/security", + method: 'PUT', + data:data + }) +} + export { security, seed, sum, logs, - securityCheck + securityCheck, + privatekey, + keyrules, + securityReset } diff --git a/pages.json b/pages.json index 4550cad..241a7d1 100644 --- a/pages.json +++ b/pages.json @@ -332,6 +332,22 @@ "navigationBarBackgroundColor":"#FFFFFF", "enablePullDownRefresh": false } + },{ + "path": "pages/wallet/privatekey", + "name": "WalletPrivatekey", + "style": { + "navigationBarTitleText": "钱包私钥", + "navigationBarBackgroundColor":"#FFFFFF", + "enablePullDownRefresh": false + } + },{ + "path": "pages/wallet/resetPassword", + "name": "ResetPassword", + "style": { + "navigationBarTitleText": "修改钱包密码", + "navigationBarBackgroundColor":"#FFFFFF", + "enablePullDownRefresh": false + } }], "tabBar": { "borderStyle": "white", diff --git a/pages/user/index.vue b/pages/user/index.vue index fec7a91..b762af9 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -34,7 +34,7 @@ direction="column" > - 开通 + 开通 @@ -84,7 +84,7 @@ - + + + + ZH钱包 + @@ -106,17 +111,16 @@ - - - 设置 - - 退出登录 + + ZH生态俱乐部 + All Rights Reserved. ZH Eco Club + @@ -141,12 +145,36 @@ getInfo(){ if(this.$store.state.token === '') return info().then(res => { + console.log(res) uni.setNavigationBarTitle({ title: res.nickname }) + this.userInfo = res + }).catch(err => { + uni.showToast({ + title: err.message, + icon : 'none' + }) }) }, + // 开通会员 + openVip(){ + if(this.$store.state.token === ''){ + this.Login() + return + } + console.log("开通会员") + }, + // 开通钱包 + onWallet(){ + if(this.$store.state.token === ''){ + this.Login() + return + } + if(this.userInfo.is_wallet) this.$Router.push({name: 'WalletProperty'}) + else this.$Router.push({name: 'WalletAdd'}) + }, // 登录 Login(){ const Auth = new userAuth() @@ -165,6 +193,13 @@ background: $window-color; min-height: 100vh; } + // 版权信息 + .footer-text{ + text-align: center; + font-size: $title-size-sm; + padding: $padding $padding $padding*2; + color: $text-gray-m; + } // 用户信息 .info-box{ position: relative; diff --git a/pages/wallet/create.vue b/pages/wallet/create.vue index 6750dbc..bafea4f 100644 --- a/pages/wallet/create.vue +++ b/pages/wallet/create.vue @@ -14,7 +14,7 @@ - + @@ -50,10 +50,7 @@ export default { code: Number(this.password) }).then(res => { this.$Router.replace({ - name: 'WalletMnemonic', - params: { - code: this.password - } + name: 'WalletProperty' }) }).catch(err => { uni.showToast({ diff --git a/pages/wallet/mnemonic.vue b/pages/wallet/mnemonic.vue index c40ec71..16d7dd0 100644 --- a/pages/wallet/mnemonic.vue +++ b/pages/wallet/mnemonic.vue @@ -9,7 +9,7 @@ 注：助记词是用户账户的唯一标识，不能分享给他人，掌握该助记词即可控制该账户与钱包 - + @@ -19,18 +19,14 @@ export default { data() { return { - mnemonic: [], // 助记词 - sign : '' // 校验签名 + mnemonic: [] } }, mounted() { - // this.$Route.query.code seed({ - code: 123456 + code: this.$Route.query.password }).then(res => { - console.log(res) this.mnemonic = res.seed.split(' ') - this.sign = res.sign }).catch(err => { uni.showToast({ icon: 'none', diff --git a/pages/wallet/privatekey.vue b/pages/wallet/privatekey.vue index 0cd040c..7c3def9 100644 --- a/pages/wallet/privatekey.vue +++ b/pages/wallet/privatekey.vue @@ -2,7 +2,7 @@ - 您已接收OC Chain托管 + 您的ZH托管钱包 {{key || '-'}} 复制我的私钥 @@ -14,9 +14,9 @@ - + @@ -26,15 +26,26 @@ data() { return { key: "", - rules: [] + rules: [ + { + title: "什么是托管钱包？", + description: "托管钱包顾名思义就是用户把私钥和数字资产委托给其他机构管理，也就是就是通过中心化的方式安全管理并保存资产，本质上是与区块链所追求的去中心化相背离的。" + }, + { + title: "什么是钱包私钥？", + description: "作为管理和使用加密货币最关键的东西，私钥对所有数字货币用户而言具有所有权，拥有私钥才能支配相应的加密资产。" + } + ] }; }, mounted() { - Promise.all([privatekey(this.$Route.query.password), keyrules()]).then(res => { - let privatekey = res[0], - keyrules = res[1] - this.key = privatekey.private_key - this.rules = keyrules + privatekey(this.$Route.query.password).then(res => { + this.key = res.private_key + }).catch(err => { + uni.showToast({ + title: err.message, + icon : 'none' + }) }) }, methods:{ @@ -63,11 +74,11 @@ .key{ padding: $padding * 2 0; text-align: center; - color: $mian-color; + color: $main-color; word-wrap: break-word; } .copykey{ - background-color: $mian-color; + background-color: $main-color; color: white; height: 95rpx; line-height: 95rpx; @@ -88,7 +99,7 @@ font-size: $title-size + 2; } .content{ - color: $text-gray-lg; + color: $text-gray; font-size: $title-size-m; line-height: 40rpx; } diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue index c66b066..57da764 100644 --- a/pages/wallet/property.vue +++ b/pages/wallet/property.vue @@ -50,7 +50,7 @@ logs : [], logsType : 0, password : '', - passwordShow : true, + passwordShow : false, passwordPages: '' }; }, @@ -90,17 +90,18 @@ return } securityCheck(this.password).then(res => { + switch (this.passwordPages){ + case 'privatekey': + this.$Router.push({name:'WalletPrivatekey', params: {password: this.password}}) + break; + case 'ResetPassword': + this.$Router.push({name:'ResetPassword', params: {password: this.password}}) + break; + case 'WalletMnemonic': + this.$Router.push({name:'WalletMnemonic', params: {password: this.password}}) + break; + } this.resetPassword() - console.log("密码验证通过") - - // switch (this.passwordPages){ - // case 'privatekey': - // this.$Router.push({name:'Privatekey', params: {password: this.password}}) - // break; - // case 'resetPassword': - // this.$Router.push({name:'ResetPassword', params: {password: this.password}}) - // break; - // } }).catch(err => { uni.showToast({ title: err.message, @@ -145,18 +146,11 @@ itemList: ['导出助记词', '修改密码'], success: (res) => { switch (res.tapIndex) { - case 0: - this.$Router.push({ - name: 'Transfer' - }) + case 0: + this.showPrivatekey('WalletMnemonic') break; - case 1: - this.$Router.push({ - name: 'WalletCode' - }) - break; - case 3: - this.showPrivatekey('resetPassword') + case 1: + this.showPrivatekey('ResetPassword') break; } uni.hideLoading() @@ -270,7 +264,7 @@ color: $main-color; margin: 0 $margin; border-radius: $radius-m; - font-size: $title-size; + font-size: $title-size-lg; } } } diff --git a/pages/wallet/resetPassword.vue b/pages/wallet/resetPassword.vue index 2ba8f6f..9459488 100644 --- a/pages/wallet/resetPassword.vue +++ b/pages/wallet/resetPassword.vue @@ -1,30 +1,26 @@ -