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

src/pages/lxMall/purchaseOrder/index.tsx

@@ -543,7 +543,8 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
 
     buyOrderInfo.payWayList = await getPayWayListByMemberId(selectItem.memberId)
 
-    PublicApi.postOrderIsWorkFlow({ productIds }).then(res => {
+    //@ts-ignore
+    PublicApi.postOrderIsWorkFlow({ productIds, memberId: selectItem.memberId }).then(res => {
       setConfirmLoading(false)
       if (res.code === 1000) {
         message.destroy()

src/pages/transaction/purchaseOrder/orderCollect/components/inquiryModalTable/index.tsx

@@ -33,7 +33,7 @@ const InquiryModalTable:React.FC<InquiryModalTableProps> = (props) => {
     if (item) {
       schemaAction.setFieldValue('quotationNo', item.quotationNo)
       const data = await fetchOrderApi.getProductListByQuotationOrderId({
-        id: item.id
+        id: item.inquiryListId
       })
       // 将询价报价单的id字段 冗余给商品列表
       schemaAction.setFieldValue('orderProductRequests', data.map((v: any) => {

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

@@ -98,7 +98,8 @@ export const useProductTableChangeForPay = (ctx: ISchemaFormActions | ISchemaFor
       // 请求一次并复制给支付信息
       const productItem = value[0]
       fetchOrderApi.getPayInfoList({
-        productId: productItem.id
+        productId: productItem.id,
+        memberId: productItem.memberId
       }).then(data => {
         ctx.setFieldValue('paymentInformationResponses', data)
       }).catch(err => {

src/utils/request.ts

@@ -48,7 +48,7 @@ const errorHandler = (error: ResponseError): IRequestError => {
     message.error('http请求错误: ' + response.status + '->' + messageText, 3)
   } else {
     // 请求超时， 会造成没有response
-    message.error('请求错误')
+    message.error('请求超时')
   }
   // throw可令响应promise走catch, 如需走resolve需直接return
   throw {