@conecli/cone-render 0.9.1-shop2.0 → 0.9.1-shop2.2

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'].includes(urlPathname)
  const getCustomObj = {
    type: 1, 
    code: 'all', 
    cost1: 1, 
    ...customObj
  }
  try {
    window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
  } catch (e) {}
+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', '/app/newProduct', '/member/shopcard'].includes(urlPathname)
  const getCustomObj = {
    type: 1, 
    code: 'all', 
    cost1: 1, 
    ...customObj
  }
  try {
    window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
  } catch (e) {}

package/dist/utils/index.h5.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  nativePageShowToast, ToastAndroidType,
  ToastIosType,
  getAppChannelType, isAndroidDevice, isH5AndJdShopView, isChartH5,
  isH5AndJdShopViewNativeScroll, isIosDevice, isJdAndAndroidDevice, isJdAndIosDevice, isJdApp,
  isWxApp, isWxMiniH5View, isH5AndJingGouMini, urlCookie,
  sgmCustomReport, isMemberPage, isH5AndJdShopViewH5Scroll, isAppClassifyPage
  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,
  windowWidth: window.innerWidth,
  containerWidth: buildType === BUILD_TYPE.CLASSIFY ? window.innerWidth - 100 : window.innerWidth,
  screenWidth: window.innerWidth,
  platform: '',
  model: '',
  system: '',
  getSystemInfo.windowWidth = getSystemInfo.screenWidth
  getSystemInfo['containerWidth'] = buildType === BUILD_TYPE.CLASSIFY ? getSystemInfo.screenWidth - 100 : getSystemInfo.screenWidth
  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]
  console.log('获取getEle及append及appendChild方法', getEle, getEle?.append, getEle?.appendChild)
  getEle.appendChild(createLoadingEle)
  const getEle = document.getElementById('J_shopLoading')
  getEle && getEle.remove()
  num,
  widthSize = 375,
  layoutWidth = getSystemInfo.windowWidth,
  const getNum = Number(num)
  return Math.round((getNum / widthSize) * layoutWidth)
  const systemInfo: UtilsInterFace.taroGetSystemInfoSyncRes = getSystemInfo
  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 
  return systemInfo
  return originDealShopContentData(pageData, sgmCustomReport, isvdev)
  isJdApp,
  isWxApp,
  isIosDevice,
  isAndroidDevice,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isWxMin,
  isWxMinAndWxapp,
  isJdMin,
  isH5,
  isH5AndJdShopView,
  isChartH5,
  isH5AndJdShopViewNativeScroll,
  isH5AndJdShopViewH5Scroll,
  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
+import Taro from '@tarojs/taro'
  nativePageShowToast, ToastAndroidType,
  ToastIosType,
  getAppChannelType, isAndroidDevice, isH5AndJdShopView, isChartH5,
  isH5AndJdShopViewNativeScroll, isIosDevice, isJdAndAndroidDevice, isJdAndIosDevice, isJdApp,
  isWxApp, isWxMiniH5View, isH5AndJingGouMini, urlCookie,
  sgmCustomReport, isMemberPage, isH5AndJdShopViewH5Scroll, isAppClassifyPage, isPc, ipLoc_djd
  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,
  windowWidth: window.innerWidth,
  containerWidth: buildType === BUILD_TYPE.CLASSIFY ? window.innerWidth - 100 : window.innerWidth,
  screenWidth: window.innerWidth,
  platform: '',
  model: '',
  system: '',
  getSystemInfo.windowWidth = getSystemInfo.screenWidth
  getSystemInfo['containerWidth'] = buildType === BUILD_TYPE.CLASSIFY ? getSystemInfo.screenWidth - 100 : getSystemInfo.screenWidth
  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]
  console.log('获取getEle及append及appendChild方法', getEle, getEle?.append, getEle?.appendChild)
  getEle.appendChild(createLoadingEle)
  const getEle = document.getElementById('J_shopLoading')
  getEle && getEle.remove()
  num,
  widthSize = 375,
  layoutWidth = getSystemInfo.windowWidth,
  const getNum = Number(num)
  return Math.round((getNum / widthSize) * layoutWidth)
  const systemInfo: UtilsInterFace.taroGetSystemInfoSyncRes = getSystemInfo
  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 
  return systemInfo
  return originDealShopContentData(pageData, sgmCustomReport, isvdev)
  isJdApp,
  isWxApp,
  isIosDevice,
  isAndroidDevice,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isWxMin,
  isWxMinAndWxapp,
  isJdMin,
  isH5,
  isH5AndJdShopView,
  isChartH5,
  isH5AndJdShopViewNativeScroll,
  isH5AndJdShopViewH5Scroll,
  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,

package/dist/utils/index.ts

@@ -1 +1 @@
-import {
  isChartH5,
  isH5AndJdShopViewH5Scroll,
  isMemberPage,
  isChartH5,
  isH5AndJdShopViewH5Scroll,
    isH5AndJingGouMini,
    urlCookie,
  isMemberPage,
+import {
  isChartH5,
  isH5AndJdShopViewH5Scroll,
  isMemberPage,
  isPc,
  ipLoc_djd,
  isChartH5,
  isH5AndJdShopViewH5Scroll,
    isH5AndJingGouMini,
    urlCookie,
  isMemberPage,
  isPc,
  ipLoc_djd,

package/dist/utils/taroRenderUtil.ts

@@ -1 +1 @@
-export enum TaroRenderVersion {
  VERSION_OLD = 0, 
  VERSION_NEW = 1, 
  let result = modularPackResult?.bundleUrl || ''
  if (window?.taroRenderVersion === TaroRenderVersion.VERSION_NEW) {
    result = modularPackResult?.bundleUrlV2 || ''
  }
  console.log(
    'getBundleUrl taroRenderVersion:' +
      window?.taroRenderVersion +
      ',bundleUrl:' +
      result,
  )
  return result
  let result = modularPackResult?.bundleFileName || ''
  if (window?.taroRenderVersion === TaroRenderVersion.VERSION_NEW) {
    result = modularPackResult?.bundleFileNameV2 || ''
  }
  console.log(
    'getBundleUrl taroRenderVersion:' +
      window?.taroRenderVersion +
      ',bundleFileName:' +
      result,
  )
  return result
  if (typeof modularPackResult === 'string') {
    return JSON.parse(modularPackResult)
  } else if (modularPackResult) {
    return modularPackResult
  } else {
    return {}
  }
+export enum TaroRenderVersion {
  VERSION_OLD = 0, 
  VERSION_NEW = 1, 
  let result = modularPackResult?.bundleUrl || ''
  if (window?.taroRenderVersion === TaroRenderVersion.VERSION_NEW) {
    result = modularPackResult?.bundleUrlV2 || ''
  }
  console.log(
    'getBundleUrl taroRenderVersion:' +
      window?.taroRenderVersion +
      ',bundleUrl:' +
      result,
  )
  return result
  let result = modularPackResult?.bundleFileName || ''
  if (window?.taroRenderVersion === TaroRenderVersion.VERSION_NEW) {
    result = modularPackResult?.bundleFileNameV2 || ''
  }
  console.log(
    'getBundleUrl taroRenderVersion:' +
      window?.taroRenderVersion +
      ',bundleFileName:' +
      result,
  )
  return result
  if (typeof modularPackResult === 'string') {
    try {
      return JSON.parse(modularPackResult)
    } catch (e) {
      console.error('JSON解析失败', e)
      return {}
    }
  }
  return modularPackResult || {}