1

resources/js/Pages/Home/components/CurrentConsignment/index.tsx

@@ -5,7 +5,7 @@ import {isMobile} from '@/js/utils/tool';
 import Pagination from '@/js/components/Pagination';
 import Pagination from '@/js/components/Pagination';
 import CustomButton from '@/js/components/Button';
 import CustomButton from '@/js/components/Button';
 import {ContractCurrentEntrustment} from '@/js/utils/api/contract';
 import {ContractCurrentEntrustment} from '@/js/utils/api/contract';
-import {getDirectionColor} from '@/js/utils/trade';
+import {getDirectionColor, getOpenText} from '@/js/utils/trade';
 import {getLocalContractHelper, getUserName} from '@/js/utils/local';
 import {getLocalContractHelper, getUserName} from '@/js/utils/local';
 import {open_loading} from '@/js/utils/tdesign';
 import {open_loading} from '@/js/utils/tdesign';
 import {ContractRevoke} from '@/js/utils/api/multipleUse';
 import {ContractRevoke} from '@/js/utils/api/multipleUse';
@@ -113,7 +113,7 @@ class CurrentConsignment extends Component<any, any> {
                                 <div className={['table-direction'].join(' ')} style={{
                                 <div className={['table-direction'].join(' ')} style={{
                                     color: getDirectionColor(item.position_side)
                                     color: getDirectionColor(item.position_side)
                                 }}>
                                 }}>
-                                    {getLocalContractHelper('position_side', item.position_side)}
+                                    {getLocalContractHelper('order_type', item.type)}/{getOpenText(item.position_side)}
                                 </div>
                                 </div>
                                 <CustomButton onClick={this.tableContractRevoke.bind(this, item)}>撤销</CustomButton>
                                 <CustomButton onClick={this.tableContractRevoke.bind(this, item)}>撤销</CustomButton>
                             </div>
                             </div>

resources/js/Pages/Home/components/HistoryTransaction/index.tsx

@@ -4,7 +4,7 @@ import CustomTable from '@/js/components/Table/index';
 import {isMobile} from '@/js/utils/tool';
 import {isMobile} from '@/js/utils/tool';
 import Pagination from '@/js/components/Pagination';
 import Pagination from '@/js/components/Pagination';
 import {ContractHistoryTransaction} from '@/js/utils/api/contract';
 import {ContractHistoryTransaction} from '@/js/utils/api/contract';
-import {getDirectionColor, getSuccessColor, getSuccessText} from '@/js/utils/trade';
+import {getDirectionColor, getSuccessColor, getSuccessText, getOpenText} from '@/js/utils/trade';
 import {getLocalContractHelper, getUserName} from '@/js/utils/local';
 import {getLocalContractHelper, getUserName} from '@/js/utils/local';
 import {open_loading} from '@/js/utils/tdesign';
 import {open_loading} from '@/js/utils/tdesign';
 
 
@@ -118,7 +118,7 @@ class HistoryTransaction extends Component<any, any> {
                                 <div className={['table-direction'].join(' ')} style={{
                                 <div className={['table-direction'].join(' ')} style={{
                                     color: getDirectionColor(item.position_side)
                                     color: getDirectionColor(item.position_side)
                                 }}>
                                 }}>
-                                    {getLocalContractHelper('position_side', item.position_side)}
+                                    {getLocalContractHelper('order_type', item.order_type)}/{getOpenText(item.position_side)}
                                 </div>
                                 </div>
                                 <div className={'table-time'}>
                                 <div className={'table-time'}>
                                     <span>更新时间 </span>
                                     <span>更新时间 </span>
@@ -231,7 +231,6 @@ class HistoryTransaction extends Component<any, any> {
             }
             }
             const res: any = await ContractHistoryTransaction(params);
             const res: any = await ContractHistoryTransaction(params);
             if (res.code == 0) {
             if (res.code == 0) {
-                console.log(res.data.data[0])
                 this.setState({
                 this.setState({
                     list: res.data.data,
                     list: res.data.data,
                     total: res.data.total,
                     total: res.data.total,

resources/js/Pages/Home/components/HoldingPosition/index.tsx

@@ -5,8 +5,8 @@ import {isMobile, isEqual} from '@/js/utils/tool';
 import CustomButton from '@/js/components/Button';
 import CustomButton from '@/js/components/Button';
 import Pagination from '@/js/components/Pagination';
 import Pagination from '@/js/components/Pagination';
 import {ContractHoldingPosition} from '@/js/utils/api/contract';
 import {ContractHoldingPosition} from '@/js/utils/api/contract';
-import {getLocalContractHelper, getUserName} from '@/js/utils/local';
-import {isRise, isPlus, getDirectionColor} from '@/js/utils/trade';
+import {getUserName} from '@/js/utils/local';
+import {isPlus, getDirectionColor, getOpenText} from '@/js/utils/trade';
 import {ClosePosition} from '@/js/utils/api/multipleUse';
 import {ClosePosition} from '@/js/utils/api/multipleUse';
 import {open_loading} from '@/js/utils/tdesign';
 import {open_loading} from '@/js/utils/tdesign';
 
 
@@ -110,7 +110,7 @@ class HoldingPosition extends Component<any, any> {
                                 <div className={'table-direction'} style={{
                                 <div className={'table-direction'} style={{
                                     color: getDirectionColor(item.position_side)
                                     color: getDirectionColor(item.position_side)
                                 }}>
                                 }}>
-                                    {getLocalContractHelper('position_side', item.position_side)}
+                                    {getOpenText(item.position_side)}
                                 </div>
                                 </div>
                                 <CustomButton onClick={ClosePosition.bind(this, {
                                 <CustomButton onClick={ClosePosition.bind(this, {
                                     ids: [item.id]
                                     ids: [item.id]

resources/js/utils/local.ts

@@ -103,11 +103,11 @@ export const getAdminUserList = async () => {
 // 请求合约辅助列表
 // 请求合约辅助列表
 export const getContractHelpList = async (skip: boolean = false) => {
 export const getContractHelpList = async (skip: boolean = false) => {
     // 清空
     // 清空
-    // window.localStorage.setItem(localContractHelpKey, '')
+    window.localStorage.setItem(localContractHelpKey, '')
     if (isLocalUserExpire(localContractHelpKey, 24 * 60 * 60 * 1000) || skip) {
     if (isLocalUserExpire(localContractHelpKey, 24 * 60 * 60 * 1000) || skip) {
         try {
         try {
             const res: any = await ContractAssist();
             const res: any = await ContractAssist();
-            // console.log(res.data)
+            console.log(res.data)
             if (res.code == 0) {
             if (res.code == 0) {
                 // 存本地
                 // 存本地
                 setLocalData(localContractHelpKey, res.data);
                 setLocalData(localContractHelpKey, res.data);
@@ -148,7 +148,11 @@ export const getLocalContractHelper = (key: string, value: string) => {
     const list = getLocalContractHelperList(key);
     const list = getLocalContractHelperList(key);
     if (list.length) {
     if (list.length) {
         const obj = list.find((item: any) => item.value == value);
         const obj = list.find((item: any) => item.value == value);
-        return obj ? obj.label : 'error';
+        if (obj) {
+            return obj.label;
+        } else {
+            return 'error';
+        }
     }
     }
 }
 }
 
 

resources/js/utils/trade.ts

@@ -74,3 +74,12 @@ export const getStatusColor = (status: number) => {
         return '#D95E71'
         return '#D95E71'
     }
     }
 }
 }
+
+// 开多开空文字
+export const getOpenText = (direction: string) => {
+    if (direction == 'LONG') {
+        return '开多'
+    } else {
+        return '开空'
+    }
+}