diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx index 9f5a690..6e776ef 100644 --- a/src/components/checkbox/index.tsx +++ b/src/components/checkbox/index.tsx @@ -38,7 +38,6 @@ export default forwardRef((props: params, ref) => { customTextClass = '', hiddenCheckboxIcon = false, } = props - console.log('Rerender component: checkbox', status) const [selected, setSelected] = usePropsValue({ value: status, defaultValue: false diff --git a/src/components/counter/index.tsx b/src/components/counter/index.tsx index 37d405c..f6d51f0 100644 --- a/src/components/counter/index.tsx +++ b/src/components/counter/index.tsx @@ -15,7 +15,6 @@ type params = { disable?: boolean, //是否禁用 } export default ({minNum = 0, maxNum = 10000, step=1, digits = 0, defaultNum = 0, onChange, onBlue, onClickBtn, unit = '', disable = false}: params) => { - console.log('Rerender component: Counter'); const [value, setValue] = useState({count:defaultNum}) const onPlus = (event) => { @@ -34,7 +33,7 @@ export default ({minNum = 0, maxNum = 10000, step=1, digits = 0, defaultNum = 0, if(disable) return false let {count} = value let num_res = Big(count).minus(step).toNumber() - num_res = num_res < minNum?minNum:num_res + num_res = num_res < minNum ? minNum : num_res setValue({...value, count:num_res}) onChange?.(parseFloat(num_res)) onClickBtn?.(parseFloat(num_res)) @@ -93,6 +92,8 @@ export default ({minNum = 0, maxNum = 10000, step=1, digits = 0, defaultNum = 0, const onBluerEven = () => { let num = parseFloat(value.count) + console.log('onInputEven res===>', num) + if (!isNaN(num)) { let count = formatDigits(num) count = checkData(count) diff --git a/src/pages/colorRelated/takeColor/components/ColorCard/index.tsx b/src/pages/colorRelated/takeColor/components/ColorCard/index.tsx index bfc00e1..77c14de 100644 --- a/src/pages/colorRelated/takeColor/components/ColorCard/index.tsx +++ b/src/pages/colorRelated/takeColor/components/ColorCard/index.tsx @@ -20,7 +20,6 @@ type PropsType = { const ColorCard: FC = params => { const { item = {}, index, onTakeColor, onPreviewRgb, currentTakeColorIndex, measureAndGetLab, bluetoothState } = params - console.log('Rerender component: ColorCard', params) console.log('item===>', item) const truncation = ev => { if (ev) { diff --git a/src/pages/shopping/components/colorKindItem/index.tsx b/src/pages/shopping/components/colorKindItem/index.tsx index e0cb12d..88e1e24 100644 --- a/src/pages/shopping/components/colorKindItem/index.tsx +++ b/src/pages/shopping/components/colorKindItem/index.tsx @@ -5,7 +5,7 @@ import { FC, forwardRef, memo, useCallback } from 'react' import classnames from 'classnames' import styles from './index.module.scss' import { debounce } from '@/common/util' -import { formatImgUrl, formatPriceDiv } from '@/common/format' +import { formatImgUrl, formatMeterDiv, formatMeterMul, formatPriceDiv } from '@/common/format' import { EnumSaleMode } from '@/common/Enumerate' import { selectList } from '../../config' import { AdjestShoppingCartApi } from '@/api/shopping/index' @@ -25,7 +25,6 @@ type PropsType = { let ColorKindItem: FC = props => { const { state, purchaserId, itemData, orderType = EnumSaleMode.Bulk } = props - console.log('Rerender component: ColorKindItem', itemData.id) const dispatch = useShoppingDispatch() // console.log('checked==>', checked) @@ -36,7 +35,7 @@ let ColorKindItem: FC = props => { //格式化数量 const formatCount = itemData => { - return itemData.sale_mode == EnumSaleMode.Bulk ? itemData.roll : itemData.length / 100 + return itemData.sale_mode == EnumSaleMode.Bulk ? itemData.roll : formatMeterDiv(itemData.length) } //格式化单位 @@ -68,6 +67,7 @@ let ColorKindItem: FC = props => { // 调整条数/米数的接口 并在调整完成后重新请求整个购物车页面 const getInputValue = debounce(async (num, itemData) => { + console.log('num===>', num) const targetColor: Record = { product_color_id: itemData.product_color_id, roll: 0, @@ -78,7 +78,7 @@ let ColorKindItem: FC = props => { targetColor.roll = num } else { itemData.length = num - targetColor.length = num + targetColor.length = formatMeterMul(num) } const res = await fetchData({ color_list: [targetColor], @@ -89,7 +89,7 @@ let ColorKindItem: FC = props => { if (res.success) { state?.Observer?.notify(purchaserId) } - }, 400) + }, 460) const labAndImgObj = useCallback(item => { return { lab: item.lab, rgb: item.rgb, texture_url: item.product_color_texture_url } }, []) @@ -102,8 +102,6 @@ let ColorKindItem: FC = props => { customTextClass={styles.colorKindItem}> - - {/* */} @@ -124,8 +122,8 @@ let ColorKindItem: FC = props => { digits={selectList[orderType].digits} onClickBtn={e => getInputValue(e, itemData)} unit={formatUnit(itemData)} - minNum={itemData.min_num} - maxNum={itemData.max_num} + minNum={itemData.sale_mode == EnumSaleMode.Bulk ? itemData.min_num : formatMeterDiv(itemData.min_num)} + maxNum={itemData.sale_mode == EnumSaleMode.Bulk ? itemData.max_num : formatMeterDiv(itemData.max_num)} /> diff --git a/src/pages/shopping/components/shoppingCartItem/index.tsx b/src/pages/shopping/components/shoppingCartItem/index.tsx index c448f41..b446318 100644 --- a/src/pages/shopping/components/shoppingCartItem/index.tsx +++ b/src/pages/shopping/components/shoppingCartItem/index.tsx @@ -89,7 +89,6 @@ let ShoppingCartItem: FC = props => { dispatch({ type: ShoppingDispatchType.UPDATE_MULTIPLE_SELECTION, data: false }) } - console.log('Rerender component: shoppingCartItem') const handleClickLayout = () => { if (currentCheckedPurchaserId === itemData?.purchaser_id) { @@ -288,7 +287,6 @@ interface GoodsListPropType { startTransition: React.TransitionStartFunction } const GoodsList = memo(props => { - console.log('Rerender component: GoodsList', props) const { itemData, selected, isPending, startTransition, multipleSelection } = props const currentSelected = useRef(null) @@ -302,6 +300,7 @@ const GoodsList = memo(props => { setComponent( itemData?.[BackEndSaleModeListFieldMap[selected]].length !== 0 ? ( itemData?.[BackEndSaleModeListFieldMap[selected]].map(item => { + console.log('item===>', item) return }) ) : ( @@ -367,10 +366,6 @@ const GoodsList = memo(props => { const withStateSlice = (comp, slice) => { const MemoComp = memo(comp, (prevProps, nextProps) => { let needMemo = true - console.log('---------------props-----------------------') - console.log('props prevProps==>', prevProps.itemData) - console.log('props nextProps==>', nextProps.itemData) - console.log('-----------------props---------------------') if (JSON.stringify(prevProps.itemData) !== JSON.stringify(nextProps.itemData)) { needMemo = false } @@ -381,7 +376,6 @@ const withStateSlice = (comp, slice) => { }) const Wrapper = (props, ref) => { const state = useShoppingState() - console.log('state===>', state) return } return memo(forwardRef(Wrapper)) diff --git a/src/pages/shopping/index.tsx b/src/pages/shopping/index.tsx index fa67eb0..0bc1bac 100644 --- a/src/pages/shopping/index.tsx +++ b/src/pages/shopping/index.tsx @@ -69,7 +69,6 @@ const ShoppingCartContainer: FC = () => { fetchData(searchOptions) } }) - console.log('Rerender component: ShoppingCartContainer') useEffect(() => { console.log('useEffect fetchData')