From df78c216ffa2ded2936d1d7fe6c4f9577ad81d16 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Fri, 11 Mar 2022 18:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3=202022.3.1?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i18n/lang/en.json                         | 18 ++++++++++--------
 i18n/lang/zh-CN.json                      |  5 +++--
 pages/accountSettings/accountSettings.vue |  4 ++--
 pages/assets/recharge.vue                 |  4 ++--
 pages/base/index.vue                      | 17 +++++++++--------
 pages/base/mine.vue                       |  6 +++---
 pages/exchange/contract-history.vue       | 14 +++++++++-----
 pages/exchange/contractHis.vue            |  2 +-
 pages/exchange/exchange-transaction.vue   | 16 ++++++++++------
 pages/exchange/his.vue                    |  4 ++--
 pages/exchange/open-position.vue          | 21 +++++++++++++--------
 pages/exchange/position.vue               |  2 +-
 pages/notice/index.vue                    | 15 ++++++++-------
 pages/purchase/bill.vue                   | 12 ++++++++----
 pages/purchase/index.vue                  |  9 ++++++---
 pages/transfer/index.vue                  |  5 ++++-
 16 files changed, 91 insertions(+), 63 deletions(-)

diff --git a/i18n/lang/en.json b/i18n/lang/en.json
index be1b82a..b13ad86 100755
--- a/i18n/lang/en.json
+++ b/i18n/lang/en.json
@@ -66,7 +66,8 @@
     "c3":"Openable",
     "c4":"Margin",
     "c5": "your transfer order has been submitted successfully, please wait patiently, and the transfer result will be notified by SMS or e-mail. Please check it carefully. If you have any questions, please contact the customer service in time.",
-	"c6":"Proportion of increase"
+		"c6":"Proportion of increase",
+		"c7":"Current valuation"
   },
   "base": {
     "a0": "Title",
@@ -447,7 +448,8 @@
     "b1": "Transfer Amount",
     "b2": "Balance",
     "b3": "All",
-    "b4": "Transferred"
+    "b4": "Transferred",
+		"b5":"Transfer Currency"
   },
   "notice": {
     "a0": "Details",
@@ -514,11 +516,11 @@
     "a5": "Opened successfully",
     "a6": "Transaction Type",
     "a7": "Filled",
-    "a8": "Order Total",
-    "a9": "Average Transaction Price",
-    "b0": "Order Price",
+    "a8": "Amount",
+    "a9": "Avg.",
+    "b0": "Price",
     "b1": "Margin",
-    "b2": "Handling Fee",
+    "b2": "Fee",
     "b3": "Status",
     "b4": "Operation",
     "b5": "Cancel order",
@@ -533,7 +535,7 @@
     "c4": "Warm Reminder",
     "c5": "Whether to cancel the current order",
     "c6": "Undo successfully",
-    "c7": "Profit and Loss",
+    "c7": "Realized PNL",
     "c8": "Share",
     "c9": "Delegation Details",
     "d0": "No data yet",
@@ -550,7 +552,7 @@
     "e1": "Can open more",
     "e2": "sell",
     "e3": "Can open empty",
-    "e4": "Available",
+    "e4": "Available Max",
     "e5": "Transfer",
     "e6": "Fund Rate",
     "e7": "Distance settlement",
diff --git a/i18n/lang/zh-CN.json b/i18n/lang/zh-CN.json
index 5faa23f..2177772 100755
--- a/i18n/lang/zh-CN.json
+++ b/i18n/lang/zh-CN.json
@@ -66,7 +66,8 @@
     "c3": "可开",
     "c4": "预估保证金",
     "c5": "您的划转订单已提交成功，请耐心等待，划转结果会以短信或邮件的方式通知。请注意查收，如有疑问请及时联系客服",
-	"c6":"涨幅比例"
+		"c6":"涨幅比例",
+		"c7":"当前估值"
   },
   "base": {
     "a0": "标题",
@@ -456,7 +457,7 @@
     "a3": "消息"
   },
   "invite": {
-    "a0": "尊享交易返佣邀请好友",
+    "a0": "申购",
     "a1": "合伙人",
     "a2": "尊享交易返佣",
     "a3": "普通用户",
diff --git a/pages/accountSettings/accountSettings.vue b/pages/accountSettings/accountSettings.vue
index dec37e7..43865cb 100755
--- a/pages/accountSettings/accountSettings.vue
+++ b/pages/accountSettings/accountSettings.vue
@@ -37,7 +37,7 @@
       <!-- #endif -->
     </view>
     <view class="m-x-lg rounded-md overflow-hidden box-shadow">
-      <v-link
+      <!-- <v-link
         to="/pages/safe/phone"
         tag="div"
         class="per-bot p-x-md border-b border-gray-7 p-y-md d-flex align-center justify-between bg-panel-3 "
@@ -55,7 +55,7 @@
             @click.stop
           />
         </view>
-      </v-link>
+      </v-link> -->
 
       <v-link
         tag="div"
diff --git a/pages/assets/recharge.vue b/pages/assets/recharge.vue
index ecf4066..a07cbfc 100755
--- a/pages/assets/recharge.vue
+++ b/pages/assets/recharge.vue
@@ -44,13 +44,13 @@
                   
                 </view>
               </view>
-              <view class="color-sell fn-12 p-x-lg">{{$t('recharge.a1')}}<span v-if="coin=='USDT'">{{text}}</span> {{coin}}{{$t('recharge.a2')}}</view>
+              <view class="color-sell fn-12 p-x-lg">{{$t('recharge.a1')}}<span v-if="coin=='USDT'">{{text}}</span> {{coin}}.{{$t('recharge.a2')}}</view>
               <view class="p-t-md  p-b-md ">
                 <view class="fn-center">
                   <v-qr v-if="form.address" class="qr-box" :text="form.address||' '"></v-qr>
                 </view>
                 <!-- <view class="tips fn-center color-light m-y-xs">{{$t('assets.e6')}}</view> -->
-                <view class="tips fn-center color-theme-1 m-t-md">{{$t('recharge.a3')}}</view>
+                <!-- <view class="tips fn-center color-theme-1 m-t-md">{{$t('recharge.a3')}}</view> -->
               </view>
             </view>
             <view class="info p-b-md rounded-md">
diff --git a/pages/base/index.vue b/pages/base/index.vue
index 084a329..ddeecba 100755
--- a/pages/base/index.vue
+++ b/pages/base/index.vue
@@ -74,20 +74,21 @@ export default {
           icon: "static/img/base_link_0.png",
           activeIcon: "static/img/base_link_1.png",
         },
+				{
+				  label: this.$t("exchange.a2"),
+				  tel: "contract",
+				  icon: "static/img/base_caidan_0.png",
+				  activeIcon: "static/img/base_caidan_1.png",
+				},
         {
           // label: this.$t("base.a4"),
           // tel: "option-list",
-		  label: this.$t("purchase.a5"),
-		  tel: "purchase",
+					label: this.$t("purchase.a5"),
+					tel: "purchase",
           icon: "static/img/base_qukuai_0.png",
           activeIcon: "static/img/base_qukuai_1.png",
         },
-        {
-          label: this.$t("exchange.a2"),
-          tel: "contract",
-          icon: "static/img/base_caidan_0.png",
-          activeIcon: "static/img/base_caidan_1.png",
-        },
+        
         {
           label: this.$t("base.d2"),
           tel: "mine",
diff --git a/pages/base/mine.vue b/pages/base/mine.vue
index b584141..473224b 100755
--- a/pages/base/mine.vue
+++ b/pages/base/mine.vue
@@ -19,7 +19,7 @@
           <text class="fn-sm m-l-md w-max"
             >
 				<!-- ≈{{ filterMoney(account.total_assets_usd) }} USD -->
-				≈{{ account.total_assets_usd }} USD
+				≈{{ (account.total_assets_usd).toFixed(4) }} USD
 			</text>
         </view>
         
@@ -121,7 +121,7 @@
                   <text class="fn-20 d-block color-light m-t-xs"
                   >
 					<!-- ≈{{ filterMoney(account.funds_account_usd) }} -->
-					≈{{ account.funds_account_usd }}
+					≈{{ (account.funds_account_usd).toFixed(4) }}
 				  </text>
                   <text class="fn-sm d-block color-gray-6 m-t-xs"
                     >{{ $t("base.d6") }}(USDT)</text>
@@ -150,7 +150,7 @@
                   icon-size="16"
                 >
                 <text class="color-gray-6 m-r-xs"
-                  >{{ $t("base.e0") }}0{{ $t("base.e1") }}</text
+                  >{{ $t("base.e0") }} 0 {{ $t("base.e1") }}</text
                 >
                 </van-checkbox>
               </view>
diff --git a/pages/exchange/contract-history.vue b/pages/exchange/contract-history.vue
index 3cad957..1867115 100755
--- a/pages/exchange/contract-history.vue
+++ b/pages/exchange/contract-history.vue
@@ -2,11 +2,13 @@
   <v-paging :ajax="getHistoryEntrust" class="h-max" ref="vPag">
     <template #box="list">
        <van-empty v-if="!$list(list).length" description="" />
+			 
+			 <!-- @click="showDetail(item)" -->
       <div
         class="item bg-panel-4 m-md rounded-sm box-shadow"
         v-for="item in $list(list)"
         :key="item.id"
-        @click="showDetail(item)"
+        
       >
         <div
           class="head d-flex align-center border-b  p-x-md p-y-xs justify-between"
@@ -50,10 +52,11 @@
             <div class="label fn-sm">{{$t('contract.b3')}}</div>
             <div class="color-light">{{ status(item.status) }}</div>
           </div>
-          <div class="row d-flex m-y-mini justify-between" v-if="item.profit">
+          <!-- <div class="row d-flex m-y-mini justify-between" v-if="item.profit">
             <div class="label fn-sm">{{$t('contract.b4')}}</div>
             <div class="color-light">
-                <!-- <v-button type="green-plain" class="m-l-xs rounded-xs" size="mini" plain
+							
+                <v-button type="green-plain" class="m-l-xs rounded-xs" size="mini" plain
                 :to="{path:'/pages/income/index',query:{
                   symbol:item.symbol,
                   side:item.side,
@@ -64,10 +67,11 @@
                   newPrice: newPrice,
                   position_side: 2,
                 }}"
-                >{{$t('contract.c8')}}</v-button> -->
+                >{{$t('contract.c8')}}</v-button>
+								
                 <v-button type="green-plain" class="m-l-xs rounded-xs" size="mini" plain @click="canvasImage(item)">{{$t('contract.c8')}}</v-button>
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     <van-popup
diff --git a/pages/exchange/contractHis.vue b/pages/exchange/contractHis.vue
index c828eb3..d213247 100755
--- a/pages/exchange/contractHis.vue
+++ b/pages/exchange/contractHis.vue
@@ -94,7 +94,7 @@
           
                       <v-button type="green" size="small" class="opt-btn rounded-xs m-b-xs" @click="closePositionShow(item)">{{ $t("contract.h3") }}</v-button>
           
-                      <v-button type="green" size="small" class="opt-btn rounded-xs m-b-xs m-l-xs" @click="onekeyReverse(item)">{{ $t("contract.k8") }}</v-button>
+                      <!-- <v-button type="green" size="small" class="opt-btn rounded-xs m-b-xs m-l-xs" @click="onekeyReverse(item)">{{ $t("contract.k8") }}</v-button> -->
                       <!-- <v-button
                 type="danger"
                 class="opt-btn m-l-xs m-b-xs"
diff --git a/pages/exchange/exchange-transaction.vue b/pages/exchange/exchange-transaction.vue
index a7e028c..accb4e1 100755
--- a/pages/exchange/exchange-transaction.vue
+++ b/pages/exchange/exchange-transaction.vue
@@ -258,7 +258,10 @@
           <view class="m-t-xs bg-panel-3">
               <view class="border-t-original d-flex justify-between align-center p-x-md p-t-lg">
                   <text class="fn-16 fn-bold color-light">{{$t("exchange.a4")}}</text>
-                  <v-link tag="div" to="/pages/exchange/exchangeHis" class="d-flex align-center"><van-icon name="orders-o" class="fn-14"/><span class="fn-12 ">{{$t("purchase.a9")}}</span> </v-link>
+                  <v-link tag="div" to="/pages/exchange/exchangeHis" class="d-flex align-center">
+										<van-icon name="orders-o" class="fn-14" style="font-size: 16px;"/>
+										<span class="fn-12 " style="font-size: 16px;">{{$t("purchase.a9")}}</span> 
+									</v-link>
               </view>
               <van-empty v-if="!Object.values(list).length" description="" />
               <view v-for="item in (list)" class="item border-b fn-14" :key="item.order_no">
@@ -379,7 +382,7 @@ export default {
       tradeList: [],
       form: {
         direction: "buy",
-        type: 0,
+        type: 1,
         symbol: this.symbol,
         entrust_price: "",
         amount: "",
@@ -414,14 +417,15 @@ export default {
     },
     typeList() {
       return [
+				{
+				  value: 1,
+				  label: this.$t("exchange.d7"),
+				},
         {
           value: 0,
           label: this.$t("exchange.d6"),
         },
-        {
-          value: 1,
-          label: this.$t("exchange.d7"),
-        },
+        
       ];
     },
     // activeType() {
diff --git a/pages/exchange/his.vue b/pages/exchange/his.vue
index 7ea24d1..7191bad 100755
--- a/pages/exchange/his.vue
+++ b/pages/exchange/his.vue
@@ -13,7 +13,7 @@
         :title="`${$t('contract.a1')}(${symbolLeft})`"
         :name="1"
       ></van-tab> -->
-      <van-tab :title="$t('contract.a2')" :name="0"></van-tab>
+      <!-- <van-tab :title="$t('contract.a2')" :name="0"></van-tab> -->
       <van-tab :title="$t('contract.a3')" :name="1"></van-tab>
       <!-- <van-tab
         :title="`${$t('exchange.a2')}${$t('assets.a7')}(${symbolLeft})`"
@@ -106,7 +106,7 @@ export default {
   },
   data() {
     return {
-      tab: 0,
+      tab: 1,
       collect: [],
       marketList: [],
       symbolListShow: false,
diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue
index 34dcb64..17738c1 100755
--- a/pages/exchange/open-position.vue
+++ b/pages/exchange/open-position.vue
@@ -33,10 +33,15 @@
            </view>
          </view>
          <view class="item p-x-xs t-no w-33 fn-center">
-           <view class="label">{{ $t("contract.d5") }}(USDT)</view>
-           <view class="num color-light " style="margin-top:8px;">{{
-             accountInfo.totalUnrealProfit
-           }}</view>
+						<view class="label">
+							<!-- {{ $t("contract.d5") }} -->
+							{{ $t("contract.e4") }}
+							(USDT)
+						</view>
+						<view class="num color-light " style="margin-top:8px;">
+							<!-- {{accountInfo.totalUnrealProfit}} -->
+							{{accountInfo.usable_balance}}
+						</view>
          </view>
          <view class="item fn-right w-33">
            <view class="label">
@@ -356,13 +361,13 @@
             </view> -->
             <template v-if="active==0">
                 <view class="p-x-md bg-panel-3 p-b-xs p-t-md fn-right d-flex justify-between">
-                    <view class="d-flex align-center" @click="
+                    <!-- <view class="d-flex align-center" @click="
                   checked = !checked;
                   holdPosition();
                 ">
                         {{ $t("contract.g3") }}
                         <van-checkbox class="m-l-xs" :value="checked"></van-checkbox>
-                    </view>
+                    </view> -->
                     <view>
                         <v-button type="green" size="small" class="rounded-lg opt-btn m-b-xs" @click="onekeyAllFlat">{{ $t("contract.k7") }}</v-button>
                     </view>
@@ -382,7 +387,7 @@
                           </view> -->
                         </view>
                         <view class="d-flex w-25 justify-end">
-                            <img @click="canvasImage(item)" width="15px" height="15px" src="static/img/share.png"/>
+                            <!-- <img @click="canvasImage(item)" width="15px" height="15px" src="static/img/share.png"/> -->
                             <!-- <v-link :to="{
                               path: '/pages/income/index',
                               query: {
@@ -450,7 +455,7 @@
                     </view>
                     <view class="row d-flex m-y-xs align-center justify-between fn-13 p-t-xs">
                         <text class="bg-form-panel-4 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1" @click="toStoploss(item)">{{ $t("contract.h5") }}</text>
-                        <text class="bg-form-panel-4 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1" @click="onekeyReverse(item)">{{ $t("contract.k8") }}</text>
+                        <!-- <text class="bg-form-panel-4 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1" @click="onekeyReverse(item)">{{ $t("contract.k8") }}</text> -->
                         <text class="bg-form-panel-4 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1" @click="closePositionShow(item)">{{ $t("contract.h3") }}</text>
                         <!-- <v-button type="default" size="small" class="opt-btn rounded-xs m-b-xs" @click="closePositionShow(item)">{{ $t("contract.h3") }}</v-button>
                         
diff --git a/pages/exchange/position.vue b/pages/exchange/position.vue
index b2fd24d..43491c8 100755
--- a/pages/exchange/position.vue
+++ b/pages/exchange/position.vue
@@ -73,7 +73,7 @@
 
                     <v-button type="green" size="small" class="opt-btn rounded-xs m-b-xs" @click="closePositionShow(item)">{{ $t("contract.h3") }}</v-button>
 
-                    <v-button type="green" size="small" class="opt-btn rounded-xs m-b-xs m-l-xs" @click="onekeyReverse(item)">{{ $t("contract.k8") }}</v-button>
+                    <!-- <v-button type="green" size="small" class="opt-btn rounded-xs m-b-xs m-l-xs" @click="onekeyReverse(item)">{{ $t("contract.k8") }}</v-button> -->
                     <!-- <v-button
               type="danger"
               class="opt-btn m-l-xs m-b-xs"
diff --git a/pages/notice/index.vue b/pages/notice/index.vue
index 25401c6..db23c1f 100755
--- a/pages/notice/index.vue
+++ b/pages/notice/index.vue
@@ -3,18 +3,19 @@
     <v-header :title="$t('notice.a1')"></v-header>
      <view class="d-flex justify-center p-t-md">
       <view class="d-flex bg-form-panel-4 rounded-lg overflow-scroll">
-        <view
-          :class="{ 'bg-theme-1 color-plain rounded-lg': active == 0 }"
-          @click="active = 0"
-          class="p-y-xs p-x-lg min-w-60 fn-center"
-          >{{$t('notice.a2')}}</view
-        >
         <view
           :class="{ 'bg-theme-1 color-plain rounded-lg': active == 1 }"
           @click="active = 1"
           class="p-y-xs p-x-lg min-w-60 fn-center"
           >{{$t('notice.a3')}}</view
         >
+				<view
+          :class="{ 'bg-theme-1 color-plain rounded-lg': active == 0 }"
+          @click="active = 0"
+          class="p-y-xs p-x-lg min-w-60 fn-center"
+          >{{$t('notice.a2')}}</view
+        >
+        
       </view>
     </view>
     <!-- 公告 -->
@@ -52,7 +53,7 @@ import Member from "@/api/member";
 export default {
   data() {
     return {
-      active: 0,
+      active: 1,
       myNotifiables: Member.myNotifiables,
       article:Member.article
     };
diff --git a/pages/purchase/bill.vue b/pages/purchase/bill.vue
index c37863a..ea9ccbc 100755
--- a/pages/purchase/bill.vue
+++ b/pages/purchase/bill.vue
@@ -26,10 +26,14 @@
               <div class="label fn-sm">{{$t('common.a5')}}</div>
               <div class="color-light">{{item.subscription_currency_amount}}</div>
             </div>
-			<div class="row d-flex m-y-xs justify-between">
-			  <div class="label fn-sm">{{$t('common.c6')}}</div>
-			  <div class="color-light">{{ ( ((issue_price-(item.payment_amount/item.subscription_currency_amount))/issue_price)*100 ).toFixed(2) }}%</div>
-			</div>
+						<div class="row d-flex m-y-xs justify-between">
+							<div class="label fn-sm">{{$t('common.c6')}}</div>
+							<div class="color-light">{{ ( item.increase_ratio ).toFixed(5) }}%</div>
+						</div>
+						<div class="row d-flex m-y-xs justify-between">
+							<div class="label fn-sm">{{$t('common.c7')}}</div>
+							<div class="color-light">{{ ( item.total_value ).toFixed(5) }}</div>
+						</div>
           </div>
         </div>
       </ul>
diff --git a/pages/purchase/index.vue b/pages/purchase/index.vue
index ba0aa07..41e8c2b 100755
--- a/pages/purchase/index.vue
+++ b/pages/purchase/index.vue
@@ -81,11 +81,14 @@
         <view class="tips m-t-xs fn-sm d-flex justify-between color-sell">
           <view
             >1 {{ activeCoin.coin_name }} ≈
-            {{ omitTo(activeCoin.proportion_amount, 4) }}
+            <!-- {{ omitTo(activeCoin.proportion_amount, 4) }} -->
+						{{ omitTo((1 / detail.issue_price),4) }}
             {{ detail.coin_name }}</view
           >
           <view class="color-sell"
-            >{{ num || 0 }} {{ activeCoin.coin_name }} ≈ {{ total }}
+            >{{ num || 0 }} {{ activeCoin.coin_name }} ≈ 
+						<!-- {{ total }} -->
+						{{ omitTo(((activeCoin.CurrentPrice/ detail.issue_price)*num),4 )}}
             {{ detail.coin_name }}</view
           >
         </view>
@@ -193,7 +196,7 @@ export default {
     return {
       coinList: [],
       detail: {},
-      num: "",
+      num: 1,
       coin: "",
       subscription:false,
       subscriptionCode:"",
diff --git a/pages/transfer/index.vue b/pages/transfer/index.vue
index 34213cc..a8f8ff1 100755
--- a/pages/transfer/index.vue
+++ b/pages/transfer/index.vue
@@ -55,7 +55,10 @@
         class=""
       >
         <view class="m-md p-md d-flex rounded bg-panel-3 box-shadow">
-          <view class="flex-fill">{{ $t("transfer.b1") }}</view>
+          <view class="flex-fill">
+						<!-- {{ $t("transfer.b1") }} -->
+						{{ $t("transfer.b5") }}
+					</view>
           <view class="color-light">{{ form.coin_name }}</view>
           <van-icon class="m-l-xs" name="arrow" />
         </view>