xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐞 fix(ID1000936):重构版货主自营的待发货状态的后台按钮为取消订单（小程序也是只有取消订单，不要申请退款），小程序待自提状态没有取消按钮

Browse Source
This commit is contained in:
Haiyi 2022-12-08 15:54:05 +08:00
parent 7cec485c9d
commit 9bb2679ac3
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/BottomBtns/index.tsx
View File

@ -9,6 +9,7 @@ interface prosObj {
status?: Number status?: Number
payment_method?: Number payment_method?: Number
settle_mode?: Number | string settle_mode?: Number | string
is_shipper_picks_up?: boolean
} }
cancle?: (any) => void cancle?: (any) => void
nextBuy?: (any) => void nextBuy?: (any) => void
@ -30,6 +31,7 @@ const BottomBtns = (props: prosObj, ref) => {
status: '', status: '',
payment_method: 0, payment_method: 0,
settle_mode: '', settle_mode: '',
is_shipper_picks_up: false,
}, },
showTuiGoods = false, showTuiGoods = false,
cancle, cancle,
@ -59,6 +61,7 @@ const BottomBtns = (props: prosObj, ref) => {
|| (obj.sale_mode === 2 && obj.status === 0 && obj.collect_status == 0) || (obj.sale_mode === 2 && obj.status === 0 && obj.collect_status == 0)
|| (obj.sale_mode === 1 && obj.status === 10) || (obj.sale_mode === 1 && obj.status === 10)
|| (obj.sale_mode === 2 && obj.status === 10) || (obj.sale_mode === 2 && obj.status === 10)
|| (obj.sale_mode === 0 && obj.status === 13)
) { ) {
return true 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 == 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 == 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 == 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 == 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.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.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 == 0 && goodsObj?.av_return_product?.length)
|| (obj.sale_mode === 1 && obj.status == 9 && 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) || (obj.sale_mode === 2 && obj.status == 0 && obj.collect_status == 1 && goodsObj?.av_return_product?.length)

8
src/pages/orderDetails/components/BottomApply/index.tsx
View File

@ -10,6 +10,7 @@ interface prosObj {
status?: Number status?: Number
payment_method?: Number payment_method?: Number
settle_mode?: Number | string settle_mode?: Number | string
is_shipper_picks_up?: boolean
} }
handApplyGoods?: () => void handApplyGoods?: () => void
handApplyMoney?: () => void handApplyMoney?: () => void
@ -24,6 +25,7 @@ const BottomApply = (props: prosObj) => {
status: '', status: '',
payment_method: 0, payment_method: 0,
settle_mode: '', settle_mode: '',
is_shipper_picks_up: false,
}, },
handApplyGoods, handApplyGoods,
handApplyMoney, 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 == 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 == 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 == 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 == 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.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.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 == 0 && goodsObj?.av_return_product?.length)
|| (obj.sale_mode === 1 && obj.status == 9 && 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) || (obj.sale_mode === 2 && obj.status == 0 && obj.collect_status == 1 && goodsObj?.av_return_product?.length)