Merge branch 'feature/v2.4.46' of https://jygit.jydev.jianyu360.cn/jianyu/qmx_page_admin into feature/v2.4.46

src/views/create-order/components/schema-form/params/common.js

@@ -61,8 +61,12 @@ export function getCommonFilterParams({ pageForm, productForm } = {}) {
     filter.buyAccountCount = productForm.subAccountNumbers?.payCount
     filter.giftAccountCount = productForm.subAccountNumbers?.freeCount
   }
-  filter.buy_cycle = productForm.validityPeriod?.payCount
-  filter.buy_type = productForm.validityPeriod?.payUnit
+
+  // saleGifts 1购买,2赠送
+  if (productForm.saleGifts === 1) {
+    filter.buy_cycle = productForm.validityPeriod?.payCount || 0
+    filter.buy_type = productForm.validityPeriod?.payUnit
+  }
   filter.give_cycle = productForm.validityPeriod?.freeCount || 0
   filter.give_type = productForm.validityPeriod?.freeUnit
   return filter