@conecli/cone-render 0.9.1-shop2.16 → 0.9.1-shop2.18

package/dist/modules/ContainerFloorList/index.h5.module.scss

@@ -52,7 +52,7 @@
       width: 100%;
       z-index: 999;
       background: black;
-	    margin-bottom: 16px;
+      margin-bottom: 16px;
     }
     .d-container-list-no-data {
         min-height: 400px;

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

@@ -1 +1 @@
-import React from 'react'
  isJdApp,
  isChartH5,
  NETWORK_DATA_TYPE,
  M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
  APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
  containerFloorListData: ComponentInterFace.ContainerItemData[]
  className?: string
  containerItemClass?: object
  style?: object
  hasGoodsFeeds?: boolean
  builtInComponents?: Object
  loadingEndComponentFn?: Function
  sectionType?: string
  updateShopFloorDataFn?: Function
  updateContainerFloorListDataFn?: Function
  refreshFloorListDataFn?: Function
  refreshFloorListDataBtnLabel?: string
  customErrorIsvFloorModule?: React.ReactElement
  componentExtend?: React.ReactElement
  const { windowHeight } = taroJdBaseInfo.info.sysInfo
  const {
    className,
    style,
    containerItemClass = null,
    containerFloorListData,
    builtInComponents,
    loadingEndComponentFn,
    sectionType,
    updateShopFloorDataFn,
    updateContainerFloorListDataFn,
    refreshFloorListDataFn,
    refreshFloorListDataBtnLabel,
    customErrorIsvFloorModule,
  } = props
  
  const renderFloorItem = (
    item,
    floorItem,
    floorIndex,
    containerLayoutLeftRightMargin,
    lazyLoadState = false,
  ) => {
    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={{
          borderRadius: `${item?.borderRadius || 0}px`,
        }}
      >
        {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
          floorIndex={floorIndex}
          floorData={floorItem}
          layoutLeftRightMargin={containerLayoutLeftRightMargin}
          containerBorderRadius={item?.borderRadius || 0}
          updateShopFloorDataFn={updateShopFloorDataFn}
          loadingEndComponentFn={loadingEndComponentFn}
          key={floorItem.uid}
          builtInComponents={builtInComponents}
          updateContainerFloorListDataFn={updateContainerFloorListDataFn}
          customErrorIsvFloorModule={customErrorIsvFloorModule}
        />
      </View>
    )
  }
  
  const getFloorSetHeight = (item) => {
    const getHeight = item?.floorExtInfo?.floorHeight
      ? Number(item?.floorExtInfo?.floorHeight)
      : 200
    return getHeight > 0 ? getHeight : 200
  }
  return (
    <View
      className={classNames(
        className,
        shopContainerListStyle['d-shop-container-list'],
      )}
      style={style}
    >
      <View id='J_shopContainerFloorList'>
        {containerFloorListData.length > 0 ? (
          containerFloorListData.map((item, index) => {
            const containerLayoutLeftRightMargin =
              (item.marginLeft || 0) + (item.marginRight || 0)
            const getContainerId = `J_container_${item.containerId}`
            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}
                  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,
                    borderRadius: item.borderRadius
                      ? `${item.borderRadius}px`
                      : 0,
                  }}
                >
                  {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,
                            )}
                          </LazyLayoutLoad>
                        ) : (
                          renderFloorItem(
                            item,
                            floorItem,
                            floorIndex,
                            containerLayoutLeftRightMargin,
                          )
                        )
                      },
                    )}
                </View>
              </React.Fragment>
            )
          })
        ) : (
          <View
            className={
              shopContainerListStyle['d-container-list-no-data']
            }
            style={{
              height: `${
                windowHeight -
                (isJdApp
                  ? APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT
                  : M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT)
              }px`,
            }}
          >
            <NetworkDataError
              netWorkShowType={NetWorkShowType.PART}
              netWorkDataType={NETWORK_DATA_TYPE.DATA_ERROR}
              refreshCallBackFn={refreshFloorListDataFn ? refreshFloorListDataFn : null}
              btnLabel={refreshFloorListDataBtnLabel || ""}
            />
          </View>
        )}
      </View>
    </View>
  )
  updateShopDataFn: null,
+import React from 'react'
  isJdApp,
  isChartH5,
  NETWORK_DATA_TYPE,
  M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
  APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
  containerFloorListData: ComponentInterFace.ContainerItemData[]
  className?: string
  containerItemClass?: object
  style?: object
  hasGoodsFeeds?: boolean
  builtInComponents?: Object
  loadingEndComponentFn?: Function
  sectionType?: string
  updateShopFloorDataFn?: Function
  updateContainerFloorListDataFn?: Function
  refreshFloorListDataFn?: Function
  refreshFloorListDataBtnLabel?: string
  customErrorIsvFloorModule?: React.ReactElement
  componentExtend?: React.ReactElement
  luxuryFixedIndex ?: number
  const { windowHeight } = taroJdBaseInfo.info.sysInfo
  const {
    className,
    style,
    containerItemClass = null,
    containerFloorListData,
    builtInComponents,
    loadingEndComponentFn,
    sectionType,
    updateShopFloorDataFn,
    updateContainerFloorListDataFn,
    refreshFloorListDataFn,
    refreshFloorListDataBtnLabel,
    customErrorIsvFloorModule,
    luxuryFixedIndex = -1
  } = props
  
  const renderFloorItem = (
    item,
    floorItem,
    floorIndex,
    containerLayoutLeftRightMargin,
    lazyLoadState = false,
    index
  ) => {
    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={{
          borderRadius: `${item?.borderRadius || 0}px`,
        }}
      >
        {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
          floorIndex={floorIndex}
          floorData={floorItem}
          layoutLeftRightMargin={containerLayoutLeftRightMargin}
          containerBorderRadius={item?.borderRadius || 0}
          updateShopFloorDataFn={updateShopFloorDataFn}
          loadingEndComponentFn={loadingEndComponentFn}
          key={floorItem.uid}
          builtInComponents={builtInComponents}
          updateContainerFloorListDataFn={updateContainerFloorListDataFn}
          customErrorIsvFloorModule={customErrorIsvFloorModule}
        />
        {index === luxuryFixedIndex ? props.children : null}
      </View>
    )
  }
  
  const getFloorSetHeight = (item) => {
    const getHeight = item?.floorExtInfo?.floorHeight
      ? Number(item?.floorExtInfo?.floorHeight)
      : 200
    return getHeight > 0 ? getHeight : 200
  }
  return (
    <View
      className={classNames(
        className,
        shopContainerListStyle['d-shop-container-list'],
      )}
      style={style}
    >
      <View id='J_shopContainerFloorList'>
        {containerFloorListData.length > 0 ? (
          containerFloorListData.map((item, index) => {
            const containerLayoutLeftRightMargin =
              (item.marginLeft || 0) + (item.marginRight || 0)
            const getContainerId = `J_container_${item.containerId}`
            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}
                  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,
                    borderRadius: item.borderRadius
                      ? `${item.borderRadius}px`
                      : 0,
                  }}
                >
                  {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
                            )}
                          </LazyLayoutLoad>
                        ) : (
                          renderFloorItem(
                            item,
                            floorItem,
                            floorIndex,
                            containerLayoutLeftRightMargin,
                            false,
                            index
                          )
                        )
                      },
                    )}
                </View>
              </React.Fragment>
            )
          })
        ) : (
          <View
            className={
              shopContainerListStyle['d-container-list-no-data']
            }
            style={{
              height: `${
                windowHeight -
                (isJdApp
                  ? APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT
                  : M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT)
              }px`,
            }}
          >
            <NetworkDataError
              netWorkShowType={NetWorkShowType.PART}
              netWorkDataType={NETWORK_DATA_TYPE.DATA_ERROR}
              refreshCallBackFn={refreshFloorListDataFn ? refreshFloorListDataFn : null}
              btnLabel={refreshFloorListDataBtnLabel || ""}
            />
          </View>
        )}
      </View>
    </View>
  )
  updateShopDataFn: null,

package/dist/open/api/device.ts

@@ -1 +1 @@
-import global from '../../common'
  return global.info.sysInfo.screenWidth
  return global.info.sysInfo.screenHeight
  return global.info.sysInfo.headerHeight
  return global.info.sysInfo.tabBarHeight
  return global.info.sysInfo.safeContentHeight
  const result =
    global.info.sysInfo.screenHeight - global.info.sysInfo.jdBottomBarHeight + 8
  console.log('result:', result)
  return result
  getScreenWidth,
  getScreenHeight,
  getHeaderHeight,
  getFooterHeight,
  getSafeContentHeight,
  getFullscreenCropHeight,
  TaroEventType,
  SHOP_NAV_BAR_HEIGHT,
+import global from '../../common'
  return global.info.sysInfo.screenWidth
  return global.info.sysInfo.screenHeight
  return global.info.sysInfo.headerHeight
  return global.info.sysInfo.tabBarHeight
  return global.info.sysInfo.safeContentHeight
  const result =
    global.info.sysInfo.screenHeight - global.info.sysInfo.jdBottomBarHeight + 8
  return result
  getScreenWidth,
  getScreenHeight,
  getHeaderHeight,
  getFooterHeight,
  getSafeContentHeight,
  getFullscreenCropHeight,
  TaroEventType,
  SHOP_NAV_BAR_HEIGHT,

package/dist/sass/base.scss

@@ -31,6 +31,39 @@
 	src: url('https://wq.360buyimg.com/data/ppms/others/JDZhengHei_01_Bold.ttf')
 		format('truetype');
 }
+@font-face {
+  font-family: 'JDZhengHeiV2-Bold';
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Bold.otf')
+  format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'JDZhengHeiV2-Light';
+  //src: url(https://storage.360buyimg.com/jshopstorage/JDZhengHT-Light.ttf) format('truetype');
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Light.otf')
+  format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'JDZhengHeiV2-Regular';
+  //src: url(https://storage.360buyimg.com/jshopstorage/JDZhengHT-Regular.ttf) format('truetype');
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Regular.otf ')
+  format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'JDZhengHeiV2-Heavy';
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Heavy.otf')
+  format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
 
 .font-jdzht {
 	font-family: 'JDZhengHT-Regular';
@@ -47,7 +80,19 @@
 .font-jdzht-light {
 	font-family: 'JDZhengHT-Light';
 }
+.font-jdzht-v2 {
+  font-family: 'JDZhengHeiV2-Regular';
+}
+.font-jdzht-v2-bold {
+  font-family: 'JDZhengHeiV2-Bold';
+}
+.font-jdzht-v2-heavy {
+  font-family: 'JDZhengHeiV2-Heavy';
+}
 
+.font-jdzht-v2-light {
+  font-family: 'JDZhengHeiV2-Light';
+}
 
 .border-box {
 	box-sizing: border-box;