Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/transaction/components/orderPayTabs/index.tsx

@@ -86,7 +86,7 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
     </Row>
   }
 
-  const urlsDatas = data.paymentInformationResponses.filter(item => item['channel'] === 5 && item['payWay'] === 2).map(_item => _item['payOrderUrls'])
+  const urlsDatas = data.paymentInformationResponses.filter(item => item['channel'] === 5 && item['payWay'] === 2).map(_item => _item['payOrderUrls']).filter(__item => __item.length)
 
   return (
     <>

src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts

@@ -107,7 +107,7 @@ export const useProductTableChangeForPay = (ctx: ISchemaFormActions | ISchemaFor
 
       } else if(pageStatus === PageStatus.ADD) { // 新增下 需要支付信息生成支付次数
         fetchOrderApi.getPayInfoList({
-          productId: orderModel === OrderModalType["HAND_ORDER"] ? productItem.id : productItem.productId,
+          productId: (orderModel === OrderModalType["HAND_ORDER"] || orderModel === OrderModalType["CHANNEL_DIRECT_MINING_ORDER"] || orderModel === OrderModalType["CHANNEL_SPOT_MANUAL_ORDER"]) ? productItem.id : productItem.productId,
           memberId: productItem?.memberId || ctx.getFieldValue('supplyMembersId'),
           memberRoleId: productItem?.memberRoleId || ctx.getFieldValue('supplyMembersRoleId'),
           orderModel: orderModel,