From 6f3269b9cae7a33efa8db466114c7705c58b0588 Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Mon, 5 Sep 2022 18:15:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/KeyValueRow/KeyValueRow.vue | 2 +-
.../entrustOrderList/entrustOrderList.vue | 14 ++++----
components/transaction/transaction.vue | 4 ++-
manifest.json | 4 ++-
pages/home/index.vue | 35 +++++++++++++------
pages/me/donateRecord.vue | 2 +-
pages/me/myTeam.vue | 2 +-
pages/mine/mineDetails.vue | 7 +++-
pages/mine/mineRecord.vue | 10 ++++--
pages/recharge/rechargeRecord.vue | 4 +++
pages/withdrawal/withdrawalRecord.vue | 7 ++--
utils/index.js | 2 +-
utils/language/en_US.js | 12 +++----
utils/language/vi_VN.js | 12 +++----
14 files changed, 74 insertions(+), 43 deletions(-)
diff --git a/components/KeyValueRow/KeyValueRow.vue b/components/KeyValueRow/KeyValueRow.vue
index ec971bf..aa91bf9 100644
--- a/components/KeyValueRow/KeyValueRow.vue
+++ b/components/KeyValueRow/KeyValueRow.vue
@@ -11,7 +11,7 @@
{{
value
- }} USDT
+ }}
diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue
index ac8aacb..b145854 100644
--- a/components/entrustOrderList/entrustOrderList.vue
+++ b/components/entrustOrderList/entrustOrderList.vue
@@ -18,7 +18,7 @@
{{item.direction}}
{{item.timestr}}
{{ i18n.CloseTime }}
- {{item.timestr2}}
+ {{item.timestr2}}
{{
i18n.close
}}
@@ -32,8 +32,8 @@
{{item.openedPrice}}
{{ i18n.Bond }}
{{item.bondAmount}}
- {{ i18n.StyPrice }}
- {{item.winStopPrice}}
+ {{ i18n.StyPrice }}
+ {{item.winStopPrice}}
@@ -41,8 +41,8 @@
{{item.hand}} * {{item.leverage}}
{{ i18n.Fee }}
{{item.fee}}
- {{ i18n.StsPrice }}
- {{item.lossStopPrice}}
+ {{ i18n.StsPrice }}
+ {{item.lossStopPrice}}
@@ -53,7 +53,7 @@
{{ i18n.do }}
Stop/Limit
- {{ i18n.ExpectProfit }}
+ {{ i18n.ExpectProfit }}
{{getItem(item.direction=='buy'?(marketDetail.close-item.openedPrice)*item.hand:(item.openedPrice-marketDetail.close)*item.hand)}}
@@ -283,7 +283,7 @@
i].addTime)
}
if (this.list[i].closedTime) {
- this.list[i].timestr2 = this.$index.getformatyymmddhhmmss(this.list[
+ this.list[i].timestr2 = this.$index.formatyymmddhhmmss(this.list[
i].closedTime)
}
diff --git a/components/transaction/transaction.vue b/components/transaction/transaction.vue
index 51d4bcd..7b88c4d 100644
--- a/components/transaction/transaction.vue
+++ b/components/transaction/transaction.vue
@@ -189,8 +189,10 @@
icon: 'success',
duration: 1500
})
+ setTimeout(()=>{
+ uni.$emit("upData",true)
+ },800)
//使用uni.$emit触发全局事件，并传参 触发这个给兄弟组件 刷新页面下面的订单列表
- uni.$emit("upData",true)
});
},
}
diff --git a/manifest.json b/manifest.json
index 357f78b..9d40492 100644
--- a/manifest.json
+++ b/manifest.json
@@ -46,7 +46,9 @@
/* ios打包配置 */
"ios" : {},
/* SDK配置 */
- "sdkConfigs" : {}
+ "sdkConfigs" : {
+ "ad" : {}
+ }
},
"nativePlugins" : {
"HF-Step" : {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 0eeb68f..4621082 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -191,7 +191,7 @@
this.getSept()
// this.startStep()
// this.resStartStep()
- this.updateSteps();
+ this.updateSteps('show');
// #endif
// #ifdef H5
this.stepsNum=0;
@@ -208,7 +208,7 @@
},
methods: {
// 更新步数逻辑
- updateSteps(){
+ updateSteps(soucre){
var today=this.$index.formatyymmdd(new Date().getTime());
var stepsNum_date= uni.getStorageSync("stepsNum_date");
@@ -223,10 +223,18 @@
}else{
if(this.stepsNum==0){
- this.stepsNum=stepsNum_date.stepsNum;
+ this.stepsNum=stepsNum_date.newStepsNum;
}
if(parseInt(this.stepsNum)>parseInt(stepsNum_date.stepsNum)){
- isUpdate=true;
+
+ uni.setStorageSync("stepsNum_date",{
+ stepsNum:stepsNum_date.stepsNum,
+ date:today,
+ newStepsNum:this.stepsNum
+ });
+ if(soucre){
+ isUpdate=true;
+ }
}
}
@@ -242,7 +250,8 @@
console.log(res,'res更新')
uni.setStorageSync("stepsNum_date",{
stepsNum:this.stepsNum,
- date:today
+ date:today,
+ newStepsNum:this.stepsNum
});
})
}
@@ -332,11 +341,14 @@
uni.$u.toast(res.errMsg);
} else {
// #ifdef APP-PLUS
- plus.runtime.openURL(res.url);
+ console.log(res.url)
+ plus.runtime.openUrl(res.url)
// #endif
// #ifdef H5
- window.location.href = res.url
+ var href = res.url
+ window.open(href, '_blank');
// #endif
+
}
})
},
@@ -360,11 +372,12 @@
api.noticeRead({
noticeId: this.noticeId
}).then(res => {
- this.noticeId = null;
- this.popupShow = false
- this.getNoReadNotice()
- console.log(res, '已经读了吗')
+
})
+ this.noticeId = null;
+ this.popupShow = false
+ this.getNoReadNotice()
+ console.log(res, '已经读了吗')
},
go(url) {
uni.navigateTo({
diff --git a/pages/me/donateRecord.vue b/pages/me/donateRecord.vue
index b5119f2..eedbb71 100644
--- a/pages/me/donateRecord.vue
+++ b/pages/me/donateRecord.vue
@@ -6,7 +6,7 @@
-
{{item.timestr}}
diff --git a/pages/me/myTeam.vue b/pages/me/myTeam.vue
index 75a42e7..b03a414 100644
--- a/pages/me/myTeam.vue
+++ b/pages/me/myTeam.vue
@@ -30,7 +30,7 @@
+ @change="sectionChange" bgColor="#211F32" fontSize="30">
diff --git a/pages/mine/mineDetails.vue b/pages/mine/mineDetails.vue
index 2f023ef..a3c0504 100644
--- a/pages/mine/mineDetails.vue
+++ b/pages/mine/mineDetails.vue
@@ -5,7 +5,12 @@
{{ i18n.Record }}
+
+
+
+
+
@@ -38,7 +43,7 @@
- {{ i18n.LockBTCBtn.replace('BTC',detail.mineDetails.baseCoin) }}{
+ {{ i18n.LockBTCBtn.replace('BTC',detail.mineDetails.baseCoin) }}
diff --git a/pages/mine/mineRecord.vue b/pages/mine/mineRecord.vue
index c6c40ae..de457ff 100644
--- a/pages/mine/mineRecord.vue
+++ b/pages/mine/mineRecord.vue
@@ -2,10 +2,16 @@
{{ i18n.MinePool }}
-
-
+
+
+
+
+
+
+
diff --git a/pages/recharge/rechargeRecord.vue b/pages/recharge/rechargeRecord.vue
index 2570774..285a7cb 100644
--- a/pages/recharge/rechargeRecord.vue
+++ b/pages/recharge/rechargeRecord.vue
@@ -175,6 +175,10 @@