diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.jsx b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.jsx index 34a014d8..db637453 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.jsx @@ -5,13 +5,17 @@ import SpotlightContainerDecorator from '@enact/spotlight/SpotlightContainerDecorator'; import ri from '@enact/ui/resolution'; +import { + scaleH, + scaleW, +} from '../../../../utils/helperMethods'; import CategoryNavItem from '../CategoryNav/CategoryNavItem/CategoryNavItem'; import css from './CategoryNav.module.less'; const LIST_ITEM_CONF = { - ITEM_WIDTH: 210 * 2, - ITEM_HEIGHT: 236 * 2, - SAPCING: 30 * 2, + ITEM_WIDTH: 210, + ITEM_HEIGHT: 235, + SAPCING: 30, }; const Container = SpotlightContainerDecorator( @@ -50,12 +54,12 @@ export default function CategoryNav({ horizontalScrollbar="hidden" itemRenderer={renderItem} itemSize={{ - minWidth: ri.scale(LIST_ITEM_CONF.ITEM_WIDTH), - minHeight: ri.scale(LIST_ITEM_CONF.ITEM_HEIGHT), + minWidth: scaleW(LIST_ITEM_CONF.ITEM_WIDTH), + minHeight: scaleH(LIST_ITEM_CONF.ITEM_HEIGHT), }} noScrollByWheel scrollMode="translate" - spacing={ri.scale(LIST_ITEM_CONF.SAPCING)} + spacing={scaleW(LIST_ITEM_CONF.SAPCING)} /> )} diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.module.less b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.module.less index 6821964a..292cb225 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.module.less @@ -2,7 +2,7 @@ @import "../../../../style/utils.module.less"; .container { - .size(@w: 100%, @h:236px); + .size(@w: 100%, @h:235px); z-index: 10; background-color: @BG_COLOR_01; .font(@fontFamily: @baseFontBold, @fontSize: 28px); diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx index fe7d6643..ffe3ac36 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx @@ -16,8 +16,6 @@ import { import Spottable from '@enact/spotlight/Spottable'; import { getSubCategory } from '../../../actions/mainActions'; -import TBody from '../../../components/TBody/TBody'; -import TGrid from '../../../components/TGrid/TGrid'; import { scaleH, scaleW, @@ -44,7 +42,7 @@ const SubCategory = () => { const categoryItemInfos = useSelector( (state) => state.main.subCategoryData.categoryItemInfos ); - const [currentLgCatCd, setCurrentLgCatCd] = useState(); + const [currentLgCatCd, setCurrentLgCatCd] = useState(null); const handleCategoryNav = (lgCatCd) => { if (currentLgCatCd === lgCatCd) { @@ -58,6 +56,7 @@ const SubCategory = () => { if (categoryInfos && !currentLgCatCd) { const initialLgCatCd = categoryInfos[0].lgCatCd; setCurrentLgCatCd(initialLgCatCd); + console.log("###ttt", currentLgCatCd); } }, [categoryInfos]); @@ -66,8 +65,7 @@ const SubCategory = () => { dispatch( getSubCategory({ lgCatCd: currentLgCatCd, - patnrIdList: null, - pageSize: 10, + pageSize: "10", tabType: "CAT00102", filterType: "CAT00202", }) @@ -118,7 +116,7 @@ const SubCategory = () => { minWidth: scaleW(324), minHeight: scaleH(438), }} - spacing={scaleW(0)} + spacing={scaleW(4)} noScrollByWheel scrollMode="translate" className={css.grid} diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.module.less b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.module.less index f614d3a5..cb6cafd7 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.module.less @@ -10,7 +10,7 @@ } .grid { - height: 478px; + height: 458px; overflow: unset; > div { overflow: unset !important;