diff --git a/App.vue b/App.vue index bf74840..af1fc85 100644 --- a/App.vue +++ b/App.vue @@ -4,7 +4,7 @@ max-width: 828rpx; //最大宽度自己可以调整 margin: auto !important; } - + /* #endif */ @import "uview-ui/index.scss"; diff --git a/components/navigation/navigation.vue b/components/navigation/navigation.vue index c95e352..9711118 100644 --- a/components/navigation/navigation.vue +++ b/components/navigation/navigation.vue @@ -63,7 +63,7 @@ .nav-head{ height: 40rpx; - // background-color: #fff; + background-color: #fAFAFA; text-align: center; font-weight: 700; font-size: 36rpx; @@ -74,9 +74,11 @@ justify-content: center; flex-direction: row-reverse; align-items: center; - margin-top: 80rpx; + //margin-top: 80rpx; + position: static; position: sticky; - top: 40px; + top: 40px; + width: 100%; z-index: 9999; diff --git a/pages/menu/collection/collectionDetail/index.vue b/pages/menu/collection/collectionDetail/index.vue index 55c23ba..f24496d 100644 --- a/pages/menu/collection/collectionDetail/index.vue +++ b/pages/menu/collection/collectionDetail/index.vue @@ -26,7 +26,7 @@ - + @@ -36,7 +36,9 @@ export default { data() { return { + noData: this.$t('index').Nocontent, item: {}, + isData:false, wallet: {}, address: '', result: [], @@ -97,7 +99,9 @@ this.result[i].address = this.result[i].address.substring(0, 6) + '...' + this.result[i].address .substring(25, this.result[i].address.length); } - + if(this.result.length==0){ + this.isData=true; + } }, async getProject2() { let params = { diff --git a/pages/menu/profile/index.vue b/pages/menu/profile/index.vue index ed53f9b..c93e03f 100644 --- a/pages/menu/profile/index.vue +++ b/pages/menu/profile/index.vue @@ -48,7 +48,7 @@ - + diff --git a/pages/menu/transction/detail/index.css b/pages/menu/transction/detail/index.css index e703999..b41519c 100644 --- a/pages/menu/transction/detail/index.css +++ b/pages/menu/transction/detail/index.css @@ -1,6 +1,4 @@ -page{ - height:100%; -} + .main{ padding: 0 30rpx; /* padding-bottom: 100rpx; */ diff --git a/pages/register/index.vue b/pages/register/index.vue index a03eccf..9cae2e5 100644 --- a/pages/register/index.vue +++ b/pages/register/index.vue @@ -4,32 +4,46 @@ - + {{i18n.Decentralised}} - {{i18n.Localstorage}} + {{i18n.Localstorage}} - - - - - - {{i18n.Decentralised}} + + + + + + {{i18n.EasyDecentralised}} + + + {{i18n.EasyLocalstorage}} + + + - - {{i18n.Localstorage}} + + + + + + + {{i18n.NftDecentralised}} + + + {{i18n.NftLocalstorage}} + + + - - - - + @@ -63,7 +77,7 @@ - {{i18n.Logintowallet}} + {{i18n.Logintowallet}} {{i18n.Restoreexisting}} @@ -78,21 +92,22 @@ - + {{i18n.lans}} {{i18n.AgreementConfirmation}} + v-model="item.checked" :name="item.name" active-color="#5B53FF"> {{i18n.AgreementConfirmation}} {{i18n.TermsofService}} - + - - + + @@ -110,26 +125,26 @@ data() { return { language: this.$store.state.language == 'en' ? 'English' : '简体中文', - cnt:this.$t('index').Confirm, - can:this.$t('index').Cancel, + cnt: this.$t('index').Confirm, + can: this.$t('index').Cancel, show: false, - list3: [{ - label: this.$t('index').langfan, - disabled: false, - value: "b", - }, - { - label: this.$t('index').langjian, - disabled: false, - value: "a", - }, - { - label: this.$t('index').eng, - disabled: false, - value: "c", - }, - - ], + list3: [{ + label: this.$t('index').langfan, + disabled: false, + value: "b", + }, + { + label: this.$t('index').langjian, + disabled: false, + value: "a", + }, + { + label: this.$t('index').eng, + disabled: false, + value: "c", + }, + + ], list2: [{ name: '', checked: false, @@ -143,7 +158,7 @@ walletInfo: {}, } }, - computed: { + computed: { i18n() { return this.$t('index') }, @@ -160,26 +175,26 @@ this.list2.checked = false; }, methods: { - - confirm(e){ - uni.setStorageSync('lang',e[0].value) - - if (e[0].value == 'c') { - this._i18n.locale = 'en' - this.$store.commit('setLanguage', 'en') - uni.setStorageSync('langTrue', 'English') - uni.setStorageSync("language", 'en') - } else if (e[0].value == 'a') { - this._i18n.locale = 'zh-CN' - this.$store.commit('setLanguage', 'zh-CN') - uni.setStorageSync("language", 'zh-CN') - uni.setStorageSync('langTrue', '简体中文') - } else if (e[0].value == 'b'){ - this._i18n.locale = 'zh-CNF' - this.$store.commit('setLanguage', 'zh-CNF') - uni.setStorageSync("language", 'zh-CNF') - uni.setStorageSync('langTrue', '繁體中文') - } + + confirm(e) { + uni.setStorageSync('lang', e[0].value) + + if (e[0].value == 'c') { + this._i18n.locale = 'en' + this.$store.commit('setLanguage', 'en') + uni.setStorageSync('langTrue', 'English') + uni.setStorageSync("language", 'en') + } else if (e[0].value == 'a') { + this._i18n.locale = 'zh-CN' + this.$store.commit('setLanguage', 'zh-CN') + uni.setStorageSync("language", 'zh-CN') + uni.setStorageSync('langTrue', '简体中文') + } else if (e[0].value == 'b') { + this._i18n.locale = 'zh-CNF' + this.$store.commit('setLanguage', 'zh-CNF') + uni.setStorageSync("language", 'zh-CNF') + uni.setStorageSync('langTrue', '繁體中文') + } }, checkboxGroupChange() { @@ -228,7 +243,7 @@ }) return; } - + this.list2[0].checked = false; uni.navigateTo({ url: '../menu/backUp/backUp4/index', diff --git a/static/tongyonh/Frame.png b/static/tongyonh/Frame.png new file mode 100644 index 0000000..11bf2ce Binary files /dev/null and b/static/tongyonh/Frame.png differ diff --git a/static/tongyonh/Illustration.png b/static/tongyonh/Illustration.png new file mode 100644 index 0000000..360b901 Binary files /dev/null and b/static/tongyonh/Illustration.png differ diff --git a/static/tongyonh/Nftimg.png b/static/tongyonh/Nftimg.png new file mode 100644 index 0000000..8e89cd6 Binary files /dev/null and b/static/tongyonh/Nftimg.png differ diff --git a/utils/locales/en.js b/utils/locales/en.js index 4a2c4b6..173ad03 100644 --- a/utils/locales/en.js +++ b/utils/locales/en.js @@ -4,6 +4,10 @@ export default { // regis Decentralised:'Decentralised wallets,self-directed assets', Localstorage:'Local storage of private keys, safe and secure', + EasyDecentralised:'Easy to use multi-chain wallet', + EasyLocalstorage:'Easy to manage multiple wallets, your close assistant', + NftDecentralised:'NFTCollection', + NftLocalstorage:'Convenient management of your NFT collection', Oneidentity:'One identity management', Logintowallet:'Login to wallet', Restoreexisting:'Restore existing wallets', diff --git a/utils/locales/zh-F.js b/utils/locales/zh-F.js index 6bb8921..48aad1e 100644 --- a/utils/locales/zh-F.js +++ b/utils/locales/zh-F.js @@ -5,6 +5,10 @@ export default { // regis Decentralised:'去中心化錢包,自主資產', Localstorage:'私鑰本地存儲,安全有保障', + EasyDecentralised:'簡單易用多鏈錢包', + EasyLocalstorage:'輕鬆管理多個錢包,您的貼心助手', + NftDecentralised:'NFT收藏', + NftLocalstorage:'方便管理您的 NFT 收藏', Oneidentity:'身份管理', Logintowallet:'導入錢包', Restoreexisting:'恢復現有錢包', diff --git a/utils/locales/zh.js b/utils/locales/zh.js index a8debed..0928214 100644 --- a/utils/locales/zh.js +++ b/utils/locales/zh.js @@ -4,6 +4,10 @@ export default { // regis Decentralised:'去中心化钱包,自主资产', Localstorage:'私钥本地存储,安全有保障', + EasyDecentralised:'简单易用多链钱包', + EasyLocalstorage:'轻松管理多个钱包,您的贴心助手', + NftDecentralised:'NFT收藏', + NftLocalstorage:'方便管理您的 NFT 收藏', Oneidentity:'身份管理', Logintowallet:'导入钱包', Restoreexisting:'恢复现有钱包',