update

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trading",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "main.js",
   "dependencies": {
     "electron-updater": "^6.1.4",

oem/gzcj/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.gzcj",
   "appName": "贵州茶交",
-  "version": "1.0.5",
-  "versionCode": "100005",
+  "version": "1.0.6",
+  "versionCode": "100006",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

src/packages/sbyj/views/delivery/components/processing/components/pay/index.vue

@@ -71,6 +71,9 @@ const refresh = shallowRef(false) // 是否刷新父组件数据
 const headurl = ref('')
 
 const formData = reactive<Proto.DeliveryClientOperatorReq>({
+    Header: {
+        MarketID: props.selectedRow.marketid
+    },
     DeliveryOrderID: handleRequestBigNumber(props.selectedRow.deliveryorderid),
     OperateType: 2, // 操作类型，必填1:客户确认2:客户付款
     DeliveryPayMode: 2, // 默认线下支付

src/packages/sbyj/views/delivery/components/processing/list/index.vue

@@ -131,6 +131,7 @@ const deliveryCommit = (item: Model.MyTradeGoodsDeliveryOfflineRsp) => {
         message: `是否确认${getTagName(item.buyorsell)}？`,
         showCancelButton: true,
     }).then(() => {
+        formData.Header = { MarketID: item.marketid }
         formData.DeliveryOrderID = handleRequestBigNumber(item.deliveryorderid)
         formData.OperateType = 1 // 操作类型，必填1:客户确认2:客户付款
         fullloading((hideLoading) => {

src/packages/sbyj/views/order/list/components/market-order-delivery/index.vue

@@ -98,6 +98,7 @@ const onRadioChange = (value: number) => {
 const onSubmit = () => {
     const { tHDetailEx } = props.selectedRow ?? {}
 
+    formData.Header = { MarketID: tHDetailEx.marketID }
     formData.BuyOrSell = tHDetailEx.buyOrSell
     formData.HoldDetails = [{
         TradeID: handleRequestBigNumber(tHDetailEx.tradeID),
@@ -105,7 +106,9 @@ const onSubmit = () => {
     }]
 
     fullloading((hideLoading) => {
-        marketOrderDeliveryApply({ data: formData }).then(() => {
+        marketOrderDeliveryApply({
+            data: formData
+         }).then(() => {
             hideLoading('提交成功', 'success')
             closed(true)
         }).catch((err) => {

src/packages/sbyj/views/order/list/components/supplement-deposit/index.vue

@@ -97,6 +97,7 @@ const onSubmit = () => {
     const { tHDetailEx } = props.selectedRow ?? {}
 
     if (orderType.value === 1) {
+        supplementDepositReq.Header = { MarketID: tHDetailEx.marketID }
         supplementDepositReq.TradeID = handleRequestBigNumber(tHDetailEx.tradeID)
         supplementDepositReq.BuyOrSell = tHDetailEx.buyOrSell
         supplementDepositReq.MarketID = tHDetailEx.marketID
@@ -112,6 +113,7 @@ const onSubmit = () => {
     }
 
     if (orderType.value === 2) {
+        refundedDepositReq.Header = { MarketID: tHDetailEx.marketID }
         refundedDepositReq.TradeID = handleRequestBigNumber(tHDetailEx.tradeID)
         refundedDepositReq.BuyOrSell = tHDetailEx.buyOrSell
         refundedDepositReq.MarketID = tHDetailEx.marketID

src/services/api/trade/index.ts

@@ -281,8 +281,7 @@ export function supplementDeposit(config: RequestConfig<Partial<Proto.Supplement
             ...config.data
         },
         requestCode: 'SupplementDepositReq',
-        responseCode: 'SupplementDepositRsp',
-        marketId: 52101
+        responseCode: 'SupplementDepositRsp'
     })
 }
 
@@ -298,8 +297,7 @@ export function refundedDeposit(config: RequestConfig<Partial<Proto.RefundedDepo
             ...config.data
         },
         requestCode: 'RefundedDepositReq',
-        responseCode: 'RefundedDepositRsp',
-        marketId: 52101
+        responseCode: 'RefundedDepositRsp'
     })
 }
 
@@ -315,8 +313,7 @@ export function marketOrderDeliveryApply(config: RequestConfig<Partial<Proto.Mar
             ...config.data
         },
         requestCode: 'MarketOrderDeliveryApplyReq',
-        responseCode: 'MarketOrderDeliveryApplyRsp',
-        marketId: 52101
+        responseCode: 'MarketOrderDeliveryApplyRsp'
     })
 }
 
@@ -333,8 +330,7 @@ export function deliveryClientOperator(config: RequestConfig<Partial<Proto.Deliv
             ...config.data
         },
         requestCode: 'DeliveryClientOperatorReq',
-        responseCode: 'DeliveryClientOperatorRsp',
-        marketId: 52101
+        responseCode: 'DeliveryClientOperatorRsp'
     })
 }