fix: bug

wupengfei

6 天以前 92034e64c9bb28c262b0fcb90660b58328aa2f5e

fix: bug

 src/hooks/useUser.ts

@@ -2,6 +2,7 @@
import { UserUtils } from '@bole-core/core';
// import * as userRoleServices from '@/services/api/UserRole';
import * as userServices from '@/services/api/User';
import * as ParkBountyApplyServices from '@/services/api/ParkBountyApply';
import { useQuery, useQueryClient } from '@tanstack/vue-query';

export function useIsSystemAdmin() {
@@ -16,8 +17,17 @@

  const { userId, userInfo } = storeToRefs(userStore);

  const { data: userDetail } = useQuery({
    queryKey: ['ParkBountyApplyServices/get818UserInfo'],
    queryFn: async () => {
      return await ParkBountyApplyServices.get818UserInfo();
    },
    placeholderData: () => ({} as API.UserInfoV2),
  });

  return {
    user: userInfo,
    userId: userId,
    userDetail: userDetail,
  };
}

 src/services/api/ParkBountyApply.ts

@@ -47,6 +47,14 @@
  });
}

/** 此处后端没有提供注释 GET /api/ParkBountyApply/Get818UserInfo */
export async function get818UserInfo(options?: API.RequestConfig) {
  return request<API.UserInfoV2>('/api/ParkBountyApply/Get818UserInfo', {
    method: 'GET',
    ...(options || {}),
  });
}

/** 此处后端没有提供注释 POST /api/ParkBountyApply/GetEnterpriseDrawWithList */
export async function getEnterpriseDrawWithList(
  body: API.GetEnterpriseDrawWithListInput,

 src/services/api/typings.d.ts

@@ -743,6 +743,8 @@

  type EnterpriseRechargeStatusEnum = 10 | 20 | 30;

  type EnterpriseTypeEnum = 10 | 20 | 30 | 40;

  interface EntityExtensionDto {
    properties?: Record<string, any>;
    configuration?: Record<string, any>;
@@ -853,6 +855,8 @@
  type FinanceStatusEnum = 1 | 2 | 3;

  type FinanceTypeEnum = 10 | 20;

  type GenderTypeEnum = 1 | 2;

  interface GetEffectingStaffListInput {
    claimDateTime?: string;
@@ -1598,6 +1602,8 @@
    errorList?: ImportInsStaffAnalysisList[];
  }

  type IndustrialParkStatusEnum = 10 | -10;

  type InsuranceClaimAttachmentBusinessTypeEnum = 10 | 20 | 30 | 40 | 50;

  interface InsuranceClaimAttachmentOutput {
@@ -2021,6 +2027,8 @@

  type InsureProductSettingStatusEnum = 10 | -10;

  type InvoicingStatusEnum = 0 | 10 | 20;

  interface IStringValueType {
    name?: string;
    properties?: Record<string, any>;
@@ -2054,6 +2062,8 @@
    name?: string;
    resource?: string;
  }

  type MatchMakingIdentityEnum = 10 | 20;

  interface MethodParameterApiDescriptionModel {
    name?: string;
@@ -3076,6 +3086,12 @@
    totalAmount?: number;
  }

  type UserCertificationAuditStatusEnum = 0 | 10 | 30 | 40;

  type UserCertificationChannelEnum = 10 | 20;

  type UserCertificationStatusEnum = 0 | 20 | 30;

  interface UserData {
    id?: string;
    tenantId?: string;
@@ -3126,6 +3142,112 @@
    batchUpdateMessage?: boolean;
    /** 企业名称 */
    enterpriseName?: string;
  }

  interface UserInfoV2 {
    /** 用户Id */
    userId?: string;
    /** 用户名 */
    userName?: string;
    /** 手机号 */
    phoneNumber?: string;
    /** 用户登录所使用的手机号 */
    userPhoneNumber?: string;
    /** 账户余额 */
    amount?: number;
    /** 收到打赏 */
    reward?: number;
    /** 昵称 */
    nickName?: string;
    userCertificationAuditStatus?: UserCertificationAuditStatusEnum;
    /** 用户认证Id */
    userCertificationId?: string;
    /** 企业认证的名称 */
    customerName?: string;
    /** 企业统一信用代码 */
    societyCreditCode?: string;
    /** 用户认证Id(公司Id) */
    companyId?: string;
    /** 法人名称 */
    legalPersonName?: string;
    /** 年消费 */
    yearlyConsume?: number;
    /** 年产品购买消费 */
    yearlyPurchasedConsume?: number;
    /** 年打赏消费 */
    yearlyRewardConsume?: number;
    /** 年产品广告投放消费 */
    yearlyProductAdConsume?: number;
    /** 年资讯广告投放消费 */
    yearlyInformationAdConsume?: number;
    /** 1，企业 2， 个人 */
    userType?: number;
    authType?: EnterpriseTypeEnum;
    userCertificationStatus?: UserCertificationStatusEnum;
    /** 0 未开通 10 待审核   20办理中  30通过  -20 驳回 40 下架 50 系统下架 */
    openHRSiteStatus?: number;
    /** 联系人 */
    contacter?: string;
    /** 用户认证过期日期 */
    userCertificationExpirationTime?: string;
    invoicingStatus?: InvoicingStatusEnum;
    /** 年审开始时间 */
    annualAuditStartTime?: string;
    /** 支付发票地址 */
    payInvoicingUrl?: string;
    /** 绑定邮箱地址 */
    bindEmailAddress?: string;
    /** 用户头像地址 */
    avatarUrl?: string;
    genderType?: GenderTypeEnum;
    /** 职称 */
    jobTitle?: string;
    /** 省code */
    provinceCode?: number;
    /** 市code */
    cityCode?: number;
    /** 区县code */
    countyCode?: number;
    /** 省 */
    provinceName?: string;
    /** 市 */
    cityName?: string;
    /** 区县 */
    countyName?: string;
    /** 详细地址 */
    addressDetail?: string;
    /** 微信二维码图片 */
    wxQrCodeUrl?: string;
    /** 个人信息邮箱地址 */
    userInfoEmailAddress?: string;
    /** 保险签约状态 0未签约 10已签约 */
    insureSignStatus?: number;
    /** 是否提交钱包开户申请 */
    isApplyWalletAccountOpen?: boolean;
    /** 联系电话 */
    contactPhone?: string;
    /** 钱包开户状态 */
    walletAccountOpenStatus?: WalletAccountOpenStatusInfo[];
    /** 钱包状态 */
    walletMainStatus?: WalletAccountTypeMainStatusInfo[];
    matchMakingIdentity?: MatchMakingIdentityEnum;
    /** 电子签印章图片生成状态 0未生成 1已生成 */
    signatureImageStatus?: number;
    certificationChannel?: UserCertificationChannelEnum;
    industrialParkId?: string;
    industrialParkName?: string;
    suportEnterpriseUpload?: boolean;
    suportPlatRecharge?: boolean;
    rewardEnable?: boolean;
    suportWithDraw?: boolean;
    industrialParkStatus?: IndustrialParkStatusEnum;
    isHasBountyApply?: boolean;
    /** 是否可以登录电子签 */
    canLoginUserSign?: boolean;
    /** 是否可以登录江佑保 */
    canLoginJYB?: boolean;
    /** 是否可以登录灵活用工 */
    canLoginFlexJob?: boolean;
  }

  interface UserListOutput {
@@ -3202,6 +3324,22 @@
    sequence?: number;
  }

  type WalletAccountOpenStatusEnum = 10 | 20;

  interface WalletAccountOpenStatusInfo {
    walletAccountType?: WalletAccountTypeEnum;
    walletAccountOpenStatus?: WalletAccountOpenStatusEnum;
  }

  type WalletAccountTypeEnum = 10 | 20 | 30;

  interface WalletAccountTypeMainStatusInfo {
    walletAccountType?: WalletAccountTypeEnum;
    walletMainStatus?: WalletMainStatusEnum;
  }

  type WalletMainStatusEnum = 10 | -20 | -10;

  interface WindowsTimeZone {
    timeZoneId?: string;
  }

 src/views/BalanceManage/BalanceManage.vue

@@ -71,18 +71,18 @@
        <ProTabPane lazy label="拨付记录" name="Payment">
          <PaymentRecordView></PaymentRecordView>
        </ProTabPane>
        <!-- <template v-if="sceneThree || sceneFour"> -->
        <ProTabPane lazy label="奖励发放记录" name="RewardGrant">
          <RewardGrantRecordView></RewardGrantRecordView>
        </ProTabPane>
        <ProTabPane lazy label="充值记录" name="Recharge">
          <RechargeRecordView ref="rechargeRecordRef"></RechargeRecordView>
        </ProTabPane>
        <ProTabPane lazy label="消费记录" name="Consume">
          <ConsumeRecordView></ConsumeRecordView>
        </ProTabPane>
        <!-- </template> -->
        <ProTabPane lazy label="提现记录" name="Withdrawal">
        <template v-if="sceneThree || sceneFour">
          <ProTabPane lazy label="奖励发放记录" name="RewardGrant">
            <RewardGrantRecordView></RewardGrantRecordView>
          </ProTabPane>
          <ProTabPane lazy label="充值记录" name="Recharge">
            <RechargeRecordView ref="rechargeRecordRef"></RechargeRecordView>
          </ProTabPane>
          <ProTabPane lazy label="消费记录" name="Consume">
            <ConsumeRecordView></ConsumeRecordView>
          </ProTabPane>
        </template>
        <ProTabPane lazy label="提现记录" name="Withdrawal" v-if="sceneTwo || sceneFour">
          <WithdrawalRecordView ref="withdrawalRecordRef"></WithdrawalRecordView>
        </ProTabPane>
      </ProTabs>
@@ -114,20 +114,20 @@
  tabType: 'Consume',
};

const { user } = useUser();
const { userDetail } = useUser();
const state = reactive({ ...BaseState });

const sceneOne = computed(() => {
  // return !userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
  return !userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
});
const sceneTwo = computed(() => {
  // return !userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
  return !userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
});
const sceneThree = computed(() => {
  // return userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
  return userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
});
const sceneFour = computed(() => {
  // return userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
  return userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
});

const { isLoading, data: detail } = useQuery({

 src/views/BalanceManage/components/RewardGrantRecordView.vue

@@ -47,14 +47,12 @@
];

const route = useRoute();
const router = useRouter();
const id = route.params.id as string;
const BaseState = {
  loading: true,
};

const state = reactive({ ...BaseState });
// const { userDetail } = useUser();
const { userDetail } = useUser();

const {
  getDataSource: getList,
@@ -70,7 +68,7 @@
          page: pageIndex,
          orderInput: extraParamState.orderInput,
        },
        // id: userDetail.value?.userId ?? '',
        id: userDetail.value?.userId ?? '',
      };
      let res = await parkBountyApplyServices.getParkCustomerBountySettleList(params, {
        showLoading: !state.loading,