diff --git a/assets/img/home/Havelogged.png b/assets/img/home/Havelogged.png
new file mode 100644
index 0000000..743f650
Binary files /dev/null and b/assets/img/home/Havelogged.png differ
diff --git a/assets/img/home/Make.png b/assets/img/home/Make.png
new file mode 100644
index 0000000..bb944d9
Binary files /dev/null and b/assets/img/home/Make.png differ
diff --git a/assets/img/home/check.png b/assets/img/home/check.png
new file mode 100644
index 0000000..500d4ad
Binary files /dev/null and b/assets/img/home/check.png differ
diff --git a/assets/img/home/currency.png b/assets/img/home/currency.png
new file mode 100644
index 0000000..267a879
Binary files /dev/null and b/assets/img/home/currency.png differ
diff --git a/assets/img/home/eye.png b/assets/img/home/eye.png
deleted file mode 100644
index 7636c6f..0000000
Binary files a/assets/img/home/eye.png and /dev/null differ
diff --git a/assets/img/home/login.png b/assets/img/home/login.png
new file mode 100644
index 0000000..24fdbe8
Binary files /dev/null and b/assets/img/home/login.png differ
diff --git a/assets/img/home/transfer.png b/assets/img/home/transfer.png
new file mode 100644
index 0000000..e845246
Binary files /dev/null and b/assets/img/home/transfer.png differ
diff --git a/i18n/lang/de.json b/i18n/lang/de.json
index e7cfffb..fea581f 100644
--- a/i18n/lang/de.json
+++ b/i18n/lang/de.json
@@ -119,7 +119,8 @@
"e5": "Umwandlung von Verträgen",
"e6": "Klasse der Bergleute",
"e7": "Mineral",
- "wallet": "Brieftasche"
+ "wallet": "Brieftasche",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0": "Einstellungen des Kontos",
diff --git a/i18n/lang/en.json b/i18n/lang/en.json
index 3d31f0f..259088d 100644
--- a/i18n/lang/en.json
+++ b/i18n/lang/en.json
@@ -160,7 +160,8 @@
"e5": "Contract conversion",
"e6": "Miner Level",
"e7": "Miner",
- "wallet": "Wallet"
+ "wallet": "Wallet",
+ "f0":"Start your crypto journey"
},
"accountSettings": {
"a0": "Account Settings",
diff --git a/i18n/lang/fin.json b/i18n/lang/fin.json
index 22ac6e3..b2780fc 100644
--- a/i18n/lang/fin.json
+++ b/i18n/lang/fin.json
@@ -115,7 +115,8 @@
"e4":"Sopimusta koskeva tili",
"e5":"Sopimusten muuntaminen",
"e6":"Mineraanien luokka",
- "e7":"kaivosmies"
+ "e7":"kaivosmies",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0":"Tilin asetukset",
diff --git a/i18n/lang/fra.json b/i18n/lang/fra.json
index 58f2294..8035f32 100644
--- a/i18n/lang/fra.json
+++ b/i18n/lang/fra.json
@@ -119,7 +119,8 @@
"e5": "Conversion contractuelle",
"e6": "Classe de mineur",
"e7": "Mineurs",
- "wallet": "Portefeuille"
+ "wallet": "Portefeuille",
+ "f0":"Commencez votre voyage crypto-monnaie"
},
"accountSettings": {
"a0": "Configuration du compte",
diff --git a/i18n/lang/it.json b/i18n/lang/it.json
index f586fba..e990648 100644
--- a/i18n/lang/it.json
+++ b/i18n/lang/it.json
@@ -119,7 +119,8 @@
"e5": "Conversione contrattuale",
"e6": "Classe di minerali",
"e7": "miner",
- "wallet": "Portafoglio"
+ "wallet": "Portafoglio",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0": "Impostazioni account",
diff --git a/i18n/lang/jp.json b/i18n/lang/jp.json
index f91fa6f..e887091 100644
--- a/i18n/lang/jp.json
+++ b/i18n/lang/jp.json
@@ -119,7 +119,8 @@
"e5": "契約が折衷する",
"e6": "鉱夫階級",
"e7": "鉱夫",
- "wallet": "財布"
+ "wallet": "財布",
+ "f0":"暗号通貨への旅を始めます"
},
"accountSettings": {
"a0": "アカウントの設定",
diff --git a/i18n/lang/kor.json b/i18n/lang/kor.json
index 2aaca81..7da55f5 100644
--- a/i18n/lang/kor.json
+++ b/i18n/lang/kor.json
@@ -119,7 +119,8 @@
"e5":"계약 을 절충 하 다",
"e6":"광부 등급",
"e7":"광부",
- "wallet": "지갑"
+ "wallet": "지갑",
+ "f0":"암호화 화폐 여행을 시작하세요"
},
"accountSettings": {
"a0":"계 정 설정",
diff --git a/i18n/lang/pl.json b/i18n/lang/pl.json
index 85176ef..b277331 100644
--- a/i18n/lang/pl.json
+++ b/i18n/lang/pl.json
@@ -115,7 +115,8 @@
"e4":"Konto kontraktowe",
"e5":"Przetwarzanie umów",
"e6":"Klasa górnicza",
- "e7":"miner"
+ "e7":"miner",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0":"Ustawienia konta",
diff --git a/i18n/lang/pt.json b/i18n/lang/pt.json
index 5adb04c..18fc4ee 100644
--- a/i18n/lang/pt.json
+++ b/i18n/lang/pt.json
@@ -119,7 +119,8 @@
"e5":"Conversão contratual",
"e6":"Classe de mineiros",
"e7":"Mineiro",
- "wallet": "Carteira"
+ "wallet": "Carteira",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0":"Configuração Da Conta",
diff --git a/i18n/lang/spa.json b/i18n/lang/spa.json
index d7e202f..61b2d5f 100644
--- a/i18n/lang/spa.json
+++ b/i18n/lang/spa.json
@@ -119,7 +119,8 @@
"e5":"Conversión de contratos",
"e6":"Grado minero",
"e7":"Minero",
- "wallet": "Cartera"
+ "wallet": "Cartera",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0":"Configuración de la cuenta",
diff --git a/i18n/lang/swe.json b/i18n/lang/swe.json
index b47ed9c..e6e5aff 100644
--- a/i18n/lang/swe.json
+++ b/i18n/lang/swe.json
@@ -115,7 +115,8 @@
"e4":"Kontraktskonto",
"e5":"Omräkning av kontrakt",
"e6":"Klassificering av mineraler",
- "e7":"gruvarbetare"
+ "e7":"gruvarbetare",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0":"Inställningar av konto",
diff --git a/i18n/lang/tr.json b/i18n/lang/tr.json
index 08c46fc..6514bd1 100644
--- a/i18n/lang/tr.json
+++ b/i18n/lang/tr.json
@@ -119,7 +119,8 @@
"e5": "Sözleşme dönüştürme",
"e6": "Madenci Seviyesi",
"e7": "Madenci",
- "wallet": "Cüzdan"
+ "wallet": "Cüzdan",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0": "Hesap Ayarları",
diff --git a/i18n/lang/ukr.json b/i18n/lang/ukr.json
index 29fd34a..b16d049 100644
--- a/i18n/lang/ukr.json
+++ b/i18n/lang/ukr.json
@@ -115,7 +115,8 @@
"e4": "Контрактний рахунок",
"e5": "Конвертація договору",
"e6": "Майнерський рівень",
- "e7": "шахтар"
+ "e7": "шахтар",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0": "Налаштування аккаунта",
diff --git a/i18n/lang/zh-CN.json b/i18n/lang/zh-CN.json
index 26d9dc0..02e8c5d 100644
--- a/i18n/lang/zh-CN.json
+++ b/i18n/lang/zh-CN.json
@@ -117,7 +117,8 @@
"e4": "合约账户",
"e5": "合约折合",
"e6": "矿工等级",
- "e7": "矿工"
+ "e7": "矿工",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0": "账号设置",
diff --git a/i18n/lang/zh-TW.json b/i18n/lang/zh-TW.json
index 8506ed7..9d71792 100644
--- a/i18n/lang/zh-TW.json
+++ b/i18n/lang/zh-TW.json
@@ -160,7 +160,8 @@
"e5": "合約折合",
"e6": "礦工等級",
"e7": "礦工",
- "wallet": "錢包"
+ "wallet": "錢包",
+ "f0":"开启您的加密货币之旅"
},
"accountSettings": {
"a0": "賬號設置",
diff --git a/pages/base/home.vue b/pages/base/home.vue
index 461eb80..337a202 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -7,7 +7,7 @@
- xxCoin
+ 主页
@@ -110,7 +110,7 @@
{{$t("homeNewText.aa3")}},{{$t("homeNewText.aa1")}}
-
+
{{ $t("homeNewText.aa3") }}
@@ -151,26 +151,38 @@
+
-
- 总资产估值(BTC)
-
+
+ {{ $t("base.d6") }}(BTC)
+
+
+
+
- 0.28235120
- ≈10000.40 USDT
+ {{filterMoney(account.total_assets_btc, true)}}
+ ≈{{ filterMoney(account.total_assets_usd, false) }} USDT
-
-
+
+
+ {{$t("base.b5")}}
+
+
+
+
+ {{$t("base.c0")}}币
+
+
- 开启您的加密货币之旅
- 立即前往
+ {{$t("base.f0")}}
+ 立即前往
@@ -264,17 +276,11 @@
公告
-
- 关于xxx和xxx定期简单赚币产品下线的通知
- 2023/11/02 19:35
-
-
- 关于xxx和xxx定期简单赚币产品下线的通知
- 2023/11/02 19:35
-
-
- 关于xxx和xxx定期简单赚币产品下线的通知
- 2023/11/02 19:35
+
+
+ {{item.title}}
+ {{item.created_at}}
+
@@ -434,199 +440,266 @@
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t("first.b2") }}
+ custom-style="width:100%;height:100%;">
+
+
+
+
+
+
+
+
+
+
+
+ 个人中心
-
- {{ $t("first.b1") }}
-
-
+
+
+
+
+
+
+
-
- {{ $t("base.e6") }}
-
-
-
-
-
-
- {{$t('auth.a1')}}
-
- {{$t('first.a0')}}
-
- {{$t('auth.a3')}}
-
-
-
-
-
-
-
- ![]()
- {{ $t("base.c1") }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("first.b2") }}
+
+
+ {{ $t("first.b1") }}
+
+
+
+
+ {{ $t("base.e6") }}
+
-
-
-
-
-
-
-
-
- ![]()
- {{ $t("base.c3") }}
-
-
-
-
+
+
+
- ![]()
- {{ $t("base.c4") }}
+
+ {{$t('auth.a1')}}
-
+ {{$t('first.a0')}}
+ {{$t('auth.a3')}}
-
-
-
-
- ![]()
- {{$t('first.a1')}}
+
+
+
+
+
+
+ {{username}}
+
+ 已完成初级认证
+
+
-
-
- ![]()
- {{ $t("base.c6") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 常用功能
+
+
+
+ 
+
+ {{ $t("base.c1") }}
-
-
-
+
+ 
+ {{ $t("base.c3") }}
+
+
+ 
+ {{ $t("base.c4") }}
+
+
+ 
+ {{ $t("base.c5") }}
+
+
+ 
+ {{ $t("first.a1") }}
+
+
+ 
+ {{ $t("base.c6") }}
+
+
-
{{ $t("accountSettings.a9") }}
@@ -710,7 +783,9 @@
num: 0,
scrollTop: 0,
refreshing: false,
- helpList: []
+ helpList: [],
+ account:{},
+ articleList:[]//公告数据
};
},
computed: {
@@ -721,10 +796,17 @@
wsState: "wsState",
logoMap: "logoMap",
theme: "theme",
+ hideMoney: "hideMoney",
}),
isLogin() {
return Boolean(uni.getStorageSync("token"));
},
+ // 获取用户登录后的名字
+ username(){
+ const name = uni.getStorageSync("_user_login")
+ const username = name.data.user.username
+ return username
+ }
},
watch: {
isShow(n) {
@@ -771,6 +853,7 @@
},
...mapActions({
setTheme: "setTheme",
+ setHide: "hideMoney"
}),
setQuery: qs.stringify,
omitTo: math.omitTo,
@@ -819,19 +902,26 @@
personalCenter() {
this.show = true;
},
-
+ Goatonce(){
+ this._router.push({
+ path:"pages/base/index.vue"
+ })
+
+ // uni.navigateTo({
+ // url:"pages/base/index.vue"
+ // })
+ },
indexData() {
let data = {};
let ajax = Home.indexList(data, {
loading: true
});
- ajax
- .then((res) => {
+ ajax.then((res) => {
this.home = res.data.bannerList;
this.notice = res.data.noticeList;
this.indexList = res.data.brokenLine;
this.marketList = res.data.marketList;
- console.log(this.marketList, 1111111);
+ this.articleList = res.data.articleList
// this.infoActive = 1;
this.dunshift();
this.getCollect();
@@ -975,10 +1065,25 @@
}
});
},
+ // 获取用户资产
+ personalAssets(){
+ Wallet.personalAssets().then((res) => {
+ this.account = res.data;
+ }).catch(() => {});
+ },
+ filterMoney(val, type) {
+ if (this.hideMoney) return "******";
+ if (type) {
+ return this.omitTo(val, 8);
+ } else {
+ return this.omitTo(val, 2);
+ }
+ },
// 创建充币地址
createWalletAddress() {
Wallet.createWalletAddress()
- .then(() => {})
+ .then((res) => {
+ })
.catch(() => {});
},
// 退出登录
@@ -1048,6 +1153,7 @@
this.indexMarketList();
this.getCurrencyExCny();
this.getHelpList();
+ this.personalAssets();
if (this.isLogin) {
this.createWalletAddress();
this.getAuthInfo()
@@ -1084,6 +1190,17 @@
}
}
+ .bg-theme{
+ background-color: #26A24F;
+ }
+
+ .Logout_color{
+ background-color: #212121;
+ height: 80rpx;
+ line-height: 80rpx;
+
+ }
+
.stock-swipe {
.stock-index {
display: flex;
@@ -1419,18 +1536,77 @@
position: relative;
}
- .titleButborder {
- position: absolute;
- left: 425rpx;
- top: 750rpx;
- width: 140px;
- height: 6px;
- line-height: 20px;
- background-color: rgba(182, 255, 52, 1);
+ // .titleButborder {
+ // position: absolute;
+ // left: 425rpx;
+ // top: 750rpx;
+ // width: 140px;
+ // height: 6px;
+ // line-height: 20px;
+ // background-color: rgba(182, 255, 52, 1);
+ // text-align: center;
+ // }
+ }
+
+ .Feature{
+ color: rgba(255, 255, 255, 1);
+ font-size: 16px;
+ padding-top: 30px;
+ border-top: 1px solid #000000;
+ padding-left: 28rpx;
+ margin-bottom: 30px;
+ font-weight: bold;
+ }
+
+ .manage{
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
+ align-items: center;
+ width: 100%;
+
+ .manage_text{
text-align: center;
+ height: 170rpx;
+ width: 200rpx;
+ img{
+ width: 50rpx;
+ height: 50rpx;
+ }
}
}
+ .username{
+ font-size: 18px;
+ font-weight: bold;
+ margin-bottom: 3px;
+ }
+
+ .border_authentication{
+ border: 1px solid #26A24F;
+ text-align: center;
+ font-size: 25rpx;
+ width: 99px;
+ border-radius: 5px;
+ color: #26A24F;
+ }
+
+ .logine{
+ // background: url('@/assets/img/home/Havelogged.png');
+ width: 96rpx;height: 96rpx;
+ }
+
+ .havelogg{
+ position: absolute;
+ left: 60rpx;
+ bottom: 0;
+ border:1px solid #000000;
+ background-color: #000000;
+ border-radius: 50%;
+ width: 28rpx;
+ height: 29rpx;
+ }
+
.top-tiel{
// margin: 60rpx 20rpx 20rpx 20rpx;
.topBTC {
@@ -1455,7 +1631,7 @@
font-size: 25rpx;
height: 35px;
line-height: 35px;
-
+ text-align: center;
image{
position: relative;
top: 5px;
@@ -1568,6 +1744,7 @@
font-weight: bold;
}
}
+
.announcement{
border-top: 5px solid #000000;
padding-top: 50rpx;
diff --git a/pages/base/mine.vue b/pages/base/mine.vue
index aad195c..b55ba4b 100644
--- a/pages/base/mine.vue
+++ b/pages/base/mine.vue
@@ -3,28 +3,65 @@
-
- {{ $t("base.d6") }}(BTC)
+ class="box-size head h-aut p-x-md d-flex justify-between flex-wrap align-center color-light"
+ :class="theme == 'light' ? 'bgb3-white' : ''" style="position: relative;background-color: black;">
+
+ {{ $t("base.d6") }}(BTC)
-
+
+
+ ≈{{ filterMoney(account.total_assets_usd) }} USD
≈{{ filterMoney(account.total_assets_usd, false) }} USDT
-
-
-
+ -->
+
+ {{filterMoney(account.total_assets_btc, true)}}
+ ≈{{ filterMoney(account.total_assets_usd, false) }} USDT
+
+
+
+
+
+ 
+
+ {{$t("base.b5")}}
+
+
+
+ 
+
+ {{$t("base.b5")}}
+
+
+
+
+
+ {{$t("base.b6")}}
+
+
+
+ 
+
+ {{$t("base.d8")}}
+
+
+
+ 
+
+ {{$t("base.d8")}}
+
+
+
+ :class="tabActive==0?'color-theme-1 bg-panel-3 rounded-xs shadow-panel-nei':''"
@@ -35,7 +72,7 @@
-
+ :class="tabActive==0?'color-theme-1 bg-panel-3 rounded-xs shadow-panel-nei':''"
@@ -65,14 +102,14 @@
-
+ -->
-
+
-
{{$t('base.e4')}}
-
-
+
+ -->
+
+
+ {{$t('base.d7')}}
+
+
+ {{$t('base.e4')}}
+
+
+
-
+
-
+
≈{{ (account.funds_account_usd).toFixed(2) }}
@@ -125,9 +175,12 @@
:placeholder="$t('base.d9')" input-class="fn-12 "
class="flex-fill color-gray-6 rounded-md pos fn-12 m-r-lg"
style="padding-left: 0"/>
-
+
+
+ {{ $t("base.e0") }} 0 {{ $t("base.e1") }}
+