xxxxxxxxx

src/packages/mobile/views/order/list/components/swaporder/detail/Index.vue

@@ -17,9 +17,6 @@
                     <Cell title="委托单号" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>
-            <div v-else>
-                <Empty />
-            </div>
             <template #footer v-if="selectedRow.orderstatus === 3 || selectedRow.orderstatus === 7">
                 <Button type="primary" block round @click="onCancelSumit">撤销</Button>
             </template>
@@ -37,8 +34,9 @@ import { useCancelOrder } from '@/business/trade'
 import { dialog, fullloading } from '@/utils/vant'
 
 const showModal = shallowRef(true)
-const refresh = shallowRef(false) // 是否刷新父组件数据
-const { cancelSubmit } = useCancelOrder()
+// 是否刷新父组件数据
+const refresh = shallowRef(false) 
+const { cancelSubmit, formData } = useCancelOrder()
 
 const props = defineProps({
     selectedRow: {
@@ -52,10 +50,12 @@ const onCancelSumit = () => {
         message: '确认要撤销吗？',
         showCancelButton: true,
     }).then(() => {
-        const { orderid = '', marketid = 0 } = props.selectedRow ?? {}
+        const { orderid = '' } = props.selectedRow ?? {}
+        /// 市场ID
+        formData.Header = { MarketID: props.selectedRow.marketid }
         /// loding....
         fullloading((hideLoading) => {
-            cancelSubmit(orderid, marketid).then(() => {
+            cancelSubmit(orderid).then(() => {
                 hideLoading('撤销成功')
             }).catch((err) => {
                 showFailToast(err)

src/packages/mobile/views/swap/detail/components/listing/Index.vue

@@ -83,7 +83,7 @@ import AppPopup from '@mobile/components/base/popup/index.vue'
 const accountStore = useAccountStore()
 const formRef = shallowRef<FormInstance>()
 const showModal = shallowRef(true)
-const refresh = shallowRef(false) // 是否刷新父组件数据
+const refresh = shallowRef(true) // 是否刷新父组件数据
 /// 履约保证金
 const permargin = shallowRef(0.0)
 /// 挂牌金额
@@ -172,7 +172,7 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
 }
 
 // 关闭弹窗
-const closed = (isRefresh = false) => {
+const closed = (isRefresh = true) => {
     refresh.value = isRefresh
     showModal.value = false
 }