Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into dev

This commit is contained in:
czm 2022-12-13 14:27:14 +08:00
commit 23a6c22045

View File

@ -247,6 +247,7 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first
}, []) }, [])
const Rows = ({ id, index, style, data }: any) => { const Rows = ({ id, index, style, data }: any) => {
const item = data[index] const item = data[index]
console.log(item, 6666)
return ( return (
<> <>
{(item && ( {(item && (
@ -258,7 +259,7 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first
<View className={styles.title}>{formatHashTag(item.code, item.name)}</View> <View className={styles.title}>{formatHashTag(item.code, item.name)}</View>
{/* {selectIndex == 0 && <View className={styles.weight_error}>空差:{formatWeightDiv(item.weight_error)}kg</View>} */} {/* {selectIndex == 0 && <View className={styles.weight_error}>空差:{formatWeightDiv(item.weight_error)}kg</View>} */}
<View className={styles.flexBox}> <View className={styles.flexBox}>
{selectIndex === 0 && <View className={styles.numone}>{formatOriginalPrice(item)}</View>} {(selectIndex === 0 && item.bulk_price !== item.last_bulk_price) && <View className={styles.numone}>{formatOriginalPrice(item)}</View>}
<View className={styles.num}>{formatPrice(item)}</View> <View className={styles.num}>{formatPrice(item)}</View>
</View> </View>