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

🐞 fix(售后模块):配合后端修改字段

Browse Source
This commit is contained in:
Haiyi 2022-12-06 16:31:25 +08:00
parent 1b4514e3d0
commit a1ebd4b29c
3 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/refundDetail/index.tsx
View File

@ -372,16 +372,16 @@ const RefundDetail = () => {
}, [DeatailObj])
// 待退款和已退款需要变更字段
const totalNums = useMemo(() => {
if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
return DeatailObj.quality_check_pass_number
}
if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.type != ReturnType.TypeOne) {
return DeatailObj.quality_check_pass_number / 100
}
if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
return DeatailObj.return_roll
}
if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.type != ReturnType.TypeOne) {
return DeatailObj.total_number / 100
}
if (DeatailObj.type == ReturnType.TypeOne) {

8
src/pages/refundMoneyDetail/index.tsx
View File

@ -330,16 +330,16 @@ const RefundMoneyDetail = () => {
}, [DeatailObj])
// 待退款和已退款需要变更字段
const totalNums = useMemo(() => {
if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
return DeatailObj.quality_check_pass_number
}
if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
if ((DeatailObj.stage == ReturnEnum.Refunded || DeatailObj.stage == ReturnEnum.RefundedBefore || DeatailObj.stage == ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.type != ReturnType.TypeOne) {
return DeatailObj.quality_check_pass_number / 100
}
if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
return DeatailObj.return_roll
}
if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.sale_mode == 0 && DeatailObj.type != ReturnType.TypeOne) {
if ((DeatailObj.stage != ReturnEnum.Refunded || DeatailObj.stage != ReturnEnum.RefundedBefore || DeatailObj.stage != ReturnEnum.RefundedAfter) && DeatailObj.sale_mode != 0 && DeatailObj.type != ReturnType.TypeOne) {
return DeatailObj.total_number / 100
}
if (DeatailObj.type == ReturnType.TypeOne) {

32
src/pages/refundPage/components/itemList/index.tsx
View File

@ -37,6 +37,25 @@ const ItemList = (props: propsObj) => {
}
}
// 根据退款状态判断使用数组
const refundArr = useMemo(() => {
// let booll = false
// let arr: any[] = []
if ((props?.obj.stage == ReturnEnum.Refunded || props?.obj.stage == ReturnEnum.RefundedBefore || props?.obj.stage == ReturnEnum.RefundedAfter) && props?.obj.sale_mode == 0 && props?.obj.type != ReturnType.TypeOne) {
return props?.obj.quality_check_pass_product
}
else {
return props?.obj.product_list
}
// if (booll) {
// arr = props?.obj.quality_check_pass_product
// }
// else {
// arr = props?.obj.product_list
// }
// return arr
}, [props?.obj])
const labAndImgObj = useCallback((item) => {
return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
}, [])
@ -122,8 +141,9 @@ const ItemList = (props: propsObj) => {
return props?.obj?.product_list[0]?.product_colors[1]?.length / 100
}
}, [props?.obj])
console.log(refundArr, 'wwww')
return (
<View className={styles.itemBox} onClick={() => navTo(props.obj)}>
<View className={styles.topItem}>
<View className={styles.orderNo}>单号：{props?.obj?.order_no}</View>
@ -156,16 +176,16 @@ const ItemList = (props: propsObj) => {
<View className={styles.shipMode}>{props?.obj?.shipment_mode_name}</View>
</View>
<View className={styles.colorsBox}>
<View className={styles.colorNameOne}>{props?.obj?.product_list[0]?.product_colors[0]?.code} {props?.obj?.product_list[0]?.product_colors[0]?.name}</View>
<View className={styles.colorNameOne}>{refundArr[0]?.product_colors[0]?.code} {refundArr[0]?.product_colors[0]?.name}</View>
<View className={styles.colorName}>x{ itemOneNums } {props?.obj?.sale_mode === 0 ? '条' : 'm'}</View>
<View className={styles.colorNameTwo}>¥ {props?.obj?.product_list[0]?.product_colors[0]?.sale_price / 100}/kg</View>
<View className={styles.colorNameTwo}>¥ {refundArr[0]?.product_colors[0]?.sale_price / 100}/kg</View>
</View>
{
props?.obj?.product_list[0]?.product_colors?.length > 1 && <>
refundArr[0]?.product_colors?.length > 1 && <>
<View className={styles.colorsBox}>
<View className={styles.colorNameOne}>{props?.obj?.product_list[0]?.product_colors[1]?.code} {props?.obj?.product_list[0]?.product_colors[1]?.name}</View>
<View className={styles.colorNameOne}>{refundArr[0]?.product_colors[1]?.code} {refundArr[0]?.product_colors[1]?.name}</View>
<View className={styles.colorName}>x{ itemTwoNums } {props?.obj?.sale_mode === 0 ? '条' : 'm'}</View>
<View className={styles.colorNameTwo}>¥ {props?.obj?.product_list[0]?.product_colors[1]?.sale_price / 100}/kg</View>
<View className={styles.colorNameTwo}>¥ {refundArr[0]?.product_colors[1]?.sale_price / 100}/kg</View>
</View>
</>
}