Merge branch 'master' into dev-v1.1

wupengfei

9 小时以前 12f08c16ee7c7176368b5961fe104ed698227a8d

Merge branch 'master' into dev-v1.1

 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>
@@ -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';

 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]: '已认证',
};