update

public/config/appconfig.json

@@ -4,7 +4,7 @@
   "appTitle": "多元世纪交易中心",
   "version": "1.0.8",
   "versionCode": "10008",
-  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/packages/gcszt/views/mine/Index.vue

@@ -82,12 +82,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/gstj/views/mine/Index.vue

@@ -88,36 +88,38 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
-                    <template #title>
-                        <Iconfont icon="g-icon-certification">实名认证</Iconfont>
-                    </template>
-                </Cell>
                 <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'bank-sign' }" v-if="authStatus === AuthStatus.Certified">
-                    <template #title>
-                        <Iconfont icon="g-icon-sign">签约账户</Iconfont>
-                    </template>
-                </Cell>
-                <Cell is-link :to="{ name: 'hold-sign' }" v-if="authStatus === AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="g-icon-signing">代扣签约</Iconfont>
-                    </template>
-                </Cell>
-                <Cell is-link :to="{ name: 'hold-deposit' }" v-if="authStatus === AuthStatus.Certified">
-                    <template #title>
-                        <Iconfont icon="g-icon-wallet">代扣查询</Iconfont>
-                    </template>
-                </Cell>
-                <Cell is-link @click="doInOutMoney('0')" v-if="authStatus === AuthStatus.Certified">
-                    <template #title>
-                        <Iconfont icon="g-icon-wallet">银行入金</Iconfont>
+                        <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
+                <template v-if="authStatus === AuthStatus.Certified">
+                    <Cell is-link :to="{ name: 'bank-sign' }">
+                        <template #title>
+                            <Iconfont icon="g-icon-sign">签约账户</Iconfont>
+                        </template>
+                    </Cell>
+                    <Cell is-link :to="{ name: 'hold-sign' }">
+                        <template #title>
+                            <Iconfont icon="g-icon-signing">代扣签约</Iconfont>
+                        </template>
+                    </Cell>
+                    <Cell is-link :to="{ name: 'hold-deposit' }">
+                        <template #title>
+                            <Iconfont icon="g-icon-wallet">代扣查询</Iconfont>
+                        </template>
+                    </Cell>
+                    <Cell is-link @click="doInOutMoney('0')">
+                        <template #title>
+                            <Iconfont icon="g-icon-wallet">银行入金</Iconfont>
+                        </template>
+                    </Cell>
+                </template>
                 <Cell is-link :to="{ name: 'mine-profile' }">
                     <template #title>
                         <Iconfont icon="g-icon-profile">个人信息</Iconfont>
@@ -153,8 +155,7 @@
         <div class="mine-footer">
             <Button class="button-logout" type="danger" size="small" round @click="userLogout">退出登录</Button>
         </div>
-        <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent"
-            v-if="componentId" />
+        <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent" v-if="componentId" />
     </app-view>
 </template>
 
@@ -188,7 +189,7 @@ const { currentAccount } = accountStore.$toRefs()
 
 const headerRef = shallowRef<HTMLDivElement>()
 // 实名认证状态
-const authStatus = computed(() => userStore.userAccount.hasauth) 
+const authStatus = computed(() => userStore.userAccount.hasauth)
 // 代扣签约信息
 const signStatus = shallowRef(SignStatus.Unsigned)
 

src/packages/gzcj/views/mine/Index.vue

@@ -85,12 +85,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/mobile/views/account/authresult/Index.vue

@@ -1,39 +1,35 @@
 <template>
-    <app-view class="g-form account-certification">
+    <app-view class="g-form">
         <template #header>
             <app-navbar title="实名认证" />
         </template>
-        <CellGroup inset>
-                <Field readonly name="username" label="姓名" :value="userInfo?.customername"/>
-                <Field readonly name="cardtype" label="证件类型" :value="getAQCertificateTypeListName(userInfo?.cardtypeid ?? 0)"/>
-                <Field readonly name="cardnum" label="证件号码" :value="decryptAES(userInfo?.cardnum ?? '')"/>
-                <Field name="cardfrontphotourl" label="证件正面照片" v-if="userInfo?.cardfrontphotourl">
-                    <template #input>
-                        <Image fit="contain" :src="getFileUrl(userInfo?.cardfrontphotourl)" width="100" height="100" />
-                    </template>
-                </Field>
-                <Field name="cardbackphotourl" label="证件反面照片" v-if="userInfo?.cardbackphotourl">
-                    <template #input>
-                        <Image fit="contain" :src="getFileUrl(userInfo?.cardbackphotourl)" width="100" height="100" />
-                    </template>
-                </Field>
-                <Field name="halfbodyphotourl" label="证件反面照片" v-if="userInfo?.halfbodyphotourl">
-                    <template #input>
-                        <Image fit="contain" :src="getFileUrl(userInfo?.halfbodyphotourl)" width="100" height="100" />
-                    </template>
-                </Field>
+        <div class="g-form__container" v-if="userInfo">
+            <CellGroup inset>
+                <Cell title="姓名" :value="userInfo.customername" />
+                <Cell title="证件类型" :value="getCertificateTypeCodeName(userInfo.cardtypeid)" />
+                <Cell title="证件号码" :value="userInfo.cardnum" />
+                <Cell title="证件正面照片">
+                    <Image fit="contain" :src="getFileUrl(userInfo.cardfrontphotourl)" width="100" height="100" />
+                </Cell>
+                <Cell title="证件反面照片">
+                    <Image fit="contain" :src="getFileUrl(userInfo.cardbackphotourl)" width="100" height="100" />
+                </Cell>
+                <Cell title="手持证件照">
+                    <Image fit="contain" :src="getFileUrl(userInfo.halfbodyphotourl)" width="100" height="100" />
+                </Cell>
             </CellGroup>
+        </div>
+        <Empty description="暂无数据" v-else />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { CellGroup, Field, Image } from 'vant'
-import { queryWrDraftUserInfo } from '@/services/api/account';
+import { CellGroup, Cell, Image, Empty } from 'vant'
+import { queryWrDraftUserInfo } from '@/services/api/account'
 import { useRequest } from '@/hooks/request'
-import { getAQCertificateTypeListName } from '@/constants/account';
-import { decryptAES } from '@/utils/crypto';
-import { getFileUrl } from '@/filters';
+import { getCertificateTypeCodeName } from '@/constants/account'
+import { getFileUrl } from '@/filters'
 
 const userInfo = shallowRef<Model.UserInfo>()
 
@@ -41,9 +37,7 @@ const userInfo = shallowRef<Model.UserInfo>()
 useRequest(queryWrDraftUserInfo, {
     onSuccess: (res) => {
         /// 签约状态
-        if (res.data.length != 0) {
-            userInfo.value = res.data[0]
-        }
+        userInfo.value = res.data[0]
     }
 })
 </script>

src/packages/mobile/views/mine/Index.vue

@@ -93,12 +93,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/nhgj/views/mine/Index.vue

@@ -85,12 +85,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/pc/views/account/sign/components/certification/index.vue

@@ -68,7 +68,7 @@ const formRules: FormRules = {
         trigger: 'blur',
         validator: (rule, value, callback) => {
             if (validateRules.cardno.validate(value)) {
-                if ((getIdCardAge(value) < 18) || (getIdCardAge(value) > 65)) {
+                if (getIdCardAge(value)) {
                     return callback(new Error('开户失败，您的年龄不符合开户要求'))
                 } 
                 return callback()

src/packages/qdhs/views/mine/Index.vue

@@ -85,12 +85,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/qxst/views/mine/Index.vue

@@ -82,12 +82,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/sbyj/views/mine/index.vue

@@ -105,12 +105,12 @@
         </app-block>
         <app-block class="g-navmenu">
             <CellGroup>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/tc/views/mine/Index.vue

@@ -88,12 +88,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/thj/views/mine/Index.vue

@@ -85,12 +85,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/tjmd/views/mine/Index.vue

@@ -88,12 +88,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/zrwyt/views/mine/Index.vue

@@ -91,12 +91,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>

src/packages/zrwyt2/views/mine/Index.vue

@@ -91,12 +91,12 @@
                         <Iconfont icon="g-icon-capital">资金信息</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
+                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-authresult' }" v-if="authStatus === AuthStatus.Submitted">
+                <Cell is-link :to="{ name: 'account-certification' }" v-else-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
                     </template>