diff --git a/components/navigation/navigation.vue b/components/navigation/navigation.vue
index 73f6f8b..6752ae2 100644
--- a/components/navigation/navigation.vue
+++ b/components/navigation/navigation.vue
@@ -62,20 +62,23 @@
}
.nav-head{
- line-height: 40rpx;
+ height: 40rpx;
// background-color: #fff;
text-align: center;
font-weight: 700;
font-size: 36rpx;
color: #000;
- position: relative;
- padding: 0 16rpx;
+ padding: 40rpx 16rpx;
margin-top: 50rpx;
display: flex;
justify-content: center;
flex-direction: row-reverse;
align-items: center;
margin-top: 80rpx;
+ position: sticky;
+ top: 40px;
+ width: 100%;
+
}
.back{
width: 30rpx;
diff --git a/pages/menu/about/index.css b/pages/menu/about/index.css
index 48a3ed1..2923699 100644
--- a/pages/menu/about/index.css
+++ b/pages/menu/about/index.css
@@ -1,3 +1,10 @@
+
+.bitcooo{
+ text-align: center;
+ font-size: 60rpx;
+ font-weight: bold;
+ margin-top: 20rpx;
+}
.main{
padding:0 24rpx
}
diff --git a/pages/menu/about/index.vue b/pages/menu/about/index.vue
index 67120d9..dd66b23 100644
--- a/pages/menu/about/index.vue
+++ b/pages/menu/about/index.vue
@@ -7,9 +7,10 @@
-
-
+
+ BitCooo
+
@@ -19,12 +20,12 @@
{{version}}
-
+
{{i18n.Officialwebsite}}
- https://bitcooo.com
+ https://www.bitcooo.com
@@ -76,6 +77,9 @@
// #endif
},
methods: {
+ goWeb(){
+ plus.runtime.openURL('https://www.bitcooo.com/');
+ },
goTerms() {
uni.navigateTo({
url: './terms/index'
diff --git a/pages/menu/sendToken/address/index.css b/pages/menu/sendToken/address/index.css
index 505ee96..2aa8c0c 100644
--- a/pages/menu/sendToken/address/index.css
+++ b/pages/menu/sendToken/address/index.css
@@ -9,6 +9,9 @@
top: 50%;
transform: translateY(-50%);
}
+/deep/ .u-empty{
+ margin-top: 180rpx !important;
+}
.renYou{
width: 48rpx;
height: 48rpx;
diff --git a/pages/menu/sendToken/address/index.vue b/pages/menu/sendToken/address/index.vue
index 7bf4a47..bcf5064 100644
--- a/pages/menu/sendToken/address/index.vue
+++ b/pages/menu/sendToken/address/index.vue
@@ -139,6 +139,8 @@
+
+
@@ -150,14 +152,16 @@
export default {
data() {
return {
+ teee: this.$t('index').Nocontent,
+ showInfo: false,
sourcePage: '',
ethIndex: 0,
btcIndex: 0,
trxIndex: 0,
showImte: false,
- BTCAddressInfo: {},
- ETHAddressInfo: {},
- TRXAddressInfo: {},
+ BTCAddressInfo: [],
+ ETHAddressInfo: [],
+ TRXAddressInfo: [],
walletIndex: -1,
itemCoin: '',
itemAddress: '',
@@ -263,9 +267,12 @@
this.showImte = true;
this.show = false;
setTimeout(() => {
+ uni.redirectTo({
+ url:'/pages/menu/sendToken/address/index'
+ })
this.showImte = false;
}, 1500)
-
+
}
if (this.itemCoin == 'ETH') {
if (this.ETHAddressInfo.length == 1) {
@@ -280,9 +287,12 @@
this.showImte = true;
this.show2 = false;
setTimeout(() => {
+ uni.redirectTo({
+ url:'/pages/menu/sendToken/address/index'
+ })
this.showImte = false;
}, 1500)
-
+
}
if (this.itemCoin == 'TRX') {
if (this.TRXAddressInfo.length == 1) {
@@ -295,9 +305,12 @@
this.showImte = true;
this.show3 = false;
setTimeout(() => {
+ uni.redirectTo({
+ url:'/pages/menu/sendToken/address/index'
+ })
this.showImte = false;
}, 1500)
-
+
}
},
goAddress() {
@@ -307,7 +320,7 @@
}
},
onLoad(item) {
-
+
this.sourcePage = uni.getStorageSync('sourcePage')
// 判断是否是从交易页面来的
if (item.item) {
@@ -327,6 +340,14 @@
this.TRXAddressInfo = uni.getStorageSync('TRXAddressInfo')
console.log(this.TRXAddressInfo, 777)
}
+ console.log(this.BTCAddressInfo.length)
+ console.log(this.ETHAddressInfo.length)
+ console.log(this.TRXAddressInfo.length)
+ if(this.BTCAddressInfo.length==0&&this.ETHAddressInfo.length==0&&this.TRXAddressInfo.length==0){
+ this.showInfo=true;
+ }else{
+ this.showInfo=false;
+ }
}
};
diff --git a/pages/menu/sendToken/transfer/index.vue b/pages/menu/sendToken/transfer/index.vue
index 7fe87cc..5487f75 100644
--- a/pages/menu/sendToken/transfer/index.vue
+++ b/pages/menu/sendToken/transfer/index.vue
@@ -80,7 +80,7 @@
-
+
@@ -452,7 +452,7 @@
// 确认提交
Confirm() {
// 做判断
- debugger
+ // debugger
if (this.transInfoPass.amount == '') {
uni.showToast({
title: this.$t('index').enterthetransferamount,
@@ -485,7 +485,6 @@
})
return
}
-
let that = this
if (this.coin.type === 'ETH') {
if(!this.$Token.validateEth(this.transInfoPass.toAddress))
diff --git a/pages/register/index.css b/pages/register/index.css
index 0bf75ff..0e1b6c0 100644
--- a/pages/register/index.css
+++ b/pages/register/index.css
@@ -1,3 +1,9 @@
+
+.lans{
+
+}
+
+
.main{
margin-top: 120rpx;
}
@@ -37,7 +43,7 @@
}
/deep/ uni-swiper .uni-swiper-dots-horizontal {
left: 50%;
- bottom: -5px;
+ bottom: -76rpx;
}
/deep/ .uni-swiper-dot{
width: 20rpx !important;
@@ -51,7 +57,7 @@
background-color: #5B53FF!important;
}
.reg_con{
- margin-top: 60rpx;
+ margin-top: 100rpx;
padding: 0 40rpx;
}
.reg{
diff --git a/pages/register/index.vue b/pages/register/index.vue
index 577393b..933233e 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -1,5 +1,9 @@
+
+
+ {{i18n.lans}}
+
@@ -7,31 +11,29 @@
- Decentralised wallets,
- self-directed assets
+ {{i18n.Decentralised}}
- Local storage of private keys, safe and secure
+ {{i18n.Localstorage}}
-
-
-
-
-
- Decentralised wallets,
- self-directed assets
-
-
- Local storage of private keys, safe and secure
-
-
-
+
+
+
+
+
+ {{i18n.Decentralised}}
-
+
+ {{i18n.Localstorage}}
+
+
+
+
+
@@ -47,10 +49,10 @@
- Create a wallet
+ {{i18n.crewalllet}}
- One identity management
+ {{i18n.Oneidentity}}
@@ -65,10 +67,10 @@
- Login to wallet
+ {{i18n.Logintowallet}}
- Restore existing wallets
+ {{i18n.Restoreexisting}}
@@ -84,12 +86,13 @@
I have read and agree to the
- Terms of Service
+ v-model="item.checked" :name="item.name" active-color="#5B53FF"> {{i18n.AgreementConfirmation}}
+ {{i18n.TermsofService}}
+
@@ -106,6 +109,17 @@
export default {
data() {
return {
+ show: false,
+ list3: [
+ {
+ value: '1',
+ label: '江'
+ },
+ {
+ value: '2',
+ label: '湖'
+ }
+ ],
list2: [{
name: '',
checked: false,
@@ -119,7 +133,11 @@
walletInfo: {},
}
},
-
+ computed: {
+ i18n() {
+ return this.$t('index')
+ },
+ },
onLoad() {},
onShow() {
console.log(uni.getStorageSync('walletInfo'))
@@ -132,6 +150,7 @@
this.list2.checked = false;
},
methods: {
+
checkboxGroupChange() {
},
diff --git a/utils/locales/en.js b/utils/locales/en.js
index f921bd4..4a2c4b6 100644
--- a/utils/locales/en.js
+++ b/utils/locales/en.js
@@ -1,6 +1,15 @@
// en.js
export default {
index: {
+ // regis
+ Decentralised:'Decentralised wallets,self-directed assets',
+ Localstorage:'Local storage of private keys, safe and secure',
+ Oneidentity:'One identity management',
+ Logintowallet:'Login to wallet',
+ Restoreexisting:'Restore existing wallets',
+
+
+
tela:'Enter the token name or contract address',
tokensfound:'No related tokens found',
thetokenname:'Please enter the token name or contract address to search',
diff --git a/utils/locales/zh-F.js b/utils/locales/zh-F.js
index 83fdb7b..6bb8921 100644
--- a/utils/locales/zh-F.js
+++ b/utils/locales/zh-F.js
@@ -1,6 +1,14 @@
// zhf.js
export default {
index: {
+
+ // regis
+ Decentralised:'去中心化錢包，自主資產',
+ Localstorage:'私鑰本地存儲，安全有保障',
+ Oneidentity:'身份管理',
+ Logintowallet:'導入錢包',
+ Restoreexisting:'恢復現有錢包',
+
tela:'请輸入代幣名稱或合約地址',
tokensfound:'未找到相關代幣',
thetokenname:'請輸入要搜索的代幣名稱或合約地址',
diff --git a/utils/locales/zh.js b/utils/locales/zh.js
index cf887f3..a8debed 100644
--- a/utils/locales/zh.js
+++ b/utils/locales/zh.js
@@ -1,6 +1,15 @@
// zh.js
export default {
index: {
+ // regis
+ Decentralised:'去中心化钱包，自主资产',
+ Localstorage:'私钥本地存储，安全有保障',
+ Oneidentity:'身份管理',
+ Logintowallet:'导入钱包',
+ Restoreexisting:'恢复现有钱包',
+
+
+
tela:'请输入代币名称或合约地址',
tokensfound:'未找到相关代币',
thetokenname:'请输入要搜索的代币名称或合约地址',