剪板流程

src/pages/order/components/kindList/index.tsx

@@ -24,7 +24,7 @@ type OrderParam = {
 }
 
 type Param = {
-    order: OrderParam,
+    order: OrderParam, 
     comfirm?: boolean //是否是确认订单页面使用
 }
 
@@ -96,14 +96,14 @@ export default memo(({order, comfirm = false}:Param) => {
         return priceInfo.value.includes(status)
     }, [order])
 
+    //金额展示
     const priceConDom = useMemo(() => {
         if(!order) return
-        //确认订单
         if(comfirm == true) {
-            return <EstimatedAmount  number={formatPriceDiv(order.estimate_amount)} title="预估金额" />
-        } 
-        //订单为取消订单状态
-        if(order?.status == SaleOrderStatusCancel.value) {
+            //确认订单时
+            return (order.sale_mode == 1)?<EstimatedAmount  number={formatPriceDiv(order.total_should_collect_money)} title="合计金额" /> : <EstimatedAmount  number={formatPriceDiv(order.estimate_amount)} title="预估金额" />
+        } else if(order?.status == SaleOrderStatusCancel.value) {
+            //订单状态为取消订单时
             return (
                 <>
                     {
@@ -114,6 +114,7 @@ export default memo(({order, comfirm = false}:Param) => {
                 </>
             )
         } else {
+            //其他订单状态
             return (
                 <>
                     {

src/pages/order/components/submitOrderBtn/index.tsx

@@ -4,10 +4,12 @@ import {formatKbPrice} from '@/common/common'
 import classnames from "classnames";
 import styles  from './index.module.scss'
 type Param = {
-    style?: Object,
-    number?: number
+    style?: Object, 
+    number?: number, //数量
+    priceTitle: string //描述
+
 }
-export default memo(({style, number = 0}:Param) => {
+export default memo(({style, number = 0, priceTitle = ''}:Param) => {
     const priceDom = useCallback(() => {
         let res = number.toFixed(2).split('.')
         let int_num  = parseInt(res[0]) + ''
@@ -24,7 +26,7 @@ export default memo(({style, number = 0}:Param) => {
         <>
             <View className={styles.order_price}>
                 <View className={classnames(styles.order_price_text, styles.emphasis)}>
-                    <Text>预估金额</Text>
+                    <Text>{priceTitle}</Text>
                     <View className={styles.iconfont_msg}>
                         <Text className={classnames(styles.miconfont, 'iconfont icon-a-tuikuanshouhou')}></Text>
                         {/* <View className={classnames(styles.message)}>123123123121212312312312312</View> */}