fix：处理积分订单详情文案显示异常，处理支付比例确认到账状态下颜色为成功状态

src/pages/orderSystem/components/StatusColors/index.tsx

@@ -101,6 +101,10 @@ const StatusColors:React.FC<StatusColorsProps> = (props) => {
   const { status, type } = props
   const statusText = typeMaps[type]
   const statusShowColor = matchStatusColor(status)
+  // 单独处理支付比例 确认到账的状态颜色
+  if(type === 'payOut' && status === 3) {
+    return (<Tag color="#41CC9E">{statusText[status]}</Tag>)
+  }
   return (<Tag color={statusShowColor}>{statusText[status]}</Tag>)
 }
 

src/pages/orderSystem/orderDetail/components/orderProductTable/index.tsx

@@ -84,7 +84,9 @@ const warehouseColumns: any[] = [
 const modalPriceActions = createFormActions()
 // 总计金额联动框
 export const MoneyTotalBox = ({ dataSource, isEditData }) => {
-  const { orderProductRequests = [], receiverAddressId  } = dataSource || {}
+  const { orderProductRequests = [], receiverAddressId, orderModel  } = dataSource || {}
+  const creditsCommodity = (orderModel === 24 || orderModel === 25) // 积分或渠道积分下单模式
+
   const sum = orderProductRequests.reduce((prev, next) => prev + Number((next.price || 0)), 0)
   const modelRef = useRef<any>({})
   const [freePrice, setFreePrice] = useState<number>(0)
@@ -119,7 +121,7 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
   }, [orderProductRequests])
   return <RowStyle>
     <Col span={2}>
-      <div>合计金额</div>
+      <div>{creditsCommodity ? '合计所需积分' : '合计金额'}</div>
       <div>{sum}</div>
     </Col>
     <Col span={2}>
@@ -127,7 +129,7 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
       <div>{freePrice}</div>
     </Col>
     <Col span={2}>
-      <div>总计金额</div>
+      <div>{creditsCommodity ? '总计所需积分' : '总计金额'}</div>
       <div>{sum + freePrice}</div>
     </Col>
     <ModalForm
@@ -232,7 +234,7 @@ const EditableCell: React.FC<EditableCellProps> = ({
         rules={[
           {
             required: true,
-            message: `单价是必填的`,
+            message: `此项为必填项`,
           },
         ]}
       >
@@ -252,7 +254,8 @@ const EditableCell: React.FC<EditableCellProps> = ({
 const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
   const { ctl, data } = useContext(OrderDetailContext)
   const { page_type } = usePageStatus()
-  const { orderProductRequests = [] } = data || {}
+  const { orderProductRequests = [], orderModel } = data || {}
+  const creditsCommodity = (orderModel === 24 || orderModel === 25) // 积分或渠道积分下单模式
 
   const [warehouseVisible, setWarehouseVisible] = useState(false)
   const [checkProductId, setCheckProductId] = useState(0) // 选中的商品id
@@ -351,7 +354,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
       key: 'unit',
     },
     {
-      title: '单价（元）',
+      title: creditsCommodity ? '所需积分' : '单价（元）',
       dataIndex: 'price',
       align: 'left',
       key: 'price',
@@ -365,7 +368,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
       render: (text, record) => record.isMemberPrice ? (text + '%') : null
     },
     {
-      title: '采购数量',
+      title: creditsCommodity ? '兑换数量' : '采购数量',
       dataIndex: 'purchaseCount',
       align: 'center',
       key: 'purchaseCount'
@@ -378,7 +381,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
       render: () => '是'
     },
     {
-      title: '金额',
+      title: creditsCommodity ? '所需积分小计' : '金额',
       dataIndex: 'price',
       align: 'center',
       key: 'price',