Merge branch 'main' into dev-sy

2024-12-02 17:08:41 +08:00 · 2024-12-02 17:08:41 +08:00 · f452f3d8fb
parent 3a05dc4029 bcc9558a06
commit f452f3d8fb
4 changed files with 2 additions and 2 deletions
--- a/src/views/user/orderManagement/detail.vue
+++ b/src/views/user/orderManagement/detail.vue
@ -111,7 +111,6 @@ const getId = () => {
 const getList = async () => {
    let params = {
        orderId: idTemp.value,
-        flag: false,
    }

    const res: any = await getOrderListInfoApi(params)
--- a/src/views/user/orderManagement/index.vue
+++ b/src/views/user/orderManagement/index.vue
@ -23,6 +23,7 @@ const queryParams: any = ref({
    pageNum: 1,
    startTime: '',
    endTime: '',
+    flag: false,
 })
 const queryFormRef = ref<FormInstance>()
 const numberTemp = ref<number>(0)
--- a/src/views/user/orderManagementCz/detail.vue
+++ b/src/views/user/orderManagementCz/detail.vue
@ -120,7 +120,6 @@ const getId = () => {
 const getList = async () => {
    let params = {
        orderId: idTemp.value,
-        flag: true,
    }

    const res: any = await getOrderListInfoApi(params)
--- a/src/views/user/orderManagementCz/index.vue
+++ b/src/views/user/orderManagementCz/index.vue
@ -27,6 +27,7 @@ const queryParams: any = ref({
    pageNum: 1,
    startTime: '',
    endTime: '',
+    flag: true,
 })
 const queryFormRef = ref<FormInstance>()
 const time = ref([])