feat:订单结算页面参数调整

src/pages/lxMall/information/detail.tsx

@@ -23,6 +23,7 @@ const InformationDetail: React.FC<InformationDetailPropsType> = (props) => {
   const { query: { id } } = props.location
   const [newsDetail, setNewsDetail] = useState<GetManageContentInformationFindByIdResponse>()
   let collectFlg = true
+
   useEffect(() => {
     if (id) {
       fetchNewsDetail()

src/pages/lxMall/order/index.tsx

@@ -78,20 +78,21 @@ const Order: React.FC<OrderPropsType> = (props) => {
       result.push(item)
     }
     const productId = sessionOrderInfo?.orderList[0]?.orderList[0].id
-    if (productId) {
-      try {
-        const rulesRes = await PublicApi.getOrderTradingRulesByProductId({ productId })
-        const { data } = rulesRes
-        if (data) {
-          // 是否选用电子合同
-          if (data.isElectronicContract) {
-            setIsElectronicContract(true)
-          }
-        }
-      } catch (error) {
-        console.log("获取交易规则失败")
-      }
-    }
+    // 根据商品ID获取工作流信息，判断是否需要签署合同
+    // if (productId) {
+    //   try {
+    //     const rulesRes = await PublicApi.getOrderTradingRulesByProductId({ productId })
+    //     const { data } = rulesRes
+    //     if (data) {
+    //       // 是否选用电子合同
+    //       if (data.isElectronicContract) {
+    //         setIsElectronicContract(true)
+    //       }
+    //     }
+    //   } catch (error) {
+    //     console.log("获取交易规则失败")
+    //   }
+    // }
     setOrderList(result)
     setOrderInfo(sessionOrderInfo)
     setSpinningState(false)
@@ -235,6 +236,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
         temp.memberDiscount = orderItem.memberDiscount
         temp.category = orderItem.category
         temp.brand = orderItem.brand
+        temp.logistics = orderItem.logistics
         orderProductRequests.push(temp)
       }
     }
@@ -252,10 +254,13 @@ const Order: React.FC<OrderPropsType> = (props) => {
     setConfirmLoading(true)
     PublicApi.postOrderProcurementOrderAdd(params).then(res => {
       if (res.code === 1000) {
-        const data = res.data
-        history.push(`/pay?orderId=${data.orderId}`)
+        if (res.data.isPay === 0) {
+          const data = res.data
+          history.push(`/pay?orderId=${data.orderId}`)
+        } else {
+          history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/orderDetail?modelType=5&spam_id=${spam_id}`)
+        }
       }
-      // history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/orderDetail?modelType=5&spam_id=${spam_id}`)
       setConfirmLoading(false)
     }).catch(() => {
       setConfirmLoading(false)
@@ -264,6 +269,11 @@ const Order: React.FC<OrderPropsType> = (props) => {
 
   const checkOrder = () => {
     message.destroy()
+    if (!selectAddressInfo) {
+      message.info('请选择收货地址')
+      return
+    }
+
     if (isEmpty(selectPayWay)) {
       message.info('请选择支付方式')
       return

src/pages/lxMall/pay/index.tsx

@@ -8,10 +8,14 @@ import BankPayWay from './components/bank'
 import TransferPayWay from './components/transfer'
 import { PublicApi } from '@/services/api'
 import { GetOrderOrderPayDetailsResponse } from '@/services/OrderApi'
+import { LAYOUT_TYPE } from '@/constants'
 import styles from './index.less'
 
 interface PayPagePropsType {
-  location: any
+  location: any;
+  shopInfo: any;
+  mallInfo: any;
+  layoutType: LAYOUT_TYPE;
 }
 
 enum PayWayType {
@@ -42,6 +46,7 @@ const getPayTypeTitle = (type) => {
 }
 
 const PayPage: React.FC<PayPagePropsType> = (props) => {
+  const { shopInfo, mallInfo, layoutType, } = props
   const { orderId } = props.location.query
   const [pageTitle, setPageTitle] = useState<string>()
   const [payType] = useState<string | number>(PayWayType.bank)
@@ -87,7 +92,10 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
 
   return payInfo ? (
     <div className={styles.pay}>
-      <CommonHeader title={pageTitle} />
+      <CommonHeader
+        logoUrl={(layoutType === LAYOUT_TYPE.channel || layoutType === LAYOUT_TYPE.ichannel) ? shopInfo?.logo : mallInfo.logoUrl}
+        title={pageTitle}
+      />
       <div className={styles.pay_container}>
         {
           payInfo && renderPayWay()