修改任务任务 #5662

src/packages/sbyj/views/mine/index.vue

@@ -20,10 +20,10 @@
                             <div class="bottom">{{ loginStore.loginId }}</div>
                         </div>
                     </div>
-                    <div class="profile-account">
+                    <!-- <div class="profile-account">
                         <span>正常</span>
                         <span>{{ currentAccount.accountid ?? 0 }}</span>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="bank">
                     <ul>
@@ -32,6 +32,26 @@
                             <span>{{ currentAccount.currentbalance?.toFixed(2) }}</span>
                         </li>
                         <li>
+                            <span>预付定金</span>
+                            <span>{{ currentAccount.freezeMargin?.toFixed(2) }}</span>
+                        </li>
+                    </ul>
+                    <ul>
+                        <li>
+                            <span>可用权益</span>
+                            <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>浮动权益</span>
+                            <span>{{ currentAccount.profitLoss?.toFixed(2) }}</span>
+                        </li>
+                    </ul>
+                    <!-- <ul>
+                        <li>
+                            <span>余额</span>
+                            <span>{{ currentAccount.currentbalance?.toFixed(2) }}</span>
+                        </li>
+                        <li>
                             <span>净值</span>
                             <span>{{ currentAccount.hazardValue?.toFixed(2) }}</span>
                         </li>
@@ -57,7 +77,7 @@
                                 {{ parsePercent(currentAccount.hazardRatio) }}
                             </span>
                         </li>
-                    </ul>
+                    </ul> -->
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>

src/packages/sbyj/views/order/list/index.vue

@@ -42,10 +42,6 @@
                                 </span>
                             </li>
                             <li>
-                                <span>订单金额</span>
-                                <span>{{ item.tHDetailEx.holderAmount }}</span>
-                            </li>
-                            <li>
                                 <span>订单价格</span>
                                 <span>{{ formatDecimal(item.tHDetailEx.holderPrice) }}</span>
                             </li>
@@ -54,6 +50,10 @@
                                 <span>{{ item.tHDetailEx.payedDeposit }}</span>
                             </li>
                             <li>
+                                <span>浮动权益</span>
+                                <span :class="handlePriceColor(item.tHDetailEx.floatPL)">{{ handleNumberValue(item.tHDetailEx.floatPL) }}</span>
+                            </li>
+                            <li>
                                 <span>已补定金</span>
                                 <span>{{ handleNumberValue(item.tHDetailEx.restockDeposit) }}</span>
                             </li>
@@ -65,6 +65,10 @@
                                 <span>滞纳金</span>
                                 <span>{{ handleNumberValue(item.tHDetailEx.callAteFee) }}</span>
                             </li>
+                            <!-- <li>
+                                <span>订单金额</span>
+                                <span>{{ item.tHDetailEx.holderAmount }}</span>
+                            </li> -->
                         </ul>
                     </div>
                     <div class="g-order-list__btnbar">
@@ -87,7 +91,7 @@
 <script lang="ts" setup>
 import { onMounted, shallowRef, defineAsyncComponent } from 'vue'
 import { BuyOrSell } from '@/constants/order'
-import { formatDecimal, parsePercent, handleNumberValue } from '@/filters'
+import { formatDecimal, parsePercent, handleNumberValue, handlePriceColor } from '@/filters'
 import { getGoodsUnitName } from '@/constants/unit'
 import { useComponent } from '@/hooks/component'
 import { Button } from 'vant'

src/packages/zrwyt/views/mine/Index.vue

@@ -156,7 +156,7 @@ import { useLoginStore, useAccountStore, useUserStore, usePositionStore } from '
 import eventBus from '@/services/bus'
 import Iconfont from '@/components/base/iconfont/index.vue'
 import { getMemberUserId } from '@/services/methods/user'
-import { queryMdUserSwapProtocol } from '@/services/api/swap'
+import { queryUsereSignRecords } from '@/services/api/account'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()
@@ -243,13 +243,13 @@ onActivated(() => {
     }
     
     /// 查询数据
-    queryMdUserSwapProtocol({
+    queryUsereSignRecords({
         data: {
             userId: loginStore.userId
         }
     }).then((res) => {
         /// 判断是否能签约
-        canBankSign.value = res.data.some(e => e.protocolstatus === 4 )
+        canBankSign.value = res.data.some(e => e.recordstatus === 3 )
     })
 })