@conecli/cone-render 0.10.1-shop-beta.37 → 0.10.1-shop-beta.40

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((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 forceMemberCardPopup = options?.forceMemberCardPopup;
  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 && !forceMemberCardPopup) {
    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 && !forceMemberCardPopup) {
    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',
      memberSceneType: 'view',
      ...options,
    };
    const memberCardurl =
      window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
        ? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
        : `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
    const sourceUrl = encodeURIComponent(window.location.href || '');
    let url =
      sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
    if (!url.includes('http')) {
      url = 'https:' + url;
    }
    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 forceMemberCardPopup = options?.forceMemberCardPopup;
  const toastOpt = {
    duration: 3000,
    image:
      'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
  };
  if (forceMemberCardPopup) {
    showFailToast({
      title: '临时调试模拟入会成功',
    });
    return new Promise((resolve) => {
      resolve(true);
    });
  }
  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 && !forceMemberCardPopup) {
    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 && !forceMemberCardPopup) {
    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',
      memberSceneType: 'view',
      ...options,
    };
    const memberCardurl =
      window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
        ? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
        : `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
    const sourceUrl = encodeURIComponent(window.location.href || '');
    let url =
      sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
    if (!url.includes('http')) {
      url = 'https:' + url;
    }
    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/service/fetchGateway.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro';
  UUID,
  isJdApp,
  jdAppVersionStr,
  isIosDevice,
  isPc,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isJdAndHarmonyDevice,
  isNewHarmonyShop,
  passSmartCouponInfoFunctionIdList,
  needFixClientValueToHarmonyFunctionIdList,
  clientVersion: isJdApp && jdAppVersionStr !== '' ? jdAppVersionStr : '11.0.0',
  client: isJdApp ? (isIosDevice ? 'apple' : 'android') : isPc ? 'pc' : 'wh5',
  screen: `${Math.ceil(window.screen?.width * devicePixelRatio)}*${Math.ceil(
    window.screen?.height * devicePixelRatio,
  )}`,
  area: '1_72_2799_0',
  uuid: UUID,
  const { area, realTimeArea } = areaInfo || {};
  area && area !== '' && (clientParams.area = area);
  realTimeArea && realTimeArea !== '' && (clientParams['realTimeArea'] = realTimeArea);
  console.warn(
    'cone-render中对外暴露fetchGateway收到原生端获取传来的四级地址信息',
    areaInfo,
    '更新后的接口底层信息',
    clientParams,
  );
  if (isH5 && (isJdAndIosDevice || isJdAndAndroidDevice)) {
    const smartCouponInfo = await getSmartCouponInfo();
    if (smartCouponInfo) {
      requestParams.smartCouponInfo = smartCouponInfo;
    }
  } else {
    console.warn('🚗 ~~ handleSmartCouponInfo ~~ 不支持的环境！');
  }
  functionId: string,
  body = {},
  options = {},
  requestOptions = {},
  const useBodyParams = { ...body };
  if (passSmartCouponInfoFunctionIdList.includes(functionId)) {
    await handleSmartCouponInfo(useBodyParams);
  }
  const params = Object.assign(
    {},
    {
      t: Date.now(),
      functionId,
      appid: 'shop_m_jd_com',
      body: JSON.stringify(useBodyParams),
    },
    clientParams,
    options,
    {
      area: clientParams.area,
      client: !isJdApp && options?.client ? options?.client : clientParams.client,
      clientVersion:
        !isJdApp && options?.clientVersion ? options?.clientVersion : clientParams.clientVersion,
    },
  );
  if (
    isJdAndHarmonyDevice &&
    (needFixClientValueToHarmonyFunctionIdList.includes(functionId) || isNewHarmonyShop)
  ) {
    params.client = 'harmony';
  } else {
  }
  console.warn(
    'fetchGateway url:' + api.apiFunc + ',functionId:' + params.functionId,
    '底层默认的clientParams',
    clientParams,
    '下发的options',
    options,
    '最后params',
    params,
  );
  return http.post(api.apiFunc, params, requestOptions);
+import Taro from '@tarojs/taro';
  UUID,
  isJdApp,
  jdAppVersionStr,
  isIosDevice,
  isPc,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  isJdAndHarmonyDevice,
  isNewHarmonyShop,
  passSmartCouponInfoFunctionIdList,
  needFixClientValueToHarmonyFunctionIdList,
  clientVersion: isJdApp && jdAppVersionStr !== '' ? jdAppVersionStr : '11.0.0',
  client: isJdApp ? (isIosDevice ? 'apple' : 'android') : isPc ? 'pc' : 'wh5',
  screen: `${Math.ceil(window.screen?.width * devicePixelRatio)}*${Math.ceil(
    window.screen?.height * devicePixelRatio,
  )}`,
  area: '1_72_2799_0',
  uuid: UUID,
  const { area, realTimeArea } = areaInfo || {};
  area && area !== '' && (clientParams.area = area);
  realTimeArea && realTimeArea !== '' && (clientParams['realTimeArea'] = realTimeArea);
  console.warn(
    'cone-render中对外暴露fetchGateway收到原生端获取传来的四级地址信息',
    areaInfo,
    '更新后的接口底层信息',
    clientParams,
  );
  const smartCouponInfo = await getSmartCouponInfo();
  if (smartCouponInfo) {
    requestParams.smartCouponInfo = smartCouponInfo;
  }
  functionId: string,
  body = {},
  options = {},
  requestOptions = {},
  const useBodyParams = { ...body };
  if (passSmartCouponInfoFunctionIdList.includes(functionId)) {
    await handleSmartCouponInfo(useBodyParams);
  }
  const params = Object.assign(
    {},
    {
      t: Date.now(),
      functionId,
      appid: 'shop_m_jd_com',
      body: JSON.stringify(useBodyParams),
    },
    clientParams,
    options,
    {
      area: clientParams.area,
      client: !isJdApp && options?.client ? options?.client : clientParams.client,
      clientVersion:
        !isJdApp && options?.clientVersion ? options?.clientVersion : clientParams.clientVersion,
    },
  );
  if (
    isJdAndHarmonyDevice &&
    (needFixClientValueToHarmonyFunctionIdList.includes(functionId) || isNewHarmonyShop)
  ) {
    params.client = 'harmony';
  } else {
  }
  console.warn(
    'fetchGateway url:' + api.apiFunc + ',functionId:' + params.functionId,
    '底层默认的clientParams',
    clientParams,
    '下发的options',
    options,
    '最后params',
    params,
  );
  return http.post(api.apiFunc, params, requestOptions);