@conecli/cone-render 0.9.1-shop2.7 → 0.9.1-shop2.8

package/dist/utils/connectNativeJsBridge.weapp.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  console.log('PageScrollEnd fire')
  Taro.eventCenter.trigger(TaroEventType.PAGE_SCROLL_END, options)
  Taro.eventCenter.trigger(TaroEventType.PAGE_INIT_EXPOSURE, options)
+import Taro from '@tarojs/taro'
  console.log('PageScrollEnd fire')
  Taro.eventCenter.trigger(TaroEventType.PAGE_SCROLL_END, options)
  Taro.eventCenter.trigger(TaroEventType.PAGE_INIT_EXPOSURE, options)

package/dist/utils/h5Utils.ts

@@ -1 +1 @@
-import {
  isApp,
  isIOS,
  getAppVersion,
  version,
  getUUID,
  getUrlQuery,
  assign,
  isString,
  isObject,
  serialize,
  isAndroid,
  versionCompare,
    CHANNEL_TYPE,
    JDShopViewBusinessPathType,
    JDShopViewBusinessPathList,
    SECTION_HOME_TAB_NAME_TYPE,
    SECTION_HOME_TAB_TYPE,
    parseQueryUrlString(window?.location?.href ?? ''),
    try {
        return JSON.parse(decodeURIComponent(getUrlQuery('cookie')))
    } catch (e) {
        return {}
    }
    isWxMiniH5View && urlCookie['wxapp_type'] == '1' 
    if (isJdApp) {
        isIosDevice
            ? e && e.stopPropagation()
            : androidDeviceStopNativeScrollEvent(state)
    }
    isJdApp &&
        isAndroidDevice &&
        window?.JdAndroid &&
        window?.JdAndroid.requestEvent(state)
    if (isH5AndJdShopView) {
        return (
            CHANNEL_TYPE[currentChannel] ||
            CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
        )
    }
    return null
    isH5 && ['/app/home', '/app/classify', '/member/shopcard','/favorite/list'].includes(urlPathname)
  isH5 && isJdApp && !['/app/home'].includes(urlPathname)
  return isJdApp ? versionCompare(nowVersion || jdAppVersionStr,compareVersion) >= 0 : -2
  const getCustomObj = {
    type: 1, 
    code: 'all', 
    cost1: 1, 
    ...customObj
  }
  try {
    window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
  } catch (e) {}
  if(isJdAndAndroidDevice && typeof displayObj === 'object'){
    const deviceRatio = window?.devicePixelRatio
    Object.keys(displayObj).forEach(key => {
      if(key === 'nativeHeaderHeight'){
        displayObj[key] = Math.ceil(displayObj[key] / (deviceRatio * deviceRatio) - 2) 
      }else {
        displayObj[key] = Math.ceil(displayObj[key] / deviceRatio)
      }
    })
  }
  return displayObj
+import {
  isApp,
  isIOS,
  getAppVersion,
  version,
  getUUID,
  getUrlQuery,
  assign,
  isString,
  isObject,
  serialize,
  isAndroid,
  versionCompare,
    CHANNEL_TYPE,
    JDShopViewBusinessPathType,
    JDShopViewBusinessPathList,
    SECTION_HOME_TAB_NAME_TYPE,
    SECTION_HOME_TAB_TYPE,
    parseQueryUrlString(window?.location?.href ?? ''),
    try {
        return JSON.parse(decodeURIComponent(getUrlQuery('cookie')))
    } catch (e) {
        return {}
    }
    isWxMiniH5View && urlCookie['wxapp_type'] == '1' 
    if (isJdApp) {
        isIosDevice
            ? e && e.stopPropagation()
            : androidDeviceStopNativeScrollEvent(state)
    }
    isJdApp &&
        isAndroidDevice &&
        window?.JdAndroid &&
        window?.JdAndroid.requestEvent(state)
    if (isH5AndJdShopView) {
        return (
            CHANNEL_TYPE[currentChannel] ||
            CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
        )
    }
    return null
  isH5 && isJdApp && ['/app/home', '/app/classify', '/member/shopcard','/favorite/list', '/favorite/home'].includes(urlPathname)
  isH5 && isJdApp && !['/app/home'].includes(urlPathname)
  return isJdApp ? versionCompare(nowVersion, compareVersion) : -2
  const getCustomObj = {
    type: 1, 
    code: 'all', 
    cost1: 1, 
    ...customObj
  }
  try {
    window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
  } catch (e) {}
  if(isJdAndAndroidDevice && typeof displayObj === 'object'){
    const deviceRatio = window?.devicePixelRatio
    Object.keys(displayObj).forEach(key => {
      if(key === 'nativeHeaderHeight'){
        displayObj[key] = Math.ceil(displayObj[key] / (deviceRatio * deviceRatio) - 2) 
      }else {
        displayObj[key] = Math.ceil(displayObj[key] / deviceRatio)
      }
    })
  }
  return displayObj

package/dist/utils/index.h5.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  UtilsInterFace
  nativePageShowToast,
  ToastAndroidType,
  ToastIosType,
  getAppChannelType,
  isAndroidDevice,
  isH5AndJdShopView,
  isChartH5,
  isH5AndJdShopViewNativeScroll,
  isIosDevice,
  isJdAndAndroidDevice,
  isJdAndIosDevice,
  isJdApp,
  isWxApp,
  isWxMiniH5View,
  isJdAndHarmonyDevice,
  isH5AndJingGouMini,
  urlCookie,
  sgmCustomReport,
  isMemberPage,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
  isAppClassifyPage,
  isPc,
  ipLoc_djd,
  jdAppVersionCompare,
  dealNativePixelToCssPixel,
  isAppStowShop,
  addHttps,
  clearTaroStorageKey,
  countStringify,
  dateFormat,
  dealAddress,
  dealShopContentData as originDealShopContentData,
  debounce,
  filterUrlQueryData,
  formatTabActiveMenuType,
  getQualityImage,
  getTaroStorageKeyValue,
  getWxAppCookieStr,
  isH5,
  isJdMin,
  isWxMin,
  isWxMinAndWxapp,
  lodashThrottle,
  objectToUrlEncode,
  parseQueryUrlString,
  removeTaroStorageKey,
  setLowSmallPicUrl,
  setTaroStorage,
  showFailToast,
  showNormalToast,
  showSuccessToast,
  sliceArrToChunkList,
  throttle,
  dealJdOpenAppData,
  BUILD_TYPE
  getFloorDataToDataDefines
  num,
  widthSize = 375,
  layoutWidth,
  const getNum = Number(num)
  let _changeLayoutWidth = layoutWidth
  if (!_changeLayoutWidth) {
    _changeLayoutWidth = _ShopSystemInfo && _ShopSystemInfo?.windowWidth ? _ShopSystemInfo.windowWidth : Taro.getSystemInfoSync()?.windowWidth
  }
  return Math.round((getNum / widthSize) * _changeLayoutWidth)
  const getRootFontSize = 40 * (systemInfo?.windowWidth ?? _ShopSystemInfo.windowWidth) / 750
  const getRealRootFontSize = getRootFontSize > 40 ? 40 : getRootFontSize < 20 ? 20 : getRootFontSize
  return (
    Math.ceil(((parseInt(String(changeSize), 10) / 40) * 750) / designWidth * getRealRootFontSize)
  )
  console.log('获取系统宽度systemInfo?.windowWidth', systemInfo?.windowWidth,
    'taroToTransformRoutimePXNumber(changeWidth)', taroToTransformRoutimePXNumber(changeWidth, 750,
    systemInfo))
  return buildType === BUILD_TYPE.CLASSIFY && systemInfo?.windowWidth ?systemInfo ?.windowWidth -
  taroToTransformRoutimePXNumber(changeWidth, 750, systemInfo) : systemInfo ?.windowWidth ?? 0
  const systemInfo = Taro.getSystemInfoSync()
  if (params && params?.pageWidth && params?.pageHeight) {
    systemInfo.windowWidth = params?.pageWidth
    systemInfo.windowHeight = params?.pageHeight
  }
  systemInfo['containerWidth'] = getContainerWidth(buildType, systemInfo)
  console.warn('====获取系统信息=====', systemInfo)
  return systemInfo
  const getSystemInfo = getSystemAndContainerWidthInfo(params) || {
    windowWidth: window.innerWidth,
    containerWidth: getContainerWidth(buildType, {
      windowWidth: window.innerWidth,
    }),
    screenWidth: window.innerWidth,
    platform: '',
    model: '',
    system: '',
  }
  if (isJdApp && isAndroidDevice && getSystemInfo.windowWidth <= 0) {
    getSystemInfo.windowWidth = getSystemInfo.screenWidth
    getSystemInfo['containerWidth'] = getContainerWidth(buildType, getSystemInfo)
  }
  return getSystemInfo
  const params = Object.assign({}, {
      title: '',
      duration: 1500,
    },
    options,
  )
  params.duration = params.duration / 1000
  if (isJdApp && isH5AndJdShopView) {
    const showSuccessType = isIosDevice ?
      ToastIosType.SUCCESS :
      ToastAndroidType.SUCCESS
    const duration = isAndroidDevice ? 0 : params.duration
    nativePageShowToast(options.title, showSuccessType, duration)
    console.log('执行原生toast success')
  } else {
    showSuccessToast(options)
  }
  const params = Object.assign({}, {
      title: '',
      duration: 1500,
    },
    options,
  )
  params.duration = params.duration / 1000
  console.log(`isJdApp${isJdApp}`)
  if (isJdApp && isH5AndJdShopView) {
    const showSuccessType = isIosDevice ?
      ToastIosType.FAIL :
      ToastAndroidType.FAIL
    const duration = isAndroidDevice ? 0 : params.duration
    nativePageShowToast(options.title, showSuccessType, duration)
    console.log('执行原生toast fail')
  } else {
    console.log('执行H5 toast fail')
    showFailToast(options)
  }
  const params = Object.assign({}, {
      title: '',
      duration: 1500,
    },
    options,
  )
  params.duration = params.duration / 1000
  if (isJdApp) {
    const showSuccessType = isIosDevice ?
      ToastIosType.NORMAL :
      ToastAndroidType.NORMAL
    const duration = isAndroidDevice ? 0 : params.duration
    nativePageShowToast(options.title, showSuccessType, duration)
  } else {
    showNormalToast(options)
  }
  const createLoadingEle = document.createElement('div')
  createLoadingEle.id = 'J_shopLoading'
  createLoadingEle.className = `d-shop-loading flexible-center-box ${customClassName}`
  createLoadingEle.innerHTML =
    `<div class='d-loading-content'>
                                    <span class='d-shop-loading-icon'></span>
                                    <p class='d-shop-text'>${text}</p>
                                  </div>`
  const getEle = document.body ? document.body : document.getElementsByTagName('body')[0]
  getEle.appendChild(createLoadingEle)
  const getEle = document.getElementById('J_shopLoading')
  getEle && getEle.remove()
  const systemInfo: UtilsInterFace.taroGetSystemInfoSyncRes = getReviseSystemInfo(params)
  if (!systemInfo.system && window) {
    systemInfo.system = window.navigator.userAgent
    systemInfo.isChrome = !!systemInfo?.system.match(/chrome/i)
  }
  const isIOS = !!systemInfo?.system.match(/ios/i)
  const isAndroid = !!systemInfo?.system.match(/android/i)
  systemInfo.navBarHeight = 0
  systemInfo.statusBarHeight = 0
  systemInfo.capsulePosition = null
  systemInfo.isIOS = isIOS 
  systemInfo.isAndroid = isAndroid 
  _ShopSystemInfo = systemInfo
  return systemInfo
  return originDealShopContentData(pageData, sgmCustomReport, isvdev)
  isJdApp,
  isWxApp,
  isIosDevice,
  isAndroidDevice,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isJdAndHarmonyDevice,
  isWxMin,
  isWxMinAndWxapp,
  isJdMin,
  isH5,
  isH5AndJdShopView,
  isChartH5,
  isH5AndJdShopViewNativeScroll,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
  isH5AndJingGouMini,
  isWxMiniH5View,
  urlCookie,
  sliceArrToChunkList,
  dealAddress,
  objectToUrlEncode,
  parseQueryUrlString,
  setLowSmallPicUrl,
  setTaroStorage,
  getTaroStorageKeyValue,
  removeTaroStorageKey,
  clearTaroStorageKey,
  getQualityImage,
  countStringify,
  getWxAppCookieStr,
  getSystemInfos,
  pxTransformFromData,
  dealShopContentDataAndReport as dealShopContentData,
  dateFormat,
  throttle,
  lodashThrottle,
  debounce,
  addHttps,
  commonShowSuccessToast as showSuccessToast,
  commonShowFailToast as showFailToast,
  commonShowNormalToast as showNormalToast,
  showShopLoading,
  hideShopLoading,
  getAppChannelType,
  formatTabActiveMenuType,
  filterUrlQueryData,
  sgmCustomReport,
  isMemberPage,
  memberFormatUtils,
  getFloorDataToDataDefines,
  isAppClassifyPage,
  isPc,
  ipLoc_djd,
  jdAppVersionCompare,
  dealJdOpenAppData,
  dealNativePixelToCssPixel,
  isAppStowShop,
+import Taro from '@tarojs/taro'
  UtilsInterFace
  nativePageShowToast,
  ToastAndroidType,
  ToastIosType,
  getAppChannelType,
  isAndroidDevice,
  isH5AndJdShopView,
  isChartH5,
  isH5AndJdShopViewNativeScroll,
  isIosDevice,
  isJdAndAndroidDevice,
  isJdAndIosDevice,
  isJdApp,
  isWxApp,
  isWxMiniH5View,
  isJdAndHarmonyDevice,
  isH5AndJingGouMini,
  urlCookie,
  sgmCustomReport,
  isMemberPage,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
  isAppClassifyPage,
  isPc,
  ipLoc_djd,
  jdAppVersionCompare,
  dealNativePixelToCssPixel,
  isAppStowShop,
  isJdAndroidX5Core,
  addHttps,
  clearTaroStorageKey,
  countStringify,
  dateFormat,
  dealAddress,
  dealShopContentData as originDealShopContentData,
  debounce,
  filterUrlQueryData,
  formatTabActiveMenuType,
  getQualityImage,
  getTaroStorageKeyValue,
  getWxAppCookieStr,
  isH5,
  isJdMin,
  isWxMin,
  isWxMinAndWxapp,
  lodashThrottle,
  objectToUrlEncode,
  parseQueryUrlString,
  removeTaroStorageKey,
  setLowSmallPicUrl,
  setTaroStorage,
  showFailToast,
  showNormalToast,
  showSuccessToast,
  sliceArrToChunkList,
  throttle,
  isOpenJdAppUrl,
  jdOpenAppParams,
  createJdOpenAppUrl,
  isEmpty,
  getJdAppReportPageSource,
  dealJdOpenAppData,
  const getNum = Number(num)
  let _changeLayoutWidth = layoutWidth
  if (!_changeLayoutWidth) {
    _changeLayoutWidth =
      _ShopSystemInfo && _ShopSystemInfo?.windowWidth
        ? _ShopSystemInfo.windowWidth
        : Taro.getSystemInfoSync()?.windowWidth
  }
  return Math.round((getNum / widthSize) * _changeLayoutWidth)
  changeSize,
  designWidth = 750,
  systemInfo,
  const getRootFontSize =
    (40 * (systemInfo?.windowWidth ?? _ShopSystemInfo.windowWidth)) / 750
  const getRealRootFontSize =
    getRootFontSize > 40 ? 40 : getRootFontSize < 20 ? 20 : getRootFontSize
  return Math.ceil(
    (((parseInt(String(changeSize), 10) / 40) * 750) / designWidth) *
      getRealRootFontSize,
  )
  console.log(
    '获取系统宽度systemInfo?.windowWidth',
    systemInfo?.windowWidth,
    'taroToTransformRoutimePXNumber(changeWidth)',
    taroToTransformRoutimePXNumber(changeWidth, 750, systemInfo),
  )
  return buildType === BUILD_TYPE.CLASSIFY && systemInfo?.windowWidth
    ? systemInfo?.windowWidth -
        taroToTransformRoutimePXNumber(changeWidth, 750, systemInfo)
    : systemInfo?.windowWidth ?? 0
  const systemInfo = Taro.getSystemInfoSync()
  if (params && params?.pageWidth && params?.pageHeight) {
    systemInfo.windowWidth = params?.pageWidth
    systemInfo.windowHeight = params?.pageHeight
  }
  systemInfo['containerWidth'] = getContainerWidth(buildType, systemInfo)
  console.warn('====获取系统信息=====', systemInfo)
  return systemInfo
  const getSystemInfo = getSystemAndContainerWidthInfo(params) || {
    windowWidth: window.innerWidth,
    containerWidth: getContainerWidth(buildType, {
      windowWidth: window.innerWidth,
    }),
    screenWidth: window.innerWidth,
    platform: '',
    model: '',
    system: '',
  }
  if (isJdApp && isAndroidDevice && getSystemInfo.windowWidth <= 0) {
    getSystemInfo.windowWidth = getSystemInfo.screenWidth
    getSystemInfo['containerWidth'] = getContainerWidth(
      buildType,
      getSystemInfo,
    )
  }
  return getSystemInfo
  const params = Object.assign(
    {},
    {
      title: '',
      duration: 1500,
    },
    options,
  )
  params.duration = params.duration / 1000
  if (isJdApp) {
    const showSuccessType = isIosDevice
      ? ToastIosType.SUCCESS
      : ToastAndroidType.SUCCESS
    const duration = isAndroidDevice ? 0 : params.duration
    nativePageShowToast(options.title, showSuccessType, duration)
    console.log('执行原生toast success')
  } else {
    showSuccessToast(options)
  }
  const params = Object.assign(
    {},
    {
      title: '',
      duration: 1500,
    },
    options,
  )
  params.duration = params.duration / 1000
  if (isJdApp) {
    const showSuccessType = isIosDevice
      ? ToastIosType.FAIL
      : ToastAndroidType.FAIL
    const duration = isAndroidDevice ? 0 : params.duration
    nativePageShowToast(options.title, showSuccessType, duration)
    console.log('执行原生toast fail')
  } else {
    console.log('执行H5 toast fail')
    showFailToast(options)
  }
  const params = Object.assign(
    {},
    {
      title: '',
      duration: 1500,
    },
    options,
  )
  params.duration = params.duration / 1000
  if (isJdApp) {
    const showSuccessType = isIosDevice ?
      ToastIosType.NORMAL :
      ToastAndroidType.NORMAL
    const duration = isAndroidDevice ? 0 : params.duration
    nativePageShowToast(options.title, showSuccessType, duration)
  } else {
    showNormalToast(options)
  }
  const createLoadingEle = document.createElement('div')
  createLoadingEle.id = 'J_shopLoading'
  createLoadingEle.className = `d-shop-loading flexible-center-box ${customClassName}`
  createLoadingEle.innerHTML =
    `<div class='d-loading-content'>
                                    <span class='d-shop-loading-icon'></span>
                                    <p class='d-shop-text'>${text}</p>
                                  </div>`
  const getEle = document.body
    ? document.body
    : document.getElementsByTagName('body')[0]
  getEle.appendChild(createLoadingEle)
  const getEle = document.getElementById('J_shopLoading')
  getEle && getEle.remove()
  const systemInfo: UtilsInterFace.taroGetSystemInfoSyncRes = getReviseSystemInfo(
    params,
  )
  if (!systemInfo.system && window) {
    systemInfo.system = window.navigator.userAgent
    systemInfo.isChrome = !!systemInfo?.system.match(/chrome/i)
  }
  const isIOS = !!systemInfo?.system.match(/ios/i)
  const isAndroid = !!systemInfo?.system.match(/android/i)
  systemInfo.navBarHeight = 0
  systemInfo.statusBarHeight = 0
  systemInfo.capsulePosition = null
  systemInfo.isIOS = isIOS 
  systemInfo.isAndroid = isAndroid 
  _ShopSystemInfo = systemInfo
  return systemInfo
  return originDealShopContentData(pageData, sgmCustomReport, isvdev)
  isJdApp,
  isWxApp,
  isIosDevice,
  isAndroidDevice,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isJdAndHarmonyDevice,
  isJdAndroidX5Core,
  isWxMin,
  isWxMinAndWxapp,
  isJdMin,
  isH5,
  isH5AndJdShopView,
  isChartH5,
  isH5AndJdShopViewNativeScroll,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
  isH5AndJingGouMini,
  isWxMiniH5View,
  urlCookie,
  sliceArrToChunkList,
  dealAddress,
  objectToUrlEncode,
  parseQueryUrlString,
  setLowSmallPicUrl,
  setTaroStorage,
  getTaroStorageKeyValue,
  removeTaroStorageKey,
  clearTaroStorageKey,
  getQualityImage,
  countStringify,
  getWxAppCookieStr,
  getSystemInfos,
  pxTransformFromData,
  dealShopContentDataAndReport as dealShopContentData,
  dateFormat,
  throttle,
  lodashThrottle,
  debounce,
  addHttps,
  commonShowSuccessToast as showSuccessToast,
  commonShowFailToast as showFailToast,
  commonShowNormalToast as showNormalToast,
  showShopLoading,
  hideShopLoading,
  getAppChannelType,
  formatTabActiveMenuType,
  filterUrlQueryData,
  sgmCustomReport,
  isMemberPage,
  getFloorDataToDataDefines,
  isOpenJdAppUrl,
  jdOpenAppParams,
  createJdOpenAppUrl,
  isEmpty,
  getJdAppReportPageSource,
  isAppClassifyPage,
  isPc,
  ipLoc_djd,
  dealJdOpenAppData,
  jdAppVersionCompare,
  dealNativePixelToCssPixel,
  isAppStowShop,

package/dist/utils/index.ts

@@ -1 +1 @@
-import {
  isChartH5,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
  isMemberPage,
  isPc,
  ipLoc_djd,
  jdAppVersionCompare,
  dealNativePixelToCssPixel,
  isAppStowShop,
  dealJdOpenAppData
  isJdAndHarmonyDevice,
  isChartH5,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
    isH5AndJingGouMini,
    urlCookie,
  isMemberPage,
  isPc,
  ipLoc_djd,
  jdAppVersionCompare,
  dealNativePixelToCssPixel,
  isAppStowShop,
  dealJdOpenAppData
+import {
  isChartH5,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
  isMemberPage,
  sgmCustomReport,
  isOpenJdAppUrl,
  jdOpenAppParams,
  createJdOpenAppUrl,
  isEmpty,
  getJdAppReportPageSource,
  isPc,
  ipLoc_djd,
  dealJdOpenAppData,
  jdAppVersionCompare,
  dealNativePixelToCssPixel,
  isAppStowShop,
  isJdAndHarmonyDevice,
  isJdAndroidX5Core,
  isChartH5,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
    isH5AndJingGouMini,
    urlCookie,
  isMemberPage,
  sgmCustomReport,
  isOpenJdAppUrl,
  jdOpenAppParams,
  createJdOpenAppUrl,
  isEmpty,
  isPc,
  ipLoc_djd,
  dealJdOpenAppData,
  jdAppVersionCompare,
  dealNativePixelToCssPixel,
  isAppStowShop,