From 9bb2679ac302d15eff770a3917dbbd44ee1cbd2e Mon Sep 17 00:00:00 2001 From: Haiyi <1021441632@qq.com> Date: Thu, 8 Dec 2022 15:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1000936):=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E7=89=88=E8=B4=A7=E4=B8=BB=E8=87=AA=E8=90=A5=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E5=8F=91=E8=B4=A7=E7=8A=B6=E6=80=81=E7=9A=84=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=8C=89=E9=92=AE=E4=B8=BA=E5=8F=96=E6=B6=88=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=88=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B9=9F=E6=98=AF?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E7=94=B3=E8=AF=B7=E9=80=80=E6=AC=BE=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BE=85=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89=E5=8F=96=E6=B6=88=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BottomBtns/index.tsx | 9 ++++++--- src/pages/orderDetails/components/BottomApply/index.tsx | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/components/BottomBtns/index.tsx b/src/components/BottomBtns/index.tsx index aa72ee2..3bdb547 100644 --- a/src/components/BottomBtns/index.tsx +++ b/src/components/BottomBtns/index.tsx @@ -9,6 +9,7 @@ interface prosObj { status?: Number payment_method?: Number settle_mode?: Number | string + is_shipper_picks_up?: boolean } cancle?: (any) => void nextBuy?: (any) => void @@ -30,6 +31,7 @@ const BottomBtns = (props: prosObj, ref) => { status: '', payment_method: 0, settle_mode: '', + is_shipper_picks_up: false, }, showTuiGoods = false, cancle, @@ -59,6 +61,7 @@ const BottomBtns = (props: prosObj, ref) => { || (obj.sale_mode === 2 && obj.status === 0 && obj.collect_status == 0) || (obj.sale_mode === 1 && obj.status === 10) || (obj.sale_mode === 2 && obj.status === 10) + || (obj.sale_mode === 0 && obj.status === 13) ) { return true } @@ -132,9 +135,9 @@ const BottomBtns = (props: prosObj, ref) => { || (obj.sale_mode === 0 && obj.status == 7 && obj.collect_status == 2 && goodsObj?.av_return_product?.length) || (obj.sale_mode === 0 && obj.status == 7 && obj.collect_status == 3 && goodsObj?.av_return_product?.length) || (obj.sale_mode === 0 && obj.status == 11 && (obj.collect_status == 1 || obj.collect_status == 2) && goodsObj?.av_return_product?.length) - || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 0 && goodsObj?.av_return_product?.length) - || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 2 && goodsObj?.av_return_product?.length) - || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 1 && goodsObj?.av_return_product?.length) + || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 0 && goodsObj?.av_return_product?.length && !obj.is_shipper_picks_up) + || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 2 && goodsObj?.av_return_product?.length && !obj.is_shipper_picks_up) + || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 1 && goodsObj?.av_return_product?.length && !obj.is_shipper_picks_up) || (obj.sale_mode === 1 && obj.status == 0 && goodsObj?.av_return_product?.length) || (obj.sale_mode === 1 && obj.status == 9 && goodsObj?.av_return_product?.length) || (obj.sale_mode === 2 && obj.status == 0 && obj.collect_status == 1 && goodsObj?.av_return_product?.length) diff --git a/src/pages/orderDetails/components/BottomApply/index.tsx b/src/pages/orderDetails/components/BottomApply/index.tsx index 9699130..ff26c14 100644 --- a/src/pages/orderDetails/components/BottomApply/index.tsx +++ b/src/pages/orderDetails/components/BottomApply/index.tsx @@ -10,6 +10,7 @@ interface prosObj { status?: Number payment_method?: Number settle_mode?: Number | string + is_shipper_picks_up?: boolean } handApplyGoods?: () => void handApplyMoney?: () => void @@ -24,6 +25,7 @@ const BottomApply = (props: prosObj) => { status: '', payment_method: 0, settle_mode: '', + is_shipper_picks_up: false, }, handApplyGoods, handApplyMoney, @@ -51,9 +53,9 @@ const BottomApply = (props: prosObj) => { || (obj.sale_mode === 0 && obj.status == 7 && obj.collect_status == 2 && goodsObj?.av_return_product?.length) || (obj.sale_mode === 0 && obj.status == 7 && obj.collect_status == 3 && goodsObj?.av_return_product?.length) || (obj.sale_mode === 0 && obj.status == 11 && (obj.collect_status == 1 || obj.collect_status == 2) && goodsObj?.av_return_product?.length) - || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 0 && goodsObj?.av_return_product?.length) - || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 2 && goodsObj?.av_return_product?.length) - || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 1 && goodsObj?.av_return_product?.length) + || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 0 && goodsObj?.av_return_product?.length && !obj.is_shipper_picks_up) + || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 2 && goodsObj?.av_return_product?.length && !obj.is_shipper_picks_up) + || (obj.sale_mode === 0 && obj.status == 3 && obj.collect_status == 1 && goodsObj?.av_return_product?.length && !obj.is_shipper_picks_up) || (obj.sale_mode === 1 && obj.status == 0 && goodsObj?.av_return_product?.length) || (obj.sale_mode === 1 && obj.status == 9 && goodsObj?.av_return_product?.length) || (obj.sale_mode === 2 && obj.status == 0 && obj.collect_status == 1 && goodsObj?.av_return_product?.length)