完善钱包模块，修改密码，导出助记词

2022-01-13 17:23:22 +08:00
parent ae0179af3c
commit 8eef1d2a4b
9 changed files with 220 additions and 152 deletions
--- 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'
 	})
 }

--- 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
 }
--- 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",
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -34,7 +34,7 @@
 					direction="column"
 				></u-notice-bar>
 			</view>
-			<view class="btn">开通</view>
+			<view class="btn" @click="openVip">开通</view>
 		</view>
 		<!-- 健康数据 -->
 		<view class="health-flex">
@@ -84,7 +84,7 @@
 		</view>
 		<!-- 功能块 -->
 		<view class="btns-box">
-			<view class="btns-box-item" @click="$Router.push({name: 'WalletAdd'})">
+			<!-- <view class="btns-box-item" @click="$Router.push({name: 'WalletAdd'})">
 				<image class="icon" src="@/static/user/icon_00.png" mode="widthFix"></image>
 				ZH钱包(首次)
 				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
@@ -93,6 +93,11 @@
 				<image class="icon" src="@/static/user/icon_00.png" mode="widthFix"></image>
 				ZH钱包（钱包）
 				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
+			</view> -->
+			<view class="btns-box-item" @click="onWallet">
+				<image class="icon" src="@/static/user/icon_00.png" mode="widthFix"></image>
+				ZH钱包
+				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
 			</view>
 			<view class="btns-box-item">
 				<image class="icon" src="@/static/user/icon_00.png" mode="widthFix"></image>
@@ -106,17 +111,16 @@
 			</view>
 		</view>
 		<view class="btns-box">
-			<view class="btns-box-item">
-				<image class="icon" src="@/static/user/icon_03.png" mode="widthFix"></image>
-				设置
-				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
-			</view>
 			<view class="btns-box-item" @click="logOut">
 				<image class="icon" src="@/static/user/icon_03.png" mode="widthFix"></image>
 				退出登录
 				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
 			</view>
 		</view>
+		<view class="footer-text">
+			<view>ZH生态俱乐部</view>
+			<view>All Rights Reserved. ZH Eco Club</view>
+		</view>
 	</view>
 </template>

@@ -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;
--- a/pages/wallet/create.vue
+++ b/pages/wallet/create.vue
@@ -14,7 +14,7 @@
 		</view>
 		<!-- 按钮 -->
 		<view class="buttons">
-			<button type="default" form-type="submit" @click="createWallet">确认</button>
+			<button type="default" form-type="submit" @click="createWallet">确认激活</button>
 		</view>
 	</view>
 </template>
@@ -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({
--- a/pages/wallet/mnemonic.vue
+++ b/pages/wallet/mnemonic.vue
@@ -9,7 +9,7 @@
 		<!-- 按钮 -->
 		<view class="buttons">
 			<view class="text">注：助记词是用户账户的唯一标识，不能分享给他人，掌握该助记词即可控制该账户与钱包</view>
-			<button type="default" @click="goto">验证助记词</button>
+			<!-- <button type="default" @click="goto">验证助记词</button> -->
 		</view>
 	</view>
 </template>
@@ -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',
--- a/pages/wallet/privatekey.vue
+++ b/pages/wallet/privatekey.vue
@@ -2,7 +2,7 @@
 	<view>
 		<!-- 私钥 -->
 		<view class="keys">
-			<view class="title">您已接收OC Chain托管</view>
+			<view class="title">您的ZH托管钱包</view>
 			<view class="key">{{key || '-'}}</view>
 			<view class="copykey" @click="copykey">复制我的私钥</view>
 		</view>
@@ -14,9 +14,9 @@
 			</view>
 		</view>
 		<!-- 免责说明 -->
-		<view class="liability">
+		<!-- <view class="liability">
 			<navigator url="/pages/wallet/cmsWithDraw">免责条款</navigator>
-		</view>
+		</view> -->
 	</view>
 </template>

@@ -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;
 			}
--- 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,
@@ -146,17 +147,10 @@
 					success: (res) => {
 						switch (res.tapIndex) {
 							case 0:
-								this.$Router.push({
-									name: 'Transfer'
-								})
+								this.showPrivatekey('WalletMnemonic')
 								break;
 							case 1:
-								this.$Router.push({
-									name: 'WalletCode'
-								})
-								break;
-							case 3:
-								this.showPrivatekey('resetPassword')
+								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;
 				}
 			}
 		}
--- a/pages/wallet/resetPassword.vue
+++ b/pages/wallet/resetPassword.vue
@@ -2,29 +2,25 @@
 	<view>
 		<!-- 设置钱包密码 -->
 		<view class="password">
-			<view class="prompt">请设置6位数字密码。建议不要使用连续的数字。</view>
+			<view class="prompt">请设置6位数字密码，建议不要使用连续的数字</view>
 			<view class="group">
 				<view class="inputs">
-					<label>密码</label>
-					<input type="digit" v-model="password" maxlength="6" password placeholder="请设置新密码" />
+					<input type="digit" password v-model="password" maxlength="6" placeholder="请设置密码" />
 				</view>
 				<view class="inputs">
-					<label>确认密码</label>
-					<input type="digit" v-model="verify" maxlength="6" password placeholder="请确认新密码" />
+					<input type="digit" password v-model="verify" maxlength="6" placeholder="请确认密码" />
 				</view>
 			</view>
 		</view>
 		<!-- 按钮 -->
 		<view class="buttons">
-			<button type="default" form-type="submit" @click="createWallet">确认</button>
+			<button type="default" form-type="submit" @click="createWallet">确认修改</button>
 		</view>
 	</view>
 </template>

 <script>
-	import {
-		securityReset
-	} from '@/apis/interfaces/wallet'
+	import { securityReset } from '@/apis/interfaces/wallet'
 	export default {
 		data() {
 			return {
@@ -37,7 +33,7 @@
 			this.oldPassword = this.$Route.query.password
 		},
 		methods: {
-			// 激活钱包
+			// 修改密码
 			createWallet() {
 				if (this.password === '' || this.verify === '') {
 					uni.showToast({
@@ -55,7 +51,7 @@
 				}
 				securityReset({
 					new_code: this.password,
-					old_code: this.oldPassword
+					code: this.oldPassword
 				}).then(res => {
 					uni.showModal({
 						title: '提示',
@@ -88,36 +84,28 @@
 	// 设置密码
 	.password {
 		padding: 0 $padding * 2;
-
 		.prompt {
 			margin-top: $margin * 2;
 			font-size: $title-size-m;
-			color: $mian-color;
+			color: $main-color;
+			text-align: center;
 		}

 		.group {
-			margin-top: $margin;
-			border-radius: $radius-m;
-			box-shadow: 0 0 4rpx 4rpx rgba($color: $text-color, $alpha: .02);
-			background-color: white;
-
+			padding-top: $padding;
 			.inputs {
-				padding: $padding $padding + 10;
-				border-bottom: solid 1rpx $border-color;
-
+				padding: 10rpx $padding + 10;
+				margin-top: $margin;
+				border-radius: $radius-m;
+				background-color: $window-color;
 				&:last-child {
 					border-bottom: none;
 				}
-
-				label {
-					color: $text-gray;
-					font-size: $title-size-m;
-				}
-
 				input {
 					height: 70rpx;
 					line-height: 70rpx;
-					font-size: $title-size;
+					font-size: $title-size-lg;
+					text-align: center;
 				}
 			}
 		}
@@ -126,25 +114,27 @@
 	// 按钮
 	.buttons {
 		padding: $padding * 2;
-
 		.text {
 			text-align: center;
 			line-height: 90rpx;
 			height: 90rpx;
 			margin-bottom: $margin * 2;
 			font-size: $title-size-lg;
-			color: $mian-color;
+			color: $main-color;
 			font-weight: bold;
 		}

 		button {
 			height: 90rpx;
 			line-height: 90rpx;
-			background-color: $mian-color;
-			border-radius: $radius-lg;
+			background-color: $main-color;
+			border-radius: $radius-m;
 			color: white;
 			font-weight: bold;
 			font-size: $title-size;
+			&::after{
+				display: none;
+			}
 		}
 	}
 </style>