diff --git a/com.twin.app.shoptime/package.json b/com.twin.app.shoptime/package.json index f9221211..31ce14f1 100644 --- a/com.twin.app.shoptime/package.json +++ b/com.twin.app.shoptime/package.json @@ -42,6 +42,7 @@ "axios": "^0.21.1", "ilib": "^14.3.0", "prop-types": "^15.6.2", + "qrcode.react": "^3.1.0", "react": "^16.7.0", "react-dom": "^16.7.0", "react-redux": "^7.2.3", @@ -51,4 +52,4 @@ "browserslist": [ "chrome 38" ] -} \ No newline at end of file +} diff --git a/com.twin.app.shoptime/src/components/TabLayout/TabLayout.module.less b/com.twin.app.shoptime/src/components/TabLayout/TabLayout.module.less index bcdf5cf3..b6b93ff2 100644 --- a/com.twin.app.shoptime/src/components/TabLayout/TabLayout.module.less +++ b/com.twin.app.shoptime/src/components/TabLayout/TabLayout.module.less @@ -58,7 +58,7 @@ &.secondDepthLayout { width: 386px; - height: calc(100%); + height: 1080px; opacity: 0.95; box-shadow: 8px 0 36px rgba(33, 33, 32, 0.08); padding-bottom: unset; diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/Indicator.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/Indicator.module.less index 30c4db60..de98592e 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/Indicator.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/Indicator.module.less @@ -3,6 +3,7 @@ .Wrap { margin: 30px 0 0 10px; + width: 714px; height: 560px; display: flex; .thumbnail { diff --git a/com.twin.app.shoptime/src/views/DetailPanel/container/ProductThumbnail.jsx b/com.twin.app.shoptime/src/views/DetailPanel/container/ProductThumbnail.jsx index 098a1d57..f2ddd747 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/container/ProductThumbnail.jsx +++ b/com.twin.app.shoptime/src/views/DetailPanel/container/ProductThumbnail.jsx @@ -1,5 +1,6 @@ import React, { useCallback, useEffect, useRef, useState } from "react"; +import QRCode from "qrcode.react"; import { useSelector } from "react-redux"; import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDecorator"; @@ -28,6 +29,7 @@ export default function ProductThumbnail() { const [tabLabel, setTabLabel] = useState(""); const { getScrollTo, scrollTop } = useScrollTo(); + console.log("#productData", productData); const scrollTo = useRef(null); const buttonLabel = [ { label: $L("DESCRIPTION") }, @@ -95,7 +97,7 @@ export default function ProductThumbnail() { verticalScrollbar="auto" cbScrollTo={getScrollTo} > -
{DESCRIPTION}
+ {DESCRIPTION}