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)