eb23fb1d477a480c773dc52c6d47f1b901d09d17..4a8d6f9364ebcadd08834dcb37feb97ab83fba78
12 小时以前 zhengyiming
fix: bug
4a8d6f 对比 | 目录
12 小时以前 zhengyiming
Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
258008 对比 | 目录
12 小时以前 zhengyiming
fix: bug
a31b80 对比 | 目录
1 天以前 wupengfei
feat: 钱包
bc17b7 对比 | 目录
7个文件已修改
114 ■■■■■ 已修改文件
apps/cMiniApp/project.private.config.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/pages/mine/index.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/List/IncomeDetailListItem.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/apiEnum.ts 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/authenticationV2.ts 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/typings.d.ts 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/project.private.config.json
@@ -85,13 +85,6 @@
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "",
                    "pathName": "subpackages/wallet/mineWallet/mineWallet",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                }
            ]
        }
apps/cMiniApp/src/pages/mine/index.vue
@@ -19,18 +19,34 @@
              <div class="user-info-item">{{ userDetail?.name ?? '' }}</div>
              <div class="user-info-auth">
                <div class="user-info-auth-item">
                  <div class="user-info-unCertified" v-if="!isCertified">
                    <div class="user-info-unCertified-text">未认证</div>
                    <div class="user-info-unCertified-btn" @click.stop="goAuthentication">
                  <div class="user-info-unCertified">
                    <div
                      class="user-info-unCertified-text"
                      v-if="userDetail.realStatus === EnumPersonalUserRealStatus.UnReal"
                    >
                      未认证
                    </div>
                    <div class="user-info-unCertified-text" v-else>
                      {{ EnumUserRealMethodText[userDetail?.realMethod]
                      }}{{ EnumPersonalUserRealStatusText[userDetail.realStatus] }}
                    </div>
                    <div
                      class="user-info-unCertified-btn"
                      @click.stop="goAuthentication"
                      v-if="
                        userDetail.realStatus === EnumPersonalUserRealStatus.UnReal ||
                        userDetail.realStatus === EnumPersonalUserRealStatus.Fail
                      "
                    >
                      立即认证
                    </div>
                  </div>
                  <div class="user-info-unCertified" v-else>
                  <!-- <div class="user-info-unCertified" v-else>
                    <img :src="IconAuth" class="user-info-unCertified-icon" />
                    <div class="user-info-unCertified-text">
                      {{ EnumUserRealMethodText[userDetail?.realMethod] }}
                      {{ EnumUserRealMethodText[userDetail?.realMethod] }}{{ EnumPersonalUserRealStatusText[userDetail.realStatus] }}
                    </div>
                  </div>
                  </div> -->
                </div>
              </div>
            </div>
@@ -42,7 +58,7 @@
    <ContentScrollView v-if="isLogin" class="mine-content-scroll-view">
      <List class="mine-list-wrapper mine-balance">
        <div class="mine-balance-title">我的余额</div>
        <div class="mine-balance-money">¥{{ toThousand(0) }}</div>
        <div class="mine-balance-money">¥{{ toThousand(userDetail?.balance) }}</div>
        <div class="mine-balance-btn" @click="goMineWallet">
          进入我的钱包
          <img :src="IconArrow" class="mine-balance-btn-icon" />
@@ -107,7 +123,11 @@
import { useUser, useIsLogin, useGoLogin } from '@/hooks';
import Taro from '@tarojs/taro';
import { RouterPath, OssAssets } from '@/constants';
import { EnumUserRealMethodText } from '@12333/constants';
import {
  EnumUserRealMethodText,
  EnumPersonalUserRealStatusText,
  EnumPersonalUserRealStatus,
} from '@12333/constants';
import { List, ListItem } from '@12333/components';
import { useSystemStore } from '@/stores/modules/system';
import PageLayoutWithBg from '@/components/Layout/PageLayoutWithBg.vue';
apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
  <WithdrawMoneyCard
    :money="100"
    :money="detail?.amount"
    :title="EnumUserWalletTransactionTypeText[detail.type]"
  ></WithdrawMoneyCard>
  <List>
@@ -23,12 +23,14 @@
    </ListItem>
    <ListItem title="结算金额" :show-arrow="false">
      <template #extra>
        <div class="income-detail-info-value">{{ toThousand(detail?.settlementAmount) }}</div>
        <div class="income-detail-info-value">
          {{ `${toThousand(detail?.settlementAmount)}元` }}
        </div>
      </template>
    </ListItem>
    <ListItem title="实发金额" :show-arrow="false">
      <template #extra>
        <div class="income-detail-info-value">{{ toThousand(detail?.amount) }}</div>
        <div class="income-detail-info-value">{{ `${toThousand(detail?.amount)}元` }}</div>
      </template>
    </ListItem>
  </List>
packages/components/src/List/IncomeDetailListItem.vue
@@ -4,7 +4,7 @@
      <slot name="title">
        <div class="income-detail-list-item-title">
          <div class="income-detail-list-item-title-text">{{ title }}</div>
          <div class="income-detail-list-item-title-value">{{ funds }}</div>
          <div class="income-detail-list-item-title-value">{{ toThousand(funds) }}</div>
        </div>
      </slot>
      <div class="income-detail-list-item-content">
@@ -16,6 +16,8 @@
</template>
<script setup lang="ts">
import { toThousand } from '@12333/utils';
defineOptions({
  name: 'IncomeDetailListItem',
});
packages/constants/apiEnum.ts
@@ -259,9 +259,9 @@
export enum EnumPersonalUserRealStatus {
  /**未实名 */
  UnReal = 0,
  /**校验中 */
  /**认证中 */
  Checking = 10,
  /**实名失败 */
  /**认证失败 */
  Fail = 99,
  /**已实名 */
  Real = 100,
packages/constants/authenticationV2.ts
@@ -1,7 +1,14 @@
import { EnumUserRealMethod } from './apiEnum';
import { EnumUserRealMethod, EnumPersonalUserRealStatus } from './apiEnum';
export const EnumUserRealMethodText = {
  [EnumUserRealMethod.Face]: '实人已认证',
  [EnumUserRealMethod.Identity3]: '已实名',
  [EnumUserRealMethod.Identity4]: '已实名',
  [EnumUserRealMethod.Face]: '实人',
  [EnumUserRealMethod.Identity3]: '实名',
  [EnumUserRealMethod.Identity4]: '实名',
};
export const EnumPersonalUserRealStatusText = {
  [EnumPersonalUserRealStatus.UnReal]: '未认证',
  [EnumPersonalUserRealStatus.Checking]: '认证中',
  [EnumPersonalUserRealStatus.Fail]: '认证失败',
  [EnumPersonalUserRealStatus.Real]: '已认证',
};
packages/services/apiV2/typings.d.ts
@@ -728,9 +728,9 @@
  enum EnumPersonalUserRealStatus {
    /**未实名 */
    UnReal = 0,
    /**校验中 */
    /**认证中 */
    Checking = 10,
    /**实名失败 */
    /**认证失败 */
    Fail = 99,
    /**已实名 */
    Real = 100,
@@ -3336,10 +3336,6 @@
    /** 钱包Id */
    id?: string;
    access?: EnumEnterpriseWalletAccess;
    /** 账号 */
    account?: string;
    /** 商户Id */
    merchantId?: string;
    /** 协议号 */
    code?: string;
    /** 通道协议号 */
@@ -3351,6 +3347,21 @@
    /** 协议失效时间 */
    invalidTime?: string;
    signStatus?: EnumEnterpriseWalletSignStatus;
    /** 支付宝姓名 */
    name?: string;
    /** 支付宝登录账号 */
    identity?: string;
    scene?: EnumEnterpriseWalletExpandindirectOrderScene;
    /** 转账场景说明 */
    sceneDirections?: string;
    orderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
    /** 进件单任务完结时间 */
    taskFinishTime?: string;
    /** 进件单审核不通过原因 */
    riskReviewRemark?: string;
    sitesInfo?: GetEnterpriseWalletExpandindirectOrderQueryResultSites;
    /** 附件 */
    files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[];
    expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
  }
@@ -3759,6 +3770,9 @@
    contactPhoneNumber?: string;
    /** 是否实名 */
    isReal?: boolean;
    realStatus?: EnumPersonalUserRealStatus;
    /** 实名失败消息 */
    realFailMessage?: string;
    realMethod?: EnumUserRealMethod;
    /** 我的报名 */
    taskCount?: number;
@@ -3766,6 +3780,8 @@
    hirePassTaskCount?: number;
    /** 已取消 */
    hireRefuseTaskCount?: number;
    /** 余额 */
    balance?: number;
  }
  type GetPersonalUserBankCardQuery = Record<string, any>;
@@ -3973,6 +3989,14 @@
    serviceFee?: number;
    /** 实际到账 */
    actualAmount?: number;
    /** 预计到账时间 */
    arrivalTimeEnd?: string;
    /** 订单支付时间 */
    transDate?: string;
    /** 创建时间 */
    createdTime?: string;
    /** 失败原因 */
    failReason?: string;
  }
  interface GetPersonalUserTransactionsQuery {
@@ -4896,10 +4920,6 @@
    /** 企业Id */
    enterpriseId?: string;
    access?: EnumEnterpriseWalletAccess;
    /** 账号 */
    account?: string;
    /** 商户Id */
    merchantId?: string;
  }
  interface OpenEnterpriseWalletCommandResult {