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

修改

master
vee 4 years ago
parent
7a1072c9f3
commit
484cb32467
13 changed files with 746 additions and 744 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 101
      pages/menu/sendToken/enPassword/index.vue
  2. 9
      pages/menu/sendToken/index.vue
  3. 266
      pages/menu/sendToken/transfer/index.vue
  4. 7
      pages/menu/setting/index.vue
  5. 46
      pages/menu/token/btc/index.css
  6. 2
      pages/menu/token/btc/index.vue
  7. 47
      pages/menu/transction/detail/index.vue
  8. 2
      pages/menu/wallet/cwallet/index.css
  9. 32
      pages/menu/wallet/index.vue
  10. 8
      pages/menu/wallet/mwallet/index.css
  11. 10
      utils/EthUtil.js
  12. 7
      utils/TronUtil.js
  13. 25
      utils/WalletUtil.js

101
pages/menu/sendToken/enPassword/index.vue
View File

@ -34,8 +34,7 @@
info: false, info: false,
transInfoPass: { transInfoPass: {
}, }
wallet: {}
} }
}, },
@ -46,91 +45,79 @@
this.info = false; this.info = false;
} }
}, },
finish2(e) { transaction() {
if (this.wallet.password != e) { if (this.transInfoPass.type === 'ETH') {
this.info = true; this.$EthUtil.transaction(this.transInfoPass.fromAddress, this.transInfoPass.privateKey,
return; this.transInfoPass.toAddress, this.transInfoPass.amount, this.transInfoPass.contractAddress,
} else { function(hash, err) {
this.info = false; if (!err) {
}
// 密码正确调用
// 如果转的是trx
if (this.wallet.type == 'TRX') {
// 如果转的不是trx代币
if (!this.contractAddress) {
this.$TronUtil.sendTransaction(this.transInfoPass.fromAddress, this.transInfoPass.privateKey, this
.transInfoPass.toAddress, this.transInfoPass.amount)
.then((res) => {
console.log(res, 111)
uni.showToast({ uni.showToast({
title: 'Successfully', title: 'Transfer succeeded',
icon: 'success', icon: 'none',
duration: 2000 duration: 1500
}) })
setTimeout(() => {
that.fingerSuccess = false;
uni.reLaunch({ uni.reLaunch({
url: '/pages/menu/wallet/index' url: '/pages/menu/wallet/index'
}) })
}).catch(err => { }, 1000)
} else {
console.log(err, 'cuowu')
uni.showToast({ uni.showToast({
title: err, title: 'Transfer failed, please confirm the information is correct',
icon: 'none', icon: 'none',
duration: 2000 duration: 1500
}) })
}
}) })
} else { } else if (this.transInfoPass.type === 'TRX') {
// 如果转的是trx代币 this.$TronUtil.transaction(this.transInfoPass.fromAddress, this.transInfoPass.privateKey,
this.$TronUtil.sendRawTransaction(this.info.address, this.info.privateKey, this.toAddress, this this.transInfoPass.toAddress, this.transInfoPass.amount, this.transInfoPass.remark, this.transInfoPass.contractAddress)
.toValue, '', this.contractAddress)
.then((res) => { .then((res) => {
uni.showToast({ uni.showToast({
title: 'Successfully', title: 'Transfer succeeded',
icon: 'success', icon: 'none',
duration: 2000 duration: 1500
}) })
this.show2 = false; setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/menu/wallet/index' url: '/pages/menu/wallet/index'
}) })
}, 1000)
}).catch(err => { }).catch(err => {
console.log(err) console.log(err, 'cuowu')
uni.showToast({ uni.showToast({
title: err, title: 'Transfer failed, please confirm the information is correct',
icon: 'none', icon: 'none',
duration: 2000 duration: 1500
}) })
}) })
} }
},
} finish2(e) {
if (this.wallet.type == 'ETH') { if (this.transInfoPass.password != e) {
if (this.info.coinList[0].xname == 'Ethereum') { this.info = true;
this.$EthUtil.transaction(this.info.address, this.toAddress, this.toValue, this.info.privateKey) return;
.then(( } else {
res) => { this.info = false;
console.log(res, '钱包') this.transaction();
this.show2 = false;
uni.reLaunch({
url: '../transfer2/index'
})
}).catch(err => {
console.log(err)
})
}
} }
}, },
}, },
onLoad() { onLoad() {
// 拿到转账信息 // 拿到转账信息
this.transInfoPass = uni.getStorageSync('transInfoPass') this.transInfoPass = uni.getStorageSync('transInfoPass')
// 拿到当前钱包信息 uni.removeStorageSync('transInfoPass')
this.wallet = uni.getStorageSync('wallet')
console.log(this.transInfoPass, 2222) console.log(this.transInfoPass, 2222)
console.log(this.wallet, 2222)
} }
}; };
</script> </script>

9
pages/menu/sendToken/index.vue
View File

@ -10,9 +10,10 @@
{{addressInfo.name}} Receiving address {{addressInfo.name}} Receiving address
</view> </view>
<view class="code_con"> <view class="code_con">
<tki-qrcode ref="qrcode" :val="addressInfo.address" :size="size" :unit="unit" :background="background" <tki-qrcode ref="qrcode" :val="addressInfo.address" :size="size" :unit="unit"
:foreground="foreground" :pdground="pdground" :lv="lv" :onval="onval" :loadMake="loadMake" :background="background" :foreground="foreground" :pdground="pdground" :lv="lv" :onval="onval"
:showLoading="showLoading" :loadingText="loadingText" :icon="icon" class="test" /> :loadMake="loadMake" :showLoading="showLoading" :loadingText="loadingText" :icon="icon"
class="test" />
</view> </view>
<view class="text1"> <view class="text1">
Scan the QR code to transfer to the asset Scan the QR code to transfer to the asset
@ -113,7 +114,5 @@
</style> </style>
<style> <style>
@import './index.css'; @import './index.css';
</style> </style>

266
pages/menu/sendToken/transfer/index.vue
View File

@ -27,7 +27,7 @@
<view class="inputcon"> <view class="inputcon">
<input type="text" value="" placeholder-style="font-size: 30rpx; color: #D0D0D2;" <input type="text" value="" placeholder-style="font-size: 30rpx; color: #D0D0D2;"
placeholder="Please enter the recipient address" class="input1" placeholder="Please enter the recipient address" class="input1"
v-model="recipientAddress" /> v-model="transInfoPass.toAddress" />
<image src="../../../../static/tongyonh/Frame330.png" mode="aspectFit" class="img1"></image> <image src="../../../../static/tongyonh/Frame330.png" mode="aspectFit" class="img1"></image>
</view> </view>
</view> </view>
@ -44,15 +44,16 @@
{{coin.name}} {{coin.name}}
</view> </view>
<input type="text" value="" placeholder-style="font-size: 30rpx; color: #D0D0D2;" <input type="text" value="" placeholder-style="font-size: 30rpx; color: #D0D0D2;"
placeholder="0.0000000" class="input3" v-model="transAmount" /> placeholder="0.0000000" class="input3" v-model="transInfoPass.amount" />
</view> </view>
<text>≈</text> <text>≈</text>
<view class="inputc flex"> <view class="inputc flex">
<view class="textt"> <view class="textt">
USD USD
</view> </view>
<input type="text" value="" placeholder-style="font-size: 30rpx; color: #D0D0D2;" <input type="text" value="" disabled="disabled"
placeholder="0.0000000" class="input3" /> placeholder-style="font-size: 30rpx; color: #D0D0D2;" placeholder="0.0000000"
class="input3" />
</view> </view>
</view> </view>
<view class="top flex bottom"> <view class="top flex bottom">
@ -74,7 +75,7 @@
</view> </view>
<view class="inputcon"> <view class="inputcon">
<input type="text" value="" placeholder-style="font-size: 30rpx; color: #D0D0D2;" <input type="text" value="" placeholder-style="font-size: 30rpx; color: #D0D0D2;"
placeholder="Please enter a note (off-chain)" class="input1" /> placeholder="Please enter a note (off-chain)" v-model="transInfoPass.remark" class="input1" />
</view> </view>
</view> </view>
@ -114,7 +115,7 @@
Amount Amount
</view> </view>
<view class="text1"> <view class="text1">
{{transAmount}} {{coin.name}} {{transInfoPass.amount}} {{coin.name}}
</view> </view>
</view> </view>
<view class="item"> <view class="item">
@ -122,7 +123,7 @@
Send address Send address
</view> </view>
<view class="text2"> <view class="text2">
{{coin.address}} {{transInfoPass.fromAddress}}
</view> </view>
</view> </view>
<view class="item"> <view class="item">
@ -130,7 +131,7 @@
Receiving address Receiving address
</view> </view>
<view class="text2"> <view class="text2">
{{recipientAddress}} {{transInfoPass.toAddress}}
</view> </view>
</view> </view>
<view class="item"> <view class="item">
@ -156,7 +157,7 @@
</view> </view>
</view> </view>
<u-mask z-index="10" :show="show"></u-mask> <u-mask z-index="10" :show="show" @click="cancelAll"></u-mask>
<!-- <u-mask z-index="1000" :show="show2" @click="show2 = false"></u-mask> --> <!-- <u-mask z-index="1000" :show="show2" @click="show2 = false"></u-mask> -->
<view class="zhiwen_con" v-if="showFinger"> <view class="zhiwen_con" v-if="showFinger">
<view class="tiao" @click="cancel"> <view class="tiao" @click="cancel">
@ -170,7 +171,7 @@
Touch the fingerprint sensor Touch the fingerprint sensor
</view> </view>
<view class="flex con"> <view class="flex con">
<view class="textt1" @click="goPassword" v-if="!passShow"> <view class="textt1" @click="goPassword">
Use Password Use Password
</view> </view>
<view class="textt2" @click="cancel"> <view class="textt2" @click="cancel">
@ -213,14 +214,14 @@
<view class="text1 green"> <view class="text1 green">
Fingerprint recognized. Fingerprint recognized.
</view> </view>
<!-- <view class="flex con"> <view class="flex con">
<view class="textt1"> <view class="textt1">
Use Password Use Password
</view> </view>
<view class="textt2"> <view class="textt2">
Confirm Confirm
</view> </view>
</view> --> </view>
</view> </view>
</view> </view>
@ -249,9 +250,6 @@
show2: false, show2: false,
showFinger: false, showFinger: false,
showBottom: false, showBottom: false,
addressInfo: {},
recipientAddress: '',
transAmount: '',
fingerSuccess: false, fingerSuccess: false,
fingerFail: false, fingerFail: false,
// 是否显示使用密码，有设置指纹就不显示 // 是否显示使用密码，有设置指纹就不显示
@ -259,13 +257,82 @@
// 不用指纹去密码页面存的信息 // 不用指纹去密码页面存的信息
transInfoPass: { transInfoPass: {
fromAddress: '', fromAddress: '',
toAddress: "", toAddress: '1',
privateKey: '', privateKey: '',
amount: '', amount: '1',
remark:'1',
contractAddress:'',
password:''
} }
} }
}, },
methods: { methods: {
transaction() {
let that=this;
if (this.coin.type === 'ETH') {
this.$EthUtil.transaction(this.transInfoPass.fromAddress, this.transInfoPass.privateKey,
this.transInfoPass.toAddress, this.transInfoPass.amount, this.transInfoPass.contractAddress,
function(hash, err) {
if (!err) {
console.log(2222211111)
that.showFinger = false
that.showBottom = false;
that.fingerSuccess = true;
uni.showToast({
title: 'Transfer succeeded',
icon: 'none',
duration: 1500
})
setTimeout(() => {
that.fingerSuccess = false;
uni.reLaunch({
url: '/pages/menu/wallet/index'
})
}, 1000)
} else {
console.log(err, 'cuowu')
that.showFinger = false;
that.showBottom = true;
uni.showToast({
title: 'Transfer failed, please confirm the information is correct',
icon: 'none',
duration: 1500
})
}
})
} else if (this.coin.type === 'TRX') {
this.$TronUtil.transaction(this.transInfoPass.fromAddress, this.transInfoPass.privateKey,
this.transInfoPass.toAddress, this.transInfoPass.amount, this.transInfoPass.remark, this.transInfoPass.contractAddress)
.then((res) => {
console.log(1212121212121212)
that.showFinger = false
that.showBottom = false;
that.fingerSuccess = true;
uni.showToast({
title: 'Transfer succeeded',
icon: 'none',
duration: 1500
})
setTimeout(() => {
that.fingerSuccess = false;
uni.reLaunch({
url: '/pages/menu/wallet/index'
})
}, 1000)
}).catch(err => {
console.log(err, 'cuowu')
that.showFinger = false;
that.showBottom = true;
uni.showToast({
title: 'Transfer failed, please confirm the information is correct',
icon: 'none',
duration: 1500
})
})
}
},
cancelAll() { cancelAll() {
this.show = false; this.show = false;
this.showBottom = false; this.showBottom = false;
@ -284,13 +351,20 @@
// 不用指纹去密码页 // 不用指纹去密码页
goPassword() { goPassword() {
this.printCancel(); this.printCancel();
this.show = false;
this.showBottom=false;
console.log(111) console.log(111)
uni.setStorageSync('transInfoPass', this.transInfoPass)
uni.navigateTo({ uni.navigateTo({
url: '/pages/menu/sendToken/enPassword/index' url: '/pages/menu/sendToken/enPassword/index'
}) })
}, },
// 唤起指纹 // 唤起指纹
confirmTo(type) { confirmTo(type) {
if(!this.passShow){
this.goPassword();
}else{
console.log('点击提交')
if (type == 'try') { if (type == 'try') {
this.fingerFail = false; this.fingerFail = false;
} }
@ -298,15 +372,11 @@
this.show = true this.show = true
this.showFinger = true this.showFinger = true
this.showBottom = false; this.showBottom = false;
// 存储去密码页面的信息
this.transInfoPass.fromAddress = this.addressInfo.address;
this.transInfoPass.toAddress = this.recipientAddress;
this.transInfoPass.privateKey = this.addressInfo.privateKey;
this.transInfoPass.amount = this.transAmount;
console.log(this.transInfoPass, 444)
// 存储去密码页面的信息
uni.setStorageSync('transInfoPass', this.transInfoPass)
this.fingerprint(); this.fingerprint();
}
}, },
back() { back() {
@ -316,12 +386,12 @@
}, },
// 点击获取所有钱 // 点击获取所有钱
forAll() { forAll() {
this.transAmount = this.coin.balance this.transInfoPass.amount = this.coin.balance
}, },
// 确认提交 // 确认提交
Confirm() { Confirm() {
// 做判断 // 做判断
if (this.transAmount == '') { if (this.transInfoPass.amount == '') {
uni.showToast({ uni.showToast({
title: 'Please enter the transfer amount', title: 'Please enter the transfer amount',
icon: 'none', icon: 'none',
@ -329,7 +399,7 @@
}) })
return return
} }
if (this.recipientAddress == '') { if (this.transInfoPass.toAddress == '') {
uni.showToast({ uni.showToast({
title: 'Please enter the receiving address', title: 'Please enter the receiving address',
icon: 'none', icon: 'none',
@ -337,7 +407,7 @@
}) })
return return
} }
if (this.transAmount == '' < 0) { if (Number(this.transInfoPass.amount) == '' < 0) {
uni.showToast({ uni.showToast({
title: 'The entered amount cannot be less than 0', title: 'The entered amount cannot be less than 0',
icon: 'none', icon: 'none',
@ -345,7 +415,7 @@
}) })
return return
} }
if( this.transAmount>this.coin.balance){ if (Number(this.transInfoPass.amount) > this.coin.balance) {
uni.showToast({ uni.showToast({
title: 'Sorry, your credit is running low', title: 'Sorry, your credit is running low',
icon: 'none', icon: 'none',
@ -360,7 +430,7 @@
printCancel() { printCancel() {
this.showFinger = false; this.showFinger = false;
console.log(this.showFinger, 4444) console.log(this.showFinger, 4444)
plus.fingerprint.cancel(); //plus.fingerprint.cancel();
console.log(this.showFinger, 4444) console.log(this.showFinger, 4444)
}, },
@ -412,126 +482,8 @@
// #ifdef APP-PLUS // #ifdef APP-PLUS
plus.fingerprint.authenticate(function() { plus.fingerprint.authenticate(function() {
plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框
console.log(that.transInfoPass,5656)
console.log(that.addressInfo,56556656)
if (that.addressInfo.type == 'TRX') {
console.log(that.addressInfo.type,11111)
console.log(that.transInfoPass,2222)
// if (!this.contractAddress) {
// 指纹通过转账成功
that.$TronUtil.sendTransaction(that.transInfoPass.fromAddress,that.transInfoPass.privateKey,that.transInfoPass.toAddress,that.transInfoPass.amount )
.then((res) => {
console.log(1212121212121212)
that.showFinger = false
that.showBottom = false;
that.fingerSuccess = true;
uni.showToast({
title: 'Transfer succeeded',
icon: 'none',
duration: 1500
})
setTimeout(()=>{
that.fingerSuccess = false;
uni.reLaunch({
url: '/pages/menu/wallet/index'
})
},1000)
}).catch(err => {
console.log(err,'cuowu')
that.showFinger=false;
that.showBottom=true;
uni.showToast({
title: 'Transfer failed, please confirm the information is correct',
icon: 'none',
duration: 1500
})
})
// }else{
// this.$TronUtil.sendRawTransaction(this.info.address, this.info.privateKey, this.toAddress, this.toValue,'',this.contractAddress )
// .then((res) => {
// uni.showToast({
// title: 'Successfully',
// icon: 'success',
// duration: 2000
// })
// this.show2 = false;
// uni.reLaunch({
// url: '/pages/menu/wallet/index'
// })
// }).catch(err => {
// console.log(err)
// uni.showToast({
// title: err,
// icon: 'none',
// duration: 2000
// })
// })
// }
}
if (that.addressInfo.type == 'ETH') {
console.log(that.addressInfo.type,11111)
console.log(that.transInfoPass,2222)
// if (!this.contractAddress) {
// 指纹通过转账成功
that.$EthUtil.transaction(that.transInfoPass.fromAddress,that.transInfoPass.privateKey,that.transInfoPass.toAddress,that.transInfoPass.amount )
.then((res) => {
console.log(2222211111)
that.showFinger = false
that.showBottom = false;
that.fingerSuccess = true;
uni.showToast({
title: 'Transfer succeeded',
icon: 'none',
duration: 1500
})
setTimeout(()=>{
that.fingerSuccess = false;
uni.reLaunch({
url: '/pages/menu/wallet/index'
})
},1000)
}).catch(err => {
console.log(err,'cuowu')
that.showFinger=false;
that.showBottom=true;
uni.showToast({
title: 'Transfer failed, please confirm the information is correct',
icon: 'none',
duration: 1500
})
})
// }else{
// this.$TronUtil.sendRawTransaction(this.info.address, this.info.privateKey, this.toAddress, this.toValue,'',this.contractAddress )
// .then((res) => {
// uni.showToast({
// title: 'Successfully',
// icon: 'success',
// duration: 2000
// })
// this.show2 = false;
// uni.reLaunch({
// url: '/pages/menu/wallet/index'
// })
// }).catch(err => {
// console.log(err)
// uni.showToast({
// title: err,
// icon: 'none',
// duration: 2000
// })
// })
// }
}
that.transaction()
}, function(e) { }, function(e) {
switch (e.code) { switch (e.code) {
@ -609,14 +561,16 @@
} }
}, },
onLoad() { onLoad() {
// 拿从地址页面传过来的接受地址
if(uni.getStorageSync('myTransAddress')){
this.recipientAddress=uni.getStorageSync('myTransAddress').address
// 拿完清掉
uni.removeStorageSync('myTransAddress')
}
this.coin = uni.getStorageSync('coin') this.coin = uni.getStorageSync('coin')
// 每次进来拿缓存里有没有指纹 // 每次进来拿缓存里有没有指纹
this.transInfoPass.fromAddress=this.coin.address;
this.transInfoPass.privateKey=this.coin.privateKey;
this.transInfoPass.password=this.coin.password;
this.transInfoPass.contractAddress=this.coin.contractAddress
this.transInfoPass.type=this.coin.type;
console.log(this.transInfoPass,'指纹')
if (uni.getStorageSync('fingerPass')) { if (uni.getStorageSync('fingerPass')) {
this.passShow = uni.getStorageSync('fingerPass') this.passShow = uni.getStorageSync('fingerPass')
} }

7
pages/menu/setting/index.vue
View File

@ -5,12 +5,7 @@
</navigation> </navigation>
<view class="main"> <view class="main">
<view class="main_con"> <view class="main_con">
<view class="item flex">
<view class="text1">
Payment password
</view>
<image src="../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
</view>
<view class="item flex"> <view class="item flex">
<view class="text1"> <view class="text1">
Fingerprint password Fingerprint password

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

@ -4,6 +4,7 @@
position: absolute; position: absolute;
right: 30rpx; right: 30rpx;
} }
.big_title { .big_title {
font-size: 36rpx; font-size: 36rpx;
} }
@ -19,52 +20,62 @@
padding: 40rpx 50rpx; padding: 40rpx 50rpx;
border-radius: 24rpx; border-radius: 24rpx;
} }
.textcon1 { .textcon1 {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
line-height: 56rpx; line-height: 56rpx;
} }
.textcon1 .text1 { .textcon1 .text1 {
color: #fff; color: #fff;
font-size: 56rpx; font-size: 56rpx;
} }
.textcon1 .text1 .text2 { .textcon1 .text1 .text2 {
color: #fff; color: #fff;
font-size: 32rpx; font-size: 32rpx;
} }
.textcon1 .img1 { .textcon1 .img1 {
width: 100rpx; width: 100rpx;
height: 110rpx; height: 110rpx;
} }
.textcon1 .v1{
} .textcon1 .v1 {}
.textcon1 .v1 .t1 { .textcon1 .v1 .t1 {
color: #fff; color: #fff;
font-size: 32rpx; font-size: 32rpx;
} }
.textcon1 .v1 .t2 { .textcon1 .v1 .t2 {
color: #fff; color: #fff;
font-size: 24rpx; font-size: 24rpx;
} }
.textcon1 .v2 { .textcon1 .v2 {
margin-right: 100rpx; margin-right: 100rpx;
} }
.select_con { .select_con {
width: 100%; width: 100%;
padding-bottom: 260rpx; padding-bottom: 260rpx;
} }
.select_con .select { .select_con .select {
margin: 0 12px; margin: 0 12px;
border-radius: 30rpx; border-radius: 30rpx;
background-color: #fff; background-color: #fff;
box-shadow: 0 0 30px #EBEEF1; box-shadow: 0 0 30px #EBEEF1;
} }
/deep/ .u-tabs { /deep/ .u-tabs {
border-bottom: 2rpx solid #F6F8FD; border-bottom: 2rpx solid #F6F8FD;
border-radius: 30rpx 30rpx 0 0; border-radius: 30rpx 30rpx 0 0;
} }
.select_con .item1 { .select_con .item1 {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -74,40 +85,48 @@
padding-left: 40rpx; padding-left: 40rpx;
padding-right: 24rpx; padding-right: 24rpx;
} }
.select_con .item1 .lef_con { .select_con .item1 .lef_con {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.select_con .item1 .lef_con .img1 { .select_con .item1 .lef_con .img1 {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
} }
.select_con .item1 .lef_con .textcon { .select_con .item1 .lef_con .textcon {
margin-left: 24rpx; margin-left: 24rpx;
} }
.select_con .item1 .lef_con .textcon .text1 { .select_con .item1 .lef_con .textcon .text1 {
font-size: 32rpx; font-size: 26rpx;
} }
.select_con .item1 .lef_con .textcon .text2 { .select_con .item1 .lef_con .textcon .text2 {
font-size: 24rpx; font-size: 22rpx;
color: #999; color: #999;
} }
.select_con .item1 .rig_con .text1 { .select_con .item1 .rig_con .text1 {
font-size: 32rpx; font-size: 24rpx;
} }
.select_con .item1 .rig_con .img1 { .select_con .item1 .rig_con .img1 {
width: 28rpx; width: 28rpx;
height: 20rpx; height: 20rpx;
float: right; float: right;
margin-top: 20rpx; margin-top: 20rpx;
} }
.select_con .item1 .rig_con .img2 { .select_con .item1 .rig_con .img2 {
width: 28rpx; width: 28rpx;
height: 40rpx; height: 40rpx;
float: right; float: right;
margin-top: 20rpx; margin-top: 20rpx;
} }
.btnconn { .btnconn {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@ -117,9 +136,10 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.btnconn .btn { .btnconn .btn {
width: 334rpx; width: 306rpx;
line-height: 96rpx; line-height: 78rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #5B53FF; border: 2rpx solid #5B53FF;
text-align: center; text-align: center;
@ -127,13 +147,15 @@
align-items: center; align-items: center;
color: #5B53FF; color: #5B53FF;
justify-content: center; justify-content: center;
font-size: 34rpx; font-size: 28rpx;
position: relative; position: relative;
} }
.active { .active {
color: #fff !important; color: #fff !important;
background-color: #5B53FF; background-color: #5B53FF;
} }
.btnconn .btn .img1 { .btnconn .btn .img1 {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
@ -141,13 +163,14 @@
} }
.arrow-up-left { .arrow-up-left {
width: 48rpx; width: 44rpx;
height: 48rpx; height: 44rpx;
position: absolute; position: absolute;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
left: 68rpx; left: 68rpx;
} }
.btn13 { .btn13 {
margin-left: 40rpx; margin-left: 40rpx;
} }
@ -160,6 +183,7 @@
position: relative; position: relative;
border-radius: 24rpx; border-radius: 24rpx;
} }
.main .money_con2 { .main .money_con2 {
margin-top: 32rpx; margin-top: 32rpx;
background-image: linear-gradient(to right, #FF820C, #FFB606); background-image: linear-gradient(to right, #FF820C, #FFB606);
@ -168,6 +192,7 @@
position: relative; position: relative;
border-radius: 24rpx; border-radius: 24rpx;
} }
.main .money_con3 { .main .money_con3 {
margin-top: 32rpx; margin-top: 32rpx;
background-image: linear-gradient(to right, #B6162A, #F96D7D); background-image: linear-gradient(to right, #B6162A, #F96D7D);
@ -180,6 +205,7 @@
.select_con .item1 .rig_con .text1 text { .select_con .item1 .rig_con .text1 text {
margin-left: 10rpx; margin-left: 10rpx;
} }
/deep/ .u-empty { /deep/ .u-empty {
padding: 30px !important; padding: 30px !important;
} }

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

@ -45,7 +45,7 @@
<view class="select_con"> <view class="select_con">
<view class="select"> <view class="select">
<u-tabs height="120" bar-width="172" active-color="#6F69FF" inactive-color="#A3AED0" :list="list" <u-tabs height="120" bar-width="172" active-font="13" inactive-font="13" active-color="#6F69FF" inactive-color="#A3AED0" :list="list"
:is-scroll="false" :current="current" @change="change"></u-tabs> :is-scroll="false" :current="current" @change="change"></u-tabs>
<u-empty text="No content" mode="list" v-if="showInfo"></u-empty> <u-empty text="No content" mode="list" v-if="showInfo"></u-empty>

47
pages/menu/transction/detail/index.vue
View File

@ -46,36 +46,37 @@
</view> </view>
<view class="text2"> <view class="text2">
{{info.txid}} {{info.txid}}
<image src="../../../../static/tongyonh/copy_24px.png" mode="aspectFit" class="img" @click="show = true"></image> <image src="../../../../static/tongyonh/copy_24px.png" mode="aspectFit" class="img"
@click="copyTextMethod(info.txid)"></image>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="text1"> <view class="text1">
Send address Send address
<text v-if="info.type=='out'"> (others)</text> <text v-if="isIn"> (others)</text>
<text v-else>(me)</text> <text v-else>(me)</text>
</view> </view>
<view class="text2"> <view class="text2">
{{info.from}} {{info.from}}
<image src="../../../../static/tongyonh/copy_24px.png" mode="aspectFit" class="img"></image> <image @click="copyTextMethod(info.from)" src="../../../../static/tongyonh/copy_24px.png" mode="aspectFit" class="img"></image>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="text1"> <view class="text1">
Receiving address Receiving address
<text v-if="info.type=='in'">(me)</text> <text v-if="isIn">(me)</text>
<text v-else>(others)</text> <text v-else>(others)</text>
</view> </view>
<view class="text2"> <view class="text2">
{{info.to}} {{info.to}}
<image src="../../../../static/tongyonh/copy_24px.png" mode="aspectFit" class="img"></image> <image @click="copyTextMethod(info.to)" src="../../../../static/tongyonh/copy_24px.png" mode="aspectFit" class="img"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="item goto"> <view class="item goto">
Go to your browser for more information Go to your browser for more information
</view> </view>
<view class="sett" v-if="show"> <!-- <view class="sett" v-if="show">
<view class="top"> <view class="top">
<view class="item"> <view class="item">
Copy address Copy address
@ -87,7 +88,7 @@
<view class="cancel" @click="show = false"> <view class="cancel" @click="show = false">
Cancel Cancel
</view> </view>
</view> </view> -->
</view> </view>
<u-mask :show="show" z-index="10"></u-mask> <u-mask :show="show" z-index="10"></u-mask>
@ -111,13 +112,45 @@
return { return {
show: false, show: false,
info: {}, info: {},
isIn:true,
toTop: false,
} }
}, },
methods: { methods: {
copyTextMethod(text) {
console.log(text)
// #ifdef H5
this.$copyText(text).then(res => {
// Copy address Successful!
uni.showToast({
title: 'Copy Successful!',
icon: 'none',
duration: 1500
})
})
// #endif
// #ifdef APP-PLUS
var that = this
console.log(123132)
uni.setClipboardData({
data: text,
success() {
uni.showToast({
title: 'Copy Successful!',
icon: 'none',
duration: 1500
})
}
})
// #endif
}
}, },
onLoad(option) { onLoad(option) {
this.info = uni.getStorageSync('transDetail') this.info = uni.getStorageSync('transDetail')
console.log(this.info.type)
this.isIn=this.info.type==='in';
console.log(this.isIn)
this.info.time = index.formatyymmddhhmmss33(this.info.time); this.info.time = index.formatyymmddhhmmss33(this.info.time);
} }
}; };

2
pages/menu/wallet/cwallet/index.css
View File

@ -133,7 +133,7 @@
.bot_con .item .rig{ .bot_con .item .rig{
text-align: right; text-align: right;
color: #fff; color: #fff;
font-size: 34rpx; font-size: 30rpx;
} }
.bot_con .item .rig .text1{ .bot_con .item .rig .text1{

32
pages/menu/wallet/index.vue
View File

@ -106,8 +106,11 @@
onLoad() { onLoad() {
// 拿钱包 // 拿钱包
this.userObj = uni.getStorageSync('wallet'); this.userObj = uni.getStorageSync('wallet');
// this.userObj2 = uni.getStorageSync('wallet'); let that=this;
this.updateData(); this.$walletUtil.updateBalance(function(){
that.userObj = uni.getStorageSync('wallet');
that.userObj2 = uni.getStorageSync('wallet');
});
}, },
// onPullDownRefresh() { // onPullDownRefresh() {
@ -118,30 +121,7 @@
// }, 500); // }, 500);
// }, // },
methods: { methods: {
updateData() {
let thar = this;
setTimeout(
function() {
thar.userObj = uni.getStorageSync('wallet');
thar.userObj2 = uni.getStorageSync('wallet');
// thar.userObj.address = thar.userObj.ellipsisAddress;
// thar.userObj.address =thar.userObj.address.substring(0, 6) + '...' + thar.userObj.address.substring(25,
// thar.userObj.address.length);
// thar.$walletUtil.updateBalance();
// thar.updateData();
// }, 100);
thar.$walletUtil.updateBalance();
console.log(thar.isStop,4444)
if (!thar.isStop) {
// thar.updateData()
}
}, 2000);
},
goOther() { goOther() {
console.log(this.userObj2, 8888) console.log(this.userObj2, 8888)
let item = JSON.stringify(this.userObj2) let item = JSON.stringify(this.userObj2)
@ -163,7 +143,9 @@
goTrans(itemm, index) { goTrans(itemm, index) {
let coin = this.userObj.coinList[index]; let coin = this.userObj.coinList[index];
coin.type=this.userObj.type; coin.type=this.userObj.type;
coin.privateKey=this.userObj.privateKey;
coin.address=this.userObj.address; coin.address=this.userObj.address;
coin.password=this.userObj.password;
uni.setStorageSync('coin',coin) uni.setStorageSync('coin',coin)
uni.navigateTo({ uni.navigateTo({
url: '/pages/menu/token/btc/index' url: '/pages/menu/token/btc/index'

8
pages/menu/wallet/mwallet/index.css
View File

@ -102,18 +102,18 @@
width:auto;flex:1 width:auto;flex:1
} }
.bot_con .item .left .textcon .text1{ .bot_con .item .left .textcon .text1{
font-size: 36rpx; font-size: 30rpx;
color: #fff; color: #fff;
} }
.bot_con .item .left .textcon .text2{ .bot_con .item .left .textcon .text2{
font-size: 28rpx; font-size: 24rpx;
color: rgba(255,255,255,.5); color: #FFFFFF;
word-break: break-word; word-break: break-word;
} }
.bot_con .item .rig{ .bot_con .item .rig{
text-align: right; text-align: right;
color: #fff; color: #fff;
font-size: 34rpx; font-size: 30rpx;
} }
.bot_con .item .rig .text1{ .bot_con .item .rig .text1{

10
utils/EthUtil.js
View File

@ -97,7 +97,7 @@ let eth = {
transaction: async function(fromAddress, toAddress, value, privateKey, success) { sendTransaction: async function(fromAddress, toAddress, value, privateKey, success) {
var nonce = await web3.eth.getTransactionCount(fromAddress); var nonce = await web3.eth.getTransactionCount(fromAddress);
var gas = await web3.eth.estimateGas({ var gas = await web3.eth.estimateGas({
@ -208,6 +208,14 @@ let eth = {
},
transaction:async function(fromAddress, toAddress, value, privateKey, contract, success){
if(contract){
await this.sendTokenTransaction(fromAddress, toAddress, value, privateKey, contract, success);
}else{
await this.sendTransaction(fromAddress, toAddress, value, privateKey, success)
}
} }
} }
export default eth; export default eth;

7
utils/TronUtil.js
View File

@ -76,6 +76,13 @@ let tron = {
} }
return null; return null;
}, },
transaction:async function(fromAddress, privateKey, toAddress, amount, remark, contract){
if(contract){
return await this.sendRawTransaction(fromAddress, privateKey, toAddress, amount, remark, contract);
}else{
return await this.sendTransaction(fromAddress, privateKey, toAddress, amount);
}
},
getContract:function(address,list,success){ getContract:function(address,list,success){
uni.request({ uni.request({
url: 'https://apiasia.tronscan.io:5566/api/account/tokens?limit=100&address=' + address, //请求接口 url: 'https://apiasia.tronscan.io:5566/api/account/tokens?limit=100&address=' + address, //请求接口

25
utils/WalletUtil.js
View File

@ -177,7 +177,8 @@ let WalletUtil = {
for (var k = 0, length = walletInfo[obj].length; k < length; k++) { for (var k = 0, length = walletInfo[obj].length; k < length; k++) {
let address = walletInfo[obj][k].address; let address = walletInfo[obj][k].address;
walletInfo[obj][k].ellipsisAddress = address.substring(0, 6) + '...' + address.substring(address.length-6, walletInfo[obj][k].ellipsisAddress = address.substring(0, 6) + '...' + address.substring(
address.length - 6,
address.length); address.length);
walletInfo[obj][k].type = obj; walletInfo[obj][k].type = obj;
walletList.push(walletInfo[obj][k]); walletList.push(walletInfo[obj][k]);
@ -202,7 +203,7 @@ let WalletUtil = {
} }
}, },
updateBalance:function() { updateBalance: function(success) {
const wallet = uni.getStorageSync('wallet'); const wallet = uni.getStorageSync('wallet');
console.log(wallet, '更新余额') console.log(wallet, '更新余额')
const walletInfo = uni.getStorageSync('walletInfo'); const walletInfo = uni.getStorageSync('walletInfo');
@ -225,6 +226,7 @@ let WalletUtil = {
wallet.coinList[0].balance = balance wallet.coinList[0].balance = balance
wallet.coinList[0].balancePrice = wallet.balancePrice wallet.coinList[0].balancePrice = wallet.balancePrice
uni.setStorageSync('wallet', wallet); uni.setStorageSync('wallet', wallet);
success()
}) })
break; break;
case 'ETH': case 'ETH':
@ -235,10 +237,14 @@ let WalletUtil = {
wallet.coinList[0].balance = balance wallet.coinList[0].balance = balance
wallet.coinList[0].balancePrice = wallet.balancePrice wallet.coinList[0].balancePrice = wallet.balancePrice
for (let i = 1; i < wallet.coinList.length; i++) { for (let i = 1; i < wallet.coinList.length; i++) {
EthUtil.getTokenBalance(wallet.address,wallet.coinList[i].contractAddress,function(b){ EthUtil.getTokenBalance(wallet.address, wallet.coinList[
i].contractAddress, function(b) {
wallet.coinList[i].balance = b; wallet.coinList[i].balance = b;
wallet.coinList[1].balancePrice=(wallet.coinList[1].balance*usdt).toFixed(2); wallet.coinList[1].balancePrice = (wallet
.coinList[1].balance * usdt)
.toFixed(2);
uni.setStorageSync('wallet', wallet); uni.setStorageSync('wallet', wallet);
success()
}); });
} }
@ -252,11 +258,14 @@ let WalletUtil = {
wallet.balancePrice = (res * rr).toFixed(2); wallet.balancePrice = (res * rr).toFixed(2);
wallet.coinList[0].balance = res wallet.coinList[0].balance = res
wallet.coinList[0].balancePrice = wallet.balancePrice wallet.coinList[0].balancePrice = wallet.balancePrice
TronUtil.getContract(wallet.address,wallet.coinList,function(list){ TronUtil.getContract(wallet.address, wallet.coinList,
function(list) {
wallet.coinList = list; wallet.coinList = list;
wallet.coinList[1].balancePrice=(wallet.coinList[1].balance*usdt).toFixed(2); wallet.coinList[1].balancePrice = (wallet
.coinList[1].balance * usdt).toFixed(2);
console.log(wallet.coinList) console.log(wallet.coinList)
uni.setStorageSync('wallet', wallet); uni.setStorageSync('wallet', wallet);
success()
}) })
}) })
@ -427,7 +436,9 @@ let WalletUtil = {
break; break;
case e.AUTHENTICATE_OVERLIMIT: case e.AUTHENTICATE_OVERLIMIT:
plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框
plus.nativeUI.alert('The number of fingerprint identification failures exceeds the limit. Please use other methods for authentication'); plus.nativeUI.alert(
'The number of fingerprint identification failures exceeds the limit. Please use other methods for authentication'
);
break; break;
case e.CANCEL: case e.CANCEL:
plus.nativeUI.toast('Recognition has been cancelled'); plus.nativeUI.toast('Recognition has been cancelled');

Write Preview
Loading…
Cancel
Save