diff --git a/manifest.json b/manifest.json index a367c7d..33ed003 100644 --- a/manifest.json +++ b/manifest.json @@ -21,26 +21,30 @@ "delay" : 0 }, /* 模块配置 */ - "modules" : {}, + "modules" : { + "FaceID" : {}, + "Fingerprint" : {} + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ "android" : { "permissions" : [ - "", - "", - "", - "", - "", + "", "", "", + "", "", + "", + "", + "", "", + "", + "", "", - "", + "", + "", "", - "", - "", "" ] }, diff --git a/pages.json b/pages.json index 8ddd4a2..2e92ceb 100644 --- a/pages.json +++ b/pages.json @@ -3,131 +3,117 @@ "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/register/index", - "style": { - "navigationStyle": "custom" - } - - }, - { - "path": "pages/menu/index/index", + { + "path": "pages/register/index", "style": { "navigationStyle": "custom" } }, - - { + { "path": "pages/menu/index/index", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true } - }, + { + "path": "pages/menu/token/btc/index", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + }, - { - "path": "pages/menu/token/btc/index", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true - } - }, + { + "path": "pages/menu/wallet/search/index", + "style": { + "navigationStyle": "custom" + } + + }, + { + "path": "pages/menu/collection/collectionDetailtrue/index", + "style": { + "navigationStyle": "custom" + } + }, { - "path": "pages/menu/wallet/search/index", - "style": { - "navigationStyle": "custom" - } - - }, - { - "path": "pages/menu/collection/collectionDetailtrue/index", - "style": { - "navigationStyle": "custom" - } - - }, - { "path": "pages/menu/collection/addCollection/index", "style": { "navigationStyle": "custom" } - + }, - { + { "path": "pages/menu/collection/collectionDetail/index", "style": { "navigationStyle": "custom" } - + }, - { + { "path": "pages/menu/collection/index", "style": { "navigationStyle": "custom" } - + }, -{ - "path": "pages/menu/token/btctrue/index", - "style": { - "navigationStyle": "custom" - } - - }, -{ - "path": "pages/menu/sendToken/transfer2/index", - "style": { - "navigationStyle": "custom" - } - - }, -{ - "path": "pages/menu/wallet/otherCoin/index", - "style": { - "navigationStyle": "custom" - } - - }, + { + "path": "pages/menu/token/btctrue/index", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/menu/sendToken/transfer2/index", + "style": { + "navigationStyle": "custom" + } - { - "path": "pages/menu/backUp/index", - "style": { - "navigationStyle": "custom" - } - }, + }, + { + "path": "pages/menu/wallet/otherCoin/index", + "style": { + "navigationStyle": "custom" + } + + }, - - { - "path": "pages/menu/wallet/cwallet/index", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/menu/backUp/transPawKey/index", - "style": { - "navigationStyle": "custom" - } - }, { - "path": "pages/menu/backUp/transPawKeyOut/index", + "path": "pages/menu/backUp/index", "style": { "navigationStyle": "custom" } }, + + + { - "path": "pages/menu/backUp/transPawMan/index", + "path": "pages/menu/wallet/cwallet/index", "style": { "navigationStyle": "custom" } }, + { + "path": "pages/menu/backUp/transPawKey/index", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/menu/backUp/transPawKeyOut/index", + "style": { + "navigationStyle": "custom" + } + }, + { "path": "pages/menu/backUp/backUpWord/index", "style": { @@ -191,8 +177,8 @@ "navigationStyle": "custom" } }, - - + + { "path": "pages/menu/wallet/mwallet/manage/index", @@ -260,6 +246,7 @@ "navigationStyle": "custom" } }, + { "path": "pages/menu/transction/detail2/index", "style": { @@ -272,6 +259,12 @@ "navigationStyle": "custom" } }, + { + "path": "pages/menu/sendToken/index2", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/menu/sendToken/index", "style": { @@ -287,15 +280,15 @@ - { + { "path": "pages/menu/token/btc/index2", "style": { "navigationStyle": "custom", - "enablePullDownRefresh": true + "enablePullDownRefresh": true } }, - + diff --git a/pages/menu/backUp/backUp5/index.vue b/pages/menu/backUp/backUp5/index.vue index 1cd3bfb..b048d94 100644 --- a/pages/menu/backUp/backUp5/index.vue +++ b/pages/menu/backUp/backUp5/index.vue @@ -86,6 +86,7 @@ name: '', typename:'', info: {}, + go:true, }; }, methods: { @@ -118,21 +119,26 @@ console.log(this.typename) this.walletInfo = uni.getStorageSync('walletInfo'); for(var i=0;i - - - - Backup mnemonic - - - - - - - Please keep your mnemonics. Anyone who gets your mnemonics can control your account, including transferring all funds - - - - Incorrect password - - - - - - - - - - - - - - - - - diff --git a/pages/menu/collection/addCollection/index.vue b/pages/menu/collection/addCollection/index.vue index f62d9ec..084c88c 100644 --- a/pages/menu/collection/addCollection/index.vue +++ b/pages/menu/collection/addCollection/index.vue @@ -103,7 +103,7 @@ }) setTimeout(()=>{ uni.navigateTo({ - url:'../addCollection/index' + url:'../collectionDetail/index' }) },1500) } diff --git a/pages/menu/collection/collectionDetailtrue/index.vue b/pages/menu/collection/collectionDetailtrue/index.vue index decfacf..1cc479a 100644 --- a/pages/menu/collection/collectionDetailtrue/index.vue +++ b/pages/menu/collection/collectionDetailtrue/index.vue @@ -29,7 +29,7 @@ Token ID - {{item.tonkenId}} + {{item.id}} @@ -51,13 +51,6 @@ wallet:{}, nftIndex:0, walletInfo:{}, - // nftContrct:{ - // // [ - // // { - - // // } - // // ] - // }, } }, @@ -79,12 +72,8 @@ }, methods: { - test(){ this.nftIndex=uni.getStorageSync('nftIndex') - - - } diff --git a/pages/menu/collection/index.vue b/pages/menu/collection/index.vue index 8013e69..9e81dff 100644 --- a/pages/menu/collection/index.vue +++ b/pages/menu/collection/index.vue @@ -147,10 +147,9 @@ goDetail(itemm,index){ uni.setStorageSync('proid',this.test.id) uni.setStorageSync('nftIndex',this.testindex) - let item = JSON.stringify(this.test) uni.setStorageSync('nftitem',this.test) uni.navigateTo({ - url:'./collectionDetail/index?type='+item + url:'./collectionDetail/index' }) this.showbottom=false; } diff --git a/pages/menu/index/index.vue b/pages/menu/index/index.vue index 013885f..52e6ff4 100644 --- a/pages/menu/index/index.vue +++ b/pages/menu/index/index.vue @@ -1,10 +1,13 @@ @@ -12,41 +15,107 @@ export default { data() { return { - eth: '', - trc: 'Hello', - param : { - 'address':"0x5b1F11800D6DdD262A5Feda2Cc6e3256A905c280", - 'pageNum':1, - 'pageSize':10, - }, + result: '', + disabled:true, + show:false, } }, onLoad() { - uni.request({ - url: 'http://scan.weirui0755.com/btc/api/address/btc/'+this.param.address+'/'+this.param.pageNum+'/'+this.param.pageSize, //请求接口 - header: { - 'content-type': 'application/x-www-form-urlencoded', //自定义请求头信息 - }, - success: (res) => { - console.log(res,78978979) - } - }); - - - this.$EthUtil.getBalance('0x4f6742badb049791cd9a37ea913f2bac38d01279',function(b){ - console.log(b,'8888') - }); - - - this.$TronUtil.getTronBalance('TGPirBtr42YvWtwDNgVEgv3YYhiCkE8hJq').then((res) => { - console.log(res,'tron') - this.trc = res - }).catch(err => { - console.log(err) - }) - + }, methods: { + printCancel:function(){ + plus.fingerprint.cancel(); + this.result="停止指纹识别" + }, + fingerprint: function() { + // // #ifdef APP-PLUS + // if (!plus.fingerprint.isSupport()) { + // uni.showToast({ + // title: 'This device does not support fingerprint identification', + // icon: 'none', + // duration: 1500 + // }) + // // this.disabled = true; + // } else if (!plus.fingerprint.isKeyguardSecure()) { + // uni.showToast({ + // title: 'This device does not support fingerprint identification', + // icon: 'none', + // duration: 1500 + // }) + + // } else if (!plus.fingerprint.isEnrolledFingerprints()) { + // uni.showToast({ + // title: 'There is no fingerprint entered in this device. Please turn it on in the setting', + // icon: 'none', + // duration: 1500 + // }) + // // this.disabled = true; + // } else { + // // this.result = '此设备支持指纹识别'; + // // // this.disabled = false; + // // #ifdef MP-WEIXIN + // this.disabled = false; + // this.result = '请在微信真机中使用，模拟器不支持'; + // // #endif + // // #ifndef APP-PLUS || MP-WEIXIN + // this.result = '此平台不支持指纹识别'; + // // #endif + + + // let that=this; + // // #ifdef APP-PLUS + // plus.fingerprint.authenticate(function() { + // plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 + // that.show=false; + // that.result='指纹识别成功' + // //plus.nativeUI.alert('指纹识别成功'); + // }, function(e) { + // switch (e.code) { + // case e.AUTHENTICATE_MISMATCH: + // plus.nativeUI.toast('指纹匹配失败，请重新输入'); + // break; + // case e.AUTHENTICATE_OVERLIMIT: + // plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 + // plus.nativeUI.alert('指纹识别失败次数超出限制，请使用其它方式进行认证'); + // break; + // case e.CANCEL: + // plus.nativeUI.toast('已取消识别'); + // break; + // default: + // plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 + // plus.nativeUI.alert('指纹识别失败，请重试'); + // break; + // } + // }); + // // Android平台手动弹出等待提示框 + // if ('Android' == plus.os.name) { + // this.show=true; + // /* plus.nativeUI.showWaiting('指纹识别中...').onclose = function() { + // plus.fingerprint.cancel(); + // } */ + // } + // // #endif + + // // #ifdef MP-WEIXIN + // wx.startSoterAuthentication({ + // requestAuthModes: ['fingerPrint'], + // challenge: '123456', + // authContent: '请用指纹解锁', + // success(res) { + // uni.showToast({ + // title: '识别成功', + // mask: false, + // duration: 1500 + // }); + // } + // }) + // // #endif + // } + // // #endif + + this.$walletUtil.fingerprint() + }, } } diff --git a/pages/menu/profile/index.vue b/pages/menu/profile/index.vue index b436c72..d9cd1db 100644 --- a/pages/menu/profile/index.vue +++ b/pages/menu/profile/index.vue @@ -1,6 +1,6 @@