li.shaoyi 3 hafta önce
ebeveyn
işleme
bcffedd1f3

+ 2 - 3
src/business/bank/index.ts

@@ -19,7 +19,6 @@ import {
     queryHybridReceiverOnboards
 } from '@/services/api/bank'
 import { SignStatus } from '@/constants/bank'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import moment from "moment"
 import { v4 } from 'uuid'
 
@@ -208,11 +207,11 @@ export function useDoBankSign() {
         BankCardType: 0,
         BankAccountType: useStore.userInfo?.userinfotype,
         AccountCode: accountStore.currentAccountId.toString(),
-        CertID: decryptAES(userInfo?.cardnum ?? ''),
+        CertID: userInfo?.cardnum,
         CertType: userInfo?.cardtypeid.toString(),
         BankAccountName: userInfo?.customername,
         MobilePhone: userInfo?.mobile2,
-        BankAccountNo: decryptAES(userInfo.bankaccount),
+        BankAccountNo: userInfo.bankaccount,
         AccountName: userInfo?.customername,
         OpenBankAccId: userInfo?.bankid,
         ExBankName: userInfo?.bankbankname

+ 1 - 2
src/business/user/account.ts

@@ -2,7 +2,6 @@ import { shallowRef, ref, reactive } from 'vue'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import { investorDel, modifyPassword, requestAddAuth, requestAddUser, requestBankCard4, requestCaptcaResend, requestCaptchaVerify, requestCreateContract, requestCreateContractAndAddSigner, requestCreateFlowByTemplateDirectly, requestSignCompleted, requestWillFace, queryTencentUsereSignRecords, requestAsignWillFace } from '@/services/api/account'
 import cryptojs from 'crypto-js'
-import { decryptAES } from '@/services/websocket/package/crypto'
 
 const loginStore = useLoginStore()
 const userStore = useUserStore()
@@ -266,7 +265,7 @@ export function useRequestCreateFlowByTemplateDirectly(memberId?: number) {
             }
             if (data.userType === 1) {
                 data.personInfo = {
-                    idCardNumber: decryptAES(userInfo.cardnum),
+                    idCardNumber: userInfo.cardnum,
                     mobile: userInfo.mobile2,
                     name: userInfo.customername,
                     idCardType: userInfo.cardtypeid ?? 0

+ 65 - 1
src/packages/digital/views/wallet/deposit/index.vue

@@ -1,11 +1,75 @@
 <!-- 钱包-充值 -->
 <template>
-    <app-view class="wallet-deposit">
+    <app-view class="wallet-deposit g-layout g-form">
         <template #header>
             <app-navbar title="充值" />
         </template>
+        <Form ref="formRef" class="g-form__container g-layout-block" @submit="onSubmit">
+            <CellGroup inset>
+                <Field name="CurrencyID" label="币种" is-link>
+                </Field>
+                <Field name="Amount" label="数量">
+                </Field>
+                <Cell title="余额" :value="balance" />
+            </CellGroup>
+        </Form>
+        <div class="g-form__footer inset">
+            <Button type="primary" @click="formRef?.submit" block>提交</Button>
+        </div>
     </app-view>
 </template>
 
 <script lang="ts" setup>
+import { shallowRef, computed, reactive, onMounted } from 'vue'
+import { FormInstance, Form, Button, CellGroup, Field, Cell } from 'vant'
+import { fullloading } from '@/utils/vant'
+import { formatDecimal } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { queryWalletAddress, queryWalletChains, createDigitalWalletAddress } from '@/services/api/digital'
+import { useNavigation } from '@mobile/router/navigation'
+import { useSpotAccountStore } from '../components/spot/composables'
+import AppSelect from '@mobile/components/base/select/index.vue'
+
+const { getQueryStringToNumber } = useNavigation()
+
+const formRef = shallowRef<FormInstance>()
+const currencyId = getQueryStringToNumber('id')
+
+const spotAccountStore = useSpotAccountStore()
+
+const formData = reactive<Partial<Proto.CreateDigitalWalletAddressReq>>({
+    DigitalAccountID: 0,
+})
+
+const accountItem = computed(() => spotAccountStore.getAccountItem({
+    currencyid: currencyId
+}))
+
+// 可用余额
+const balance = computed(() => {
+    const balance = spotAccountStore.getAvailableBalance(accountItem.value)
+    return formatDecimal(balance, accountItem.value?.currencydecimalplace)
+})
+
+const { dataList, run } = useRequest(queryWalletAddress, { manual: true })
+
+const onSubmit = () => {
+    fullloading((hideLoading) => {
+        createDigitalWalletAddress({
+            data: formData
+        }).then(() => {
+            hideLoading('充值成功', 'success')
+        }).catch((err) => {
+            hideLoading(err, 'fail')
+        })
+    })
+}
+
+onMounted(() => {
+    if (accountItem.value) {
+        run({
+            digitalaccountid: accountItem.value.digitalaccountid
+        })
+    }
+})
 </script>

+ 2 - 2
src/packages/gcszt/views/account/certification/Index.vue

@@ -295,14 +295,14 @@ const onCheckCardNum = () => {
 onMounted(() => {
     // 个人
     if (getUserInfoType() === 1) {
-        person.value.idCardNo = decryptAES(cardnum)
+        person.value.idCardNo = cardnum
         person.value.mobile = mobile2
         realName.value = customername
         person.value.realName = realName.value
     } else {
         // 企业
         company.value.mobile = mobile2
-        company.value.creditCode = decryptAES(cardnum)
+        company.value.creditCode = cardnum
         realName.value = legalpersonname
         company.value.realName = realName.value
         company.value.companyName = customername

+ 3 - 4
src/packages/gcszt/views/account/protocol/Index.vue

@@ -7,9 +7,9 @@
             <CellGroup inset>
                 <Cell title="名称" :value="customername" />
                 <Cell title="手机号码" :value="mobile2" />
-                <Cell title="证件号码" :value="decryptAES(cardnum)" />
+                <Cell title="证件号码" :value="cardnum" />
                 <Cell title="开户银行" :value="bankbankname" />
-                <Cell title="银行卡号" :value="decryptAES(bankaccount)" />
+                <Cell title="银行卡号" :value="bankaccount" />
                 <Cell title="签署机构" :value="memberUserId" />
             </CellGroup>
             <CellGroup inset>
@@ -39,7 +39,6 @@ import { useRequestCreateContract, useRequestAsignWillFace } from '@/business/us
 import plus from '@/utils/h5plus'
 import { getUserId } from '@/services/methods/user'
 import { useUserStore } from '@/stores'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import eventBus from '@/services/bus'
 
 const { getQueryStringToNumber } = useNavigation()
@@ -101,7 +100,7 @@ const faceAuth = (status: number) => {
                 plus.requestPermissionRecordAudio({
                     onSuccess: () => {
                         /// 进行视频认证
-                        asignWillFaceFormData.idCardNo = decryptAES(cardnum)
+                        asignWillFaceFormData.idCardNo = cardnum
                         asignWillFaceFormData.realName = customername
                         /// loading
                         fullloading((hideLoading) => {

+ 2 - 2
src/packages/gzcj/views/account/certification/Index.vue

@@ -295,14 +295,14 @@ const onCheckCardNum = () => {
 onMounted(() => {
     // 个人
     if (getUserInfoType() === 1) {
-        person.value.idCardNo = decryptAES(cardnum)
+        person.value.idCardNo = cardnum
         person.value.mobile = mobile2
         realName.value = customername
         person.value.realName = realName.value
     } else {
         // 企业
         company.value.mobile = mobile2
-        company.value.creditCode = decryptAES(cardnum)
+        company.value.creditCode = cardnum
         realName.value = legalpersonname
         company.value.realName = realName.value
         company.value.companyName = customername

+ 3 - 4
src/packages/gzcj/views/account/protocol/Index.vue

@@ -7,9 +7,9 @@
             <CellGroup inset>
                 <Cell title="名称" :value="customername" />
                 <Cell title="手机号码" :value="mobile2" />
-                <Cell title="证件号码" :value="decryptAES(cardnum)" />
+                <Cell title="证件号码" :value="cardnum" />
                 <Cell title="开户银行" :value="bankbankname" />
-                <Cell title="银行卡号" :value="decryptAES(bankaccount)" />
+                <Cell title="银行卡号" :value="bankaccount" />
                 <Cell title="签署机构" :value="memberUserId" />
             </CellGroup>
             <CellGroup inset>
@@ -38,7 +38,6 @@ import { useRequestCreateContract, useRequestAsignWillFace } from '@/business/us
 import plus from '@/utils/h5plus'
 import { getUserId } from '@/services/methods/user'
 import { useUserStore } from '@/stores'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import eventBus from '@/services/bus'
 
 const { getQueryStringToNumber } = useNavigation()
@@ -103,7 +102,7 @@ const faceAuth = (status: number) => {
                 plus.requestPermissionRecordAudio({
                     onSuccess: () => {
                         /// 进行视频认证
-                        asignWillFaceFormData.idCardNo = decryptAES(cardnum)
+                        asignWillFaceFormData.idCardNo = cardnum
                         asignWillFaceFormData.realName = customername
                         /// loading
                         fullloading((hideLoading) => {

+ 15 - 22
src/packages/mobile/views/account/authresult/Index.vue

@@ -3,7 +3,7 @@
         <template #header>
             <app-navbar :title="$t('user.authentication.title')" />
         </template>
-        <template v-if="userInfo">
+        <template v-if="userInfo && !loading">
             <CellGroup title="认证信息" inset>
                 <Cell :title="$t('user.authentication.customername')" :value="userInfo.customername" />
                 <Cell :title="$t('user.authentication.cardtype')"
@@ -29,57 +29,50 @@
                     :value="getAuthStatusName(userStore.userAccount.hasauth)" />
             </CellGroup>
             <div class="g-layout-block g-layout-block--inset"
-                v-if="userStore.userAccount.hasauth === AuthStatus.Rejected">
+                v-if="userStore.userAccount.hasauth === AuthStatus.Rejected && userStore.userAccount.modifystatus === 1">
                 <Button type="primary" round block @click="routerTo('account-certification')">重新认证</Button>
             </div>
         </template>
-        <Empty :description="$t('common.nodatas')" v-else-if="!loading" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, onActivated } from 'vue'
-import { Button, CellGroup, Cell, Image, Empty, showLoadingToast } from 'vant'
+import { shallowRef, onActivated, computed } from 'vue'
+import { Button, CellGroup, Cell, Image,  showLoadingToast } from 'vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { AuthStatus, getAuthStatusName } from '@/constants/account'
 import { queryWrDraftUserInfo } from '@/services/api/account'
 import { useRequest } from '@/hooks/request'
 import { getCertificateTypeCodeName } from '@/constants/account'
 import { getFileUrl } from '@/filters'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import { getWskhOpenAccountConfigs } from '@/services/api/account'
-import { i18n, useUserStore } from "@/stores"
+import { i18n, useUserStore } from '@/stores'
 
 const { routerTo } = useNavigation()
 
 const { t } = i18n.global
 const userStore = useUserStore()
-const userInfo = shallowRef<Model.UserInfo>()
 const showHalfBodyPhoto = shallowRef(false)
 const showCardBackPhoto = shallowRef(false)
 const halfBodyPhotoTitle = shallowRef('')
 
-const toast = showLoadingToast({
-    duration: 0,
-    message: '加载中...'
-})
+const toast = showLoadingToast({ duration: 0 })
 
-/// 查询托管银行信息
-const { loading, run } = useRequest(queryWrDraftUserInfo, {
+// 查询实名认证信息
+const { data, loading, run } = useRequest(queryWrDraftUserInfo, {
     manual: true,
     onSuccess: (res) => {
-        /// 签约状态
-        userInfo.value = res.data[0] ?? {
-            ...userStore.userInfo,
-            cardnum: decryptAES(userStore.userInfo.cardnum),
-            bankaccount: decryptAES(userStore.userInfo.bankaccount),
-        }
+        data.value = res.data[0]
     },
     onFinally: () => {
-        toast.close()
+        userStore.getUserData().finally(() => {
+            toast.close()
+        })
     }
 })
 
+const userInfo = computed(() => data.value ?? userStore.userInfo)
+
 // 获取网上开户配置
 useRequest(getWskhOpenAccountConfigs, {
     defaultParams: {
@@ -96,7 +89,7 @@ useRequest(getWskhOpenAccountConfigs, {
 })
 
 onActivated(() => {
-    toast.open({})
+    toast.open({ message: '加载中...' })
     run()
 })
 </script>

+ 1 - 2
src/packages/mobile/views/mine/email/Index.vue

@@ -26,7 +26,6 @@ import { useLoginStore, useUserStore } from '@/stores'
 import { useNavigation } from '@mobile/router/navigation'
 import { fullloading } from '@/utils/vant'
 import { validateRules } from '@/constants/regex'
-import { decryptAES } from '@/services/websocket/package/crypto'
 
 // formRef
 const formRef = shallowRef<FormInstance>()
@@ -39,7 +38,7 @@ const { router } = useNavigation()
 
 const formData = reactive<Model.UserInfoWechatAndEmailReq>({
     userid: loginStore.userId, // 用户ID
-    email: decryptAES(userStore.userInfo.email), //  邮箱
+    email: userStore.userInfo.email, //  邮箱
 })
 
 // 表单验证规则

+ 2 - 3
src/packages/mobile/views/mine/profile/Index.vue

@@ -6,8 +6,8 @@
         <CellGroup>
             <Cell :title="$t('mine.profile.invoiceinfo')" :to="{ name: 'mine-invoice' }" is-link />
             <Cell :title="$t('mine.profile.addressinfo')" :to="{ name: 'mine-address' }" is-link />
-            <Cell v-if="!showLoginAlert" :title="$t('mine.profile.wechat')" :to="{ name: 'mine-wechat' }" :value="decryptAES(userStore.userInfo.wechat ?? '')" is-link />
-            <Cell :title="$t('mine.profile.email')" :to="{ name: 'mine-email' }" :value="decryptAES(userStore.userInfo.email ?? '')" is-link />
+            <Cell v-if="!showLoginAlert" :title="$t('mine.profile.wechat')" :to="{ name: 'mine-wechat' }" :value="userStore.userInfo.wechat" is-link />
+            <Cell :title="$t('mine.profile.email')" :to="{ name: 'mine-email' }" :value="userStore.userInfo.email" is-link />
         </CellGroup>
     </app-view>
 </template>
@@ -15,7 +15,6 @@
 <script lang="ts" setup>
 import { Cell, CellGroup } from 'vant'
 import { useUserStore, useGlobalStore } from '@/stores'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import { onActivated } from 'vue'
 
 defineProps({

+ 1 - 2
src/packages/mobile/views/mine/wechat/Index.vue

@@ -25,7 +25,6 @@ import { updateUserInfoWechatAndEmail } from '@/services/api/user'
 import { useLoginStore, useUserStore, i18n } from '@/stores'
 import { useNavigation } from '@mobile/router/navigation'
 import { fullloading } from '@/utils/vant'
-import { decryptAES } from '@/services/websocket/package/crypto'
 
 const { global: { t } } = i18n
 // formRef
@@ -39,7 +38,7 @@ const { router } = useNavigation()
 
 const formData = reactive<Model.UserInfoWechatAndEmailReq>({
     userid: loginStore.userId, // 用户ID
-    wechat: decryptAES(userStore.userInfo.wechat), //  微信
+    wechat: userStore.userInfo.wechat, //  微信
 })
 
 // 表单验证规则

+ 1 - 2
src/packages/nhgj/views/account/protocol/Index.vue

@@ -7,7 +7,7 @@
             <CellGroup inset>
                 <Cell title="姓名" :value="userInfo.customername" />
                 <Cell title="手机号码" :value="userInfo.mobile2" />
-                <Cell title="证件号码" :value="decryptAES(userInfo.cardnum)" />
+                <Cell title="证件号码" :value="userInfo.cardnum" />
                 <Cell title="签署机构" :value="signId" />
             </CellGroup>
             <CellGroup inset>
@@ -26,7 +26,6 @@ import { fullloading } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { requestInitTencentESS } from '@/services/api/account'
 import { useRequestCreateFlowByTemplateDirectly } from '@/business/user/account'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import plus from '@/utils/h5plus'
 
 const { getQueryStringToNumber } = useNavigation()

+ 2 - 2
src/packages/qxst/views/account/certification/Index.vue

@@ -295,14 +295,14 @@ const onCheckCardNum = () => {
 onMounted(() => {
     // 个人
     if (getUserInfoType() === 1) {
-        person.value.idCardNo = decryptAES(cardnum)
+        person.value.idCardNo = cardnum
         person.value.mobile = mobile2
         realName.value = customername
         person.value.realName = realName.value
     } else {
         // 企业
         company.value.mobile = mobile2
-        company.value.creditCode = decryptAES(cardnum)
+        company.value.creditCode = cardnum
         realName.value = legalpersonname
         company.value.realName = realName.value
         company.value.companyName = customername

+ 3 - 4
src/packages/qxst/views/account/protocol/Index.vue

@@ -7,9 +7,9 @@
             <CellGroup inset>
                 <Cell title="名称" :value="customername" />
                 <Cell title="手机号码" :value="mobile2" />
-                <Cell title="证件号码" :value="decryptAES(cardnum)" />
+                <Cell title="证件号码" :value="cardnum" />
                 <Cell title="开户银行" :value="bankbankname" />
-                <Cell title="银行卡号" :value="decryptAES(bankaccount)" />
+                <Cell title="银行卡号" :value="bankaccount" />
                 <Cell title="签署机构" :value="memberUserId" />
             </CellGroup>
             <CellGroup inset>
@@ -38,7 +38,6 @@ import { useRequestCreateContract, useRequestAsignWillFace } from '@/business/us
 import plus from '@/utils/h5plus'
 import { getUserId } from '@/services/methods/user'
 import { useUserStore } from '@/stores'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import eventBus from '@/services/bus'
 
 const { getQueryStringToNumber } = useNavigation()
@@ -103,7 +102,7 @@ const faceAuth = (status: number) => {
                 plus.requestPermissionRecordAudio({
                     onSuccess: () => {
                         /// 进行视频认证
-                        asignWillFaceFormData.idCardNo = decryptAES(cardnum)
+                        asignWillFaceFormData.idCardNo = cardnum
                         asignWillFaceFormData.realName = customername
                         /// loading
                         fullloading((hideLoading) => {

+ 1 - 2
src/packages/sbyj/views/account/protocol/Index.vue

@@ -8,7 +8,7 @@
                 <Cell title="姓名" :value="userInfo.customername" />
                 <Cell title="手机号码" :value="userInfo.mobile2" />
                 <Cell title="证件类型" :value="getCerTypePersonName(userInfo.cardtypeid)" />
-                <Cell title="证件号码" :value="decryptAES(userInfo.cardnum)" />
+                <Cell title="证件号码" :value="userInfo.cardnum" />
                 <Cell title="签署机构" :value="signId" />
             </CellGroup>
             <CellGroup inset>
@@ -28,7 +28,6 @@ import { useNavigation } from '@mobile/router/navigation'
 import { requestInitTencentESS } from '@/services/api/account'
 import { useRequestCreateFlowByTemplateDirectly } from '@/business/user/account'
 import { getCerTypePersonName } from "@/constants/account"
-import { decryptAES } from '@/services/websocket/package/crypto'
 import plus from '@/utils/h5plus'
 
 const { getQueryStringToNumber } = useNavigation()

+ 1 - 2
src/packages/thj/views/account/protocol/Index.vue

@@ -7,7 +7,7 @@
             <CellGroup inset>
                 <Cell title="姓名" :value="userInfo.customername" />
                 <Cell title="手机号码" :value="userInfo.mobile2" />
-                <Cell title="证件号码" :value="decryptAES(userInfo.cardnum)" />
+                <Cell title="证件号码" :value="userInfo.cardnum" />
                 <Cell title="签署机构" :value="signId" />
             </CellGroup>
             <CellGroup inset>
@@ -31,7 +31,6 @@ import { fullloading } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { requestInitMdUserSwapProtocol } from '@/services/api/account'
 import { useRequestCreateFlowByTemplateDirectly } from '@/business/user/account'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import plus from '@/utils/h5plus'
 
 const { getQueryStringToNumber, router } = useNavigation()

+ 1 - 2
src/packages/tjmd/views/account/protocol/Index.vue

@@ -7,7 +7,7 @@
             <CellGroup inset>
                 <Cell title="姓名" :value="userInfo.customername" />
                 <Cell title="手机号码" :value="userInfo.mobile2" />
-                <Cell title="证件号码" :value="decryptAES(userInfo.cardnum)" />
+                <Cell title="证件号码" :value="userInfo.cardnum" />
                 <Cell title="签署机构" :value="signId" />
             </CellGroup>
             <CellGroup inset>
@@ -26,7 +26,6 @@ import { fullloading } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { requestInitTencentESS } from '@/services/api/account'
 import { useRequestCreateFlowByTemplateDirectly } from '@/business/user/account'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import plus from '@/utils/h5plus'
 
 const { getQueryStringToNumber } = useNavigation()

+ 2 - 2
src/packages/zrwyt/views/account/certification/Index.vue

@@ -295,14 +295,14 @@ const onCheckCardNum = () => {
 onMounted(() => {
     // 个人
     if (getUserInfoType() === 1) {
-        person.value.idCardNo = decryptAES(cardnum)
+        person.value.idCardNo = cardnum
         person.value.mobile = mobile2
         realName.value = customername
         person.value.realName = realName.value
     } else {
         // 企业
         company.value.mobile = mobile2
-        company.value.creditCode = decryptAES(cardnum)
+        company.value.creditCode = cardnum
         realName.value = legalpersonname
         company.value.realName = realName.value
         company.value.companyName = customername

+ 3 - 4
src/packages/zrwyt/views/account/protocol/Index.vue

@@ -7,9 +7,9 @@
             <CellGroup inset>
                 <Cell title="名称" :value="customername" />
                 <Cell title="手机号码" :value="mobile2" />
-                <Cell title="证件号码" :value="decryptAES(cardnum)" />
+                <Cell title="证件号码" :value="cardnum" />
                 <Cell title="开户银行" :value="bankbankname" />
-                <Cell title="银行卡号" :value="decryptAES(bankaccount)" />
+                <Cell title="银行卡号" :value="bankaccount" />
                 <Cell title="签署机构" :value="memberUserId" />
             </CellGroup>
             <CellGroup inset>
@@ -38,7 +38,6 @@ import { useRequestCreateContract, useRequestAsignWillFace } from '@/business/us
 import plus from '@/utils/h5plus'
 import { getUserId } from '@/services/methods/user'
 import { useUserStore } from '@/stores'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import eventBus from '@/services/bus'
 
 const { getQueryStringToNumber } = useNavigation()
@@ -103,7 +102,7 @@ const faceAuth = (status: number) => {
                 plus.requestPermissionRecordAudio({
                     onSuccess: () => {
                         /// 进行视频认证
-                        asignWillFaceFormData.idCardNo = decryptAES(cardnum)
+                        asignWillFaceFormData.idCardNo = cardnum
                         asignWillFaceFormData.realName = customername
                         /// loading
                         fullloading((hideLoading) => {

+ 2 - 2
src/packages/zrwyt2/views/account/certification/Index.vue

@@ -295,14 +295,14 @@ const onCheckCardNum = () => {
 onMounted(() => {
     // 个人
     if (getUserInfoType() === 1) {
-        person.value.idCardNo = decryptAES(cardnum)
+        person.value.idCardNo = cardnum
         person.value.mobile = mobile2
         realName.value = customername
         person.value.realName = realName.value
     } else {
         // 企业
         company.value.mobile = mobile2
-        company.value.creditCode = decryptAES(cardnum)
+        company.value.creditCode = cardnum
         realName.value = legalpersonname
         company.value.realName = realName.value
         company.value.companyName = customername

+ 3 - 4
src/packages/zrwyt2/views/account/protocol/Index.vue

@@ -7,9 +7,9 @@
             <CellGroup inset>
                 <Cell title="名称" :value="customername" />
                 <Cell title="手机号码" :value="mobile2" />
-                <Cell title="证件号码" :value="decryptAES(cardnum)" />
+                <Cell title="证件号码" :value="cardnum" />
                 <Cell title="开户银行" :value="bankbankname" />
-                <Cell title="银行卡号" :value="decryptAES(bankaccount)" />
+                <Cell title="银行卡号" :value="bankaccount" />
                 <Cell title="签署机构" :value="memberUserId" />
             </CellGroup>
             <CellGroup inset>
@@ -38,7 +38,6 @@ import { useRequestCreateContract, useRequestAsignWillFace } from '@/business/us
 import plus from '@/utils/h5plus'
 import { getUserId } from '@/services/methods/user'
 import { useUserStore } from '@/stores'
-import { decryptAES } from '@/services/websocket/package/crypto'
 import eventBus from '@/services/bus'
 
 const { getQueryStringToNumber } = useNavigation()
@@ -103,7 +102,7 @@ const faceAuth = (status: number) => {
                 plus.requestPermissionRecordAudio({
                     onSuccess: () => {
                         /// 进行视频认证
-                        asignWillFaceFormData.idCardNo = decryptAES(cardnum)
+                        asignWillFaceFormData.idCardNo = cardnum
                         asignWillFaceFormData.realName = customername
                         /// loading
                         fullloading((hideLoading) => {

+ 1 - 1
src/services/api/account/index.ts

@@ -137,7 +137,7 @@ export function queryAccountRole(config: RequestConfig = {}) {
  * 查询实名认证信息
  */
 export function queryWrDraftUserInfo(config: RequestConfig<Model.WrDraftUserInfoReq> = {}) {
-    return http.commonRequest<Model.UserInfo[]>({
+    return http.commonRequest<Model.WrDraftUserInfoRsp[]>({
         url: '/WrTrade2/QueryWrDraftUserInfo',
         params: {
             userid: getUserId(),

+ 10 - 2
src/stores/modules/user.ts

@@ -1,5 +1,6 @@
 import { reactive, computed, toRefs } from 'vue'
 import { getFileUrl } from '@/filters'
+import { decryptAES } from '@/services/websocket/package/crypto'
 import { fetchSystemParams } from '@/services/api/common'
 import { queryLoginData } from '@/services/api/account'
 import { useLoginStore } from './login'
@@ -88,12 +89,19 @@ export const useUserStore = defineStore(() => {
     const getUserData = async () => {
         try {
             state.loading = true
-            const res = await queryLoginData({
+
+            const { data } = await queryLoginData({
                 data: {
                     loginID: loginStore.loginId
                 }
             })
-            state.userData = res.data
+
+            data.userInfo.cardnum = decryptAES(data.userInfo.cardnum)
+            data.userInfo.bankaccount = decryptAES(data.userInfo.bankaccount)
+            data.userInfo.email = decryptAES(data.userInfo.email)
+            data.userInfo.wechat = decryptAES(data.userInfo.wechat)
+
+            state.userData = data
         } finally {
             state.loading = false
         }

+ 70 - 2
src/types/model/bank.d.ts

@@ -220,9 +220,77 @@ declare namespace Model {
     /// 查询实名认证信息
     interface WrDraftUserInfoReq {
         // 用户状态 1:正常 2:注销
-        userstatus?: number,
+        userstatus?: number;
         // 用户id
-        userid: number
+        userid: number;
+    }
+
+    /** 查询实名认证信息 响应 */
+    interface WrDraftUserInfoRsp {
+        address: string; // 地址
+        attachment1: string; // 附件1
+        attachment2: string; // 附件2
+        attachment3: string; // 附件3
+        attachment4: string; // 附件4
+        attachment5: string; // 附件5
+        bankaccount: string; // 银行帐号 (加密存储)
+        bankaccountname: string; // 收款人名称
+        bankbankname: string; // 银行名称
+        bankcardfrontphotourl: string; // 银行卡正面照地址
+        bankid: string; // 银行编码
+        bankname: string; // 银行名称
+        birthday: string; // 生日(个人:年月日)
+        biznature: number; // 企业性质( 企业) - 1:国有控股企业 2:集体控股企业 3:私人控股企业 4:港澳台商控股企业 5:外商控股企业 6:其它
+        bizscope: string; // 企业经营范围(企业)
+        biztype: number; // 企业类型 - 1:进口/生产 2:销售 3:零售 4:运输 5:仓储
+        cardbackphotourl: string; // 证件背面图片地址
+        cardfrontphotourl: string; // 证件正面图片地址
+        cardnum: string; // 证件号码(加密存储)
+        cardtypeid: number; // 证件类型ID
+        cityid: number; // 市
+        company: string; // 公司(个人)
+        contactcardbackphotourl: string; // 联系人证件背面图片地址
+        contactcardfrontphotourl: string; // 联系人证件正面图片地址
+        contactname: string; // 联系人
+        countryid: number; // 国家
+        createtime: string; // 创建时间
+        creatorid: number; // 创建人
+        creditquota: number; // 授信额度(金瑞)
+        customername: string; // 客户名称(企业名称)
+        districtid: number; // 地区
+        email: string; // 邮件(加密存储)
+        fax: string; // 传真(加密存储)
+        halfbodyphotourl: string; // 半身照地址
+        hasauth: number; // 是否已实名(枚举'hasauth')
+        hasencrypt: number; // 数据是否已加密 - 0:未加密 1:已加密
+        headurl: string; // 头像地址
+        legalcardbackphotourl: string; // 法人身份证背面照地址
+        legalcardfrontphotourl: string; // 法人身份证正面照地址
+        legalpersonname: string; // 法人姓名(企业)
+        mobile: string; // 手机号码(加密存储)
+        mobile2: string; // 手机号码[明文-尚志]
+        modifierid: number; // 修改人
+        modifiertime: string; // 修改时间
+        modifystatus: number; // 变更状态(枚举'modifystatus')
+        needinvoice: number; // 是否需要发票 - 0:不需要 1:需要
+        nickname: string; // 昵称:默认为名称脱敏(张**) 或 手机号脱敏(139****9999)
+        openmode: number; // 开户方式 - 1:管理端开户 2 :网上开户注册(会员官网) 3:微信开户 4:网页交易端注册 5:安卓手机端注册 6:苹果手机端注册 7:PC交易端注册
+        otherurl: string; // 其它图片地址[使用分号分隔]
+        postalcode: string; // 邮政编码
+        provinceid: number; // 省
+        proxystatementurl: string; // 授权委托书
+        qq: string; // QQ(加密存储
+        remark: string; // 备注
+        sex: number; // 用户性别 0: 女 1: 男
+        signpdfurl: string; // 签约pdf文件
+        taxpayernum: string; // 纳税人识别号
+        telphone: string; // 联系电话(加密存储)
+        userid: number; // 用户ID
+        userinfotype: number; // 用户信息类型 - 1:个人 2:企业
+        userstatus: number; // 用户状态 - 1:正常 2:注销
+        usertype: number; // 账户类型 - 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者
+        wechat: string; // 微信(加密存储)
+        wskhinfo: string; // 开户申请信息(JSON)
     }
 
     /** 资金流水查询(当前) 请求 */