diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue index 57626ad..e672ba0 100644 --- a/components/tabBar/tabBar.vue +++ b/components/tabBar/tabBar.vue @@ -11,7 +11,7 @@ - + @@ -72,16 +72,35 @@ }, data() { return { - status:'' + status:'', + showTwo:true, + address:'', } }, computed: { }, mounted() { + // 拿收藏品 + this.getCollection(); }, methods: { - + async getCollection(){ + if(uni.getStorageSync('wallet')){ + this.address=uni.getStorageSync('wallet').address + }else{ + this.address=uni.getStorageSync('walletInfo').BTC[0].address + } + let params = { + address: this.address + } + const response = await this.$api.getNftProjectList(params) + console.log(response.data,777) + if(response.data.length==0||!response.data){ + this.showTwo=false; + } + + }, goToPage(num) { if(num == 1) { uni.reLaunch({ diff --git a/manifest.json b/manifest.json index dad38f1..c8899de 100644 --- a/manifest.json +++ b/manifest.json @@ -26,10 +26,7 @@ /* 模块配置 */ "modules" : { "FaceID" : {}, -<<<<<<< HEAD "Fingerprint" : {}, -======= ->>>>>>> 5377f57f2bb8b108a0dee3b3b361fa3e0f60dbbb "Push" : {} }, /* 应用发布信息 */ @@ -59,15 +56,11 @@ }, /* ios打包配置 */ "ios" : { -<<<<<<< HEAD "privacyDescription" : { "NSCameraUsageDescription" : "BitCooo requires camera permission", "NSPhotoLibraryUsageDescription" : "BitCooo needs to use album permissions", "NSPhotoLibraryAddUsageDescription" : "BitCooo needs to use album permissions" } -======= - "idfa" : false ->>>>>>> 5377f57f2bb8b108a0dee3b3b361fa3e0f60dbbb }, /* SDK配置 */ "sdkConfigs" : { @@ -127,8 +120,9 @@ "name": "BitCooo", // 应用名称 "android": { "strings": { //Android平台自定义字符串 - "CustomKey": "CustomValue" - //... + "NSCameraUsageDescription" : "BitCooo requires camera permission", + "NSPhotoLibraryUsageDescription" : "BitCooo needs to use album permissions", + "NSPhotoLibraryAddUsageDescription" : "BitCooo needs to use album permissions" } }, "ios": { @@ -136,13 +130,61 @@ "NSCameraUsageDescription" : "BitCooo requires camera permission", "NSPhotoLibraryUsageDescription" : "BitCooo needs to use album permissions", "NSPhotoLibraryAddUsageDescription" : "BitCooo needs to use album permissions" - }, - "infoPlist": { //iOS平台自定义InfoPlist.strings - "CustomKey": "CustomValue" - //... - } - } - } + } + + // "infoPlist": { //iOS平台自定义InfoPlist.strings + // "CustomKey": "CustomValue" + // //... + // } + } + }, + + "HK": { // 繁体 + "name": "BitCooo", // 应用名称 + "android": { + "strings": { //Android平台自定义字符串 + "NSCameraUsageDescription" : "BitCooo 需要攝像頭權限", + "NSPhotoLibraryUsageDescription" : "BitCooo需要使用相冊權限", + "NSPhotoLibraryAddUsageDescription" : "BitCooo需要使用相冊權限" + } + }, + "ios": { + "privacyDescription" : { + "NSCameraUsageDescription" : "BitCooo 需要攝像頭權限", + "NSPhotoLibraryUsageDescription" : "BitCooo需要使用相冊權限", + "NSPhotoLibraryAddUsageDescription" : "BitCooo需要使用相冊權限" + } + + // "infoPlist": { //iOS平台自定义InfoPlist.strings + // "CustomKey": "CustomValue" + // //... + // } + } + }, + "CN": { // 繁体 + "name": "BitCooo", // 应用名称 + "android": { + "strings": { //Android平台自定义字符串 + "NSCameraUsageDescription" : "BitCooo 需要摄像头权限", + "NSPhotoLibraryUsageDescription" : "BitCooo需要使用相册权限", + "NSPhotoLibraryAddUsageDescription" : "BitCooo需要使用相册权限" + } + }, + "ios": { + "privacyDescription" : { + "NSCameraUsageDescription" : "BitCooo 需要摄像头权限", + "NSPhotoLibraryUsageDescription" : "BitCooo需要使用相册权限", + "NSPhotoLibraryAddUsageDescription" : "BitCooo需要使用相册权限" + } + + // "infoPlist": { //iOS平台自定义InfoPlist.strings + // "CustomKey": "CustomValue" + // //... + // } + } + } + + }, /* 快应用特有相关 */ "quickapp" : {}, diff --git a/pages/menu/backUp/index.vue b/pages/menu/backUp/index.vue index 016efc5..d33a42f 100644 --- a/pages/menu/backUp/index.vue +++ b/pages/menu/backUp/index.vue @@ -73,7 +73,7 @@ }else{ uni.showToast({ - title: 'Please check the prompt to agree to backup', + title: this.$t('index').agreetobackup, icon: 'none', duration: 1500 }) diff --git a/pages/register/index.vue b/pages/register/index.vue index 8ab3df6..082a74c 100644 --- a/pages/register/index.vue +++ b/pages/register/index.vue @@ -270,7 +270,7 @@ createWallet() { if (this.list2[0].checked != true) { uni.showToast({ - title: 'Please check the terms of service', + title: this.$t('index').checkthetermsofservice, icon: 'none', duration: 1500 }) @@ -297,7 +297,7 @@ loginWallet() { if (this.list2[0].checked != true) { uni.showToast({ - title: 'Please check the terms of service', + title: this.$t('index').checkthetermsofservice, icon: 'none', duration: 1500 }) diff --git a/utils/locales/by.js b/utils/locales/by.js index 82b8997..8146e90 100644 --- a/utils/locales/by.js +++ b/utils/locales/by.js @@ -1,6 +1,8 @@ // by.js export default { index: { + agreetobackup:'Пожалуйста, проверьте запрос, чтобы согласиться на резервное копирование', + checkthetermsofservice:'Прочтите и примите условия использования', //help faq:'Центр помощи', t1:'Что такое блокчейн?', diff --git a/utils/locales/en.js b/utils/locales/en.js index 8bb390e..7bc5789 100644 --- a/utils/locales/en.js +++ b/utils/locales/en.js @@ -1,6 +1,9 @@ // en.js export default { index: { + agreetobackup:'Please check the prompt to agree to backup', + checkthetermsofservice:'Please review and agree to the terms of service', + //help faq:'Help Center', t1:'What Is Blockchain?', diff --git a/utils/locales/zh-F.js b/utils/locales/zh-F.js index 7b30960..525164c 100644 --- a/utils/locales/zh-F.js +++ b/utils/locales/zh-F.js @@ -1,6 +1,8 @@ // zhf.js export default { index: { + agreetobackup:'請勾選同意備份的提示', + checkthetermsofservice:'請查看並同意服務條款', faq:'幫助中心', //help t1:'什麼是區塊鏈？', diff --git a/utils/locales/zh.js b/utils/locales/zh.js index f6fdc1a..39f5d0a 100644 --- a/utils/locales/zh.js +++ b/utils/locales/zh.js @@ -1,6 +1,8 @@ // zh.js export default { index: { + agreetobackup:'请勾选同意备份的提示', + checkthetermsofservice:'请查看并同意服务条款', //help faq:'帮助中心', t1:'什么是区块链？',