huangbin há 4 anos atrás
pai
commit
fc984a7c66

+ 1 - 1
public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://103.40.249.123:28280/cfg?key=mtp_20"
+    "apiUrl": "http://192.168.31.139:8080/cfg?key=test_139"
 }

+ 1 - 4
src/services/bus/index.ts

@@ -42,10 +42,7 @@ export async function globalDataRefresh(): Promise<string> {
                 await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), LoginQuery(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])
                 const marketInfo = getMarketByTradeMode(TradeMode.WarehouseReceiptTrade);
                 if (marketInfo) {
-                    if (isOemByEnum(OemType.wrspot)) {
-                        // 仓单贸易交易规则
-                        await queryWrMarketTradeConfig({ marketid: marketInfo.marketid })
-                    }
+                    await queryWrMarketTradeConfig({ marketid: marketInfo.marketid })
                 }
             }
         } else {

+ 1 - 5
src/services/bus/login.ts

@@ -1,4 +1,3 @@
-import { isOemByEnum, OemType } from '@/common/config/projectName';
 import { TradeMode } from '@/common/constants/enumCommon';
 import APP from '@/services';
 import { isAllEnum } from '@/services/bus/allEnum';
@@ -31,10 +30,7 @@ export const login = async (logidCode: string, password: string, byteArr: Uint8A
         await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), getServerTime(), LoginQuery(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])
         const marketInfo = getMarketByTradeMode(TradeMode.WarehouseReceiptTrade);
         if (marketInfo) {
-            if (isOemByEnum(OemType.wrspot)) {
-                // 仓单贸易交易规则
-                await queryWrMarketTradeConfig({ marketid: marketInfo.marketid })
-            }
+            await queryWrMarketTradeConfig({ marketid: marketInfo.marketid })
         }
 
         // await GetPCMenus();

+ 1 - 0
src/views/market/spot_trade/components/post_buying/setup.ts

@@ -36,6 +36,7 @@ export function handleNumAndPrice(enumName: EnumRouterName, selectedRow: WrOrder
     const getSelectedAccount = () => accountList.find((e) => e.accountid === formState.accountid);
     // 交易规则
     const rules = getRules()
+    debugger
     const { buymarginvalue, buymarginalgorithm } = rules[0]
     //保证金模式 1: 比率 2: 固定
     const marginMethod = () => buymarginalgorithm === 1