feat:订单结算物流费用

src/pages/lxMall/order/index.tsx

@@ -137,7 +137,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
         for (let orderItem of item.orderList) {
           let templateId = orderItem.logistics?.templateId
           // 判断是否物流的方式和由买家承担费用并使用了运费模板
-          if (orderItem.logistics?.deliveryType === 1 && orderItem.logistics?.carriageType === 1 && orderItem.logistics?.useTemplate && templateId) {
+          if (orderItem.logistics?.deliveryType === 1 && orderItem.logistics?.carriageType === 2 && orderItem.logistics?.useTemplate && templateId) {
             orderProductList.push({
               templateId,
               weight: orderItem.logistics?.weight,
@@ -167,7 +167,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
   }
 
   const getAmount = (state = true) => {
-    return state ? priceFormat(getCommodityAmount() + getLogisticsFee()) : numFormat(getCommodityAmount() + getLogisticsFee())
+    return state ? priceFormat(getCommodityAmount() + getLogisticsFee()) : numFormat(getCommodityAmount())
   }
 
   /**
@@ -260,8 +260,8 @@ const Order: React.FC<OrderPropsType> = (props) => {
       message.info('请先同意签订电子合同')
       return
     }
-    // setSignModalVisible(true)
-    submitOrder()
+    setSignModalVisible(true)
+    // submitOrder()
   }
 
   const handleSignModalConfirm = () => {