Handy_Cao 8 hours ago
parent
commit
f2ba01750d

+ 0 - 1
src/packages/digital/views/contract/components/order/list/index.vue

@@ -125,7 +125,6 @@ const onRefresh = () => {
 // 接收委托回应通知
 const orderRspNotify = eventBus.$on('OrderRsp', () => pullRefreshRef.value?.refresh())
 
-
 // 暴露组件属性给父组件调用
 defineExpose({
     refresh: () => {

+ 4 - 1
src/packages/digital/views/listing/goods/detail/index.vue

@@ -133,6 +133,7 @@ import { i18n, useFuturesStore } from '@/stores'
 import { useSpotAccountStore } from '../../../wallet/components/spot/composables'
 import quoteSocket from '@/services/websocket/quote'
 import Long from 'long'
+import eventBus from '@/services/bus'
 import AppStepper from '@mobile/components/base/stepper/index.vue'
 import AppSubmitbar from '@mobile/components/base/submitbar/index.vue'
 import SpotOrder from '../../../spot/components/order/index.vue'
@@ -242,8 +243,10 @@ const onSubmit = () => {
 
             digitalOrder({
                 data: formData
-            }).then(() => {
+            }).then((res) => {
                 hideLoading(t('common.submitsuccess'), 'success')
+                // 推送委托回应通知
+                eventBus.$emit('OrderRsp', res)
             }).catch((err) => {
                 hideLoading(err, 'fail')
             })

+ 5 - 2
src/packages/digital/views/spot/components/order/cancel/index.vue

@@ -12,6 +12,7 @@ import { handleRequestBigNumber } from '@/filters'
 import { EOperateType } from '@/constants/client'
 import { cancelOrder } from '@/services/api/trade'
 import { i18n } from '@/stores'
+import eventBus from '@/services/bus'
 
 const props = defineProps({
     selectedRow: {
@@ -41,9 +42,11 @@ const onBeforeClose = (action: string) => {
         fullloading((hideLoading) => {
             cancelOrder({
                 data: formData
-            }).then(() => {
-                hideLoading('撤销成功', 'success')
+            }).then((res) => {
+                hideLoading(t('order.pricingorder.tips2'), 'success')
                 refresh.value = true
+                // 推送委托回应通知
+                eventBus.$emit('OrderRsp', res)
             }).catch((err) => {
                 hideLoading(err, 'fail')
             }).finally(() => {

+ 9 - 1
src/packages/digital/views/spot/components/order/index.vue

@@ -60,7 +60,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, defineAsyncComponent, PropType, computed } from 'vue'
+import { shallowRef, defineAsyncComponent, PropType, computed, onUnmounted } from 'vue'
 import { Button } from 'vant'
 import { formatDate } from '@/filters'
 import { useComponent } from '@/hooks/component'
@@ -68,6 +68,7 @@ import { useRequest } from '@/hooks/request'
 import { getBuyOrSellName, getOrderStatusName } from '@/constants/order'
 import { queryDigitalTradeOrderDetails } from '@/services/api/digital'
 import { i18n, useFuturesStore } from '@/stores'
+import eventBus from '@/services/bus'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import AppDatePicker from '@mobile/components/base/datepicker/index.vue'
 
@@ -123,9 +124,16 @@ const onRefresh = () => {
     })
 }
 
+// 接收委托回应通知
+const orderRspNotify = eventBus.$on('OrderRsp', () => pullRefreshRef.value?.refresh())
+
 // 撤销
 const cancelOrder = (item: Model.DigitalTradeOrderDetailsRsp) => {
     selectedRow.value = item
     openComponent('Cancel')
 }
+
+onUnmounted(() => {
+    orderRspNotify.cancel()
+})
 </script>