diff --git a/components/navigation/navigation.vue b/components/navigation/navigation.vue
index 80fa039..c647eb0 100644
--- a/components/navigation/navigation.vue
+++ b/components/navigation/navigation.vue
@@ -1,5 +1,6 @@
+
@@ -74,6 +75,7 @@
justify-content: center;
flex-direction: row-reverse;
align-items: center;
+ margin-top: 80rpx;
}
.back{
width: 16rpx;
diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue
index 67c5302..d143ad9 100644
--- a/components/tabBar/tabBar.vue
+++ b/components/tabBar/tabBar.vue
@@ -11,7 +11,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
Profile
@@ -55,10 +55,7 @@
diff --git a/pages/menu/backUp/backUp4/index.vue b/pages/menu/backUp/backUp4/index.vue
index 493d48b..7471bf4 100644
--- a/pages/menu/backUp/backUp4/index.vue
+++ b/pages/menu/backUp/backUp4/index.vue
@@ -105,9 +105,8 @@
}
var a=uni.getStorageSync('createWalletName')
-
if(a=='BTC'&&a!=''&&a!=undefined){
- this.walletInfo=uni.getStorageSync('word');
+ this.walletInfo=uni.getStorageSync('walletInfo');
var mnemonic=this.wordInfo;
uni.setStorageSync('word',mnemonic);
let btc;
@@ -123,7 +122,6 @@
return;
}
-
for(var i=0;i
-
+
{{item.name}}
- Start backup
+
@@ -40,41 +40,48 @@
list: [
{
name: 'Axioms are the only way to control assets.',
- checked: true,
- disabled: true
+ checked: false,
+ disabled: false
},
{
name: 'You cannot retrieve a lost mnemonic, so be sure to back it up!',
- checked: true,
- disabled: true
+ checked: false,
+ disabled: false
},
{
name: 'Do not disclose your mnemonic to anyone.',
- checked: true,
- disabled: true
+ checked: false,
+ disabled: false
}
],
- inde:1,
+ inde:false,
+ showI:-1
};
},
methods: {
test(){
-
- if(true){
+ if(this.inde){
+ console.log(this.list,777)
+ for(var i=0;i {
- val.checked = true;
- })
+ for(var i=0;i
diff --git a/pages/menu/load/index.vue b/pages/menu/load/index.vue
index e942e51..c2f9cbb 100644
--- a/pages/menu/load/index.vue
+++ b/pages/menu/load/index.vue
@@ -9,10 +9,6 @@
+
+
+
diff --git a/pages/menu/sendToken/address/index.css b/pages/menu/sendToken/address/index.css
index f44809b..6e398a3 100644
--- a/pages/menu/sendToken/address/index.css
+++ b/pages/menu/sendToken/address/index.css
@@ -1,6 +1,14 @@
.hr{
height: 100%;
}
+ .renYou2{
+ width: 16rpx;
+ height: 24rpx;
+ position: absolute;
+ left:36rpx;
+ top: 50%;
+ transform: translateY(-50%);
+ }
.renYou{
width: 48rpx;
height: 48rpx;
@@ -16,6 +24,7 @@ padding: 0 24rpx;
margin-top: 50rpx;
height: 100%;
position: relative;
+padding-bottom: 150rpx;
}
.main .item{
background-color: #fff;
@@ -33,7 +42,9 @@ position: relative;
width: 48rpx;
height: 48rpx;
}
-
+.big_item{
+ position: relative;
+}
.bigcon .text1{
font-size: 28rpx;
margin-top: 15rpx;
@@ -45,8 +56,8 @@ position: relative;
}
.bigcon .textimg .img{
- width: 50rpx;
- height: 50rpx;
+ width: 60rpx;
+ height: 60rpx;
}
.flexx{
display: flex;
@@ -112,8 +123,9 @@ position: relative;
height: 120rpx;
display: flex;
align-items: center;
- position: absolute;
+ position: fixed;
bottom: 60rpx;
+ z-index: 999;
border-radius: 26rpx;
justify-content: space-between;
padding: 0 48rpx;
diff --git a/pages/menu/sendToken/address/index.vue b/pages/menu/sendToken/address/index.vue
index c7edef5..50a3a0e 100644
--- a/pages/menu/sendToken/address/index.vue
+++ b/pages/menu/sendToken/address/index.vue
@@ -1,68 +1,94 @@
-
-
-
+
+
+
+
Address
-
+
+
+
+
-
- BTC
- Chisu
+
+ {{item.coinList[0].name}}
+ {{item.name}}
- TAADz1cFXLB2fWikE1sRi9znpmFFaMgaad
+ {{item.address}}
-
+
-
-
-
-
-
- Edit
-
-
-
- Delete
+
+
+
+
+
+
+
+ {{item.coinList[0].name}}
+ {{item.name}}
+
+
+ {{item.address}}
+
+
+
+
+
+
-
-
-
+
-
- BTC
- Chisu
+
+ {{item.coinList[0].name}}
+ {{item.name}}
- TAADz1cFXLB2fWikE1sRi9znpmFFaMgaad
+ {{item.address}}
-
+
+
+
+
+
+
+
+ Edit
+
+
+
+ Delete
+
+
+
+
-
+
- BTC TAADz1c...1sFFaMgaad
+
+ {{itemCoin}} {{itemAddress}}
DELETE
@@ -88,7 +114,15 @@
export default {
data() {
return {
-show: true,
+ showImte:false,
+ BTCAddressInfo:{},
+ ETHAddressInfo:{},
+ TRXAddressInfo:{},
+ walletIndex:-1,
+ itemCoin:'',
+ itemAddress:'',
+ info:{},
+show: false,
list: [
{
name: 'Single address',
@@ -109,7 +143,116 @@ show: true,
}
},
methods: {
-
+ back(){
+ uni.navigateTo({
+ url:'/pages/menu/profile/index'
+ })
+ },
+ editItem(){
+ uni.setStorageSync('AddressInfo',this.info)
+ uni.setStorageSync('AddressName',this.itemCoin)
+ uni.setStorageSync('AddressIndex',this.walletIndex)
+ uni.navigateTo({
+ url:'../addAddress2/index'
+ })
+ },
+ showIndex(item,index){
+ this.info= item
+ this.itemCoin=item.coinList[0].name
+ this.itemAddress=item.address
+ this.show=true;
+ this.walletIndex=index;
+ },
+ deleteItem(){
+ if(this.itemCoin=='BTC'){
+ if(this.BTCAddressInfo.length==1){
+ let BTCAddressInfo=[]
+ uni.setStorageSync('BTCAddressInfo',BTCAddressInfo)
+
+ }
+ console.log(this.BTCAddressInfo,1111)
+ console.log(this.walletIndex,44444)
+ let BTCAddressInfo=[]
+ BTCAddressInfo=uni.getStorageSync('BTCAddressInfo')
+ BTCAddressInfo=BTCAddressInfo.splice(this.walletIndex,1)
+ console.log(BTCAddressInfo,77777)
+ uni.setStorageSync('BTCAddressInfo',BTCAddressInfo)
+ this.showImte=true;
+ console.log(BTCAddressInfo,2222)
+ this.show=false;
+ setTimeout(()=>{
+ uni.reLaunch({
+ url:'../address/index'
+ })
+ },1500)
+
+ }
+ if(this.itemCoin=='ETH'){
+ if(this.ETHAddressInfo.length==1){
+ let ETHAddressInfo=[]
+ uni.setStorageSync('ETHAddressInfo',ETHAddressInfo)
+
+ }
+ console.log(this.ETHAddressInfo,1111)
+ console.log(this.walletIndex,44444)
+ let ETHAddressInfo=[]
+ ETHAddressInfo=uni.getStorageSync('ETHAddressInfo')
+ ETHAddressInfo=ETHAddressInfo.splice(this.walletIndex-1,1)
+ console.log(ETHAddressInfo,77777)
+ uni.setStorageSync('ETHAddressInfo',ETHAddressInfo)
+ this.showImte=true;
+ console.log(ETHAddressInfo,2222)
+ this.show=false;
+ setTimeout(()=>{
+ uni.reLaunch({
+ url:'../address/index'
+ })
+ },1500)
+
+ }
+ if(this.itemCoin=='TRX'){
+ if(this.TRXAddressInfo.length==1){
+ let TRXAddressInfo=[]
+ uni.setStorageSync('TRXAddressInfo',TRXAddressInfo)
+
+ }
+ console.log(this.TRXAddressInfo,1111)
+ console.log(this.walletIndex,44444)
+ let TRXAddressInfo=[]
+ TRXAddressInfo=uni.getStorageSync('TRXAddressInfo')
+ TRXAddressInfo=TRXAddressInfo.splice(this.walletIndex-1,1)
+ console.log(TRXAddressInfo,77777)
+ uni.setStorageSync('TRXAddressInfo',TRXAddressInfo)
+ this.showImte=true;
+ console.log(TRXAddressInfo,2222)
+ this.show=false;
+ setTimeout(()=>{
+ uni.reLaunch({
+ url:'../address/index'
+ })
+ },1500)
+
+ }
+ },
+goAddress(){
+ uni.navigateTo({
+ url:'../addAddress/index'
+ })
+}
+ },
+ onLoad() {
+ if(uni.getStorageSync('BTCAddressInfo')){
+ this.BTCAddressInfo=uni.getStorageSync('BTCAddressInfo')
+ console.log(this.BTCAddressInfo,777)
+ }
+ if(uni.getStorageSync('ETHAddressInfo')){
+ this.ETHAddressInfo=uni.getStorageSync('ETHAddressInfo')
+ console.log(this.ETHAddressInfo,777)
+ }
+ if(uni.getStorageSync('TRXAddressInfo')){
+ this.TRXAddressInfo=uni.getStorageSync('TRXAddressInfo')
+ console.log(this.TRXAddressInfo,777)
+ }
}
};
diff --git a/pages/menu/token/btc/index.css b/pages/menu/token/btc/index.css
index c149a12..96137a5 100644
--- a/pages/menu/token/btc/index.css
+++ b/pages/menu/token/btc/index.css
@@ -53,7 +53,7 @@
}
.select_con{
width: 100%;
- padding-bottom: 100rpx;
+ padding-bottom: 260rpx;
}
.select_con .select{
margin: 0 12px;
@@ -109,6 +109,8 @@
margin-top: 20rpx;
}
.btnconn{
+ position: fixed;
+ bottom: 0;
background-color: #fff;
padding: 24rpx 24rpx;
width: 100%;
@@ -173,4 +175,8 @@
padding: 40rpx 36rpx;
position: relative;
border-radius: 24rpx;
+}
+
+.select_con .item1 .rig_con .text1 text{
+ margin-left: 10rpx;
}
\ No newline at end of file
diff --git a/pages/menu/token/btc/index.vue b/pages/menu/token/btc/index.vue
index 0f6b3cd..6f6b598 100644
--- a/pages/menu/token/btc/index.vue
+++ b/pages/menu/token/btc/index.vue
@@ -1,7 +1,6 @@
-
BTC
@@ -25,7 +24,7 @@
0.00 TRX
- ≈ $25.521.00
+ ≈ $0.0
@@ -34,7 +33,7 @@
- 0.4
+ 0.0
Existing balance
@@ -42,7 +41,7 @@
- 0.121
+ 0.0
Freeze balance
@@ -63,57 +62,87 @@
TDJK ... gaad
- 09.01/ 10:32
+ 00.01/ 00:00
- +0.1 BTC
+ +0.0
+
+ BTC
+
+
+ ETH
+
+
+ TRX
+
+
-
-
-
-
-
- TDJK ... gaad
-
-
- 09.01/ 10:32
-
-
+
+
+
+
+
+ TDJK ... gaad
+
+
+ 00.01/ 00:00
+
-
-
- +0.1 BTC
-
-
+
+
+
+ +0.0
+
+ BTC
+
+
+ ETH
+
+
+ TRX
+
+
+
+
-
-
-
-
-
- TDJK ... gaad
-
-
- 09.01/ 10:32
-
-
+
+
+
+
+
+ TDJK ... gaad
+
+
+ 00.01/ 00:00
+
-
-
- +0.1 BTC
-
-
+
+
+
+ +0.0
+
+ BTC
+
+
+ ETH
+
+
+ TRX
+
+
+
+
@@ -152,17 +181,15 @@
}
},
methods: {
- goPro(){
- uni.navigateTo({
- url:'/pages/menu/profile/index'
- })
- },
+
change(index) {
this.current = index;
},
},
onLoad(option) {
+
const item = JSON.parse(option.item);
+ console.log(item,777)
this.userObject=item
}
};
diff --git a/pages/menu/wallet/cwallet/index.vue b/pages/menu/wallet/cwallet/index.vue
index 6007146..c83fbff 100644
--- a/pages/menu/wallet/cwallet/index.vue
+++ b/pages/menu/wallet/cwallet/index.vue
@@ -122,7 +122,7 @@
uni.reLaunch({
url:'../index'
})
- },500)
+ },5)
}
if(index.coinList[0].name=='ETH'){
console.log(this.walletInfoETH2[i],777777777)
@@ -131,7 +131,7 @@
uni.reLaunch({
url:'../index'
})
- },500)
+ },5)
}
if(index.coinList[0].name=='TRX'){
console.log(this.walletInfoTRX2[i])
@@ -140,7 +140,7 @@
uni.reLaunch({
url:'../index'
})
- },500)
+ },5)
}
},
@@ -222,6 +222,7 @@
if(uni.getStorageSync('walleti')!=''){
this.num=uni.getStorageSync('walleti')
}
+
}
};
diff --git a/pages/menu/wallet/mwallet/index.css b/pages/menu/wallet/mwallet/index.css
index 3bcfb1d..35f36d3 100644
--- a/pages/menu/wallet/mwallet/index.css
+++ b/pages/menu/wallet/mwallet/index.css
@@ -80,7 +80,7 @@
width: 575rpx;
height: 164rpx;
background-image: linear-gradient(to right, #FF9913, #FFB60C);
- padding: 44rpx 0;
+ padding: 30rpx 0;
padding-left: 25rpx;
padding-right: 32rpx;
border-radius: 24rpx;
@@ -168,7 +168,7 @@
.bot_con .item .rig .img1{
display: block;
width: 32rpx;
- height: 10rpx;
+ height: 32rpx;
margin-left: 32rpx;
margin-bottom: 26rpx;
}
diff --git a/pages/register/index.css b/pages/register/index.css
index e19e11e..0bf75ff 100644
--- a/pages/register/index.css
+++ b/pages/register/index.css
@@ -1,3 +1,7 @@
+.main{
+ margin-top: 120rpx;
+}
+
.swiper-item .img1{
display: block;
margin: 0 auto;
diff --git a/pages/register/index.vue b/pages/register/index.vue
index ca85243..b2eac8f 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -83,8 +83,8 @@
I have read and agree to the
@@ -100,7 +100,6 @@