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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      pages/menu/sendToken/addAddress/index.vue
  2. 2
      pages/menu/token/btc/index.css
  3. 4
      pages/menu/token/btc/index.vue
  4. 86
      pages/menu/wallet/mwallet/manage/index.vue
  5. 43851
      unpackage/dist/dev/app-plus/app-service.js
  6. 17850
      unpackage/dist/dev/app-plus/app-view.js

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

@ -16,9 +16,8 @@
</view> </view>
<view class="inputcon"> <view class="inputcon">
<input type="text" value="" v-model="value" <input type="text" value="" v-model="value"
placeholder-style="font-size: 30rpx; color: #D0D0D2;" placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee1" class="input1"
:placeholder="teee1" class="input1" @click="showSelect()" @click="showSelect()" :disabled="true" />
:disabled="true" />
<image src="../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"> <image src="../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1">
</image> </image>
</view> </view>
@ -32,10 +31,10 @@
</view> </view>
<view class="inputcon"> <view class="inputcon">
<input type="text" value="" @input="showSave()" <input type="text" value="" @input="showSave()"
placeholder-style="font-size: 30rpx; color: #D0D0D2;" placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee2" class="input1"
:placeholder="teee2" class="input1" v-model="bigAddress" /> v-model="bigAddress" />
<image src="../../../../static/tongyonh/Frame330.png" mode="aspectFit" class="img2" <image src="../../../../static/tongyonh/Frame330.png" mode="aspectFit" class="img2"
@click="chooseImage"></image> @click="scanCode"></image>
</view> </view>
</view> </view>
@ -48,8 +47,8 @@
</view> </view>
<view class="inputcon"> <view class="inputcon">
<input type="text" @input="showSave" value="" <input type="text" @input="showSave" value=""
placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee3" placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee3" class="input1"
class="input1" v-model="addressName" /> v-model="addressName" />
</view> </view>
</view> </view>
@ -87,7 +86,7 @@
</view> </view>
</u-radio-group> </u-radio-group>
<view class="select_btn" @click="selectA"> <view class="select_btn" @click="selectA">
{{i18n.langSelect}} {{i18n.langSelect}}
</view> </view>
</view> </view>
</view> </view>
@ -102,9 +101,9 @@
export default { export default {
data() { data() {
return { return {
teee1:this.$t('index').selectcurrency, teee1: this.$t('index').selectcurrency,
teee2:this.$t('index').Pleaserecipientaddress, teee2: this.$t('index').Pleaserecipientaddress,
teee3:this.$t('index').enterthename, teee3: this.$t('index').enterthename,
info: {}, info: {},
addressName: '', addressName: '',
bigAddress: '', bigAddress: '',
@ -133,7 +132,7 @@
], ],
// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中 // u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
value: '', value: '',
transfer:'', transfer: '',
} }
}, },
onLoad() { onLoad() {
@ -148,18 +147,17 @@
selectA() { selectA() {
this.show = false this.show = false
}, },
// 唤醒摄像头 scanCode() {
chooseImage() {
var _this = this var _this = this
uni.chooseImage({ uni.scanCode({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], //从相册选择、摄像头
success: function(res) { success: function(res) {
_this.imgShow = res.tempFilePaths[0] console.log('扫码内容', res.result)
_this.bigAddress = res.result;
} }
}); });
}, },
handove2(item, index) { handove2(item, index) {
this.value = item.name; this.value = item.name;
this.show = false; this.show = false;

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

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

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

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

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

@ -1,7 +1,8 @@
<template> <template>
<view class=""> <view class="">
<navigation :showBack="false" :bgnum="true"> <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"> <text class="big_title">
{{i18n.Manage}} {{i18n.Manage}}
</text> </text>
@ -21,16 +22,14 @@
<view class="text1"> <view class="text1">
{{i18n.Name}} {{i18n.Name}}
</view> </view>
<view class="address" > <view class="address">
<<<<<<< HEAD <!-- <text v-if="userObj.name=='BTC'">{{i18n.Setname}}</text>
<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=='ETH'">{{i18n.Setname}}</text>
<text v-else-if="userObj.name=='TRX'">{{i18n.Setname}}</text> <text v-else-if="userObj.name=='TRX'">{{i18n.Setname}}</text> -->
<text v-else>{{userObj.name}}</text> <text>{{userObj.name}}</text>
=======
{{userObj.name}} <image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit"
>>>>>>> 597f46eb933c677e991915c5a7fe52f9e8d27baa class="img1"></image>
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
</view> </view>
</view> </view>
<view class="name flex" @click="goTrans()" v-if="itemMnemonic"> <view class="name flex" @click="goTrans()" v-if="itemMnemonic">
@ -38,7 +37,8 @@
{{i18n.backupMneTit}} {{i18n.backupMneTit}}
</view> </view>
<view class="address"> <view class="address">
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image> <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="name flex" @click="goKey()">
@ -46,13 +46,15 @@
{{i18n.Backupprivatekey}} {{i18n.Backupprivatekey}}
</view> </view>
<view class="address"> <view class="address">
<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image> <image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit"
class="img1"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="showAddress" v-if="showAddress"> <view class="showAddress" v-if="showAddress">
<image src="../../../../../static/tongyonh/xg.png" mode="aspectFit" class="img1" @click="showAddress=false"></image> <image src="../../../../../static/tongyonh/xg.png" mode="aspectFit" class="img1"
@click="showAddress=false"></image>
<view class="title"> <view class="title">
{{i18n.Newwalletname}} {{i18n.Newwalletname}}
</view> </view>
@ -78,7 +80,7 @@
<u-mask z-index='100' :show="showAddress" @click="showAddress = false"></u-mask> <u-mask z-index='100' :show="showAddress" @click="showAddress = false"></u-mask>
</view> </view>
@ -89,72 +91,72 @@
export default { export default {
data() { data() {
return { return {
teee:this.$t('index').walletname, teee: this.$t('index').walletname,
value: '', value: '',
type: 'text', type: 'text',
border: true, border: true,
height: 90, height: 90,
autoHeight: true, autoHeight: true,
showAddress:false, showAddress: false,
userObj:{}, userObj: {},
itemMnemonic:true, itemMnemonic: true,
walletInfo:{}, walletInfo: {},
nameIndex:-1, nameIndex: -1,
} }
}, },
methods: { methods: {
back(){ back() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/menu/wallet/mwallet/index' url: '/pages/menu/wallet/mwallet/index'
}) })
}, },
setName(){ setName() {
if(this.value==''){ if (this.value == '') {
uni.showToast({ uni.showToast({
title:this.$t('index').Namecannot, title: this.$t('index').Namecannot,
icon: 'none', icon: 'none',
duration: 1500 duration: 1500
}) })
} }
console.log(this.userObj,2222) console.log(this.userObj, 2222)
this.userObj.name=this.value; this.userObj.name = this.value;
this.$walletUtil.updateWalletName(this.userObj.type,this.userObj.address,this.value) this.$walletUtil.updateWalletName(this.userObj.type, this.userObj.address, this.value)
uni.showToast({ uni.showToast({
title: this.$t('index').Successful, title: this.$t('index').Successful,
icon: 'success', icon: 'success',
duration: 1500 duration: 1500
}) })
this.showAddress=false; this.showAddress = false;
setTimeout(()=>{ setTimeout(() => {
uni.navigateTo({ uni.navigateTo({
url:'../../mwallet/index' url: '../../mwallet/index'
}) })
},1500) }, 1500)
}, },
goTrans(){ goTrans() {
console.log(this.userObj,444) console.log(this.userObj, 444)
uni.setStorageSync('backWordInfo',this.userObj) uni.setStorageSync('backWordInfo', this.userObj)
uni.navigateTo({ uni.navigateTo({
url:'/pages/menu/backUp/transPawMan/index' url: '/pages/menu/backUp/transPawMan/index'
}) })
}, },
goKey(){ goKey() {
// 存储私钥信息 // 存储私钥信息
uni.setStorageSync('keyInfo',this.userObj) uni.setStorageSync('keyInfo', this.userObj)
uni.navigateTo({ uni.navigateTo({
url:'../../../backUp/transPawKeyOut/index' url: '../../../backUp/transPawKeyOut/index'
}) })
}, },
}, },
onLoad: function(option) { onLoad: function(option) {
this.userObj = uni.getStorageSync('addressDetailInfo') this.userObj = uni.getStorageSync('addressDetailInfo')
console.log(this.userObj,45454554) console.log(this.userObj, 45454554)
// 没有助记词就隐藏助剂词导入 // 没有助记词就隐藏助剂词导入
if(!this.userObj.mnemonic){ if (!this.userObj.mnemonic) {
this.itemMnemonic=false; this.itemMnemonic = false;
} }
}, },
computed: { computed: {

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

File diff suppressed because one or more lines are too long

17850
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