@conecli/cone-render 0.10.1-shop-beta.24 → 0.10.1-shop-beta.26

package/dist/components/base/MobileCommonHeader/index.tsx

@@ -1 +1 @@
-import React, {useEffect, useRef} from 'react'
  const { title, openAppParams, style, hasCommonHeader = true, hasDownloadTips = true, headerParams } = props
  const headerRef:any = useRef(null)
  useEffect(() => {
    hasCommonHeader && initCommonHeader()
    hasDownloadTips && initDownloadAppLayerConfigData()
  }, [])
  const isScrolledToTop = () => {
    return window.scrollY !== undefined ? window.scrollY === 0 :
      document.documentElement.scrollTop === 0 || document.body.scrollTop === 0;
  }
  const scrollEventFunc = () => {
    if(!headerRef.current) return
    const stickyTop = headerRef.current?.getBoundingClientRect()?.top || 0;
    if(Math.trunc(stickyTop) <= 0 && !isScrolledToTop()) {
      console.log('scroll 添加class',Math.trunc(stickyTop), isScrolledToTop())
      headerRef.current.classList.add('d-mobile-header-sticky');
    }else {
      console.log('scroll 移除class',Math.trunc(stickyTop), isScrolledToTop())
      headerRef.current.classList.remove('d-mobile-header-sticky');
    }
  }
  useEffect(() => {
    Taro.eventCenter.on(TaroEventType.PAGE_SCROLL,() => {
      scrollEventFunc()
    })
  },[])
  const initCommonHeader = () => {
    if (window?.MCommonHeaderBottom) {
      const mchb = new MCommonHeaderBottom()
      const headerArg = {
        moduleName: 'shop',
        hrederId: 'm_common_header',
        title,
        stype: 1,
        onClickJdkey: function () {
          console.log('==>m_common_header jdkey click.')
        },
        ...headerParams
      }
      mchb.header(headerArg)
    }
  }
  const initDownloadAppLayerConfigData = () => {
    const getEle = document.getElementById('m_common_tip')
    getEle &&
      window.$ &&
      window.$.downloadAppLayerConfigData &&
      window.$.downloadAppLayerConfigData({
        tipId: 'm_common_tip',
        M_sourceFrom: 'jshop',
        bottom: 74,
        onClickTipX: () => {
          Taro.eventCenter.trigger(
            TaroEventType.DOWN_LOAD_APP_CLOSE_CHANGE,
            true,
          )
        },
        downloadAppPlugIn: {
          M_sourceFrom: 'jshop',
          openAppBtnId: 'download_openapp',
          downAppURl: '//conecli.com/downloadApp/download.html?channel=jd-m',
          inteneUrl: 'openapp.jdmobile://virtual?',
          inteneUrlParams: {
            category: 'jump',
            des: 'jshopMain',
            shopId: `${global.info.queryInfo.shopId || ''}`,
            venderId: `${global.info.queryInfo.venderId || ''}`,
            sourceType: global.info.queryInfo?.sourceType || 'M-H5',
            sourceValue: global.info.queryInfo?.sourceValue || 'Mshop',
            ...openAppParams,
          },
        },
      })
  }
  return !isWxMiniH5View && !isJdApp ? (
    <View
      className={mobileCommonHeaderStyle['d-mobile-header-layout']}
      style={style}
      ref={headerRef}
    >
      <View
        id="m_common_tip"
        className={mobileCommonHeaderStyle['d-mobile-common-tip']}
      />
      {hasCommonHeader && (
        <View
          id="m_common_header"
          className={mobileCommonHeaderStyle['d-mobile-common-header']}
        />
      )}
    </View>
  ) : null
  title: '店铺',
  openAppParams: {},
+import Taro from '@tarojs/taro'
  const { title, openAppParams, style, hasCommonHeader = true, hasDownloadTips = true, headerParams } = props
  const headerRef:any = useRef(null)
  useEffect(() => {
    hasCommonHeader && initCommonHeader()
    !isTjScence && hasDownloadTips && initDownloadAppLayerConfigData()
  }, [])
  const isScrolledToTop = () => {
    return window.scrollY !== undefined ? window.scrollY === 0 :
      document.documentElement.scrollTop === 0 || document.body.scrollTop === 0;
  }
  const scrollEventFunc = () => {
    if(!headerRef.current) return
    const stickyTop = headerRef.current?.getBoundingClientRect()?.top || 0;
    if(Math.trunc(stickyTop) <= 0 && !isScrolledToTop()) {
      console.log('scroll 添加class',Math.trunc(stickyTop), isScrolledToTop())
      headerRef.current.classList.add('d-mobile-header-sticky');
    }else {
      console.log('scroll 移除class',Math.trunc(stickyTop), isScrolledToTop())
      headerRef.current.classList.remove('d-mobile-header-sticky');
    }
  }
  useEffect(() => {
    Taro.eventCenter.on(TaroEventType.PAGE_SCROLL,() => {
      scrollEventFunc()
    })
  },[])
  const initCommonHeader = () => {
    if (window?.MCommonHeaderBottom) {
      const mchb = new MCommonHeaderBottom()
      const headerArg = {
        moduleName: 'shop',
        hrederId: 'm_common_header',
        title,
        stype: 1,
        onClickJdkey: function () {
          console.log('==>m_common_header jdkey click.')
        },
        ...headerParams
      }
      mchb.header(headerArg)
    }
  }
  const initDownloadAppLayerConfigData = () => {
    const getEle = document.getElementById('m_common_tip')
    getEle &&
      window.$ &&
      window.$.downloadAppLayerConfigData &&
      window.$.downloadAppLayerConfigData({
        tipId: 'm_common_tip',
        M_sourceFrom: 'jshop',
        bottom: 74,
        onClickTipX: () => {
          Taro.eventCenter.trigger(
            TaroEventType.DOWN_LOAD_APP_CLOSE_CHANGE,
            true,
          )
        },
        downloadAppPlugIn: {
          M_sourceFrom: 'jshop',
          openAppBtnId: 'download_openapp',
          downAppURl: '//conecli.com/downloadApp/download.html?channel=jd-m',
          inteneUrl: 'openapp.jdmobile://virtual?',
          inteneUrlParams: {
            category: 'jump',
            des: 'jshopMain',
            shopId: `${global.info.queryInfo.shopId || ''}`,
            venderId: `${global.info.queryInfo.venderId || ''}`,
            sourceType: global.info.queryInfo?.sourceType || 'M-H5',
            sourceValue: global.info.queryInfo?.sourceValue || 'Mshop',
            ...openAppParams,
          },
        },
      })
  }
  return !isWxMiniH5View && !isJdApp ? (
    <View
      className={mobileCommonHeaderStyle['d-mobile-header-layout']}
      style={style}
      ref={headerRef}
    >
      {hasDownloadTips && (
        <View
          id="m_common_tip"
          className={mobileCommonHeaderStyle['d-mobile-common-tip']}
        />
      )}
      {hasCommonHeader && (
        <View
          id="m_common_header"
          className={mobileCommonHeaderStyle['d-mobile-common-header']}
        />
      )}
    </View>
  ) : null
  title: '店铺',
  openAppParams: {},

package/dist/components/base/NetworkDataError/const.ts

@@ -1 +1 @@
-import { NETWORK_DATA_TYPE } from '../../../common/const';
  [NETWORK_DATA_TYPE.NO_NET_WORK]: global?.languageJsonData?.loseNetwork || '网络连接已断开',
  [NETWORK_DATA_TYPE.DATA_ERROR]:
    global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多',
  [NETWORK_DATA_TYPE.NO_DATA]: global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多', 
  [NETWORK_DATA_TYPE.RISK]: global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多',
  [NETWORK_DATA_TYPE.NO_NET_WORK]: global?.languageJsonData?.checkNetwork || '请检查您的网络设置',
  [NETWORK_DATA_TYPE.DATA_ERROR]:
    global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试',
  [NETWORK_DATA_TYPE.NO_DATA]: global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试',
  [NETWORK_DATA_TYPE.RISK]: `${
    global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试'
  }。`,
  NETWORK_DATA_TYPE.NO_NET_WORK,
  NETWORK_DATA_TYPE.DATA_ERROR,
  NETWORK_DATA_TYPE.NO_DATA,
  NETWORK_DATA_TYPE.RISK,
  PART: 'part', 
  FULL: 'full', 
  No_Data_Default_Tip: 'no-data-default-tip',
  No_Data_Tip_1: 'no-data-tip-1',
  No_Data_Tip_2: 'no-data-tip-2',
  No_Network_Err_Tip: 'no-network',
  No_Data_Bmall: 'no-data-bmall',
  OLD: 'old',
  NEW: 'new',
+import { NETWORK_DATA_TYPE } from '../../../common/const';
  [NETWORK_DATA_TYPE.NO_NET_WORK]: global?.languageJsonData?.loseNetwork || '网络连接已断开',
  [NETWORK_DATA_TYPE.DATA_ERROR]:
    global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多',
  [NETWORK_DATA_TYPE.NO_DATA]: global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多', 
  [NETWORK_DATA_TYPE.RISK]: global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多',
  [NETWORK_DATA_TYPE.NOT_LOGIN]: global?.languageJsonData?.notLogin || '登录后，购物更轻松~',
  [NETWORK_DATA_TYPE.NO_NET_WORK]: global?.languageJsonData?.checkNetwork || '请检查您的网络设置',
  [NETWORK_DATA_TYPE.DATA_ERROR]:
    global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试',
  [NETWORK_DATA_TYPE.NO_DATA]: global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试',
  [NETWORK_DATA_TYPE.RISK]: `${global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试'
    }。`,
  [NETWORK_DATA_TYPE.NOT_LOGIN]: '', 
  NETWORK_DATA_TYPE.NO_NET_WORK,
  NETWORK_DATA_TYPE.DATA_ERROR,
  NETWORK_DATA_TYPE.NO_DATA,
  NETWORK_DATA_TYPE.RISK,
  NETWORK_DATA_TYPE.NOT_LOGIN,
  PART: 'part', 
  FULL: 'full', 
  No_Data_Default_Tip: 'no-data-default-tip',
  No_Data_Tip_1: 'no-data-tip-1',
  No_Data_Tip_2: 'no-data-tip-2',
  No_Network_Err_Tip: 'no-network',
  No_Data_Bmall: 'no-data-bmall',
  OLD: 'old',
  NEW: 'new',

package/dist/components/base/NetworkDataError/index.module.scss

@@ -91,7 +91,7 @@
   .d-risk {
     background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/256437/5/21857/22576/67b438adFed8a2665/7df7277fec7e3e8e.png');
   }
-  .d-no-data {
+  .d-no-data, .d-no-login {
     background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/256437/5/21857/22576/67b438adFed8a2665/7df7277fec7e3e8e.png');
   }
   .d-no-data-tip-1 {

package/dist/components/base/Price/Double/index.module.scss

@@ -91,7 +91,7 @@
 }
 
 .priceDesc {
-  margin-left: 4px;
+  margin-left: 8px;
   font-family: PingFang SC;
   &.priceHiddenDesc {
     width: 0;

package/dist/components/base/ShopLeGaoTag/index.h5.tsx

@@ -1 +1 @@
-import React, { useMemo } from 'react';
  const getThisLeGaoTagKey = `${tagId}-${tagText}}`;
  const getLeGaoTagCacheNode = shopLeGaoTagNodeMap.get(getThisLeGaoTagKey) || false;
  return getLeGaoTagCacheNode
    ? getLeGaoTagCacheNode
    : useMemo(() => {
      const createCanVasTag = (
        <canvas-tag
          className={classNames(shopTagStyle['d-tag-item-canvas'])}
          tagId={tagId}
          text={tagText}
          appVersion={getJdAppVersionStr}
          lang={languageNowType}
        />
      );
      shopLeGaoTagNodeMap.set(getThisLeGaoTagKey, createCanVasTag);
      return createCanVasTag;
    }, [tagId, tagText]);
  const { tagInfoList = [], className, itemClassName, isSkuBaseTag = false, itemClickCallback } = props;
  const getTagInfoList = Array.isArray(tagInfoList) ? tagInfoList : [];
  const getTagInfoListNum = getTagInfoList.length;
  const isCallBackFn = typeof itemClickCallback === 'function';
  return getTagInfoListNum > 0 ? (
    <View className={classNames(shopTagStyle['d-shop-tag-list'],{
      [shopTagStyle['d-shop-sku-tag-list']]: isSkuBaseTag
    }, className)}>
      {}
      <View style={{ width: '1px', height: '100%' }} />
      {getTagInfoList.map((item, index) => {
        const { tagId, tabIconId, tagText, type, tabIconType, tabText } = item;
        const getTagId = tagId || tabIconId;
        const getTagType = type || tabIconType;
        const getTagText = tagText || tabText;
        return getTagId  ? (
          <View
            key={getTagId + getTagType + index}
            className={classNames(shopTagStyle['d-tag-item'], itemClassName)}
            onClick={isCallBackFn && itemClickCallback.bind(this, item, index)}
          >
            <LeGaoTagComponent tagId={getTagId} tagText={getTagText} />
          </View>
        ) : null;
      })}
    </View>
  ) : null;
+import React, { useEffect, useMemo, useState } from 'react';
  const getThisLeGaoTagKey = `${tagId}-${tagText}}`;
  const getLeGaoTagCacheNode = shopLeGaoTagNodeMap.get(getThisLeGaoTagKey) || false;
  return getLeGaoTagCacheNode
    ? getLeGaoTagCacheNode
    : useMemo(() => {
        const createCanVasTag = (
          <canvas-tag
            className={classNames(shopTagStyle['d-tag-item-canvas'])}
            tagId={tagId}
            text={tagText}
            appVersion={getJdAppVersionStr}
            lang={languageNowType}
          />
        );
        shopLeGaoTagNodeMap.set(getThisLeGaoTagKey, createCanVasTag);
        return createCanVasTag;
      }, [tagId, tagText]);
  const {
    tagInfoList = [],
    className,
    itemClassName,
    isSkuBaseTag = false,
    itemClickCallback,
  } = props;
  const getTagInfoList = Array.isArray(tagInfoList) ? tagInfoList : [];
  const getTagInfoListNum = getTagInfoList.length;
  const isCallBackFn = typeof itemClickCallback === 'function';
  const needAsyncLoad = useMemo(() => {
    if (window.CanvasTag) return false;
    const h5TagJs = taroJdBaseInfo.loadJsSdkList.find((e) => e.fileName === 'h5TagJs');
    return !!(h5TagJs && h5TagJs.initTriggerType === LoadJsInitTriggerType.NRXT_TICK);
  }, []);
  const [loadOver, setLoadOver] = useState(!needAsyncLoad);
  useEffect(() => {
    async function loadTagSdk() {
      try {
        await taroJdBaseInfo.loadH5tagReayPromise();
      } catch (error) {}
      setLoadOver(true);
    }
    needAsyncLoad && loadTagSdk();
  }, []);
  if (!loadOver) return null;
  return getTagInfoListNum > 0 ? (
    <View
      className={classNames(
        shopTagStyle['d-shop-tag-list'],
        {
          [shopTagStyle['d-shop-sku-tag-list']]: isSkuBaseTag,
        },
        className,
      )}
    >
      {}
      <View style={{ width: '1px', height: '100%' }} />
      {getTagInfoList.map((item, index) => {
        const { tagId, tabIconId, tagText, type, tabIconType, tabText } = item;
        const getTagId = tagId || tabIconId;
        const getTagType = type || tabIconType;
        const getTagText = tagText || tabText;
        return getTagId ? (
          <View
            key={getTagId + getTagType + index}
            className={classNames(shopTagStyle['d-tag-item'], itemClassName)}
            onClick={isCallBackFn && itemClickCallback.bind(this, item, index)}
          >
            <LeGaoTagComponent tagId={getTagId} tagText={getTagText} />
          </View>
        ) : null;
      })}
    </View>
  ) : null;

package/dist/components/floorItem.tsx

@@ -1 +1 @@
-import React, { memo, useMemo } from 'react';
  const {
    floorData,
    renderSourceType = BUSINESS_TYPE.ONLINE, 
    builtInComponents = {},
  } = props;
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE;
  const specificModuleFlag = ['mHeaderVideo'];
  const frontEndSpecificModuleFlag = ['header_mVideo'];
  const luxuryContainerPosition = 'luxuryFixed';
  const floorPosition = floorData?.floorPosition;
  let floorModuleType: any = floorData?.floorExtInfo?.moduleFlag;
  specificModuleFlag.includes(floorModuleType) &&
    floorPosition === luxuryContainerPosition &&
    (floorModuleType = frontEndSpecificModuleFlag);
  const FloorContentItem = (floorModuleType && builtInComponents[floorModuleType]) || null;
  const dataDefines = useMemo(() => {
    return getFloorDataToDataDefines(floorData);
  }, [floorData]);
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    );
  };
  if (
    floorModuleType &&
    (RemoteLoadFloorList.includes(floorModuleType) || floorData?.floorExtInfo?.floorLoadWay === 2)
  ) {
    return <RemoteFloorItem {...props} dataDefines={dataDefines}></RemoteFloorItem>;
  } else {
    return FloorContentItem ? (
      <ErrorBoundary {...props}>
        <FloorContentItem {...props} dataDefines={dataDefines} />
      </ErrorBoundary>
    ) : isDevMode ? (
      renderDecorateDefaultModule()
    ) : null;
  }
  switch (moduleId) {
    case 83158:
      return 'freeLayout';
    case 99654:
      return 'activeText';
    case 100382:
      return 'superGoods';
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null;
    }
    const moduleFlag = item.floorExtInfo.moduleFlag;
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId);
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag;
      }
    }
  });
  if (nextProps.source !== 'appView') return false;
  return (
    prevProps.floorData === nextProps.floorData &&
    prevProps.extendInfoData === nextProps.extendInfoData
  );
+import React, { memo, useMemo } from 'react';
  const {
    floorData,
    renderSourceType = BUSINESS_TYPE.ONLINE, 
    builtInComponents = {},
  } = props;
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE;
  const specificModuleFlag = ['mHeaderVideo'];
  const frontEndSpecificModuleFlag = ['header_mVideo'];
  const luxuryContainerPosition = 'luxuryFixed';
  const floorPosition = floorData?.floorPosition;
  let floorModuleType: any = floorData?.floorExtInfo?.moduleFlag;
  specificModuleFlag.includes(floorModuleType) &&
    floorPosition === luxuryContainerPosition &&
    (floorModuleType = frontEndSpecificModuleFlag);
  const FloorContentItem = (floorModuleType && builtInComponents[floorModuleType]) || null;
  const dataDefines = useMemo(() => {
    return getFloorDataToDataDefines(floorData);
  }, [floorData]);
  const isOfficlialMemberFloorPreview =
    getPageType() === PageType.M_PREVIEW && memberDefaultTypeList.includes(floorModuleType);
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    );
  };
  
  const renderMemberFixedFloor = (floorData) => {
    return (
      <View>
        {floorData?.previewUri ? (
          <img
            src={floorData.previewUri}
            style={{ width: '100%', display: 'block' }}
            alt="会员楼层占位图"
          />
        ) : null}
      </View>
    );
  };
  if (
    floorModuleType &&
    (RemoteLoadFloorList.includes(floorModuleType) || floorData?.floorExtInfo?.floorLoadWay === 2)
  ) {
    return <RemoteFloorItem {...props} dataDefines={dataDefines}></RemoteFloorItem>;
  } else {
    return isOfficlialMemberFloorPreview ? (
      renderMemberFixedFloor(floorData)
    ) : FloorContentItem ? (
      <ErrorBoundary {...props}>
        <FloorContentItem {...props} dataDefines={dataDefines} />
      </ErrorBoundary>
    ) : isDevMode ? (
      renderDecorateDefaultModule()
    ) : null;
  }
  switch (moduleId) {
    case 83158:
      return 'freeLayout';
    case 99654:
      return 'activeText';
    case 100382:
      return 'superGoods';
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null;
    }
    const moduleFlag = item.floorExtInfo.moduleFlag;
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId);
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag;
      }
    }
  });
  if (nextProps.source !== 'appView') return false;
  return (
    prevProps.floorData === nextProps.floorData &&
    prevProps.extendInfoData === nextProps.extendInfoData
  );

package/dist/config/env.ts

@@ -1 +1 @@
-const buildCopyType = process.env.BUILD_COPY_TYPE || 'none'
  isPublishToWxapp || (!isBetaServer && !isDev)
    ? 'https:'
    : isH5
      ? ''
      : 'http:'
+const buildCopyType = process.env.BUILD_COPY_TYPE || 'none';
  isPublishToWxapp || (!isBetaServer && !isDev) ? 'https:' : isH5 ? '' : 'http:';