🎈 perf:将确认收货挪出来在订单详情

This commit is contained in:
Haiyi
2022-10-08 17:48:29 +08:00
parent 7cb8cbe9d5
commit 0f281f93c9
3 changed files with 30 additions and 20 deletions
@@ -12,7 +12,7 @@ interface prosObj {
}
handApplyGoods?: () => void,
handApplyMoney?: () => void,
handSureGoods?: () => void,
// handSureGoods?: () => void,
}
export default memo((props: prosObj) => {
@@ -26,7 +26,7 @@ export default memo((props: prosObj) => {
},
handApplyGoods,
handApplyMoney,
handSureGoods
// handSureGoods
} = props
//判断显示申请退货
@@ -58,19 +58,7 @@ export default memo((props: prosObj) => {
return true
} else return false
}, [obj])
//判断显示确认收货
const showTake = useMemo(() => {
if (
(obj.sale_mode === 0 && obj.status == 8 && obj.collect_status == 0) ||
(obj.sale_mode === 0 && obj.status == 8 && obj.collect_status == 1) ||
(obj.sale_mode === 0 && obj.status == 8 && obj.collect_status == 2) ||
(obj.sale_mode === 0 && obj.status == 8 && obj.settle_mode == 3) ||
(obj.sale_mode === 1 && obj.status == 8) ||
(obj.sale_mode === 2 && obj.status == 8)
) {
return true
} else return false
}, [obj])
return (
@@ -85,13 +73,13 @@ export default memo((props: prosObj) => {
showTuikuan && <View className={styles.tuikuan} onClick={() => handApplyMoney?.()}>申请退款</View>
}
{/*
{
showTake && <View className={styles.tuikuan} onClick={() => handSureGoods?.()}>确认收货</View>
}
} */}
{
!showTuihuo && !showTuikuan && !showTake && <View className={styles.title} >暂无更多</View>
!showTuihuo && !showTuikuan && <View className={styles.title} >暂无更多</View>
}
</>
)
+2 -1
View File
@@ -684,15 +684,16 @@ export default () => {
obj={infoObj}
handApplyGoods={() => handApplyGood?.()}
handApplyMoney={() => handApplyMoney?.()}
handSureGoods={() => handSureGoods?.()}
></BottomApply>
</View>
}
<BottomBtns
obj={infoObj}
showTuiGoods
cancle={(e) => cancle?.(e, infoObj)}
nextBuy={(e) => nextBuy?.(e, infoObj)}
toPay={(e) => toPay?.(e, infoObj)}
handSureGoods={() => handSureGoods?.()}
></BottomBtns>
</View>
<PayPopup