@conecli/cone-render 0.10.1-isv2.1 → 0.10.1-isv2.4

package/dist/open/api/device.ts

@@ -1 +1 @@
-import taroJdBaseInfo from '../../common'
+import global from "../../common";
  return global.info.sysInfo.screenWidth;
  return global.info.sysInfo.screenHeight;
  return global.info.sysInfo.headerHeight;
  return global.info.sysInfo.tabBarHeight;
  return global.info.sysInfo.safeContentHeight;
  const result =
    global.info.sysInfo.screenHeight -
    global.info.sysInfo.jdBottomBarHeight +
    8;
  return result;
  getScreenWidth,
  getScreenHeight,
  getHeaderHeight,
  getFooterHeight,
  getSafeContentHeight,
  getFullscreenCropHeight,
  TaroEventType,
  SHOP_NAV_BAR_HEIGHT,

package/dist/open/api/environment.ts

@@ -1 +1 @@
-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 
+import taroJdBaseInfo from '../../common'
  isIosDevice,
  isAndroidDevice,
  isHarmonyDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isMin,
  isWxMinAndWxapp,
  getNetworkType,
  isIos: isIosDevice,
  isAndroid: isAndroidDevice,
  isHarmony: isHarmonyDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isMin,
  isWxJgMin: isWxMinAndWxapp,
  
  pageType: pageType,
  return sysInfo.netWorkType 

package/dist/open/api/request.ts

@@ -1 +1 @@
-import requestServer from '../../service/requestServer'
  return requestServer.receiveCoupon(param, clientParams)
  return requestServer.batchAddCart(skuIdList, num, showToast)
  return requestServer.bMallGetUserInfo()
  return requestServer.bMallGetSkuNumApi(needRequest, bMallTag)
  return requestServer.bMallCartHandle(goodItem, num)
  receiveCoupon,
  bMallGetUserInfo,
  bMallGetSkuNumApi,
  bMallCartHandle,
  batchAddCart
+import requestServer from '../../service/requestServer'
  return requestServer.receiveCoupon(param, clientParams)
  return requestServer.batchAddCart(skuIdList, num, showToast)
  return requestServer.bMallGetUserInfo()
  return requestServer.bMallGetSkuNumApi(needRequest, bMallTag)
  return requestServer.bMallCartHandle(goodItem, num)
  receiveCoupon,
  bMallGetUserInfo,
  bMallGetSkuNumApi,
  bMallCartHandle,
  batchAddCart

package/dist/open/api/shopMember.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  TaroEventType,
  JUMP_MEMBER_CHANNEL,
  CENTERDISPATCH_JUMPPAGE_VALUE,
  
  CARD_BANNER = 'shopMemberCardVenderCardBanner',
  
  CARD_NAME = 'shopMemberCardVenderCardName',
  
  MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
  
  MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
  
  MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
  return new Promise((resolve) => {
    requestServer
      .getCustomerCenterDispatch(params)
      .then(async (response) => {
        if (response.result && response.code === '0') {
          resolve(response.result)
        } else {
          resolve({
            jumpPage:
              response.code === '1'
                ? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
                : CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
          })
        }
      })
      .catch((err) => {
        resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR })
        console.log('oneKeyJoinMember getcustomerCenterDispatch err', err)
      })
  })
  const currentVenderId = global.info.queryInfo.venderId
  const currentShopId = global.info.queryInfo.shopId
  const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW
  const toastOpt = {
    duration: 3000,
    image:
      'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
  }
  const params = {
    venderId: currentVenderId,
    channel,
    queryVersion:
      isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0', 
  }
  const centerDispatchResult = await getCenterDispatchResult(params)
  console.log(
    'oneKeyJoinMember getcustomerCenterDispatch 接口返回值',
    centerDispatchResult,
  )
  const { jumpPage } = centerDispatchResult
  if (typeof jumpPage !== 'number') {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常，非数字',
    )
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  const centerDispatchJumpPageValue = Number(jumpPage)
  if (
    centerDispatchJumpPageValue ===
    CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
  ) {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常',
      jumpPage,
    )
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  if (
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
  ) {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录，跳登录页',
    )
    global
      .doLogin()
      .then((res) => {
        console.log('登录成功', res)
      })
      .catch((err) => {
        console.log('登录失败', err)
      })
    return
  }
  const memberRoleJumpPageValueArr = [
    CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
    CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
    CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
  ]
  const isMemberRole = memberRoleJumpPageValueArr.includes(
    centerDispatchJumpPageValue,
  )
  if (isMemberRole) {
    showFailToast({
      title: '您已是本店会员，无需再次入会',
      ...toastOpt,
    })
    return
  }
  if (!isH5AndJdShopView) {
    JumpEventReport.jdJumpToNewH5MemberCard()
    return
  }
  const { isDegrade = true, isLowVersion = true } = centerDispatchResult
  console.log('一键入会，是否已降级', isDegrade)
  console.log('一键入会，是否低版本', isLowVersion)
  if (isDegrade) {
    console.log('一键入会，已降级')
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  if (isLowVersion) {
    console.log('一键入会，低版本')
    JumpEventReport.jdJumpToMemberTab()
    return
  }
  return new Promise((resolve) => {
    const memberCardurl = window?.shopGlobalSwitch?.openNewMemberEntry === 'true' ?
      `${JumpWebUrl.memberCard}?venderId=${currentVenderId}&shopId=${currentShopId}&channel=${JUMP_MEMBER_CHANNEL.POP_WEBVIEW}` :
      `${JumpWebUrl.shopH5MemberCardAPP}?venderId=${currentVenderId}&shopId=${currentShopId}&channel=${JUMP_MEMBER_CHANNEL.POP_WEBVIEW}`
    const sourceUrl = encodeURIComponent(window.location.href || '')
    const url =
      sourceUrl && sourceUrl !== ''
        ? `${memberCardurl}&sourceUrl=${sourceUrl}`
        : memberCardurl
    console.log('openPopWebview url', url)
    nativeOpenPopWebView({
      url,
    })
    Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS)
    Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
      console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res)
      const { shopId, venderId } = res
      if (shopId === currentShopId && venderId === currentVenderId) {
        resolve(true)
      } else {
        console.log(
          'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配，currentShopId, currentVenderId',
          currentShopId,
          currentVenderId,
        )
        resolve(false)
      }
    })
  })
+import Taro from '@tarojs/taro';
  TaroEventType,
  JUMP_MEMBER_CHANNEL,
  CENTERDISPATCH_JUMPPAGE_VALUE,
  
  CARD_BANNER = 'shopMemberCardVenderCardBanner',
  
  CARD_NAME = 'shopMemberCardVenderCardName',
  
  MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
  
  MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
  
  MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
  return new Promise((resolve) => {
    requestServer
      .getCustomerCenterDispatch(params)
      .then((response) => {
        if (response.result && response.code === '0') {
          resolve(response.result);
        } else {
          resolve({
            jumpPage:
              response.code === '1'
                ? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
                : CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
          });
        }
      })
      .catch((err) => {
        resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR });
        console.log('oneKeyJoinMember getcustomerCenterDispatch err', err);
      });
  });
  const currentVenderId = global.info.queryInfo.venderId;
  const currentShopId = global.info.queryInfo.shopId;
  const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW;
  const toastOpt = {
    duration: 3000,
    image:
      'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
  };
  if (isAppHomeForMarketPage) {
    JumpEventReport.jdJumpToBottomTabBrandMember({
      shopId: currentShopId,
      venderId: currentVenderId,
    });
    return;
  }
  const params = {
    venderId: currentVenderId,
    channel,
    queryVersion: isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0', 
  };
  const centerDispatchResult = await getCenterDispatchResult(params);
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回值', centerDispatchResult);
  const { jumpPage } = centerDispatchResult;
  if (typeof jumpPage !== 'number') {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常，非数字');
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  const centerDispatchJumpPageValue = Number(jumpPage);
  if (
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
  ) {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常', jumpPage);
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  if (centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN) {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录，跳登录页');
    global
      .doLogin()
      .then((res) => {
        console.log('登录成功', res);
      })
      .catch((err) => {
        console.log('登录失败', err);
      });
    return;
  }
  const memberRoleJumpPageValueArr = [
    CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
    CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
    CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
  ];
  const isMemberRole = memberRoleJumpPageValueArr.includes(centerDispatchJumpPageValue);
  if (isMemberRole) {
    showFailToast({
      title: '您已是本店会员，无需再次入会',
      ...toastOpt,
    });
    return;
  }
  if (!isH5AndJdShopView) {
    JumpEventReport.jdJumpToNewH5MemberCard();
    return;
  }
  const { isDegrade = true, isLowVersion = true } = centerDispatchResult;
  console.log('一键入会，是否已降级', isDegrade);
  console.log('一键入会，是否低版本', isLowVersion);
  if (isDegrade) {
    console.log('一键入会，已降级');
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  if (isLowVersion) {
    console.log('一键入会，低版本');
    JumpEventReport.jdJumpToMemberTab();
    return;
  }
  return new Promise((resolve) => {
    const getOpenCardUrlParams = {
      venderId: currentVenderId,
      shopId: currentShopId,
      channel: JUMP_MEMBER_CHANNEL.POP_WEBVIEW,
      device: global.info.sysInfo?.isJdTabletDevice ? 'tablet' : 'all',
    };
    const memberCardurl =
      window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
        ? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
        : `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
    const sourceUrl = encodeURIComponent(window.location.href || '');
    const url =
      sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
    console.log('openPopWebview url', url);
    nativeOpenPopWebView({
      url,
    });
    Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS);
    Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
      console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res);
      const { shopId, venderId } = res;
      if (shopId === currentShopId && venderId === currentVenderId) {
        resolve(true);
      } else {
        console.log(
          'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配，currentShopId, currentVenderId',
          currentShopId,
          currentVenderId,
        );
        resolve(false);
      }
    });
  });

package/dist/open/api/util.ts

@@ -1 +1 @@
-import {
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll
  openTaroEventDialog,
  closeTaroEventDialog,
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  openDialog: openTaroEventDialog,
  closeDialog: closeTaroEventDialog,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
+import {
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
  stopNativeScrollEvent,
  pxTransformFromData,
  remoteCustomReport,
  isLanguageForEn,
  lodashThrottle,
  countStringify,
  dateFormat,
  countFormat: countStringify,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  openDialog: openTaroEventDialog,
  closeDialog: closeTaroEventDialog,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
  stopNativeScrollEvent,
  pxTransformFromData,
  remoteCustomReport,
  isLanguageForEn,
  lodashThrottle,

package/dist/open/components/index.ts

@@ -1 +1 @@
-import CountDown from "../../components/base/CountDown";
  Exposure,
  ItemViewExposureSmart,
  MobileCommonHeader
+import CountDown from "../../components/base/CountDown";
  Exposure,
  ItemViewExposureSmart,
  MobileCommonHeader,
  NetworkDataError,