@conecli/cone-render 0.8.28 → 0.8.30

package/dist/service/requestServer.ts

@@ -1 +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: {
    appid: APPID.SHOP_COLOR_APPID,
    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 = window.location.hostname === PAGES_DOMAIN
    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 bMallUserInfo
  }
  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 && window.bMallCartData) {
      return window.bMallCartData
    }
    const cartData = await this.bMallGetSkuNumService(bMallTag)
    let items
    if (cartData.ok && cartData.result) {
      items = cartData?.result?.items || {}
    }
    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)
    }
  }
+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: {
    appid: APPID.SHOP_COLOR_APPID,
    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] || {}
  PAGE_PV_PARAM: 'pagePvParam' 
  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
    }
  }