diff --git a/pages/menu/sendToken/addAddress/index.vue b/pages/menu/sendToken/addAddress/index.vue
index dcd362d..8ebea6e 100644
--- a/pages/menu/sendToken/addAddress/index.vue
+++ b/pages/menu/sendToken/addAddress/index.vue
@@ -16,9 +16,8 @@
+ placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee1" class="input1"
+ @click="showSelect()" :disabled="true" />
@@ -32,10 +31,10 @@
+ placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee2" class="input1"
+ v-model="bigAddress" />
+ @click="scanCode">
@@ -48,8 +47,8 @@
+ placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee3" class="input1"
+ v-model="addressName" />
@@ -87,7 +86,7 @@
-{{i18n.langSelect}}
+ {{i18n.langSelect}}
@@ -102,9 +101,9 @@
export default {
data() {
return {
- teee1:this.$t('index').selectcurrency,
- teee2:this.$t('index').Pleaserecipientaddress,
- teee3:this.$t('index').enterthename,
+ teee1: this.$t('index').selectcurrency,
+ teee2: this.$t('index').Pleaserecipientaddress,
+ teee3: this.$t('index').enterthename,
info: {},
addressName: '',
bigAddress: '',
@@ -133,11 +132,11 @@
],
// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
value: '',
- transfer:'',
+ transfer: '',
}
},
onLoad() {
-
+
},
computed: {
i18n() {
@@ -148,18 +147,17 @@
selectA() {
this.show = false
},
- // 唤醒摄像头
- chooseImage() {
+ scanCode() {
var _this = this
- uni.chooseImage({
- count: 1, //默认9
- sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
- sourceType: ['album', 'camera'], //从相册选择、摄像头
+ uni.scanCode({
success: function(res) {
- _this.imgShow = res.tempFilePaths[0]
+ console.log('扫码内容', res.result)
+
+ _this.bigAddress = res.result;
}
});
},
+
handove2(item, index) {
this.value = item.name;
this.show = false;
diff --git a/pages/menu/token/btc/index.css b/pages/menu/token/btc/index.css
index b12e7b2..6691ab9 100644
--- a/pages/menu/token/btc/index.css
+++ b/pages/menu/token/btc/index.css
@@ -41,7 +41,7 @@
.textcon1 .text1 {
color: #fff;
- font-size: 56rpx;
+ font-size: 50rpx;
}
.textcon1 .text1 .text2 {
diff --git a/pages/menu/token/btc/index.vue b/pages/menu/token/btc/index.vue
index b92589f..50a467a 100644
--- a/pages/menu/token/btc/index.vue
+++ b/pages/menu/token/btc/index.vue
@@ -13,9 +13,9 @@
- {{coin.balance}}
+ {{coin.balance}} {{coin.name}}
- ≈ $ {{coin.balancePrice}}
+ ≈ $ {{coin.balancePrice?coin.balancePrice:0}}
diff --git a/pages/menu/wallet/mwallet/manage/index.vue b/pages/menu/wallet/mwallet/manage/index.vue
index b5a87c4..34d7fa7 100644
--- a/pages/menu/wallet/mwallet/manage/index.vue
+++ b/pages/menu/wallet/mwallet/manage/index.vue
@@ -1,76 +1,78 @@
-
+
+
- {{i18n.Manage}}
+ {{i18n.Manage}}
-
-
- {{i18n.Address}}
-
-
- {{userObj.address}}
-
-
+
+
+ {{i18n.Address}}
+
+
+ {{userObj.address}}
+
+
-
-
-
- {{i18n.Name}}
-
-
-<<<<<<< HEAD
- {{i18n.Setname}}
+
+
+
+ {{i18n.Name}}
+
+
+
+ {{userObj.name}}
+
+
+
-
- {{i18n.Confirm}}
+
+
+ {{i18n.backupMneTit}}
+
+
+
+
-
-
-
-
-
-
-
+
+
+ {{i18n.Backupprivatekey}}
+
+
+
+
+
+
+
+
+
+
+ {{i18n.Newwalletname}}
+
+
+
+
+ {{i18n.Cancel}}
+
+
+ {{i18n.Confirm}}
+
+
+
+
+
+
+
+
@@ -78,7 +80,7 @@
-
+
@@ -89,79 +91,79 @@
export default {
data() {
return {
- teee:this.$t('index').walletname,
- value: '',
+ teee: this.$t('index').walletname,
+ value: '',
type: 'text',
border: true,
height: 90,
autoHeight: true,
- showAddress:false,
- userObj:{},
- itemMnemonic:true,
- walletInfo:{},
- nameIndex:-1,
+ showAddress: false,
+ userObj: {},
+ itemMnemonic: true,
+ walletInfo: {},
+ nameIndex: -1,
}
},
methods: {
- back(){
+ back() {
uni.navigateTo({
- url:'/pages/menu/wallet/mwallet/index'
+ url: '/pages/menu/wallet/mwallet/index'
})
},
- setName(){
- if(this.value==''){
+ setName() {
+ if (this.value == '') {
uni.showToast({
- title:this.$t('index').Namecannot,
+ title: this.$t('index').Namecannot,
icon: 'none',
duration: 1500
})
}
- console.log(this.userObj,2222)
- this.userObj.name=this.value;
- this.$walletUtil.updateWalletName(this.userObj.type,this.userObj.address,this.value)
- uni.showToast({
- title: this.$t('index').Successful,
- icon: 'success',
- duration: 1500
- })
- this.showAddress=false;
- setTimeout(()=>{
- uni.navigateTo({
- url:'../../mwallet/index'
- })
- },1500)
-
+ console.log(this.userObj, 2222)
+ this.userObj.name = this.value;
+ this.$walletUtil.updateWalletName(this.userObj.type, this.userObj.address, this.value)
+ uni.showToast({
+ title: this.$t('index').Successful,
+ icon: 'success',
+ duration: 1500
+ })
+ this.showAddress = false;
+ setTimeout(() => {
+ uni.navigateTo({
+ url: '../../mwallet/index'
+ })
+ }, 1500)
+
+ },
+ goTrans() {
+ console.log(this.userObj, 444)
+ uni.setStorageSync('backWordInfo', this.userObj)
+ uni.navigateTo({
+ url: '/pages/menu/backUp/transPawMan/index'
+ })
+
+ },
+ goKey() {
+ // 存储私钥信息
+ uni.setStorageSync('keyInfo', this.userObj)
+ uni.navigateTo({
+ url: '../../../backUp/transPawKeyOut/index'
+ })
+
},
- goTrans(){
- console.log(this.userObj,444)
- uni.setStorageSync('backWordInfo',this.userObj)
- uni.navigateTo({
- url:'/pages/menu/backUp/transPawMan/index'
- })
-
- },
- goKey(){
- // 存储私钥信息
- uni.setStorageSync('keyInfo',this.userObj)
- uni.navigateTo({
- url:'../../../backUp/transPawKeyOut/index'
- })
-
},
+ onLoad: function(option) {
+ this.userObj = uni.getStorageSync('addressDetailInfo')
+ console.log(this.userObj, 45454554)
+ // 没有助记词就隐藏助剂词导入
+ if (!this.userObj.mnemonic) {
+ this.itemMnemonic = false;
+ }
},
- onLoad: function(option) {
- this.userObj = uni.getStorageSync('addressDetailInfo')
- console.log(this.userObj,45454554)
- // 没有助记词就隐藏助剂词导入
- if(!this.userObj.mnemonic){
- this.itemMnemonic=false;
- }
+ computed: {
+ i18n() {
+ return this.$t('index')
},
- computed: {
- i18n() {
- return this.$t('index')
- },
- },
+ },
};