pb-sxp-ui 1.3.2 → 1.3.4

package/dist/index.css

@@ -1872,7 +1872,7 @@ button.swiper-pagination-bullet {
 }
 .clc-sxp-like-button {
   position: absolute;
-  z-index: 10;
+  z-index: 11;
   background-color: transparent;
   width: 50px;
   height: 50px;

package/dist/index.js

@@ -711,9 +711,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         }
         if (isEditor) {
             let pageNum = 1;
-            query = Object.assign(Object.assign({}, query), (!utmVal && channelQueryList && (channelQueryList === null || channelQueryList === void 0 ? void 0 : channelQueryList.length) > 0 && { channel: channelQueryList === null || channelQueryList === void 0 ? void 0 : channelQueryList[0] }));
-            if (!(query === null || query === void 0 ? void 0 : query.channel) || isInit.current)
-                return;
+            query = Object.assign(Object.assign(Object.assign({}, query), { directPage: true, level: 1 }), (!utmVal && channelQueryList && (channelQueryList === null || channelQueryList === void 0 ? void 0 : channelQueryList.length) > 0 && { channel: channelQueryList === null || channelQueryList === void 0 ? void 0 : channelQueryList[0] }));
+            if (!(query === null || query === void 0 ? void 0 : query.channel) || isInit.current) {
+                return undefined;
+            }
             isInit.current = true;
             let list = [];
             let result = null;
@@ -724,6 +725,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 if (!(result === null || result === void 0 ? void 0 : result.success)) {
                     return undefined;
                 }
+                setLoading(false);
                 const isNotNullList = (_s = (_r = result === null || result === void 0 ? void 0 : result.data) === null || _r === void 0 ? void 0 : _r.recList) === null || _s === void 0 ? void 0 : _s.every((item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video));
                 list = list.concat((_w = (_v = (_u = (_t = result === null || result === void 0 ? void 0 : result.data) === null || _t === void 0 ? void 0 : _t.recList) === null || _u === void 0 ? void 0 : _u.filter) === null || _v === void 0 ? void 0 : _v.call(_u, (item) => (item === null || item === void 0 ? void 0 : item.product) || (item === null || item === void 0 ? void 0 : item.video))) !== null && _w !== void 0 ? _w : []);
                 if (isNotNullList) {
@@ -893,8 +895,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         bffGetTagList();
         getRecommendVideos()
             .then((data) => {
-            setRtcList(getFilterRecList(data));
-            setCacheRtcList(getFilterRecList(data));
+            if (data) {
+                setRtcList(getFilterRecList(data));
+                setCacheRtcList(getFilterRecList(data));
+            }
         })
             .finally(() => {
             bffEventReport({
@@ -913,8 +917,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         bffGetTagList();
         getRecommendVideos()
             .then((data) => {
-            setRtcList(getFilterRecList(data));
-            setCacheRtcList(getFilterRecList(data));
+            if (data) {
+                setRtcList(getFilterRecList(data));
+                setCacheRtcList(getFilterRecList(data));
+            }
         })
             .finally(() => {
             bffEventReport({
@@ -1417,7 +1423,7 @@ var settingRender$a = [
  * @Author: binruan@chatlabs.com
  * @Date: 2024-03-12 10:59:06
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-08-14 17:02:53
+ * @LastEditTime: 2024-08-22 17:43:04
  * @FilePath: \pb-sxp-ui\src\core\hooks\useEventReport.ts
  *
  */
@@ -8803,13 +8809,13 @@ SwiperSlide.displayName = 'SwiperSlide';
  * @Author: binruan@chatlabs.com
  * @Date: 2023-11-02 18:34:34
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-08-20 18:29:11
+ * @LastEditTime: 2024-08-22 18:48:44
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\Modal\index.tsx
  *
  */
 const closeIcon$1 = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII=';
 const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema, fullHeight = window.innerHeight, isFullScreen = false }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const touchRef = useRef(null);
     const fTouchRef = useRef(null);
     const touchMoveRef = useRef(null);
@@ -8934,8 +8940,7 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
                 React.createElement("div", { onClick: onClose, className: 'modal-icon-wrapper' },
                     React.createElement("img", { src: (_t = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.popupCloseIcon) !== null && _t !== void 0 ? _t : closeIcon$1, alt: 'close', className: 'modal-icon' })),
                 React.createElement("div", { ref: ref, style: {
-                        height: (_x = (isScrollFullScreen ? fullHeight : MODAL_DEF_CON_H) -
-                            ((_w = (_v = (_u = getPopupById === null || getPopupById === void 0 ? void 0 : getPopupById.item) === null || _u === void 0 ? void 0 : _u.props) === null || _v === void 0 ? void 0 : _v.popupBg) === null || _w === void 0 ? void 0 : _w.bottomMargin)) !== null && _x !== void 0 ? _x : 0,
+                        height: isScrollFullScreen ? fullHeight : MODAL_DEF_CON_H,
                         overflow: (isScrollFullScreen && modalTrans <= 0) || !isScrollFullScreen ? 'auto' : 'hidden'
                     } }, children)))))), modalEleRef.current);
 };
@@ -9103,8 +9108,8 @@ const CommodityGroup = ({ products, data, defImg, style, onCLick, popupDetailDat
 var CommodityGroup$1 = memo(CommodityGroup);
 
 const CommodityDetail$1 = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
-    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio"]);
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel } = _a, props = __rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel"]);
     const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
     const curTimeRef = useRef(null);
@@ -9224,18 +9229,18 @@ const CommodityDetail$1 = (_a) => {
         };
         return dotsAlignClass === null || dotsAlignClass === void 0 ? void 0 : dotsAlignClass[swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign];
     }, [swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign]);
-    const iframeUrl = ((_x = (_w = data === null || data === void 0 ? void 0 : data.video) === null || _w === void 0 ? void 0 : _w.bindProduct) === null || _x === void 0 ? void 0 : _x.remark) || ((_0 = (_z = (_y = data === null || data === void 0 ? void 0 : data.video) === null || _y === void 0 ? void 0 : _y.bindProducts) === null || _z === void 0 ? void 0 : _z[0]) === null || _0 === void 0 ? void 0 : _0.remark) || ((_1 = data === null || data === void 0 ? void 0 : data.product) === null || _1 === void 0 ? void 0 : _1.remark);
+    const iframeUrl = product === null || product === void 0 ? void 0 : product.remark;
     return (React.createElement(React.Fragment, null,
         React.createElement("div", Object.assign({ className: css(Object.assign({}, style)) }, props),
             React.createElement("div", { style: { position: 'relative' } },
-                product && ((_2 = product === null || product === void 0 ? void 0 : product.homePage) === null || _2 === void 0 ? void 0 : _2.length) > 0 && (React.createElement(Swiper, { height: height, modules: [Pagination, Autoplay], pagination: {
+                product && ((_w = product === null || product === void 0 ? void 0 : product.homePage) === null || _w === void 0 ? void 0 : _w.length) > 0 && (React.createElement(Swiper, { height: height, modules: [Pagination, Autoplay], pagination: {
                         clickable: true,
                         bulletActiveClass: 'swipe-item-active-bullet',
                         clickableClass: getDotsAlign
                     }, loop: true, autoplay: {
                         delay: (swiper === null || swiper === void 0 ? void 0 : swiper.delay) * 1000
                     }, ref: ref },
-                    React.createElement(React.Fragment, null, (_3 = product === null || product === void 0 ? void 0 : product.homePage) === null || _3 === void 0 ? void 0 : _3.map((src) => {
+                    React.createElement(React.Fragment, null, (_x = product === null || product === void 0 ? void 0 : product.homePage) === null || _x === void 0 ? void 0 : _x.map((src) => {
                         var _a;
                         return (React.createElement(SwiperSlide, { key: src },
                             React.createElement("div", { style: {
@@ -9251,7 +9256,7 @@ const CommodityDetail$1 = (_a) => {
                                         objectPosition: `50% ${(swiper === null || swiper === void 0 ? void 0 : swiper.translateY) ? (swiper === null || swiper === void 0 ? void 0 : swiper.translateY) + 50 : 50}%`
                                     }, src: (_a = src !== null && src !== void 0 ? src : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _a !== void 0 ? _a : bottom_image }))));
                     })))),
-                !((_4 = product === null || product === void 0 ? void 0 : product.homePage) === null || _4 === void 0 ? void 0 : _4.length) && (React.createElement("div", { className: css({
+                !((_y = product === null || product === void 0 ? void 0 : product.homePage) === null || _y === void 0 ? void 0 : _y.length) && (React.createElement("div", { className: css({
                         height,
                         width
                     }) },
@@ -9259,7 +9264,7 @@ const CommodityDetail$1 = (_a) => {
                             objectFit: 'cover',
                             width: '100%',
                             height: '100%'
-                        }), src: (_5 = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _5 !== void 0 ? _5 : bottom_image, alt: 'pdp image' }))),
+                        }), src: (_z = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _z !== void 0 ? _z : bottom_image, alt: 'pdp image' }))),
                 (iframeUrl || !product) && iframeIcon && (React.createElement("div", { style: {
                         padding: '5px 10px',
                         display: 'flex',
@@ -9271,8 +9276,7 @@ const CommodityDetail$1 = (_a) => {
                         background: '#fff',
                         borderRadius: '3px'
                     }, onClick: () => setShow3DModal(true) },
-                    React.createElement("img", { src: iframeIcon, alt: '3d', width: '20px', height: '20px', style: { marginRight: '5px' } }),
-                    React.createElement("span", { style: { fontSize: '12px' } }, "Try in 3D")))),
+                    React.createElement("img", { src: iframeIcon, alt: '3d', width: '20px', height: '20px' })))),
             renderCommodityGroup(),
             React.createElement("div", { className: 'pb-commondity-content' }, renderContent({ isPost }))),
         renderBtn(),
@@ -9280,12 +9284,13 @@ const CommodityDetail$1 = (_a) => {
             React.createElement("div", { style: { paddingBottom: '80px' } }, renderContent({ isPost: false })),
             renderBtn()),
         React.createElement(Modal$1, { visible: show3DModal, padding: 0, isFullScreen: true, onClose: () => setShow3DModal(false) },
-            React.createElement("iframe", { src: iframeUrl, style: {
-                    width: '100%',
-                    height: 'calc(100% - 50px)',
-                    marginTop: '40px',
-                    border: 'none'
-                } }))));
+            React.createElement("div", { style: { height: window.innerHeight } },
+                React.createElement("iframe", { src: iframeUrl, style: {
+                        width: '100%',
+                        height: isTel ? `${664 - 50}px` : `${window.innerHeight - 50}px`,
+                        marginTop: '50px',
+                        border: 'none'
+                    } })))));
 };
 var CommodityDetailComponent = memo(CommodityDetail$1);
 
@@ -9938,8 +9943,8 @@ var settingRender$7 = [
 ];
 
 const CommodityDetailDiroNew$1 = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
-    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio"]);
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel"]);
     useState(true);
     const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
@@ -10090,17 +10095,17 @@ Made in Italy` })));
         };
         return dotsAlignClass === null || dotsAlignClass === void 0 ? void 0 : dotsAlignClass[swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign];
     }, [swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign]);
-    const iframeUrl = ((_x = (_w = data === null || data === void 0 ? void 0 : data.video) === null || _w === void 0 ? void 0 : _w.bindProduct) === null || _x === void 0 ? void 0 : _x.remark) || ((_0 = (_z = (_y = data === null || data === void 0 ? void 0 : data.video) === null || _y === void 0 ? void 0 : _y.bindProducts) === null || _z === void 0 ? void 0 : _z[0]) === null || _0 === void 0 ? void 0 : _0.remark) || ((_1 = data === null || data === void 0 ? void 0 : data.product) === null || _1 === void 0 ? void 0 : _1.remark);
+    const iframeUrl = product === null || product === void 0 ? void 0 : product.remark;
     return (React.createElement("div", { className: 'pb-commondityDiroNew' },
         React.createElement("div", Object.assign({ className: css(Object.assign(Object.assign({}, style), { transform: 'translate3d(0px, 0px, 0px)' })) }, props),
             React.createElement("div", { style: { position: 'relative' } },
-                product && ((_2 = product === null || product === void 0 ? void 0 : product.homePage) === null || _2 === void 0 ? void 0 : _2.length) > 0 && (React.createElement(Swiper, { height: height, modules: [Pagination, Autoplay], pagination: {
+                product && ((_w = product === null || product === void 0 ? void 0 : product.homePage) === null || _w === void 0 ? void 0 : _w.length) > 0 && (React.createElement(Swiper, { height: height, modules: [Pagination, Autoplay], pagination: {
                         clickable: true,
                         bulletActiveClass: 'commondityDiroNew-swipe-item-active-bullet',
                         clickableClass: getDotsAlign
                     }, loop: true, autoplay: {
                         delay: (swiper === null || swiper === void 0 ? void 0 : swiper.delay) * 1000
-                    }, ref: ref }, (_3 = product === null || product === void 0 ? void 0 : product.homePage) === null || _3 === void 0 ? void 0 : _3.map((src) => {
+                    }, ref: ref }, (_x = product === null || product === void 0 ? void 0 : product.homePage) === null || _x === void 0 ? void 0 : _x.map((src) => {
                     var _a;
                     return (React.createElement(SwiperSlide, { key: src },
                         React.createElement("div", { style: {
@@ -10116,7 +10121,7 @@ Made in Italy` })));
                                     objectPosition: `50% ${(swiper === null || swiper === void 0 ? void 0 : swiper.translateY) ? (swiper === null || swiper === void 0 ? void 0 : swiper.translateY) + 50 : 50}%`
                                 }, src: (_a = src !== null && src !== void 0 ? src : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _a !== void 0 ? _a : bottom_image }))));
                 }))),
-                !((_4 = product === null || product === void 0 ? void 0 : product.homePage) === null || _4 === void 0 ? void 0 : _4.length) && (React.createElement("div", { className: css({
+                !((_y = product === null || product === void 0 ? void 0 : product.homePage) === null || _y === void 0 ? void 0 : _y.length) && (React.createElement("div", { className: css({
                         height,
                         width
                     }) },
@@ -10124,7 +10129,7 @@ Made in Italy` })));
                             objectFit: 'cover',
                             width: '100%',
                             height: '100%'
-                        }), src: (_5 = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _5 !== void 0 ? _5 : bottom_image, alt: 'pdp image' }))),
+                        }), src: (_z = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _z !== void 0 ? _z : bottom_image, alt: 'pdp image' }))),
                 (iframeUrl || !product) && iframeIcon && (React.createElement("div", { style: {
                         padding: '5px 10px',
                         display: 'flex',
@@ -10136,14 +10141,13 @@ Made in Italy` })));
                         background: '#fff',
                         borderRadius: '3px'
                     }, onClick: () => setShow3DModal(true) },
-                    React.createElement("img", { src: iframeIcon, alt: '3d', width: '20px', height: '20px', style: { marginRight: '5px' } }),
-                    React.createElement("span", { style: { fontSize: '12px' } }, "Try in 3D")))),
+                    React.createElement("img", { src: iframeIcon, alt: '3d', width: '20px', height: '20px' })))),
             renderCommodityGroup(),
             React.createElement("div", { className: 'pb-commondityDiroNew-content' },
                 React.createElement("div", { className: 'pb-commondityDiroNew-content-top' },
                     React.createElement("div", { className: 'pb-commondityDiroNew-content-top-left' },
                         React.createElement("div", { className: 'pb-commondityDiroNew-content-top-left-title', style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title), dangerouslySetInnerHTML: {
-                                __html: setFontForText((_6 = product === null || product === void 0 ? void 0 : product.title) !== null && _6 !== void 0 ? _6 : 'Large Dior Toujours BagLarge', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title)
+                                __html: setFontForText((_0 = product === null || product === void 0 ? void 0 : product.title) !== null && _0 !== void 0 ? _0 : 'Large Dior Toujours BagLarge', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title)
                             } }),
                         React.createElement("div", { className: 'pb-commondityDiroNew-content-collection', hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.collection) || (product === null || product === void 0 ? void 0 : product.collection) === ''), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection), dangerouslySetInnerHTML: {
                                 __html: setFontForText((product === null || product === void 0 ? void 0 : product.collection) || 'Black Macrocannage CalfskinLarge', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection)
@@ -10153,21 +10157,22 @@ Made in Italy` })));
                                 __html: setFontForText(priceText, commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price)
                             } }),
                         React.createElement("div", { className: 'pb-commondityDiroNew-content-top-right-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.taxInfo), style: getStyle(commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo), dangerouslySetInnerHTML: {
-                                __html: setFontForText((_7 = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _7 !== void 0 ? _7 : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
+                                __html: setFontForText((_1 = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _1 !== void 0 ? _1 : '税费', commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo)
                             } }))),
-                (!product || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { "aria-label": (_8 = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _8 !== void 0 ? _8 : 'Shop now', onClick: handleLink, className: 'pb-commondityDiroNew-btn', style: buttonStyle },
+                (!product || (product === null || product === void 0 ? void 0 : product.link)) && (React.createElement("button", { "aria-label": (_2 = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _2 !== void 0 ? _2 : 'Shop now', onClick: handleLink, className: 'pb-commondityDiroNew-btn', style: buttonStyle },
                     React.createElement("span", { dangerouslySetInnerHTML: {
-                            __html: setFontForText((_9 = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _9 !== void 0 ? _9 : 'Shop now', buttonStyle)
+                            __html: setFontForText((_3 = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _3 !== void 0 ? _3 : 'Shop now', buttonStyle)
                         } }))),
                 productInfoText({ isPost }))),
         React.createElement(Modal$1, { visible: showModal, onClose: () => setShowModal(false) }, productInfoText({ isPost: false })),
         React.createElement(Modal$1, { visible: show3DModal, padding: 0, isFullScreen: true, onClose: () => setShow3DModal(false) },
-            React.createElement("iframe", { src: iframeUrl, style: {
-                    width: '100%',
-                    height: 'calc(100% - 50px)',
-                    marginTop: '40px',
-                    border: 'none'
-                } }))));
+            React.createElement("div", { style: { height: window.innerHeight } },
+                React.createElement("iframe", { src: iframeUrl, style: {
+                        width: '100%',
+                        height: isTel ? `${664 - 50}px` : `${window.innerHeight - 50}px`,
+                        marginTop: '50px',
+                        border: 'none'
+                    } })))));
 };
 var CommodityDetailDiroNewComponent = memo(CommodityDetailDiroNew$1);
 
@@ -10760,7 +10765,7 @@ const Iframe$1 = (_a) => {
     var { content, btnText, style, icon, isPopup, isExternalLink, onClose, onClick, submitButtonStyle, contentStyle, isTel } = _a, props = __rest(_a, ["content", "btnText", "style", "icon", "isPopup", "isExternalLink", "onClose", "onClick", "submitButtonStyle", "contentStyle", "isTel"]);
     const { popupDetailData } = useSxpDataSource();
     const iframeUrl = (_c = (_b = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.video) === null || _b === void 0 ? void 0 : _b.bindCta) === null || _c === void 0 ? void 0 : _c.remark;
-    return (React.createElement("div", Object.assign({ className: `${css(Object.assign(Object.assign({}, style), { height: isTel ? 664 : '100%' }))}` }, props),
+    return (React.createElement("div", Object.assign({ className: `${css(Object.assign(Object.assign({}, style), { height: isTel ? 664 : window === null || window === void 0 ? void 0 : window.innerHeight }))}` }, props),
         React.createElement("iframe", { src: iframeUrl, style: {
                 width: '100%',
                 height: 'calc(100% - 50px)',
@@ -16001,7 +16006,7 @@ var Tagbar$1 = memo(Tagbar);
  * @Author: binruan@chatlabs.com
  * @Date: 2024-01-15 19:03:09
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-08-22 09:56:51
+ * @LastEditTime: 2024-08-22 18:34:01
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
  *
  */
@@ -16341,7 +16346,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     };
     const handleScrollEvent = (swiper) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-        viewTime.current = new Date();
         const item = data[swiper.previousIndex];
         if (!item)
             return;
@@ -16382,6 +16386,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 eventName: 'ProductView'
             });
         }
+        viewTime.current = new Date();
     };
     const handleReportProductView = (item) => {
         var _a, _b, _c;
@@ -16391,8 +16396,12 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     };
     useEffect(() => {
         const item = data[activeIndex];
-        if (openHashtag)
+        if (openHashtag) {
             handleReportProductView(item);
+        }
+        else {
+            viewTime.current = new Date();
+        }
     }, [openHashtag, data, activeIndex]);
     const handleViewImageStartEvent = (activeIndex) => {
         var _a, _b, _c, _d, _e, _f;