@conecli/cone-render 0.9.1-shop2.8 → 0.10.1-beta.0

package/dist/jumpEventReport/web.tjm.ts

@@ -0,0 +1 @@
+import global from '../common'
  objectToUrlEncode,
  parseQueryUrlString,
  isTjScence,
  isTjM,
  isTjJxM,
  isH5AdnJxMini,
  tjChannel,
  public logPageId: string
  public jumpConfig: JumpEventReportInterFace.JumpH5ReportConfig
  constructor(opt) {
    super(opt)
    this.getConfig(opt)
    console.log('加载特价/京喜m的跳转js文件....')
  }
  
  getTjShopParam() {
    const { tjshop } = global.info.queryInfo
    const tjshopParam = tjshop ? `&tjshop=${tjshop}` : ''
    const tjChannelStr = tjChannel ? `&tjChannel=${tjChannel}` : ''
    return `${tjshopParam}${tjChannelStr}`
  }
  
  jdJumpToProduct(skuIds, logEventInfo) {
    skuIds = skuIds.toString().trim()
    const getSkuId = skuIds.indexOf(',') !== -1 ? skuIds.split(',')[0] : skuIds
    const { jingxiSdx, ...otherLogInfo } = logEventInfo
    let url = `${this.jumpWebUrl.detail}${getSkuId}.html`
    if (isTjScence) {
      if (isTjM) {
        url = `${this.jumpWebUrl.tjDetail}?wareId=${getSkuId}`
      } else if (isTjJxM) {
        const { _fd } = global.info.queryInfo
        const fd = _fd ? `&_fd=${_fd}` : ''
        url = `${this.jumpWebUrl.jxDetail}?sku=${getSkuId}${fd}`
      }
    }
    if (jingxiSdx) {
      this.jdNavigateToNative(`${url}?sdx=${jingxiSdx}`, otherLogInfo)
    } else {
      this.jdNavigateToNative(url, logEventInfo)
    }
  }
  
  jdJumpToShopHome(shopInfo: JumpEventReportInterFace.ShopIdsInfo = {}) {
    const getInfo = Object.assign(
      {},
      {
        shopId: global.info.queryInfo.shopId,
        venderId: global.info.queryInfo.venderId,
      },
      shopInfo,
    )
    this.jdNavigateToNative(
      `${this.jumpWebUrl.mshop}?${objectToUrlEncode(
        this.getShopIdOrVenderIdParams(getInfo),
      )}${this.getTjShopParam()}`,
      {
        ...getInfo,
      },
    )
  }
  
  jdJumpToWeb(
    url,
    logEventInfo,
    successBack?: Function | undefined,
    failBack?: Function | undefined,
  ) {
    console.log('web.tjm.ts - jdJumpToWeb')
    if (url.indexOf('tjshop') == -1) {
      url = url + this.getTjShopParam()
    }
    this.jdNavigateToNative(
      url,
      {
        ...logEventInfo,
      },
      successBack,
      failBack,
    )
  }
  
  jdJumpConfigUrl(detail, logEventInfo = {}) {
    const { configDataType, configDataValue } = detail
    console.log(
      'jdJumpConfigUrl web.tj.base configDataType:',
      configDataType,
      configDataValue,
    )
    switch (configDataType) {
      case LinkConfigType.CONFIG_TYPE_SKU_LIST:
        if (logEventInfo?.jsonParam?.logBaseInfo?.mInfo) {
          logEventInfo.jsonParam.logBaseInfo.mInfo.skuid =
            configDataValue.skuIds
        }
        this.jdJumpToProduct(configDataValue.skuIds, logEventInfo)
        break
      case LinkConfigType.CONFIG_TYPE_COUPON_LIST:
        this.jdJumpToWeb(
          `${this.jumpWebUrl.shopCoupon}?couponType=1&shopId=${global.info.queryInfo.shopId}&venderId=${global.info.queryInfo.venderId}`,
          {},
        )
        break
      case LinkConfigType.CONFIG_TYPE_CATEGORY:
        if (this.isOpenJdAppUrl(configDataValue.clickUrl)) {
          const getShopSearchParams = this.jdOpenAppParams(
            configDataValue.clickUrl,
          )
          getShopSearchParams &&
            this.jdJumpToShopSearch(
              Object.assign({}, getShopSearchParams, {
                logEventInfo,
              }),
            )
        } else {
          this.jdJumpToShopSearch(
            configDataValue['cid']
              ? Object.assign(
                  {},
                  {
                    shopId: global.info.queryInfo.shopId,
                    categoryId: configDataValue.cid,
                    ...configDataValue,
                    logEventInfo,
                  },
                )
              : {
                  shopId: global.info.queryInfo.shopId,
                  logEventInfo,
                },
          )
        }
        break
      case LinkConfigType.CONFIG_TYPE_CATEGORY_PAGE:
        this.jdJumpToShopCategory({
          ...configDataValue,
          logEventInfo,
        })
        break
      case LinkConfigType.CONFIG_TYPE_MEMBER:
        if (this.isOpenJdAppUrl(configDataValue.clickUrl)) {
          const getShopMemberParams = this.jdOpenAppParams(
            configDataValue.clickUrl,
          )
          getShopMemberParams &&
            this.jdJumpToShopMember(
              Object.assign({}, getShopMemberParams, {
                logEventInfo,
              }),
            )
        } else {
          this.jdJumpToShopMember({
            shopId: global.info.queryInfo.shopId,
            venderId: configDataValue.shopDetail,
            logEventInfo,
          })
        }
        break
      case LinkConfigType.CONFIG_TYPE_SHOP_ACTIVITY:
        if (this.isOpenJdAppUrl(configDataValue.clickUrl)) {
          const getShopActivityParams = this.jdOpenAppParams(
            configDataValue.clickUrl,
          )
          if (
            getShopActivityParams &&
            getShopActivityParams['des'] == 'jshopActivity'
          ) {
            this.jdJumpToShopActivity({
              projectId: configDataValue['projectId'],
              configDataValue,
              logEventInfo,
            })
          }
        } else if (configDataValue['projectId']) {
          this.jdJumpToShopActivity({
            projectId: configDataValue['projectId'],
            configDataValue,
            logEventInfo,
          })
        }
        break
      case LinkConfigType.CONFIG_TYPE_CUSTOM_LINK:
      case LinkConfigType.CONFIG_TYPE_FINANCE_COUPON:
        let _url = configDataValue.linkUrl
        const isProductM = /item\.m\.jd\.com/.test(_url)
        const isProductPC = /item\.jd\.com/.test(_url)
        if (isTjScence) {
          const { appCode } = global.info.queryInfo
          
          if (/(pro|prodev)\.jd\.com(\/mall\/)/.test(_url)) {
            if (isH5AdnJxMini) {
              _url =
                _url.replace(
                  /([prodev]|[pro])(\.jd\.com)(\/mall)/,
                  '$1.m$2/mini',
                ) + `appCode=${appCode}&wxAppName=jx`
            } else {
              _url = _url.replace(
                /([prodev]|[pro])(\.jd\.com)(\/mall)/,
                '$1.m$2/jdlite',
              )
            }
          } else if (/(pro|prodev)\.(m\.jd|jd)\.com(\/mall\/)/.test(_url)) {
            if (isH5AdnJxMini) {
              _url =
                _url.replace(
                  /([prodev]|[pro])(\.m\.jd\.com)(\/mall)/,
                  '$1$2/mini',
                ) + `appCode=${appCode}&wxAppName=jx`
            } else {
              _url = _url.replace(
                /([prodev]|[pro])(\.m\.jd\.com)(\/mall)/,
                '$1$2/jdlite',
              )
            }
          }
        }
        if (
          _url.indexOf('to=') === -1 &&
          _url.indexOf(`${domain.mshop.replace(/https?:/, '')}/?shopId=`) !== -1
        ) {
          const _shopId = _url.match(/\d+/g)[0]
          this.jdJumpToShopHome({
            shopId: `${_shopId}`,
            logEventInfo,
          })
        } else if (this.isOpenJdAppUrl(_url)) {
          const getOpenAppParams: any = this.jdOpenAppParams(_url)
          if (getOpenAppParams) {
            if (getOpenAppParams.jumpTab == 'allProduct') {
              this.jdJumpToTabAllProduct(
                global.info.queryInfo.shopId,
                global.info.queryInfo.venderId,
              )
            } else if (
              getOpenAppParams.des == 'productList' &&
              getOpenAppParams.from == 'couponBatch'
            ) {
              this.jdJumpToCouponSearchProductList(getOpenAppParams?.couponId)
            } else if (getOpenAppParams.des == 'vapp') {
              this.jdJumpToWeb(
                `https:
                  getOpenAppParams.category
                }&des=${getOpenAppParams.des}&vapptype=${
                  getOpenAppParams.vapptype
                }&appId=${getOpenAppParams.appId}&path=${
                  getOpenAppParams.path
                }&param=${encodeURI(JSON.stringify(getOpenAppParams.param))}`,
                logEventInfo,
              )
            } else {
              this.jdNavigateToNative(
                '',
                Object.assign({}, getOpenAppParams, {
                  logEventInfo,
                }),
              )
            }
          }
        } else if (isProductM || isProductPC) {
          const skuid = _url.match(/\d+/g)[0]
          if (skuid) {
            this.jdJumpToProduct(skuid, logEventInfo)
          }
        } else {
          this.jdJumpToWeb(_url, logEventInfo)
        }
        break
      case LinkConfigType.CONFIG_TYPE_JSHOP_DETAIL:
        this.jdJumpToShopDetail({
          venderId: global.info.queryInfo.venderId,
          shopId: global.info.queryInfo.shopId,
          logEventInfo,
        })
        break
      case LinkConfigType.CONFIG_TYPE_SHOP_HOME:
        this.jdJumpToShopHome({
          ...configDataValue,
          logEventInfo,
        })
        break
      case LinkConfigType.CONFIG_TYPE_ANCHOR_POINT:
        break
      case LinkConfigType.CONFIG_TYPE_SHOPPING_GUIDE:
        if (this.isOpenJdAppUrl(configDataValue.clickUrl)) {
          const getShoppingGuideParams = this.jdOpenAppParams(
            configDataValue.clickUrl,
          )
          getShoppingGuideParams &&
            this.jdJumpToShopActivity(
              Object.assign({}, getShoppingGuideParams, {
                logEventInfo,
              }),
            )
        }
        break
      case LinkConfigType.CONFIG_TYPE_MINI_PROGRAM: {
        const linkUrl = decodeURIComponent(configDataValue?.linkUrl || '')
        const search = linkUrl.match(/\?.+/)
        if (search) {
          const miniQueryData: JumpEventReportInterFace.LinkMiniParams = parseQueryUrlString(
            linkUrl,
          )
          try {
            miniQueryData.param = JSON.parse(<string>miniQueryData?.param)
          } catch (e) {
            console.warn('解析小程序 param 错误：', miniQueryData.param)
          }
          this.jdJumpToMiniProgram(miniQueryData)
        } else {
          console.warn('小程序地址错误：', linkUrl)
        }
        break
      }
      default:
    }
  }
  
  jdJumpToCouponSearchProductList(couponId, logEventInfo = {}) {
    if (isTjM) return
    let batchParam = isTjScence
      ? `coupon_batch=${couponId}`
      : `couponbatch=${couponId}`
    this.jdJumpToWeb(
      `${this.jumpWebUrl.jxCouponSearch}?${batchParam}`,
      logEventInfo,
    )
  }
  
  jdNavigateToNative(
    url: string,
    params: {
      logEventInfo?: object
    } = {},
    successBack?: Function | undefined,
    failBack?: Function | undefined,
  ) {
    const { logEventInfo } = params
    const getEparam = logEventInfo || params
    if (url.indexOf('tjshop') == -1) {
      url = url + this.getTjShopParam()
    }
    console.log(`url:::::::${url}`)
    global.info.pageInfo.dataType === BUSINESS_TYPE.ONLINE &&
      this.clickEventLog(getEparam)
        .then(() => {
          typeof successBack == 'function'
            ? successBack(url)
            : (window.location.href = url)
        })
        .catch(() => {
          typeof failBack == 'function' && failBack(url)
        })
  }

package/dist/open/api/environment.ts

@@ -1 +1 @@
-import taroJdBaseInfo from '../../common'
  isIosDevice,
  isAndroidDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isWxMinAndWxapp,
  getNetworkType,
  isIos: isIosDevice,
  isAndroid: isAndroidDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isWxJgMin: isWxMinAndWxapp,
  
  pageType: pageType,
  return sysInfo.netWorkType 
+import taroJdBaseInfo from '../../common'
  isIosDevice,
  isAndroidDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isMin,
  isWxMinAndWxapp,
  getNetworkType,
  isIos: isIosDevice,
  isAndroid: isAndroidDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isMin,
  isWxJgMin: isWxMinAndWxapp,
  
  pageType: pageType,
  return sysInfo.netWorkType 

package/dist/open/api/index.ts

@@ -1 +1 @@
-import * as device from './device'
  device,
  environment,
  jump,
  storage,
  util,
  moduleUtil,
  track,
  trackPromise,
  global,
  http,
  fetchGateway,
  fetchJsonp,
  shopMember,
  userToken,
  TokenPlatform,
  requestServer,
  isvStorage,
+import * as device from './device'
  device,
  environment,
  jump,
  storage,
  util,
  moduleUtil,
  track,
  trackPromise,
  global,
  http,
  fetchGateway,
  fetchJsonp,
  shopMember,
  userToken,
  TokenPlatform,
  requestServer,
  isvStorage,

package/dist/open/api/track.ts

@@ -1 +1 @@
-import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
  getCustomClickEventInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  getCustomExposureInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  initOpenTriggerExposure: (type: string) => void
  logPageIdInfo: Object
  logPnameInfo: Object
  getFloorPointIndexClassName: (obj: object, index?: number, tip?: string) => string
  getIsvClickEventInfo: (obj) => obj,
  getIsvExposureInfo: (obj) => obj,
  getCustomClickEventInfo: (obj) => obj,
  getCustomExposureInfo: (obj) => obj,
  initOpenTriggerExposure: () => {},
  logPageIdInfo: {},
  logPnameInfo: {},
    initOpenTriggerExposure,
    logPageIdInfo,
    logPnameInfo
    getCustomClickEventInfo: ReportContainerData.getCustomClickEventInfo.bind(ReportContainerData),
    getCustomExposureInfo: ReportContainerData.getCustomExposureInfo.bind(ReportContainerData),
    getCustomClickEventInfo: ReportContainerData.getCustomClickEventInfo.bind(ReportContainerData),
    getCustomExposureInfo: ReportContainerData.getCustomExposureInfo.bind(ReportContainerData),
    initReportBaseData: ReportContainerData.initReportBaseData.bind(ReportContainerData),
    updateSectionTabDataInfo: ReportContainerData.updateSectionTabDataInfo.bind(ReportContainerData),
    initOpenTriggerExposure: initOpenTriggerExposure.bind(JumpEventReport),
    logPnameInfo: logPnameInfo,
    logPageIdInfo: logPageIdInfo,
    getFloorPointIndexClassName: ReportContainerData.getFloorPointIndexClassName.bind(ReportContainerData)
+import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
  getCustomClickEventInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  getCustomExposureInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  initOpenTriggerExposure: (type: string) => void
  logPageIdInfo: Object
  logPnameInfo: Object
  getFloorPointIndexClassName: (obj: object, index?: number, tip?: string) => string
  getIsvClickEventInfo: (obj) => obj,
  getIsvExposureInfo: (obj) => obj,
  getCustomClickEventInfo: (obj) => obj,
  getCustomExposureInfo: (obj) => obj,
  initOpenTriggerExposure: () => {},
  logPageIdInfo: {},
  logPnameInfo: {},
    initOpenTriggerExposure,
    logPageIdInfo,
    logPnameInfo
    getCustomClickEventInfo: ReportContainerData.getCustomClickEventInfo.bind(ReportContainerData),
    getCustomExposureInfo: ReportContainerData.getCustomExposureInfo.bind(ReportContainerData),
    initReportBaseData: ReportContainerData.initReportBaseData.bind(ReportContainerData),
    updateSectionTabDataInfo: ReportContainerData.updateSectionTabDataInfo.bind(ReportContainerData),
    initOpenTriggerExposure: initOpenTriggerExposure.bind(JumpEventReport),
    logPnameInfo: logPnameInfo,
    logPageIdInfo: logPageIdInfo,
    getFloorPointIndexClassName: ReportContainerData.getFloorPointIndexClassName.bind(ReportContainerData)

package/dist/sass/app.h5.scss

@@ -228,6 +228,11 @@ video {
 	}
 }
 
+// tarojs会在运行时动态给页面写入这个样式，但是动态写入可能导致在写入之前，有些依赖于 taro-view-core 块行为的逻辑出现异常，比如获取一个view的宽度，block情况下应该是有宽度的，但可能会出现获取到的宽度值是0。所以改成样式表里就直接定义好
+taro-view-core {
+    display: block;
+}
+
 taro-view-core,
 taro-image-core,
 taro-text-core,