diff --git a/config/requestConfig.js b/config/requestConfig.js
index f0cc14d..1f4e35b 100644
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -176,10 +176,10 @@ $http.dataFactory = async function(res) {
errMsg: "【request】" + (httpData.info || httpData.msg)
});
} else {
- store.commit("emptyUserInfo");
- uni.navigateTo({
- url:'/pages/mine/index'
- })
+ // store.commit("emptyUserInfo");
+ // uni.navigateTo({
+ // url:'/pages/mine/index'
+ // })
//其他错误提示
if (res.isPrompt) {
uni.showToast({
diff --git a/locales/en.json b/locales/en.json
index ade55e8..9f008da 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -9,6 +9,7 @@
"buttonDetails": "renew",
"nodata": "No data available",
"loading": "Data Loading...",
+ "btnClose": "Close",
"copy": "Copy",
"setIndex":{
"title": "setting",
@@ -254,7 +255,9 @@
"text8": "Please do not recharge assets other than USDT to the above address, otherwise it may lead to the loss of assets.",
"text9": "Please ensure the security of your mobile device to prevent information from being tampered with or leaked.",
"text10": "Please enter the recharge amount",
- "text11": "The minimum recharge amount is "
+ "text11": "The minimum recharge amount is ",
+ "text12": "Recharge quantity",
+ "text13": "Recharge network"
},
"wallet":{
"title": "My wallet",
diff --git a/locales/zh.json b/locales/zh.json
index 150b7c9..5b9ec0f 100644
--- a/locales/zh.json
+++ b/locales/zh.json
@@ -9,6 +9,7 @@
"buttonDetails": "更新",
"nodata": "暂无数据",
"loading": "数据加载...",
+ "btnClose": "关闭",
"copy": "复制",
"setIndex":{
"title": "设置",
@@ -254,7 +255,9 @@
"text8": "请不要将USDT以外的资产充值到上述地址，否则可能导致资产丢失。",
"text9": "请确保您的移动设备的安全，防止信息被篡改或泄露。",
"text10": "请输入充值金额",
- "text11": "最小充值金额为 "
+ "text11": "最小充值金额为 ",
+ "text12": "充值金额",
+ "text13": "充值网络"
},
"wallet":{
"title": "我的钱包",
diff --git a/manifest.json b/manifest.json
index 006349b..7dacef2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -69,9 +69,9 @@
"splashscreen" : {
"androidStyle" : "default",
"android" : {
- "hdpi" : "static/images/index1-1.png",
- "xhdpi" : "static/images/index2-1.png",
- "xxhdpi" : "static/images/index3-1.png"
+ "hdpi" : "static/images/480_762@1x.png",
+ "xhdpi" : "static/images/720_1242@1x.png",
+ "xxhdpi" : "static/images/1080_1882@1x.png"
}
},
"icons" : {
diff --git a/pages/wallet/recharge.vue b/pages/wallet/recharge.vue
index 1c220cd..99dc2e7 100644
--- a/pages/wallet/recharge.vue
+++ b/pages/wallet/recharge.vue
@@ -6,21 +6,38 @@
- {{$t('recharge.text1')}}
- {{rechargeModel.name}}
-
-
-
-
+
+
+
+
+ Available balance
+
+
+
+
-
+
USDT
-
+
+
+
+
+
+
+ {{rechargeModel.name}}
+
+
+
+
+
+
+
+
@@ -29,7 +46,8 @@
- {{$t('recharge.text3')}} {{init.recharge_minimum}} USDT
+ {{$t('recharge.text3')}}
+ {{rechargeModel.amount}} USDT
{{$t('recharge.text4')}}
@@ -41,7 +59,7 @@
-
+
{{$t('recharge.text5')}}
@@ -52,6 +70,11 @@
4. {{$t('recharge.text9')}}
+
+
+
+
+
@@ -73,7 +96,8 @@
network: 'TRC-20',
amount: '',
address:"",
- images:""
+ images:"",
+ time:"0"
},
init: {},
@@ -100,7 +124,7 @@
this.$http.get('/api/common/init?lang='+this.$i18n.locale).then(res => {
this.init = res.data;
});
- if(e.network != typeof(undefined) && e.neetwork != undefined){
+ if(e.network){
if(e.network != this.rechargeModel.neetwork){
this.rechargeModel.network=e.network;
if(this.rechargeModel.network=='TRC-20'){
@@ -177,6 +201,7 @@
this.$http.post('/api/recharge/create', data).then(res => {
if(res.code == 0){
this.show = 2;
+ this.time = 15;
this.qrcode = res.data.order.address;
this.icon = this.rechargeModel.network == 'TRC-20' ? '/static/images/s1.png' : '/static/images/s2.png'
}else{
@@ -225,4 +250,8 @@
.rechargeNet{
font-weight: 600;font-size: 40rpx;color: #333;line-height: 46rpx; text-align: center; margin-top: 40rpx;
}
+ ::v-deep .uni-input-input{ height: 80rpx; line-height: 80rpx;}
+ ::v-deep .uni-input-wrapper{height: 80rpx;line-height: 80rpx;}
+ ::v-deep .uni-easyinput__content{height: 80rpx;line-height: 80rpx;}
+ ::v-deep .uni-easyinput__content-input{height: 80rpx;line-height: 80rpx;}
\ No newline at end of file
diff --git a/static/images/1080_1882@1x.png b/static/images/1080_1882@1x.png
new file mode 100644
index 0000000..457df0f
Binary files /dev/null and b/static/images/1080_1882@1x.png differ
diff --git a/static/images/480_762@1x.png b/static/images/480_762@1x.png
new file mode 100644
index 0000000..39dc86b
Binary files /dev/null and b/static/images/480_762@1x.png differ
diff --git a/static/images/720_1242@1x.png b/static/images/720_1242@1x.png
new file mode 100644
index 0000000..604c079
Binary files /dev/null and b/static/images/720_1242@1x.png differ