@conecli/cone-render 0.10.1-shop-beta.36 → 0.10.1-shop-beta.37

package/dist/modules/ContainerFloorList/index.h5.tsx

@@ -1 +1 @@
-import React from 'react';
  NETWORK_DATA_TYPE,
  M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
  APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
  window.navigator.userAgent.includes('jdappPuppeteer') && window.loadPuppeteerPageLocalData;
  memberBaseInfo?: {
    shopId?: string;
    venderId?: string;
    channel?: string;
    venderType?: string;
    showDefaultModule?: boolean;
    customerLevel?: string;
    isUserForMember?: boolean;
    isLv0?: boolean;
    levelZeroMenuUrl?: string;
    totalRefresh?: functionType;
    callOpenCardPopPage?: functionType;
  };
  source?: string;
  containerFloorListData: ComponentInterFace.ContainerItemData[];
  extendInfoData?: object;
  className?: string;
  containerItemClass?: object;
  style?: object;
  hasGoodsFeeds?: boolean;
  builtInComponents?: object;
  loadingEndComponentFn?: functionType;
  sectionType?: string;
  updateShopFloorDataFn?: functionType;
  updateContainerFloorListDataFn?: functionType;
  refreshFloorListDataFn?: functionType;
  refreshFloorListDataBtnLabel?: string;
  customErrorIsvFloorModule?: React.ReactElement;
  componentExtend?: React.ReactElement;
  luxuryFixedIndex?: number;
  isContainerListHasMarginBottom?: boolean;
  switchConfig?: {
    [key: string]: any;
  };
  const { windowHeight, screenHeight } = taroJdBaseInfo.info.sysInfo;
  const {
    source,
    className,
    style,
    memberBaseInfo,
    containerItemClass = null,
    containerFloorListData,
    extendInfoData,
    builtInComponents,
    loadingEndComponentFn,
    sectionType,
    updateShopFloorDataFn,
    updateContainerFloorListDataFn,
    refreshFloorListDataFn,
    refreshFloorListDataBtnLabel,
    customErrorIsvFloorModule,
    luxuryFixedIndex = -1,
    isContainerListHasMarginBottom,
    switchConfig,
  } = props;
  const emptyFloorListHidden = switchConfig?.emptyFloorListHidden || false;
  const isSageShop = taroJdBaseInfo.info?.pageInfo?.isSageShop;
  const isHasMarginBottom = isContainerListHasMarginBottom ?? !isSageShop;
  
  const hasLiveForSageShop =
    isSageShop && taroJdBaseInfo.info?.pageInfo?.isJdShowNativeImmersivePlayer;
  
  const renderFloorItem = (
    item,
    floorItem,
    floorIndex,
    containerLayoutLeftRightMargin,
    lazyLoadState = false,
    index,
    borderStyle,
  ) => {
    return (
      <View
        className={classNames(shopContainerListStyle['d-floor-item'])}
        data-floor-uid={floorItem?.uid}
        data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
        data-lazy-load={lazyLoadState}
        key={floorItem.uid}
        id={`J_floor_${floorItem.uid}`}
        style={borderStyle}
      >
        {isChartH5 && (
          <View
            className={shopContainerListStyle['d-floor-chart-item']}
            id={`J_chart_floor_${floorItem?.uid}`}
            data-floor-uid={floorItem?.uid}
            data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
          />
        )}
        <FloorListItem
          memberBaseInfo={memberBaseInfo}
          source={source}
          floorIndex={floorIndex}
          floorData={floorItem}
          containerIndex={index}
          layoutLeftRightMargin={containerLayoutLeftRightMargin}
          containerBorderRadius={borderStyle}
          updateShopFloorDataFn={updateShopFloorDataFn}
          loadingEndComponentFn={loadingEndComponentFn}
          extendInfoData={
            passExtendInfoModuleWhiteList.includes(floorItem?.floorExtInfo?.moduleFlag)
              ? extendInfoData
              : undefined
          }
          key={floorItem.uid}
          builtInComponents={builtInComponents}
          updateContainerFloorListDataFn={updateContainerFloorListDataFn}
          customErrorIsvFloorModule={customErrorIsvFloorModule}
        />
        {index === luxuryFixedIndex ? props.children : null}
        {floorItem?.inspectResult === '1' && (
          <View className={shopContainerListStyle['d-floor-inspect-mask']} />
        )}
      </View>
    );
  };
  
  const getFloorSetHeight = (item) => {
    const getHeight = item?.floorExtInfo?.floorHeight
      ? Number(item?.floorExtInfo?.floorHeight)
      : 200;
    return getHeight > 0 ? getHeight : 200;
  };
  const containerFloorListDataLen = containerFloorListData.length;
  
  const getNoDataContainerHeight = () => {
    const getWindowHeight = windowHeight > 10 ? windowHeight : screenHeight;
    const changeHeight = hasLiveForSageShop
      ? getWindowHeight
      : getWindowHeight -
        (isJdApp
          ? APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT
          : M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT);
    return {
      height: `${changeHeight}px`,
    };
  };
  return (
    <View
      id="J_shopContainerFloorList"
      className={classNames(
        className,
        shopContainerListStyle['d-shop-container-list'],
        isHasMarginBottom
          ? shopContainerListStyle['d-container-list-with-margin-bottom']
          : shopContainerListStyle['d-container-list-no-margin-bottom'],
      )}
      style={style}
    >
      {containerFloorListDataLen > 0 ? (
        <>
          {containerFloorListData.map((item, index) => {
            const containerLayoutLeftRightMargin = (item.marginLeft || 0) + (item.marginRight || 0);
            const getContainerId = `J_container_${item.containerId}`;
            const borderStyle = getBorderStyle(
              item,
              index,
              containerFloorListData,
              containerFloorListDataLen,
            );
            return (
              <React.Fragment key={item.containerId + index}>
                {item.addLuxuryStyle ? (
                  <View className={shopContainerListStyle['d-luxury-header']} />
                ) : null}
                {item.addLuxuryBackupStyle ? (
                  <View
                    style={{
                      height: taroJdBaseInfo?.info?.sysInfo?.jdNativeHeaderHeight + 'px',
                    }}
                    className={shopContainerListStyle['d-luxury-header-black']}
                  />
                ) : null}
                {typeof item?.renderExtendComponent === 'function'
                  ? item?.renderExtendComponent(item?.floorExtendData)
                  : null}
                <View
                  className={classNames(
                    shopContainerListStyle['d-container-item'],
                    containerItemClass,
                  )}
                  id={getContainerId}
                  key={item.containerId}
                  data-container-id={item?.containerId}
                  data-container-type={item?.typeCode}
                  data-container-index={index}
                  style={{
                    marginBottom: item.marginBottom ? `${item.marginBottom}px` : 0,
                    marginTop: item.marginTop ? `${item.marginTop}px` : 0,
                    marginLeft: item.marginLeft ? `${item.marginLeft}px` : 0,
                    marginRight: item.marginRight ? `${item.marginRight}px` : 0,
                    borderTopLeftRadius: borderStyle?.borderTopLeftRadius || `0px`,
                    borderTopRightRadius: borderStyle?.borderTopRightRadiu || `0px`,
                    borderBottomLeftRadius: borderStyle?.borderBottomLeftRadius || `0px`,
                    borderBottomRightRadius: borderStyle?.borderBottomRightRadius || `0px`,
                    '--container-layout-left-right-margin': `${containerLayoutLeftRightMargin}px`,
                  }}
                >
                  {typeof item?.insertContainerStartComponent === 'function'
                    ? item?.insertContainerStartComponent(item)
                    : null}
                  {item.floors &&
                    item.floors.length > 0 &&
                    item.floors?.map((floorItem, floorIndex) => {
                      return index > lazyLoadStartIndex ? (
                        <LazyLayoutLoad
                          key={item.containerId}
                          sectionType={sectionType}
                          containerId={getContainerId}
                          height={getFloorSetHeight(floorItem)}
                          floorData={floorItem}
                        >
                          {renderFloorItem(
                            item,
                            floorItem,
                            floorIndex,
                            containerLayoutLeftRightMargin,
                            true,
                            index,
                            borderStyle,
                          )}
                        </LazyLayoutLoad>
                      ) : (
                        renderFloorItem(
                          item,
                          floorItem,
                          floorIndex,
                          containerLayoutLeftRightMargin,
                          false,
                          index,
                          borderStyle,
                        )
                      );
                    })}
                </View>
              </React.Fragment>
            );
          })}
        </>
      ) : !emptyFloorListHidden ? (
        <View
          className={classNames(shopContainerListStyle['d-container-list-no-data'], {
            [shopContainerListStyle['d-sage-shop-no-data']]: hasLiveForSageShop,
          })}
          style={getNoDataContainerHeight()}
        >
          <NetworkDataError
            netWorkShowType={NetWorkShowType.PART}
            netWorkDataType={NETWORK_DATA_TYPE.DATA_ERROR}
            backgroundColorWhite={hasLiveForSageShop}
            refreshCallBackFn={refreshFloorListDataFn ? refreshFloorListDataFn : null}
            btnLabel={refreshFloorListDataBtnLabel || ''}
          />
        </View>
      ) : null}
    </View>
  );
  updateShopDataFn: null,
+import React from 'react';
  NETWORK_DATA_TYPE,
  M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
  APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
  memberBaseInfo?: {
    shopId?: string;
    venderId?: string;
    channel?: string;
    venderType?: string;
    showDefaultModule?: boolean;
    customerLevel?: string;
    isUserForMember?: boolean;
    isLv0?: boolean;
    levelZeroMenuUrl?: string;
    totalRefresh?: functionType;
    callOpenCardPopPage?: functionType;
  };
  source?: string;
  containerFloorListData: ComponentInterFace.ContainerItemData[];
  extendInfoData?: object;
  className?: string;
  containerItemClass?: object;
  style?: object;
  hasGoodsFeeds?: boolean;
  builtInComponents?: object;
  loadingEndComponentFn?: functionType;
  sectionType?: string;
  updateShopFloorDataFn?: functionType;
  updateContainerFloorListDataFn?: functionType;
  refreshFloorListDataFn?: functionType;
  refreshFloorListDataBtnLabel?: string;
  customErrorIsvFloorModule?: React.ReactElement;
  componentExtend?: React.ReactElement;
  luxuryFixedIndex?: number;
  isContainerListHasMarginBottom?: boolean;
  switchConfig?: {
    [key: string]: any;
  };
  const { windowHeight, screenHeight } = taroJdBaseInfo.info.sysInfo;
  const {
    source,
    className,
    style,
    memberBaseInfo,
    containerItemClass = null,
    containerFloorListData,
    extendInfoData,
    builtInComponents,
    loadingEndComponentFn,
    sectionType,
    updateShopFloorDataFn,
    updateContainerFloorListDataFn,
    refreshFloorListDataFn,
    refreshFloorListDataBtnLabel,
    customErrorIsvFloorModule,
    luxuryFixedIndex = -1,
    isContainerListHasMarginBottom,
    switchConfig,
  } = props;
  const emptyFloorListHidden = switchConfig?.emptyFloorListHidden || false;
  const isSageShop = taroJdBaseInfo.info?.pageInfo?.isSageShop;
  const isHasMarginBottom = isContainerListHasMarginBottom ?? !isSageShop;
  
  const hasLiveForSageShop =
    isSageShop && taroJdBaseInfo.info?.pageInfo?.isJdShowNativeImmersivePlayer;
  
  const renderFloorItem = (
    item,
    floorItem,
    floorIndex,
    containerLayoutLeftRightMargin,
    lazyLoadState = false,
    index,
    borderStyle,
  ) => {
    return (
      <View
        className={classNames(shopContainerListStyle['d-floor-item'])}
        data-floor-uid={floorItem?.uid}
        data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
        data-lazy-load={lazyLoadState}
        key={floorItem.uid}
        id={`J_floor_${floorItem.uid}`}
        style={borderStyle}
      >
        {isChartH5 && (
          <View
            className={shopContainerListStyle['d-floor-chart-item']}
            id={`J_chart_floor_${floorItem?.uid}`}
            data-floor-uid={floorItem?.uid}
            data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
          />
        )}
        <FloorListItem
          memberBaseInfo={memberBaseInfo}
          source={source}
          floorIndex={floorIndex}
          floorData={floorItem}
          containerIndex={index}
          layoutLeftRightMargin={containerLayoutLeftRightMargin}
          containerBorderRadius={borderStyle}
          updateShopFloorDataFn={updateShopFloorDataFn}
          loadingEndComponentFn={loadingEndComponentFn}
          extendInfoData={
            passExtendInfoModuleWhiteList.includes(floorItem?.floorExtInfo?.moduleFlag)
              ? extendInfoData
              : undefined
          }
          key={floorItem.uid}
          builtInComponents={builtInComponents}
          updateContainerFloorListDataFn={updateContainerFloorListDataFn}
          customErrorIsvFloorModule={customErrorIsvFloorModule}
        />
        {index === luxuryFixedIndex ? props.children : null}
        {floorItem?.inspectResult === '1' && (
          <View className={shopContainerListStyle['d-floor-inspect-mask']} />
        )}
      </View>
    );
  };
  
  const getFloorSetHeight = (item) => {
    const getHeight = item?.floorExtInfo?.floorHeight
      ? Number(item?.floorExtInfo?.floorHeight)
      : 200;
    return getHeight > 0 ? getHeight : 200;
  };
  const containerFloorListDataLen = containerFloorListData.length;
  
  const getNoDataContainerHeight = () => {
    const getWindowHeight = windowHeight > 10 ? windowHeight : screenHeight;
    const changeHeight = hasLiveForSageShop
      ? getWindowHeight
      : getWindowHeight -
        (isJdApp
          ? APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT
          : M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT);
    return {
      height: `${changeHeight}px`,
    };
  };
  return (
    <View
      id="J_shopContainerFloorList"
      className={classNames(
        className,
        shopContainerListStyle['d-shop-container-list'],
        isHasMarginBottom
          ? shopContainerListStyle['d-container-list-with-margin-bottom']
          : shopContainerListStyle['d-container-list-no-margin-bottom'],
      )}
      style={style}
    >
      {containerFloorListDataLen > 0 ? (
        <>
          {containerFloorListData.map((item, index) => {
            const containerLayoutLeftRightMargin = (item.marginLeft || 0) + (item.marginRight || 0);
            const getContainerId = `J_container_${item.containerId}`;
            const borderStyle = getBorderStyle(
              item,
              index,
              containerFloorListData,
              containerFloorListDataLen,
            );
            return (
              <React.Fragment key={item.containerId + index}>
                {item.addLuxuryStyle ? (
                  <View className={shopContainerListStyle['d-luxury-header']} />
                ) : null}
                {item.addLuxuryBackupStyle ? (
                  <View
                    style={{
                      height: taroJdBaseInfo?.info?.sysInfo?.jdNativeHeaderHeight + 'px',
                    }}
                    className={shopContainerListStyle['d-luxury-header-black']}
                  />
                ) : null}
                {typeof item?.renderExtendComponent === 'function'
                  ? item?.renderExtendComponent(item?.floorExtendData)
                  : null}
                <View
                  className={classNames(
                    shopContainerListStyle['d-container-item'],
                    containerItemClass,
                  )}
                  id={getContainerId}
                  key={item.containerId}
                  data-container-id={item?.containerId}
                  data-container-type={item?.typeCode}
                  data-container-index={index}
                  style={{
                    marginBottom: item.marginBottom ? `${item.marginBottom}px` : 0,
                    marginTop: item.marginTop ? `${item.marginTop}px` : 0,
                    marginLeft: item.marginLeft ? `${item.marginLeft}px` : 0,
                    marginRight: item.marginRight ? `${item.marginRight}px` : 0,
                    borderTopLeftRadius: borderStyle?.borderTopLeftRadius || `0px`,
                    borderTopRightRadius: borderStyle?.borderTopRightRadiu || `0px`,
                    borderBottomLeftRadius: borderStyle?.borderBottomLeftRadius || `0px`,
                    borderBottomRightRadius: borderStyle?.borderBottomRightRadius || `0px`,
                    '--container-layout-left-right-margin': `${containerLayoutLeftRightMargin}px`,
                  }}
                >
                  {typeof item?.insertContainerStartComponent === 'function'
                    ? item?.insertContainerStartComponent(item)
                    : null}
                  {item.floors &&
                    item.floors.length > 0 &&
                    item.floors?.map((floorItem, floorIndex) => {
                      return index > lazyLoadStartIndex ? (
                        <LazyLayoutLoad
                          key={item.containerId}
                          sectionType={sectionType}
                          containerId={getContainerId}
                          height={getFloorSetHeight(floorItem)}
                          floorData={floorItem}
                        >
                          {renderFloorItem(
                            item,
                            floorItem,
                            floorIndex,
                            containerLayoutLeftRightMargin,
                            true,
                            index,
                            borderStyle,
                          )}
                        </LazyLayoutLoad>
                      ) : (
                        renderFloorItem(
                          item,
                          floorItem,
                          floorIndex,
                          containerLayoutLeftRightMargin,
                          false,
                          index,
                          borderStyle,
                        )
                      );
                    })}
                </View>
              </React.Fragment>
            );
          })}
        </>
      ) : !emptyFloorListHidden ? (
        <View
          className={classNames(shopContainerListStyle['d-container-list-no-data'], {
            [shopContainerListStyle['d-sage-shop-no-data']]: hasLiveForSageShop,
          })}
          style={getNoDataContainerHeight()}
        >
          <NetworkDataError
            netWorkShowType={NetWorkShowType.PART}
            netWorkDataType={NETWORK_DATA_TYPE.DATA_ERROR}
            backgroundColorWhite={hasLiveForSageShop}
            refreshCallBackFn={refreshFloorListDataFn ? refreshFloorListDataFn : null}
            btnLabel={refreshFloorListDataBtnLabel || ''}
          />
        </View>
      ) : null}
    </View>
  );
  updateShopDataFn: null,

package/dist/service/fetchGateway.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro';
  UUID,
  isJdApp,
  jdAppVersionStr,
  isIosDevice,
  isPc,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isJdAndHarmonyDevice,
  isNewHarmonyShop,
  passSmartCouponInfoFunctionIdList,
  needFixClientValueToHarmonyFunctionIdList,
  clientVersion: isJdApp && jdAppVersionStr !== '' ? jdAppVersionStr : '11.0.0',
  client: isJdApp ? (isIosDevice ? 'apple' : 'android') : isPc ? 'pc' : 'wh5',
  screen: `${Math.ceil(window.screen?.width * devicePixelRatio)}*${Math.ceil(
    window.screen?.height * devicePixelRatio,
  )}`,
  area: '1_72_2799_0',
  uuid: UUID,
  const { area, realTimeArea } = areaInfo || {};
  area && area !== '' && (clientParams.area = area);
  realTimeArea && realTimeArea !== '' && (clientParams['realTimeArea'] = realTimeArea);
  console.warn(
    'cone-render中对外暴露fetchGateway收到原生端获取传来的四级地址信息',
    areaInfo,
    '更新后的接口底层信息',
    clientParams,
  );
  const smartCouponInfo = await getSmartCouponInfo();
  if (smartCouponInfo) {
    requestParams.smartCouponInfo = smartCouponInfo;
  }
  functionId: string,
  body = {},
  options = {},
  requestOptions = {},
  const useBodyParams = { ...body };
  if (passSmartCouponInfoFunctionIdList.includes(functionId)) {
    await handleSmartCouponInfo(useBodyParams);
  }
  const params = Object.assign(
    {},
    {
      t: Date.now(),
      functionId,
      appid: 'shop_m_jd_com',
      body: JSON.stringify(useBodyParams),
    },
    clientParams,
    options,
    {
      area: clientParams.area,
      client: !isJdApp && options?.client ? options?.client : clientParams.client,
      clientVersion:
        !isJdApp && options?.clientVersion ? options?.clientVersion : clientParams.clientVersion,
    },
  );
  if (
    isJdAndHarmonyDevice &&
    (needFixClientValueToHarmonyFunctionIdList.includes(functionId) || isNewHarmonyShop)
  ) {
    params.client = 'harmony';
  } else {
  }
  console.warn(
    'fetchGateway url:' + api.apiFunc + ',functionId:' + params.functionId,
    '底层默认的clientParams',
    clientParams,
    '下发的options',
    options,
    '最后params',
    params,
  );
  return http.post(api.apiFunc, params, requestOptions);
+import Taro from '@tarojs/taro';
  UUID,
  isJdApp,
  jdAppVersionStr,
  isIosDevice,
  isPc,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isJdAndHarmonyDevice,
  isNewHarmonyShop,
  passSmartCouponInfoFunctionIdList,
  needFixClientValueToHarmonyFunctionIdList,
  clientVersion: isJdApp && jdAppVersionStr !== '' ? jdAppVersionStr : '11.0.0',
  client: isJdApp ? (isIosDevice ? 'apple' : 'android') : isPc ? 'pc' : 'wh5',
  screen: `${Math.ceil(window.screen?.width * devicePixelRatio)}*${Math.ceil(
    window.screen?.height * devicePixelRatio,
  )}`,
  area: '1_72_2799_0',
  uuid: UUID,
  const { area, realTimeArea } = areaInfo || {};
  area && area !== '' && (clientParams.area = area);
  realTimeArea && realTimeArea !== '' && (clientParams['realTimeArea'] = realTimeArea);
  console.warn(
    'cone-render中对外暴露fetchGateway收到原生端获取传来的四级地址信息',
    areaInfo,
    '更新后的接口底层信息',
    clientParams,
  );
  if (isH5 && (isJdAndIosDevice || isJdAndAndroidDevice)) {
    const smartCouponInfo = await getSmartCouponInfo();
    if (smartCouponInfo) {
      requestParams.smartCouponInfo = smartCouponInfo;
    }
  } else {
    console.warn('🚗 ~~ handleSmartCouponInfo ~~ 不支持的环境！');
  }
  functionId: string,
  body = {},
  options = {},
  requestOptions = {},
  const useBodyParams = { ...body };
  if (passSmartCouponInfoFunctionIdList.includes(functionId)) {
    await handleSmartCouponInfo(useBodyParams);
  }
  const params = Object.assign(
    {},
    {
      t: Date.now(),
      functionId,
      appid: 'shop_m_jd_com',
      body: JSON.stringify(useBodyParams),
    },
    clientParams,
    options,
    {
      area: clientParams.area,
      client: !isJdApp && options?.client ? options?.client : clientParams.client,
      clientVersion:
        !isJdApp && options?.clientVersion ? options?.clientVersion : clientParams.clientVersion,
    },
  );
  if (
    isJdAndHarmonyDevice &&
    (needFixClientValueToHarmonyFunctionIdList.includes(functionId) || isNewHarmonyShop)
  ) {
    params.client = 'harmony';
  } else {
  }
  console.warn(
    'fetchGateway url:' + api.apiFunc + ',functionId:' + params.functionId,
    '底层默认的clientParams',
    clientParams,
    '下发的options',
    options,
    '最后params',
    params,
  );
  return http.post(api.apiFunc, params, requestOptions);