Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

src/business/trade/index.ts

@@ -497,9 +497,12 @@ export function useCancelOrder() {
             return await cancelOrder({
                 data: {
                     ...params,
+                    Header: {
+                        MarketID: marketid
+                    },
                     OldOrderId: orderid
                 }
-            }, marketid)
+            })
         } finally {
             loading.value = false
         }
@@ -531,6 +534,9 @@ export function useHolderClose() {
             loading.value = true
             return await holderClose({
                 data: {
+                    Header: {
+                        MarketID: marketid
+                    },
                     TradeID: tradeid,
                     GoodsID: goodsid,
                     BuyOrSell: buyOrSell,

src/services/api/trade/index.ts

@@ -170,12 +170,11 @@ export function spotPresalePointPrice(config: RequestConfig<Proto.SpotPresalePoi
 /**
  * 挂牌撤单
  */
-export function cancelOrder(config: RequestConfig<Proto.CancelOrderReq>, marketid: number) {
+export function cancelOrder(config: RequestConfig<Proto.CancelOrderReq>) {
     return http.mqRequest<Proto.CancelOrderRsp>({
         data: config.data,
         requestCode: 'CancelOrderReq',
-        responseCode: 'CancelOrderRsp',
-        marketId: marketid
+        responseCode: 'CancelOrderRsp'
     })
 }