@conecli/cone-render 0.8.19 → 0.8.20-beta.0

package/dist/service/requestServer.ts

@@ -0,0 +1 @@
+import Taro from '@tarojs/taro'
  APPID,
  JshopxColorFunctionIdList,
  PagesColorFunctionIdList,
  PAGES_DOMAIN,
  B2BColorFunctionIdList,
  MobileVerifyColorList,
  AppVerifyColorList,
  JshopxVerifyColorList,
  BMallVerifyColorList,
  shopMemberColorFunctionIdList
  cookiesStr: '', 
  requestHeaderContentType: {
    jsonHeader: {
      'content-type': 'application/json;charset=utf-8',
    },
    formDataHeader: {
      'content-type': 'application/x-www-form-urlencoded',
    },
  },
  requestBaseParam: {
    data: null,
    header: {
      'content-type': 'application/json;charset=utf-8',
    },
  },
  timeOut: 7000,
  apiClientParams: {
    clientVersion:
      isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '11.0.0',
    client: isH5AndJdShopView ? (isIosDevice ? 'apple' : 'android') : 'wh5',
    area: '1_72_2799_0', 
    uuid: UUID,
  },
  public addressFetchInfo: {
    reqState: boolean
    promiseInstance: null | Promise<any>
  }
  public getPromotionConfig: {
    projectId: null | string | number
    pageId: null | string | number
  }
  public resInfo: ServiceInterFace.HttpRequestInfo
  public api: ServiceInterFace.HttpApi
  public isPageDomain: boolean
  public verifyColorList: string[]
  constructor(opt) {
    this._init()
    this.addressFetchInfo = {
      reqState: false,
      promiseInstance: null,
    }
    this.getPromotionConfig = {
      projectId: null,
      pageId: null,
    }
    this._userAreaUpdateListen()
    this.resInfo = this._getResConfig(opt)
    this.api = api
    this.isPageDomain = isH5 ? window?.location?.hostname === PAGES_DOMAIN : false
    this.verifyColorList = [
      ...MobileVerifyColorList,
      ...AppVerifyColorList,
      ...JshopxVerifyColorList,
      ...BMallVerifyColorList,
    ]
  }
  _init(): void {
    httpInterceptors.forEach((item) => {
      Taro.addInterceptor((chain) => item(chain))
    })
  }
  _getResConfig(opt = {}): ServiceInterFace.HttpRequestInfo {
    return Object.assign({}, DefaultConfig, opt)
  }
  
  _userAreaUpdateListen() {
    Taro.eventCenter.on(TaroEventType.USER_AREA_UPDATE, (area) => {
      this.updateApiClientParamsResInfo({
        area,
      })
    })
  }
  updateApiClientParamsResInfo(opt = {}) {
    this.resInfo.apiClientParams = {
      ...this.resInfo.apiClientParams,
      ...opt,
    }
  }
  
  checkFunctionIdToReturnAppId(functionId) {
    if (JshopxColorFunctionIdList.includes(functionId)) {
      return APPID.JSHOPX_COLOR_APPID
    } else if (
      this.isPageDomain &&
      PagesColorFunctionIdList.includes(functionId)
    ) {
      return APPID.PAGES_COLOR_APPID
    } else if (shopMemberColorFunctionIdList.includes(functionId)) {
      return APPID.SHOP_MEMBER_COLOR_APPID
    }else if (B2BColorFunctionIdList.includes(functionId)) {
      return APPID.B2B_COLOR_APPID
    } else {
      return APPID.SHOP_COLOR_APPID
    }
  }
  
  gatewayReq(
    functionId: string,
    bodyParams = {},
    clientParams = {},
  ): Promise<any> {
    if (
      functionId === 'receiveShopCoupon' &&
      ((isH5 && window?.isJingGouMiniViewState) || isWxMinAndWxapp)
    ) {
      clientParams = Object.assign(
        {},
        {
          loginType: '1',
          loginWQBiz: WXAPP_BIZ_KEY,
        },
        clientParams,
      )
    }
    const apiClientParams = Object.assign(
      {},
      this.resInfo.apiClientParams,
      clientParams,
    )
    typeof apiClientParams.appid === 'undefined' && (apiClientParams.appid = this.checkFunctionIdToReturnAppId(functionId))
    const isColorVerify = this.verifyColorList.includes(functionId)
    const getReqData = {
      functionId: functionId,
      body: JSON.stringify(bodyParams),
      t: Date.now(),
      ...apiClientParams,
    }
    return http
      .request({
        url: this.api.apiFunc,
        data: getReqData,
        isColorVerify,
      })
      .then((res: ServiceInterFace.RequestPromiseRes) => {
        const { statusCode, data } = res
        let changeRes: ServiceInterFace.RequestResponseFormatRes = {
          ok: true,
        }
        if (statusCode === 200 && data) {
          const resCode = Object.prototype.hasOwnProperty.call(res.data, 'code')
            ? Number(res.data.code)
            : -1
          const subCode = Object.prototype.hasOwnProperty.call(
            res.data,
            'subCode',
          )
            ? Number(res.data.subCode)
            : -1
          if (
            data.success === true ||
            data.isSuccess ||
            resCode === 0 ||
            resCode === 200 ||
            subCode === 0
          ) {
            changeRes = {
              result: Object.prototype.hasOwnProperty.call(data, 'result')
                ? data.result
                : Object.prototype.hasOwnProperty.call(data, 'data')
                ? data.data
                : data,
              code: data.code || 200,
              ok: true,
              source: data,
            }
            return changeRes
          } else {
            changeRes = {
              ...data,
              ok: false,
              statusCode: res.statusCode,
            }
            return changeRes
          }
        } else {
          changeRes = {
            ...data,
            ok: false,
            statusCode: res.statusCode,
          }
          return changeRes
        }
      })
      .catch((res) => {
        return {
          ...res,
          ok: false,
        } as ServiceInterFace.RequestResponseFormatRes
      })
  }
  
  async receiveCoupon(param = {}, clientParams) {
    return await this.gatewayReq(
      'receiveShopCoupon',
      {
        operation: '3',
        ...param,
      },
      clientParams,
    )
  }
  
  getCustomerCenterDispatch(params = {}) {
    return this.gatewayReq('customerCenterDispatch', params, {
      clientVersion: '9.2.0',
      client: 'H5',
      uuid: 88888,
      appid: 'shopmember_m_jd_com',
    })
  }
  bMallGetUserInfo = () => {
    return getBMallUserInfo()
  }
  async bMallAddCart(params = {}) {
    return await this.gatewayReq('bmall_cartAdd', params, {
      client: 'H5',
      clientVersion: '5.5.0'
    })
  }
  async bMallChangeCart(params = {}) {
    return await this.gatewayReq('bmall_cartChange', params, {
      client: 'H5',
      clientVersion: '5.5.0'
    })
  }
  async bMallRemoveCart(params = {}) {
    return await this.gatewayReq(
      'bmall_cartRemove',
      params,
      {
        client: 'H5',
        clientVersion: '5.5.0'
      },
    )
  }
  async bMallGetOmittedProduct(params = {}) {
    return await this.gatewayReq('bmall_getOmittedProduct', params, {
      client: 'H5',
      clientVersion: '5.5.0'
    })
  }
  async bMallAddCartService({ skuId, bMallTag, num, data = {} }) {
    const params = await getParams({ ...data, skuId, bMallTag, num })
    return await this.bMallAddCart(params)
  }
  async bMallGetSkuNumService(bMallTag = 1) {
    const params = await getParams({ bMallTag })
    delete params.operations
    return await this.bMallGetOmittedProduct(params)
  }
  async bMallRemoveCartService({ skuId, bMallTag, num, skuUuid, data = {} }) {
    let params = await getParams({ ...data, skuId, bMallTag, num, skuUuid })
    return await this.bMallRemoveCart(params)
  }
  async bMallChangeCartService({ skuId, bMallTag, num, skuUuid, data = {} }) {
    let params = await getParams({ ...data, skuId, bMallTag, num, skuUuid })
    return await this.bMallChangeCart(params)
  }
  
  async bMallGetSkuNumApi(needRequest = false, bMallTag = 1) {
    if (!needRequest && isH5 && window?.bMallCartData) {
      return window?.bMallCartData
    }
    const cartData = await this.bMallGetSkuNumService(bMallTag)
    let items
    if (cartData.ok && cartData.result) {
      items = cartData?.result?.items || {}
    }
    if (isH5) {
      window.bMallCartData = items
    }
    return items
  }
  
  async bMallCartHandle(goodItem, num) {
    try {
      const {
        skuUuid, 
        limitUpper, 
        limitLower, 
      } = goodItem
      let cartNum = Number(num)
      if (limitLower && cartNum && cartNum < limitLower) {
        cartNum = limitLower
      } else if (limitUpper && cartNum && cartNum > limitUpper) {
        cartNum = limitUpper
      }
      if (skuUuid && cartNum > 0) {
        return this.bMallChangeCartService({
          ...goodItem,
          skuUuid,
          num: cartNum,
        })
      } else if (!skuUuid && cartNum > 0) {
        return this.bMallAddCartService({ ...goodItem, num: cartNum })
      } else if (skuUuid && !cartNum) {
        return this.bMallRemoveCartService({
          ...goodItem,
          skuUuid,
          num: cartNum,
        })
      } else {
        console.error('参数不全')
        return false
      }
    } catch (e) {
      console.error(e)
    }
  }

package/dist/utils/connectNativeJsBridge.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = {
        displayHeight: 1920,
        offSetY: 0
    }
    console.log('>>>>>>>>>>>>>>>>>>> render taroEventSendPageScrollInfo origin time:', Date.now(), 'res:', options)
    if(options){
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = options
    }
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
  const { displayHeight, offSetY } = res
  if (typeof displayHeight === 'undefined' || typeof offSetY === 'undefined') return
  
  if (isIosDevice) return res
  
  if (isAndroidDevice) {
    const deviceRatio = window.devicePixelRatio
    const cssDisplayHeight = Math.ceil(displayHeight / deviceRatio)
    const cssOffsetY = Math.ceil(offSetY / deviceRatio)
    return {
      displayHeight: cssDisplayHeight,
      offSetY: cssOffsetY
    }
  }
+import Taro from '@tarojs/taro'
    latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = {
        displayHeight: 1920,
        offSetY: 0
    }
    console.log('>>>>>>>>>>>>>>>>>>> render taroEventSendPageScrollInfo origin time:', Date.now(), 'res:', options)
    if(options){
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = options
    }
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
  PAGE_PV_PARAM: 'pagePvParam', 
  NATIVE_SCORLL_VIEW: 'nativeScrollControl', 
    OPEN: 'open',
  const { displayHeight, offSetY } = res
  if (typeof displayHeight === 'undefined' || typeof offSetY === 'undefined') return
  if (isIosDevice) return res
  if (isAndroidDevice) {
    const deviceRatio = window.devicePixelRatio
    const cssDisplayHeight = Math.ceil(displayHeight / deviceRatio)
    const cssOffsetY = Math.ceil(offSetY / deviceRatio)
    return {
      displayHeight: cssDisplayHeight,
      offSetY: cssOffsetY
    }
  }

package/dist/utils/connectNativeJsBridge.weapp.ts

@@ -1 +1 @@
-import Taro from "@tarojs/taro";
+import Taro from "@tarojs/taro";

package/dist/utils/h5Utils.ts

@@ -1 +1 @@
-import {
    isApp,
    isIOS,
    getAppVersion,
    version,
    getUUID,
    getUrlQuery,
    assign,
    isString,
    isObject,
    serialize,
    isAndroid,
    CHANNEL_TYPE,
    JDShopViewBusinessPathType,
    JDShopViewBusinessPathList,
    SECTION_HOME_TAB_NAME_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'].includes(urlPathname)
+import {
    isApp,
    isIOS,
    getAppVersion,
    version,
    getUUID,
    getUrlQuery,
    assign,
    isString,
    isObject,
    serialize,
    isAndroid,
    CHANNEL_TYPE,
    JDShopViewBusinessPathType,
    JDShopViewBusinessPathList,
    SECTION_HOME_TAB_NAME_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) {}

package/dist/utils/index.h5.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    nativePageShowToast, ToastAndroidType,
    ToastIosType
    getAppChannelType, isAndroidDevice, isH5AndJdShopView,
    isH5AndJdShopViewNativeScroll, isIosDevice, isJdAndAndroidDevice, isJdAndIosDevice, isJdApp,
    isWxApp, isWxMiniH5View, isH5AndJingGouMini, urlCookie
    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
                                    <span class="d-shop-loading-icon"></span>
                                    <p class="d-shop-text">${text}</p>
                                  </div>`
    return originDealShopContentData(pageData, DraJSAgentReport, isvdev)
    isJdApp,
    isWxApp,
    isIosDevice,
    isAndroidDevice,
    isJdAndIosDevice,
    isJdAndAndroidDevice,
    isWxMin,
    isWxMinAndWxapp,
    isJdMin,
    isH5,
    isH5AndJdShopView,
    isH5AndJdShopViewNativeScroll,
    isH5AndJingGouMini,
    isWxMiniH5View,
    urlCookie,
    sliceArrToChunkList,
    dealAddress,
    objectToUrlEncode,
    parseQueryUrlString,
    setLowSmallPicUrl,
    setTaroStorage,
    getTaroStorageKeyValue,
    removeTaroStorageKey,
    clearTaroStorageKey,
    getQualityImage,
    countStringify,
    getWxAppCookieStr,
    getSystemInfos,
    pxTransformFromData,
    dateFormat,
    throttle,
    lodashThrottle,
    debounce,
    addHttps,
    commonShowSuccessToast as showSuccessToast,
    commonShowFailToast as showFailToast,
    commonShowNormalToast as showNormalToast,
    showShopLoading,
    hideShopLoading,
    getAppChannelType,
    formatTabActiveMenuType,
    filterUrlQueryData,
+import Taro from '@tarojs/taro'
  nativePageShowToast, ToastAndroidType,
  ToastIosType,
  getAppChannelType, isAndroidDevice, isH5AndJdShopView,
  isH5AndJdShopViewNativeScroll, isIosDevice, isJdAndAndroidDevice, isJdAndIosDevice, isJdApp,
  isWxApp, isWxMiniH5View, isH5AndJingGouMini, urlCookie,
  sgmCustomReport, isMemberPage
  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,
  screenWidth: window.innerWidth,
  platform: '',
  model: '',
  system: '',
  getSystemInfo.windowWidth = 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, DraJSAgentReport, isvdev)
  isJdApp,
  isWxApp,
  isIosDevice,
  isAndroidDevice,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isWxMin,
  isWxMinAndWxapp,
  isJdMin,
  isH5,
  isH5AndJdShopView,
  isH5AndJdShopViewNativeScroll,
  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