pb-sxp-ui 1.15.3 → 1.15.4

package/es/core/components/Consent/index.js

@@ -29,7 +29,6 @@ const Consent = ({ width = window.innerWidth, height = window.innerHeight, priva
                 utmCampaign: getUtmValue('utm_campaign'),
                 utmId: getUtmValue('utm_id'),
                 utmContent: getUtmValue('utm_content'),
-                clSource: getUtmValue('cl_source'),
                 enterTime: `${Date.now()}`,
                 enterUrl: window.location.href,
                 rtc: null,

package/es/core/components/SxpPageRender/ConsentPopup.js

@@ -3,10 +3,10 @@ import './index.less';
 import withBindDataSource from '../../../core/hoc/withBindDataSource';
 import { useEditorDataProvider } from '../../../core/context/EditorDataProvider';
 const Consent = ({ resolver, globalConfig }) => {
-    var _a, _b;
+    var _a, _b, _c;
     const { consentPopupCate } = useEditorDataProvider();
     const value = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consentPopup) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item;
-    if (!value)
+    if (!value || (!consentPopupCate && !((_c = value === null || value === void 0 ? void 0 : value.props) === null || _c === void 0 ? void 0 : _c.open)))
         return null;
     const t = resolver === null || resolver === void 0 ? void 0 : resolver[value === null || value === void 0 ? void 0 : value.type];
     const Component = withBindDataSource(t);

package/es/core/components/SxpPageRender/index.js

@@ -411,7 +411,7 @@ 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, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const item = data[swiper.previousIndex];
         if (!item)
             return;
@@ -430,9 +430,9 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     contentId: (_e = (_d = item === null || item === void 0 ? void 0 : item.video) === null || _d === void 0 ? void 0 : _d.itemId) !== null && _e !== void 0 ? _e : '',
                     productId: (_g = (_f = item === null || item === void 0 ? void 0 : item.product) === null || _f === void 0 ? void 0 : _f.itemId) !== null && _g !== void 0 ? _g : '',
                     requestId: null,
-                    traceInfo: (_j = (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.traceInfo) !== null && _j !== void 0 ? _j : '',
+                    traceInfo: (_l = (_j = (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.traceInfo) !== null && _j !== void 0 ? _j : (_k = item === null || item === void 0 ? void 0 : item.product) === null || _k === void 0 ? void 0 : _k.traceInfo) !== null && _l !== void 0 ? _l : '',
                     contentFormat,
-                    position: ((_k = swiper.previousIndex) !== null && _k !== void 0 ? _k : 0) + ''
+                    position: ((_m = swiper.previousIndex) !== null && _m !== void 0 ? _m : 0) + ''
                 }
             });
             handleViewImageStartEnd(item);
@@ -443,12 +443,12 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 eventInfo: {
                     eventSubject: 'scrollUp',
                     eventDescription: 'User scroll up',
-                    contentId: (_m = (_l = item === null || item === void 0 ? void 0 : item.video) === null || _l === void 0 ? void 0 : _l.itemId) !== null && _m !== void 0 ? _m : '',
-                    productId: (_p = (_o = item.product) === null || _o === void 0 ? void 0 : _o.itemId) !== null && _p !== void 0 ? _p : '',
+                    contentId: (_p = (_o = item === null || item === void 0 ? void 0 : item.video) === null || _o === void 0 ? void 0 : _o.itemId) !== null && _p !== void 0 ? _p : '',
+                    productId: (_r = (_q = item.product) === null || _q === void 0 ? void 0 : _q.itemId) !== null && _r !== void 0 ? _r : '',
                     requestId: null,
-                    traceInfo: (_r = (_q = item === null || item === void 0 ? void 0 : item.video) === null || _q === void 0 ? void 0 : _q.traceInfo) !== null && _r !== void 0 ? _r : '',
+                    traceInfo: (_v = (_t = (_s = item === null || item === void 0 ? void 0 : item.video) === null || _s === void 0 ? void 0 : _s.traceInfo) !== null && _t !== void 0 ? _t : (_u = item === null || item === void 0 ? void 0 : item.product) === null || _u === void 0 ? void 0 : _u.traceInfo) !== null && _v !== void 0 ? _v : '',
                     contentFormat,
-                    position: ((_s = swiper.previousIndex) !== null && _s !== void 0 ? _s : 0) + ''
+                    position: ((_w = swiper.previousIndex) !== null && _w !== void 0 ? _w : 0) + ''
                 }
             });
             handleViewImageStartEnd(item);

package/es/core/context/SxpDataSourceProvider.d.ts

@@ -90,6 +90,8 @@ export interface ISxpDataSourceContext {
     setEventTimeList?: React.Dispatch<React.SetStateAction<Array<IEventTimeType>>>;
     multiPostTimeRef?: any;
     refreshFeSession?: (enableReSid?: boolean, event?: (fk: string) => void) => void;
+    getAccount?: () => Promise<any>;
+    accountSonsent?: (v: boolean) => Promise<boolean>;
 }
 export declare const SxpDataSourceContext: React.Context<ISxpDataSourceContext>;
 export interface SxpDataSourceProviderProps {

package/es/core/context/SxpDataSourceProvider.js

@@ -47,6 +47,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     const [channel, setChannel] = useState();
     const [eventTimeList, setEventTimeList] = useState([]);
     const [playbookType, setPlaybookType] = useState();
+    const [chatlabsId, setChatlabsId] = useState();
     const finalPageData = useMemo(() => pageData !== null && pageData !== void 0 ? pageData : data, [pageData, data]);
     const isShowConsent = useMemo(() => {
         var _a, _b, _c, _d;
@@ -127,16 +128,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     }, [bffDataSource, fakeUserId]);
     const getRecommendVideos = useCallback((query) => __awaiter(void 0, void 0, void 0, function* () {
         var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        query = {
-            maxSize: (_f = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _f !== void 0 ? _f : maxSize,
-            defaultSize: (_g = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _g !== void 0 ? _g : defaultSize,
-            hashTag: query === null || query === void 0 ? void 0 : query.hashTag,
-            traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo,
-            themeTag: query === null || query === void 0 ? void 0 : query.themeTag,
-            pageNum: query === null || query === void 0 ? void 0 : query.pageNum,
-            contentFilter: query === null || query === void 0 ? void 0 : query.contentFilter,
-            productFilter: query === null || query === void 0 ? void 0 : query.productFilter
-        };
+        query = Object.assign({ maxSize: (_f = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _f !== void 0 ? _f : maxSize, defaultSize: (_g = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _g !== void 0 ? _g : defaultSize, hashTag: query === null || query === void 0 ? void 0 : query.hashTag, traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo, themeTag: query === null || query === void 0 ? void 0 : query.themeTag, pageNum: query === null || query === void 0 ? void 0 : query.pageNum, contentFilter: query === null || query === void 0 ? void 0 : query.contentFilter, productFilter: query === null || query === void 0 ? void 0 : query.productFilter }, (chatlabsId && { chatlabsId }));
         if (channel) {
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(channel) });
         }
@@ -201,7 +193,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             return Object.assign(Object.assign({}, result.data), { recList: list });
         }
         return result === null || result === void 0 ? void 0 : result.data;
-    }), [bffFetch, utmVal, maxSize, defaultSize, channelQueryList, channel]);
+    }), [bffFetch, utmVal, maxSize, defaultSize, channelQueryList, channel, chatlabsId]);
     const loadVideos = useCallback((pageNum) => __awaiter(void 0, void 0, void 0, function* () {
         var _1, _2, _3, _4;
         if (rtcList.length <= 0) {
@@ -250,9 +242,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             const value = val.split('=')[1];
             params[key] = value;
         });
-        console.log(params, '111');
         const cl_source = params === null || params === void 0 ? void 0 : params.cl_source;
-        const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' })), (cl_source && { cl_source }));
+        const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' })), (cl_source && { clSource: cl_source }));
         const realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
         const realEventInfo = Object.entries(ef)
             .map(([k, v]) => v && { name: k, value: v })
@@ -433,12 +424,26 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 utmContent: getVal('utm_content'),
                 enterTime: Math.floor(time / 1000) + '',
                 requestId: null,
-                enterUrl: (_c = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href) !== null && _c !== void 0 ? _c : '',
-                clSource: getVal('cl_source')
+                enterUrl: (_c = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href) !== null && _c !== void 0 ? _c : ''
             },
             reportLayId: false
         });
     }, [bffEventReport]);
+    const getAccount = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _13, _14;
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/account', { method: 'GET' }));
+        setChatlabsId((_13 = res === null || res === void 0 ? void 0 : res.data) === null || _13 === void 0 ? void 0 : _13.chatLabsId);
+        return ((_14 = res === null || res === void 0 ? void 0 : res.data) === null || _14 === void 0 ? void 0 : _14.consentResult) === 'true';
+    }), [bffFetch]);
+    const accountSonsent = useCallback((consentResult) => __awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/account/consent', {
+            method: 'POST',
+            body: {
+                consentResult
+            }
+        }));
+        return res === null || res === void 0 ? void 0 : res.success;
+    }), [bffFetch]);
     useEffect(() => {
         if (!isShowConsent)
             h5EnterLink();
@@ -586,7 +591,9 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             eventTimeList,
             setEventTimeList,
             multiPostTimeRef,
-            refreshFeSession
+            refreshFeSession,
+            getAccount,
+            accountSonsent
         } }, isShowConsent ? (React.createElement(Consent, Object.assign({}, (_e = (_d = (_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.item) === null || _e === void 0 ? void 0 : _e.props))) : (render({
         rtcList,
         mutateLike: bffMutateLike,

package/es/materials/sxp/consentPopup/Click/index.js

@@ -1,19 +1,37 @@
-import { __rest } from "tslib";
-import React, { memo, useMemo } from 'react';
+import { __awaiter, __rest } from "tslib";
+import React, { memo, useEffect, useMemo, useState } from 'react';
 import './index.less';
-import tel from './tel.png';
 import ConsentDetail from '../../popup/ConsentDetail';
+import tel from './tel.png';
+import { setFontForText } from '../../../../core/utils/tool';
+import { useSxpDataSource } from '../../../../core/hooks';
 const Click = (_a) => {
     var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton"]);
+    const { getAccount, accountSonsent } = useSxpDataSource();
+    const [consentResult, setConsentResult] = useState(false);
+    const handleGetAccount = () => __awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
+        setConsentResult(res);
+    });
+    useEffect(() => {
+        handleGetAccount();
+    }, []);
     const visivle = useMemo(() => {
-        return consentPopupCate || (open && style);
-    }, [consentPopupCate, open]);
-    const handleClickAccept = () => { };
-    const handleClickReject = () => { };
+        return consentPopupCate || (open && style && !consentResult);
+    }, [consentPopupCate, open, style, consentResult]);
+    const handleClick = (v) => {
+        accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(v);
+        setConsentResult(true);
+    };
     return (React.createElement(React.Fragment, null, isTel ? (React.createElement("img", { src: tel, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (React.createElement(React.Fragment, null, visivle && (React.createElement("div", { className: 'consentPopupClick' },
         React.createElement("div", { className: 'consentPopupClick-container', style: style },
-            React.createElement(ConsentDetail, { content: content, style: { padding: 0 } }),
-            React.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: handleClickAccept }, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text),
-            React.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: handleClickReject }, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text))))))));
+            React.createElement("div", { className: 'consentPopupClick-container-content' },
+                React.createElement(ConsentDetail, { content: content, style: { padding: 0 } })),
+            React.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: () => handleClick(true), dangerouslySetInnerHTML: {
+                    __html: setFontForText(acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style)
+                } }),
+            React.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: () => handleClick(false), dangerouslySetInnerHTML: {
+                    __html: setFontForText(rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style)
+                } }))))))));
 };
 export default memo(Click);

package/es/materials/sxp/consentPopup/Click/settingRender.js

@@ -152,7 +152,7 @@ export default [
             {
                 type: 'TextMargin',
                 label: '边距',
-                name: ['props', 'acceptButton', 'style']
+                name: ['props', 'rejectButton', 'style']
             },
             {
                 type: 'Group',

package/es/materials/sxp/consentPopup/Swipe/index.d.ts

@@ -7,6 +7,7 @@ export interface ISwipeProps {
     isTel?: boolean;
     consentPopupCate?: string;
     swipeIcon?: string;
+    closeIcon?: string;
 }
 declare const _default: React.NamedExoticComponent<ISwipeProps>;
 export default _default;

package/es/materials/sxp/consentPopup/Swipe/index.js

@@ -1,13 +1,29 @@
-import { __rest } from "tslib";
-import React, { memo, useMemo, useRef } from 'react';
+import { __awaiter, __rest } from "tslib";
+import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
 import './index.less';
-import tel from './tel.png';
 import ConsentDetail from '../../popup/ConsentDetail';
-const closeIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII=';
+import tel from './tel.png';
+import { useSxpDataSource } from '../../../../core/hooks';
 const Swipe = (_a) => {
-    var { isTel, open, content, style, consentPopupCate, swipeIcon } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon"]);
+    var { isTel, open, content, style, consentPopupCate, swipeIcon, closeIcon } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon", "closeIcon"]);
     const touchInfo = useRef();
     const threshold = 50;
+    const { getAccount, accountSonsent } = useSxpDataSource();
+    const [consentResult, setConsentResult] = useState(false);
+    const handleGetAccount = () => __awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
+        setConsentResult(res);
+    });
+    useEffect(() => {
+        handleGetAccount();
+    }, []);
+    const visivle = useMemo(() => {
+        return consentPopupCate || (open && style && !consentResult);
+    }, [consentPopupCate, open, style, consentResult]);
+    const handleClick = (v) => {
+        accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(v);
+        setConsentResult(true);
+    };
     const handleTouchStart = (event) => {
         const touch = event.touches[0];
         touchInfo.current = { y: touch.clientY, d: 0 };
@@ -26,19 +42,17 @@ const Swipe = (_a) => {
             return;
         const { d } = touchInfo.current || {};
         if (d > threshold) {
+            handleClick(true);
         }
         touchInfo.current = {};
     };
-    const handleClickReject = () => { };
-    const visivle = useMemo(() => {
-        return consentPopupCate || (open && style);
-    }, [consentPopupCate, open]);
     return (React.createElement(React.Fragment, null, isTel ? (React.createElement("img", { src: tel, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (React.createElement(React.Fragment, null, visivle && (React.createElement("div", { className: 'consentPopupSwipe', onTouchStart: handleTouchStart, onTouchMove: handleTouchMove, onTouchEnd: handleTouchEnd },
         React.createElement("div", { className: 'consentPopupSwipe-container', style: style },
-            React.createElement(ConsentDetail, { content: content, style: { padding: 0 } }),
-            React.createElement("button", { "aria-label": 'close', className: 'consentPopupSwipe-container-close', onClick: handleClickReject },
+            React.createElement("div", { className: 'consentPopupSwipe-container-content' },
+                React.createElement(ConsentDetail, { content: content, style: { padding: 0 } })),
+            React.createElement("button", { "aria-label": 'close', className: 'consentPopupSwipe-container-close', onClick: () => handleClick(false) },
                 React.createElement("img", { src: closeIcon, alt: 'close' })),
-            swipeIcon && (React.createElement("div", { className: 'consentPopupSwipe-container-swipeIcon', onClick: handleClickReject },
+            swipeIcon && (React.createElement("div", { className: 'consentPopupSwipe-container-swipeIcon', onClick: () => handleClick(false) },
                 React.createElement("img", { src: swipeIcon, alt: 'Swipe Icon' }))))))))));
 };
 export default memo(Swipe);

package/es/materials/sxp/consentPopup/Swipe/material.js

@@ -12,7 +12,8 @@ const Swipe = createMaterial(SwipeComponent, {
     },
     defaulSetting: {
         props: {
-            content: '<p><span style="font- size: 14px"><strong><span style="line - height: 3">Your Cookie Preferences</span></strong></span></p><p><span style="line- height: 1"><span style="font- size: 12px">We use cookie, including third-party cookies, to</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">ensure the proper functioning and security of</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">this site, to analyse its use, and to show you</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">personalised content.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">You can authorise the use of all cookies by</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">clicking on &#x27;Accept all cookies&#x27;. If you click on</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">&#x27;Reject all cookies&#x27;, we will only use cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">necessary for the proper functioning and </span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">security of this site. To personalise or adjust</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">your preferences at any time, click on &#x27;Cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Settings&#x27; below or at the bottom of any</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Fendi.com webpage.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">For more information, <u>read our Cookie Policy</u>.</span></span></p>'
+            content: '<p><span style="font- size: 14px"><strong><span style="line - height: 3">Your Cookie Preferences</span></strong></span></p><p><span style="line- height: 1"><span style="font- size: 12px">We use cookie, including third-party cookies, to</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">ensure the proper functioning and security of</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">this site, to analyse its use, and to show you</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">personalised content.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">You can authorise the use of all cookies by</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">clicking on &#x27;Accept all cookies&#x27;. If you click on</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">&#x27;Reject all cookies&#x27;, we will only use cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">necessary for the proper functioning and </span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">security of this site. To personalise or adjust</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">your preferences at any time, click on &#x27;Cookies</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Settings&#x27; below or at the bottom of any</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">Fendi.com webpage.</span></span></p><p><span style="line - height: 1"><span style="font - size: 12px">For more information, <u>read our Cookie Policy</u>.</span></span></p>',
+            closeIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII='
         },
         style: {
             backgroundColor: '#fff',

package/es/materials/sxp/consentPopup/Swipe/settingRender.js

@@ -17,6 +17,11 @@ export default [
                 label: '内边距',
                 name: ['style', 'padding'],
                 addonAfter: 'px'
+            },
+            {
+                label: '关闭按钮',
+                type: 'Upload',
+                name: ['props', 'closeIcon']
             }
         ]
     },

package/lib/core/components/Consent/index.js

@@ -32,7 +32,6 @@ const Consent = ({ width = window.innerWidth, height = window.innerHeight, priva
                 utmCampaign: getUtmValue('utm_campaign'),
                 utmId: getUtmValue('utm_id'),
                 utmContent: getUtmValue('utm_content'),
-                clSource: getUtmValue('cl_source'),
                 enterTime: `${Date.now()}`,
                 enterUrl: window.location.href,
                 rtc: null,

package/lib/core/components/SxpPageRender/ConsentPopup.js

@@ -6,10 +6,10 @@ require("./index.less");
 const withBindDataSource_1 = tslib_1.__importDefault(require("../../../core/hoc/withBindDataSource"));
 const EditorDataProvider_1 = require("../../../core/context/EditorDataProvider");
 const Consent = ({ resolver, globalConfig }) => {
-    var _a, _b;
+    var _a, _b, _c;
     const { consentPopupCate } = (0, EditorDataProvider_1.useEditorDataProvider)();
     const value = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consentPopup) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item;
-    if (!value)
+    if (!value || (!consentPopupCate && !((_c = value === null || value === void 0 ? void 0 : value.props) === null || _c === void 0 ? void 0 : _c.open)))
         return null;
     const t = resolver === null || resolver === void 0 ? void 0 : resolver[value === null || value === void 0 ? void 0 : value.type];
     const Component = (0, withBindDataSource_1.default)(t);

package/lib/core/components/SxpPageRender/index.js

@@ -414,7 +414,7 @@ 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, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const item = data[swiper.previousIndex];
         if (!item)
             return;
@@ -433,9 +433,9 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                     contentId: (_e = (_d = item === null || item === void 0 ? void 0 : item.video) === null || _d === void 0 ? void 0 : _d.itemId) !== null && _e !== void 0 ? _e : '',
                     productId: (_g = (_f = item === null || item === void 0 ? void 0 : item.product) === null || _f === void 0 ? void 0 : _f.itemId) !== null && _g !== void 0 ? _g : '',
                     requestId: null,
-                    traceInfo: (_j = (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.traceInfo) !== null && _j !== void 0 ? _j : '',
+                    traceInfo: (_l = (_j = (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.traceInfo) !== null && _j !== void 0 ? _j : (_k = item === null || item === void 0 ? void 0 : item.product) === null || _k === void 0 ? void 0 : _k.traceInfo) !== null && _l !== void 0 ? _l : '',
                     contentFormat,
-                    position: ((_k = swiper.previousIndex) !== null && _k !== void 0 ? _k : 0) + ''
+                    position: ((_m = swiper.previousIndex) !== null && _m !== void 0 ? _m : 0) + ''
                 }
             });
             handleViewImageStartEnd(item);
@@ -446,12 +446,12 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 eventInfo: {
                     eventSubject: 'scrollUp',
                     eventDescription: 'User scroll up',
-                    contentId: (_m = (_l = item === null || item === void 0 ? void 0 : item.video) === null || _l === void 0 ? void 0 : _l.itemId) !== null && _m !== void 0 ? _m : '',
-                    productId: (_p = (_o = item.product) === null || _o === void 0 ? void 0 : _o.itemId) !== null && _p !== void 0 ? _p : '',
+                    contentId: (_p = (_o = item === null || item === void 0 ? void 0 : item.video) === null || _o === void 0 ? void 0 : _o.itemId) !== null && _p !== void 0 ? _p : '',
+                    productId: (_r = (_q = item.product) === null || _q === void 0 ? void 0 : _q.itemId) !== null && _r !== void 0 ? _r : '',
                     requestId: null,
-                    traceInfo: (_r = (_q = item === null || item === void 0 ? void 0 : item.video) === null || _q === void 0 ? void 0 : _q.traceInfo) !== null && _r !== void 0 ? _r : '',
+                    traceInfo: (_v = (_t = (_s = item === null || item === void 0 ? void 0 : item.video) === null || _s === void 0 ? void 0 : _s.traceInfo) !== null && _t !== void 0 ? _t : (_u = item === null || item === void 0 ? void 0 : item.product) === null || _u === void 0 ? void 0 : _u.traceInfo) !== null && _v !== void 0 ? _v : '',
                     contentFormat,
-                    position: ((_s = swiper.previousIndex) !== null && _s !== void 0 ? _s : 0) + ''
+                    position: ((_w = swiper.previousIndex) !== null && _w !== void 0 ? _w : 0) + ''
                 }
             });
             handleViewImageStartEnd(item);

package/lib/core/context/SxpDataSourceProvider.d.ts

@@ -90,6 +90,8 @@ export interface ISxpDataSourceContext {
     setEventTimeList?: React.Dispatch<React.SetStateAction<Array<IEventTimeType>>>;
     multiPostTimeRef?: any;
     refreshFeSession?: (enableReSid?: boolean, event?: (fk: string) => void) => void;
+    getAccount?: () => Promise<any>;
+    accountSonsent?: (v: boolean) => Promise<boolean>;
 }
 export declare const SxpDataSourceContext: React.Context<ISxpDataSourceContext>;
 export interface SxpDataSourceProviderProps {

package/lib/core/context/SxpDataSourceProvider.js

@@ -50,6 +50,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     const [channel, setChannel] = (0, react_1.useState)();
     const [eventTimeList, setEventTimeList] = (0, react_1.useState)([]);
     const [playbookType, setPlaybookType] = (0, react_1.useState)();
+    const [chatlabsId, setChatlabsId] = (0, react_1.useState)();
     const finalPageData = (0, react_1.useMemo)(() => pageData !== null && pageData !== void 0 ? pageData : data, [pageData, data]);
     const isShowConsent = (0, react_1.useMemo)(() => {
         var _a, _b, _c, _d;
@@ -130,16 +131,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     }, [bffDataSource, fakeUserId]);
     const getRecommendVideos = (0, react_1.useCallback)((query) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        query = {
-            maxSize: (_f = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _f !== void 0 ? _f : maxSize,
-            defaultSize: (_g = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _g !== void 0 ? _g : defaultSize,
-            hashTag: query === null || query === void 0 ? void 0 : query.hashTag,
-            traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo,
-            themeTag: query === null || query === void 0 ? void 0 : query.themeTag,
-            pageNum: query === null || query === void 0 ? void 0 : query.pageNum,
-            contentFilter: query === null || query === void 0 ? void 0 : query.contentFilter,
-            productFilter: query === null || query === void 0 ? void 0 : query.productFilter
-        };
+        query = Object.assign({ maxSize: (_f = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _f !== void 0 ? _f : maxSize, defaultSize: (_g = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _g !== void 0 ? _g : defaultSize, hashTag: query === null || query === void 0 ? void 0 : query.hashTag, traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo, themeTag: query === null || query === void 0 ? void 0 : query.themeTag, pageNum: query === null || query === void 0 ? void 0 : query.pageNum, contentFilter: query === null || query === void 0 ? void 0 : query.contentFilter, productFilter: query === null || query === void 0 ? void 0 : query.productFilter }, (chatlabsId && { chatlabsId }));
         if (channel) {
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(channel) });
         }
@@ -204,7 +196,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             return Object.assign(Object.assign({}, result.data), { recList: list });
         }
         return result === null || result === void 0 ? void 0 : result.data;
-    }), [bffFetch, utmVal, maxSize, defaultSize, channelQueryList, channel]);
+    }), [bffFetch, utmVal, maxSize, defaultSize, channelQueryList, channel, chatlabsId]);
     const loadVideos = (0, react_1.useCallback)((pageNum) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _1, _2, _3, _4;
         if (rtcList.length <= 0) {
@@ -253,9 +245,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             const value = val.split('=')[1];
             params[key] = value;
         });
-        console.log(params, '111');
         const cl_source = params === null || params === void 0 ? void 0 : params.cl_source;
-        const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' })), (cl_source && { cl_source }));
+        const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' })), (cl_source && { clSource: cl_source }));
         const realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
         const realEventInfo = Object.entries(ef)
             .map(([k, v]) => v && { name: k, value: v })
@@ -436,12 +427,26 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 utmContent: getVal('utm_content'),
                 enterTime: Math.floor(time / 1000) + '',
                 requestId: null,
-                enterUrl: (_c = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href) !== null && _c !== void 0 ? _c : '',
-                clSource: getVal('cl_source')
+                enterUrl: (_c = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href) !== null && _c !== void 0 ? _c : ''
             },
             reportLayId: false
         });
     }, [bffEventReport]);
+    const getAccount = (0, react_1.useCallback)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        var _13, _14;
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/account', { method: 'GET' }));
+        setChatlabsId((_13 = res === null || res === void 0 ? void 0 : res.data) === null || _13 === void 0 ? void 0 : _13.chatLabsId);
+        return ((_14 = res === null || res === void 0 ? void 0 : res.data) === null || _14 === void 0 ? void 0 : _14.consentResult) === 'true';
+    }), [bffFetch]);
+    const accountSonsent = (0, react_1.useCallback)((consentResult) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/account/consent', {
+            method: 'POST',
+            body: {
+                consentResult
+            }
+        }));
+        return res === null || res === void 0 ? void 0 : res.success;
+    }), [bffFetch]);
     (0, react_1.useEffect)(() => {
         if (!isShowConsent)
             h5EnterLink();
@@ -589,7 +594,9 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             eventTimeList,
             setEventTimeList,
             multiPostTimeRef,
-            refreshFeSession
+            refreshFeSession,
+            getAccount,
+            accountSonsent
         } }, isShowConsent ? (react_1.default.createElement(Consent_1.default, Object.assign({}, (_e = (_d = (_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.item) === null || _e === void 0 ? void 0 : _e.props))) : (render({
         rtcList,
         mutateLike: bffMutateLike,

package/lib/materials/sxp/consentPopup/Click/index.js

@@ -3,19 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 require("./index.less");
-const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDetail"));
+const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
+const tool_1 = require("../../../../core/utils/tool");
+const hooks_1 = require("../../../../core/hooks");
 const Click = (_a) => {
     var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton"]);
+    const { getAccount, accountSonsent } = (0, hooks_1.useSxpDataSource)();
+    const [consentResult, setConsentResult] = (0, react_1.useState)(false);
+    const handleGetAccount = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
+        setConsentResult(res);
+    });
+    (0, react_1.useEffect)(() => {
+        handleGetAccount();
+    }, []);
     const visivle = (0, react_1.useMemo)(() => {
-        return consentPopupCate || (open && style);
-    }, [consentPopupCate, open]);
-    const handleClickAccept = () => { };
-    const handleClickReject = () => { };
+        return consentPopupCate || (open && style && !consentResult);
+    }, [consentPopupCate, open, style, consentResult]);
+    const handleClick = (v) => {
+        accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(v);
+        setConsentResult(true);
+    };
     return (react_1.default.createElement(react_1.default.Fragment, null, isTel ? (react_1.default.createElement("img", { src: tel_png_1.default, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (react_1.default.createElement(react_1.default.Fragment, null, visivle && (react_1.default.createElement("div", { className: 'consentPopupClick' },
         react_1.default.createElement("div", { className: 'consentPopupClick-container', style: style },
-            react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } }),
-            react_1.default.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: handleClickAccept }, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text),
-            react_1.default.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: handleClickReject }, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text))))))));
+            react_1.default.createElement("div", { className: 'consentPopupClick-container-content' },
+                react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } })),
+            react_1.default.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: () => handleClick(true), dangerouslySetInnerHTML: {
+                    __html: (0, tool_1.setFontForText)(acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style)
+                } }),
+            react_1.default.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: () => handleClick(false), dangerouslySetInnerHTML: {
+                    __html: (0, tool_1.setFontForText)(rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style)
+                } }))))))));
 };
 exports.default = (0, react_1.memo)(Click);

package/lib/materials/sxp/consentPopup/Click/settingRender.js

@@ -154,7 +154,7 @@ exports.default = [
             {
                 type: 'TextMargin',
                 label: '边距',
-                name: ['props', 'acceptButton', 'style']
+                name: ['props', 'rejectButton', 'style']
             },
             {
                 type: 'Group',

package/lib/materials/sxp/consentPopup/Swipe/index.d.ts

@@ -7,6 +7,7 @@ export interface ISwipeProps {
     isTel?: boolean;
     consentPopupCate?: string;
     swipeIcon?: string;
+    closeIcon?: string;
 }
 declare const _default: React.NamedExoticComponent<ISwipeProps>;
 export default _default;