diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue
index 9a699cb..98b6af1 100644
--- a/components/entrustOrderList/entrustOrderList.vue
+++ b/components/entrustOrderList/entrustOrderList.vue
@@ -22,12 +22,6 @@
{{
i18n.close
}}
-
- {{ i18n.PL }}:{{" "}}
-
- 0
-
-
@@ -69,8 +63,11 @@
{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}}
-->
{{ i18n.ROE }}
-
- {{getValue(item.profitAmount/item.bondAmount)}}%
+
+
+ {{getValue(item.direction=='buy'?(marketDetail.close-item.openedPrice)*item.hand/item.bondAmount:(item.openedPrice-marketDetail.close)*item.hand/item.bondAmount)}}%
{{ i18n.ExpectProfit }}
@@ -106,16 +103,16 @@
-
{{ i18n.PL }}
0
- -->
+
diff --git a/components/transaction/transaction.vue b/components/transaction/transaction.vue
index 7d553c3..cf821c8 100644
--- a/components/transaction/transaction.vue
+++ b/components/transaction/transaction.vue
@@ -114,7 +114,8 @@
},
data() {
- return {
+ return {
+ newSymbol:'',
math:null,
priceSelectListShow: false,
priceTypeValue: 0,
@@ -148,13 +149,18 @@
marketDetail: {
deep: true,
handler: function (n,i) {
- this.coinPrice = n.close
+ if(this.newSymbol!=n.symbol){
+ this.coinPrice = this.marketDetail.close
+ }
+ this.newSymbol=n.symbol
+
}
}
},
mounted() {
this.leverageValue = this.contractConfig.leverage[0];
this.coinPrice = this.marketDetail.close
+ this.newSymbol=this.marketDetail.symbol
},
methods: {
diff --git a/manifest.json b/manifest.json
index ce01c1a..8a1d626 100644
--- a/manifest.json
+++ b/manifest.json
@@ -84,7 +84,22 @@
}
}
},
- "nativePlugins" : {}
+ "nativePlugins" : {
+ "HF-Step" : {
+ "__plugin_info__" : {
+ "name" : "原生计步器（Android和IOS）",
+ "description" : "计步器，原生计步器插件,安卓,IOS",
+ "platforms" : "Android,iOS",
+ "url" : "https://ext.dcloud.net.cn/plugin?id=6632",
+ "android_package_name" : "com.samehome",
+ "ios_bundle_id" : "com.samehome",
+ "isCloud" : true,
+ "bought" : 1,
+ "pid" : "6632",
+ "parameters" : {}
+ }
+ }
+ }
},
"h5" : {
"publicPath" : "/",
diff --git a/pages/charity/details.vue b/pages/charity/details.vue
index 551aafd..0a18c64 100644
--- a/pages/charity/details.vue
+++ b/pages/charity/details.vue
@@ -5,7 +5,7 @@
-
{{detail.charityDetails.title}}
@@ -117,6 +117,7 @@
name: "charityDetails",
data() {
return {
+ imgDetail:'',
id:'',
baseURL:'',
DonatePopupShow: false,
@@ -131,7 +132,9 @@
},
radioValue: '',
detail:{
- charityDetails:{},
+ charityDetails:{
+ img:null,
+ },
coins:[{}],
},
};
@@ -189,6 +192,9 @@
charityId:id
}).then(res => {
this.detail=res;
+
+ this.imgDetail=res.charityDetails.img
+
this.coinInfo.coinCode=this.detail.coins[0].enname
this.coinInfo.coinCode2=this.detail.coins[0].code
})
diff --git a/pages/markets/kLine.vue b/pages/markets/kLine.vue
index aeefda1..9180e37 100644
--- a/pages/markets/kLine.vue
+++ b/pages/markets/kLine.vue
@@ -90,15 +90,15 @@
-
+
- {{ i18n.open }}
+ {{ i18n.LONG }}
- {{ i18n.close }}
+ {{ i18n.SHORT }}
diff --git a/pages/me/index.vue b/pages/me/index.vue
index d70cdb2..c1a06aa 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -10,7 +10,7 @@
-
ID:{{userInfo.uid}}
@@ -100,6 +100,7 @@
name: 'me',
data() {
return {
+ imgDetail:'',
baseURL:'',
// 退出登录模态框的显示与否。
showLogOut: false,
@@ -132,6 +133,7 @@
// 获取用户信息
getUserInfo() {
api.userInfo().then(res => {
+ this.imgDetail=res.headImg
this.userInfo=res
})
},
diff --git a/pages/me/transfer.vue b/pages/me/transfer.vue
index b05d35a..acae7f8 100644
--- a/pages/me/transfer.vue
+++ b/pages/me/transfer.vue
@@ -30,7 +30,7 @@
{{ i18n.To }}
+ :placeholder="i18n.OptionAccount" :disabled="true">
@@ -94,18 +94,17 @@
@touchmove.stop.prevent="">
-
-
- OK
+ OK
@@ -119,11 +118,11 @@
@touchmove.stop.prevent="">
-
- OK
+ OK
@@ -187,6 +186,14 @@
},
onLoad() {
this.baseURL = constant.BASE_URL
+
+ this.coinInfo.fromWays='exchange';
+ this.coinInfo.toWays='contract';
+ this.transCoinInfo.fromWays='Balance account';
+ this.i18fromWays=this.$t("me").Balanceaccount
+ this.transCoinInfo.toWays='Contract account';
+ this.i18toWays=this.$t("me").Contractaccount
+
this.getInfo()
},
onShow() {},
@@ -213,12 +220,13 @@
if(e=='exchange'){
this.transCoinInfo.fromWays='Balance account'
this.i18fromWays=this.$t("me").Balanceaccount
+
}else{
- console.log(123456)
this.transCoinInfo.fromWays='Contract account'
this.i18fromWays=this.$t("me").Contractaccount
}
this.coinInfo.fromWays=e
+ this.getInfo()
}else{
if(e=='exchange'){
this.transCoinInfo.toWays='Balance account'
@@ -267,13 +275,16 @@
fromWays:this.coinInfo.fromWays,
}).then(res => {
this.coinWayInfo=res
- this.accountPopupShow = false
- this.accountPopupShowTo = false
+
})
},
// 获取配置信息
getInfo(type) {
- api.getTransferConfig({}).then(res => {
+ this.coinWayInfo={};
+ this.info={};
+ api.getTransferConfig({
+ fromWays:this.coinInfo.fromWays
+ }).then(res => {
this.info = res
// 首次进来才默认选择
if(type){
@@ -283,13 +294,7 @@
this.coinInfo.coinCode=this.info.coinList[0].enname
this.coinCode = this.info.coinList[0].enname
this.coinCode2 = this.info.coinList[0].code
- this.coinInfo.fromWays='exchange';
- this.coinInfo.toWays='contract';
- this.transCoinInfo.fromWays='Balance account';
- this.i18fromWays=this.$t("me").Balanceaccount
-
- this.transCoinInfo.toWays='Contract account';
- this.i18toWays=this.$t("me").Contractaccount
+
})
},
USDTRadioChange(e) {},
diff --git a/pages/withdrawal/chooseAddress.vue b/pages/withdrawal/chooseAddress.vue
index 0a3835b..fc676ce 100644
--- a/pages/withdrawal/chooseAddress.vue
+++ b/pages/withdrawal/chooseAddress.vue
@@ -2,10 +2,23 @@
{{ i18n.ChooseAddress }}
- {{
- editFlag ? i18n.OK : i18n.Edit
- }}
+
+
+
+ {{
+ editFlag ? i18n.OK : i18n.Edit
+ }}
+
+
+
+ {{
+ editFlag ? i18n.OK : i18n.Edit
+ }}
+
+
+
+
@@ -232,6 +245,22 @@
border-radius: 8px;
color: #FFBC1F;
}
+
+
+ .right2{
+ width: 82rpx;
+ height: 56rpx;
+ line-height: 56rpx;
+ position: absolute;
+ right: 32rpx;
+ top: 70%;
+ transform: translateY(-50%);
+ font-size: 24rpx;
+ background: rgba(246, 166, 9, 0.1);
+ border-radius: 8px;
+ color: #FFBC1F;
+ }
+
.content {
diff --git a/utils/constant.js b/utils/constant.js
index 82370c1..f834123 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -1,5 +1,5 @@
-const IS_TEST = true;
+const IS_TEST = false;
const H5_BASE_URL = '/api';
const BASE_URL = IS_TEST?'https://sapi.payairs.com':'https://api.gream.ltd';
const H5_MARKET_URL = '/market';
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index 234b899..603a9ee 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -448,7 +448,7 @@ export default {
SelectCurrency: 'Select currency',
PleaseChooseCoin: 'Please choose coin',
From: 'From',
- OptionAccount: 'Option account',
+ OptionAccount: 'Choose account',
To: 'To',
TradingAccount: 'Trading account',
TransferNumber: 'Transfer number',
diff --git a/utils/language/vi_VN.js b/utils/language/vi_VN.js
index 15b1039..eb94074 100644
--- a/utils/language/vi_VN.js
+++ b/utils/language/vi_VN.js
@@ -437,7 +437,7 @@ export default {
SelectCurrency: 'Chọn đơn vị tiền tệ',
PleaseChooseCoin: 'Vui lòng chọn đơn vị tiền tệ',
From: 'chuyển ra ngoài',
- OptionAccount: 'Tài khoản Tùy chọn',
+ OptionAccount: 'chọn tài khoản',
To: 'chuyển giao',
TradingAccount: 'tài khoản giao dịch',
TransferNumber: 'Số tiền chuyển khoản',
diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js
index e81a19a..bd87a11 100644
--- a/utils/language/zh_TW.js
+++ b/utils/language/zh_TW.js
@@ -444,7 +444,7 @@ export default {
SelectCurrency: '選擇幣種',
PleaseChooseCoin: '請選擇幣種',
From: '轉出',
- OptionAccount: '期權賬戶',
+ OptionAccount: '選擇帳戶',
To: '轉入',
TradingAccount: '交易賬戶',
TransferNumber: '轉帳金額',