jack
/
bitcooo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

master
vee 4 years ago
parent
bc3c894c78
commit
61f57ce7b5
6 changed files with 38031 additions and 41750 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      pages/menu/sendToken/addAddress/index.vue
  2. 2
      pages/menu/token/btc/index.css
  3. 4
      pages/menu/token/btc/index.vue
  4. 236
      pages/menu/wallet/mwallet/manage/index.vue
  5. 59803
      unpackage/dist/dev/app-plus/app-service.js
  6. 19696
      unpackage/dist/dev/app-plus/app-view.js

40
pages/menu/sendToken/addAddress/index.vue
View File

@ -16,9 +16,8 @@
</view>
<view class="inputcon">
<input type="text" value="" v-model="value"
placeholder-style="font-size: 30rpx; color: #D0D0D2;"
:placeholder="teee1" class="input1" @click="showSelect()"
:disabled="true" />
placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee1" class="input1"
@click="showSelect()" :disabled="true" />
<image src="../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1">
</image>
</view>
@ -32,10 +31,10 @@
</view>
<view class="inputcon">
<input type="text" value="" @input="showSave()"
placeholder-style="font-size: 30rpx; color: #D0D0D2;"
:placeholder="teee2" class="input1" v-model="bigAddress" />
placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee2" class="input1"
v-model="bigAddress" />
<image src="../../../../static/tongyonh/Frame330.png" mode="aspectFit" class="img2"
@click="chooseImage"></image>
@click="scanCode"></image>
</view>
</view>
@ -48,8 +47,8 @@
</view>
<view class="inputcon">
<input type="text" @input="showSave" value=""
placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee3"
class="input1" v-model="addressName" />
placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee3" class="input1"
v-model="addressName" />
</view>
</view>
@ -87,7 +86,7 @@
</view>
</u-radio-group>
<view class="select_btn" @click="selectA">
{{i18n.langSelect}}
{{i18n.langSelect}}
</view>
</view>
</view>
@ -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;

2
pages/menu/token/btc/index.css
View File

@ -41,7 +41,7 @@
.textcon1 .text1 {
color: #fff;
font-size: 56rpx;
font-size: 50rpx;
}
.textcon1 .text1 .text2 {

4
pages/menu/token/btc/index.vue
View File

@ -13,9 +13,9 @@
<view class="textcon1">
<text class="text1">
<view class="">
{{coin.balance}}
{{coin.balance}} {{coin.name}}
</view>
<text class="text2">≈ $ {{coin.balancePrice}}</text>
<text class="text2">≈ $ {{coin.balancePrice?coin.balancePrice:0}}</text>
</text>
<image src="../../../../static/tongyonh/ethereum.png" mode="aspectFit" class="img1"
v-if="coin.type=='ETH'&&!coin.contractAddress"></image>

236
pages/menu/wallet/mwallet/manage/index.vue
View File

@ -1,76 +1,78 @@
<template>
<view class="">
<navigation :showBack="false" :bgnum="true">
<image src="../../../../../static/tongyonh/Vector.png" mode="aspectFit" class="back" @click="back()"></image>
<image src="../../../../../static/tongyonh/Vector.png" mode="aspectFit" class="back" @click="back()">
</image>
<text class="big_title">
{{i18n.Manage}}
{{i18n.Manage}}
</text>
</navigation>
<view class="main">
<view class="item">
<view class="text1">
{{i18n.Address}}
</view>
<view class="text2">
{{userObj.address}}
</view>
</view>
<view class="item">
<view class="text1">
{{i18n.Address}}
</view>
<view class="text2">
{{userObj.address}}
</view>
</view>
<view class="item item2">
<view class="name flex bor" @click="showAddress=true">
<view class="text1">
{{i18n.Name}}
</view>
<view class="address" >
<<<<<<< HEAD
<text v-if="userObj.name=='BTC'">{{i18n.Setname}}</text>
<view class="item item2">
<view class="name flex bor" @click="showAddress=true">
<view class="text1">
{{i18n.Name}}
</view>
<view class="address">
<!-- <text v-if="userObj.name=='BTC'">{{i18n.Setname}}</text>
<text v-else-if="userObj.name=='ETH'">{{i18n.Setname}}</text>
<text v-else-if="userObj.name=='TRX'">{{i18n.Setname}}</text>
<text v-else>{{userObj.name}}</text>
=======
{{userObj.name}}
>>>>>>> 597f46eb933c677e991915c5a7fe52f9e8d27baa
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
</view>
</view>
<view class="name flex" @click="goTrans()" v-if="itemMnemonic">
<view class="text1">
{{i18n.backupMneTit}}
</view>
<view class="address">
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
</view>
</view>
<view class="name flex" @click="goKey()">
<view class="text1">
{{i18n.Backupprivatekey}}
</view>
<view class="address">
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
</view>
</view>
</view>
<view class="showAddress" v-if="showAddress">
<image src="../../../../../static/tongyonh/xg.png" mode="aspectFit" class="img1" @click="showAddress=false"></image>
<view class="title">
{{i18n.Newwalletname}}
</view>
<u-input :placeholder="teee" border-color="#E9EDF7" v-model="value" :type="type" :border="border" />
<view class="btnconn">
<view class="btn" @click="showAddress=false">
{{i18n.Cancel}}
<text v-else-if="userObj.name=='TRX'">{{i18n.Setname}}</text> -->
<text>{{userObj.name}}</text>
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit"
class="img1"></image>
</view>
</view>
<view class="btn active" @click="setName()">
{{i18n.Confirm}}
<view class="name flex" @click="goTrans()" v-if="itemMnemonic">
<view class="text1">
{{i18n.backupMneTit}}
</view>
<view class="address">
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit"
class="img1"></image>
</view>
</view>
</view>
</view>
<view class="name flex" @click="goKey()">
<view class="text1">
{{i18n.Backupprivatekey}}
</view>
<view class="address">
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit"
class="img1"></image>
</view>
</view>
</view>
<view class="showAddress" v-if="showAddress">
<image src="../../../../../static/tongyonh/xg.png" mode="aspectFit" class="img1"
@click="showAddress=false"></image>
<view class="title">
{{i18n.Newwalletname}}
</view>
<u-input :placeholder="teee" border-color="#E9EDF7" v-model="value" :type="type" :border="border" />
<view class="btnconn">
<view class="btn" @click="showAddress=false">
{{i18n.Cancel}}
</view>
<view class="btn active" @click="setName()">
{{i18n.Confirm}}
</view>
</view>
</view>
</view>
@ -78,7 +80,7 @@
<u-mask z-index='100' :show="showAddress" @click="showAddress = false"></u-mask>
</view>
</view>
@ -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')
},
},
},
};
</script>
<style scoped>

59803
unpackage/dist/dev/app-plus/app-service.js
View File

File diff suppressed because one or more lines are too long

19696
unpackage/dist/dev/app-plus/app-view.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save