From 10c8ed6840604e3e545e2796c53a0a116b7d3b7a Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Fri, 9 Sep 2022 10:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/entrustOrderList/entrustOrderList.vue | 14 ++++++++++++--
 utils/language/en_US.js                          |  2 ++
 utils/language/vi_VN.js                          |  1 +
 utils/language/zh_TW.js                          |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue
index c0ba207..bd2aa37 100644
--- a/components/entrustOrderList/entrustOrderList.vue
+++ b/components/entrustOrderList/entrustOrderList.vue
@@ -67,9 +67,12 @@
 						<view class="right" v-show="type === 2">
 							<view class="title">{{ i18n.ClosePrice }}</view>
 							<view class="value" style="color:#00E8A2;">{{item.closedPrice}}</view>
-							<view class="title">{{ i18n.status }}</view>
+							<view class="title">{{ i18n.ROE }}</view>
 							<view class="value">
-								{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}}
+							<!-- 	{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}} -->
+							<view class="value" :style="(item.profitAmount/item.bondAmount)*100>=0?'color:#00E8A2;':'color:#F4506A'">
+								{{getValue(item.profitAmount/item.bondAmount)}}%
+							</view>
 							</view>
 
 							<view class="title">{{ i18n.PL }}</view>
@@ -246,6 +249,13 @@
 			timer2 = null;
 		},
 		methods: {
+			// 获取百分比位数
+			getValue(e){
+				 let data = e*100
+				 data = parseFloat(data.toPrecision(10))
+				 data = String(data)
+				 return data.substring(0, data.indexOf(".") + 3);
+			},
 			// 获取位数
 			getPrice(s) {
 				var i=s;
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index e2fa6c9..488ac7c 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -95,6 +95,8 @@ export default {
 
 	// 合约页面相关
 	markets: {
+		ROE:'ROE',
+		
 		// 漏掉的国际化
 		undone:'undone',
 		opened:'open position',
diff --git a/utils/language/vi_VN.js b/utils/language/vi_VN.js
index 2431716..72e04c8 100644
--- a/utils/language/vi_VN.js
+++ b/utils/language/vi_VN.js
@@ -93,6 +93,7 @@ export default {
 
 	// 合约页面相关
 	markets: {
+		ROE:'Thua',
 		
 		// 漏掉的国际化
 		undone: 'Không',
diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js
index 63a79b6..accc342 100644
--- a/utils/language/zh_TW.js
+++ b/utils/language/zh_TW.js
@@ -94,6 +94,7 @@ export default {
 
 	// 合约页面相关
 	markets: {
+		ROE:'收益率',
 		// 漏掉的国际化
 		undone:'未成交',
 		opened:'已開倉',