From b4e5d9e01a9065cbb95199bd1d5dbc29271e02eb Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Tue, 26 Jul 2022 11:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E6=B5=8B=E8=AF=95=E7=89=88v8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/components/scanPay/index.tsx      | 14 ++++++++++++--
 src/pages/order/components/scanPayCheck/index.tsx | 13 ++++++++++++-
 src/pages/orderList/index.tsx                     |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/pages/order/components/scanPay/index.tsx b/src/pages/order/components/scanPay/index.tsx
index 3730bea..296f202 100644
--- a/src/pages/order/components/scanPay/index.tsx
+++ b/src/pages/order/components/scanPay/index.tsx
@@ -35,7 +35,6 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
     
     useEffect(() => {
         if(orderInfo) {
-            console.log('orderInfo::',orderInfo)
             let lists:ListParam[] = []
             orderInfo.product_list?.map(pitem => {
                 pitem?.product_colors?.map(citem => {
@@ -75,7 +74,18 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
                 qrcode:"",  //跳转链接
                 order_total_weight: formatWeightDiv(orderInfo.total_weight||orderInfo.total_estimate_weight).toString(),  //订单布匹重量
                 list: lists ,
-                show_qrcode: true //是否显示码单
+                show_qrcode: true, //是否显示码单
+
+                estimate_amount: orderInfo.estimate_amount,
+                show_estimate_amount: orderInfo.estimate_amount > 0,
+                total_sale_price: orderInfo.total_sale_price,
+                show_total_sale_price: orderInfo.total_sale_price > 0,
+                total_weight_error_discount:  orderInfo.total_weight_error_discount,
+                show_total_weight_error_discount: orderInfo.total_weight_error_discount > 0,
+                actual_amount: orderInfo.actual_amount,
+                show_actual_amount: orderInfo.actual_amount > 0,
+                wait_pay_amount: orderInfo.wait_pay_amount,
+                show_wait_pay_amount: orderInfo.wait_pay_amount > 0
             }))
         }
     }, [orderInfo])
diff --git a/src/pages/order/components/scanPayCheck/index.tsx b/src/pages/order/components/scanPayCheck/index.tsx
index 77a9fc2..c7257c7 100644
--- a/src/pages/order/components/scanPayCheck/index.tsx
+++ b/src/pages/order/components/scanPayCheck/index.tsx
@@ -78,7 +78,18 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
                 order_total_num: (orderInfo.total_number).toString(),
                 qrcode:"",  //跳转链接
                 order_total_weight: formatWeightDiv(orderInfo.total_weight||orderInfo.total_estimate_weight).toString(),  //订单布匹重量
-                list: lists 
+                list: lists,
+
+                estimate_amount: orderInfo.estimate_amount,
+                show_estimate_amount: orderInfo.estimate_amount > 0,
+                total_sale_price: orderInfo.total_sale_price,
+                show_total_sale_price: orderInfo.total_sale_price > 0,
+                total_weight_error_discount:  orderInfo.total_weight_error_discount,
+                show_total_weight_error_discount: orderInfo.total_weight_error_discount > 0,
+                actual_amount: orderInfo.actual_amount,
+                show_actual_amount: orderInfo.actual_amount > 0,
+                wait_pay_amount: orderInfo.wait_pay_amount,
+                show_wait_pay_amount: orderInfo.wait_pay_amount > 0
             }))
         }
     }, [orderInfo])
diff --git a/src/pages/orderList/index.tsx b/src/pages/orderList/index.tsx
index 6619f34..19cbe12 100644
--- a/src/pages/orderList/index.tsx
+++ b/src/pages/orderList/index.tsx
@@ -9,11 +9,11 @@ import InfiniteScroll from "@/components/infiniteScroll"
 import { GetOrderListApi, OrderStatusListApi} from '@/api/order'
 import { dataLoadingStatus, getFilterData } from "@/common/util"
 import OrderStatusList from "./components/orderStatusList"
-import Payment from "../order/components/payment"
 import { AddShoppingCartApi } from "@/api/shopCart"
 import ShopCart from "@/components/shopCart"
 import { alert } from "@/common/common"
 import { useRouter } from "@tarojs/runtime"
+import Payment from "../order/components/payment"
 import ApplyRefund from "../order/components/applyRefund"
 import ReturnRecord from "../order/components/returnRecord"