代码提交

oem/gstj/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "甘肃碳交",
   "version": "1.0.29",
   "versionCode": "100029",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://8.130.69.63:8280/cfg?key=gstj",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/packages/gcszt/router/index.ts

@@ -129,6 +129,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/account/certification/Index.vue'),
       },
       {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
+      {
         path: 'protocol',
         name: 'account-protocol',
         component: () => import('../views/account/protocol/Index.vue'),

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

@@ -87,6 +87,11 @@
                         <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 && hasSignContract">
                     <template #title>
                         <Iconfont icon="g-icon-sign">银行签约</Iconfont>

src/packages/gstj/router/index.ts

@@ -109,6 +109,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'account-certification',
         component: () => import('@mobile/views/account/certification/Index.vue'),
       },
+      {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
     ],
   },
   {

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

@@ -93,6 +93,11 @@
                         <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>

src/packages/gzcj/router/index.ts

@@ -110,6 +110,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/account/certification/Index.vue'),
       },
       {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
+      {
         path: 'protocol',
         name: 'account-protocol',
         component: () => import('../views/account/protocol/Index.vue'),

src/packages/gzcj/views/account/protocol/Index.vue

@@ -18,11 +18,6 @@
                 </template>
             </CellGroup>
         </div>
-        <!-- <template #footer>
-            <div class="g-form__footer inset">
-                <Button type="danger" @click="onClose()" round block>完成合同签署</Button>
-            </div>
-        </template> -->
     </app-view>
 </template>
 

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

@@ -90,6 +90,11 @@
                         <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 && hasSignContract">
                     <template #title>
                         <Iconfont icon="g-icon-sign">银行签约</Iconfont>

src/packages/mobile/router/index.ts

@@ -105,7 +105,12 @@ const routes: RouteRecordRaw[] = [
         path: 'certification',
         name: 'account-certification',
         component: () => import('../views/account/certification/Index.vue'),
-      }
+      },
+      {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('../views/account/authresult/Index.vue'),
+      },
     ]
   },
   {

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

@@ -0,0 +1,49 @@
+<template>
+    <app-view class="g-form account-certification">
+        <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>
+            </CellGroup>
+    </app-view>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue'
+import { CellGroup, Field, Image } 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';
+
+const userInfo = shallowRef<Model.UserInfo>()
+
+/// 查询托管银行信息
+useRequest(queryWrDraftUserInfo, {
+    onSuccess: (res) => {
+        /// 签约状态
+        if (res.data.length != 0) {
+            userInfo.value = res.data[0]
+        }
+    }
+})
+</script>

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

@@ -98,6 +98,11 @@
                         <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>

src/packages/nhgj/router/index.ts

@@ -110,6 +110,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/account/certification/Index.vue'),
       },
       {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
+      {
         path: 'protocol',
         name: 'account-protocol',
         component: () => import('../views/account/protocol/Index.vue'),

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

@@ -90,6 +90,11 @@
                         <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 && canBankSign">
                     <template #title>
                         <Iconfont icon="g-icon-sign">签约账户</Iconfont>

src/packages/qdhs/router/index.ts

@@ -120,6 +120,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'account-certification',
         component: () => import('@mobile/views/account/certification/Index.vue'),
       },
+      {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
     ],
   },
   {

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

@@ -90,6 +90,11 @@
                         <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>

src/packages/qxst/router/index.ts

@@ -117,6 +117,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'account-certification',
         component: () => import('../views/account/certification/Index.vue'),
       },
+      {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
     ],
   },
   {

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

@@ -87,6 +87,11 @@
                         <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>

src/packages/sbyj/router/index.ts

@@ -121,6 +121,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/account/certification/Index.vue'),
       },
       {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
+      {
         path: 'protocol',
         name: 'account-protocol',
         component: () => import('../views/account/protocol/Index.vue'),

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

@@ -106,56 +106,52 @@
         <app-block class="g-navmenu">
             <CellGroup>
                 <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 && canBankSign">
-
                     <template #title>
                         <Iconfont icon="g-icon-sign">签约账户</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'account-protocol', query: { memberUserId: getMemberUserId() } }"
                     v-if="userStore.userType != 2 && authStatus === AuthStatus.Certified">
-
                     <template #title>
                         <Iconfont icon="g-icon-order--line">合同签署</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-profile' }">
-
                     <template #title>
                         <Iconfont icon="g-icon-profile">个人信息</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-zcxy' }">
-
                     <template #title>
                         <Iconfont icon="g-icon-zcxy">用户注册协议</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-yszc' }">
-
                     <template #title>
                         <Iconfont icon="g-icon-yszc">关于隐私</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-fwrx' }">
-
                     <template #title>
                         <Iconfont icon="g-icon-fwrx">服务热线</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-setting' }">
-
                     <template #title>
                         <Iconfont icon="g-icon-setting">设置</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-gywm' }">
-
                     <template #title>
                         <Iconfont icon="g-icon-gywm">关于我们</Iconfont>
                     </template>

src/packages/tc/router/index.ts

@@ -106,6 +106,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'account-certification',
         component: () => import('@mobile/views/account/certification/Index.vue'),
       },
+      {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      }
     ],
   },
   {

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

@@ -93,6 +93,11 @@
                         <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>

src/packages/thj/router/index.ts

@@ -120,6 +120,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/account/certification/Index.vue'),
       },
       {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
+      {
         path: 'protocol',
         name: 'account-protocol',
         component: () => import('../views/account/protocol/Index.vue'),

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

@@ -90,6 +90,11 @@
                         <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 && canBankSign">
                     <template #title>
                         <Iconfont icon="g-icon-sign">签约账户</Iconfont>

src/packages/tjmd/router/index.ts

@@ -107,6 +107,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/account/certification/Index.vue'),
       },
       {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
+      {
         path: 'protocol',
         name: 'account-protocol',
         component: () => import('../views/account/protocol/Index.vue'),

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

@@ -93,6 +93,11 @@
                         <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 && canBankSign">
                     <template #title>
                         <Iconfont icon="g-icon-sign">签约账户</Iconfont>

src/packages/zrwyt/router/index.ts

@@ -121,6 +121,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/account/certification/Index.vue'),
       },
       {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
+      {
         path: 'protocol',
         name: 'account-protocol',
         component: () => import('../views/account/protocol/Index.vue'),

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

@@ -96,6 +96,11 @@
                         <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 && ((hasAQAuth && hasSignContract) || !hasAQAuth)">
                     <template #title> 
                         <Iconfont icon="g-icon-sign">银行签约</Iconfont>

src/packages/zrwyt2/router/index.ts

@@ -118,6 +118,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/account/certification/Index.vue'),
       },
       {
+        path: 'authresult',
+        name: 'account-authresult',
+        component: () => import('@mobile/views/account/authresult/Index.vue'),
+      },
+      {
         path: 'protocol',
         name: 'account-protocol',
         component: () => import('../views/account/protocol/Index.vue'),

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

@@ -96,6 +96,11 @@
                         <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 && ((hasAQAuth && hasSignContract) || !hasAQAuth)">
                     <template #title> 
                         <Iconfont icon="g-icon-sign">银行签约</Iconfont>

src/services/api/account/index.ts

@@ -140,7 +140,10 @@ export function queryAccountRole(config: RequestConfig = {}) {
 export function queryWrDraftUserInfo(config: RequestConfig<Model.WrDraftUserInfoReq> = {}) {
     return http.commonRequest<Model.UserInfo[]>({
         url: '/WrTrade2/QueryWrDraftUserInfo',
-        params: config.data,
+        params: {
+            userid: loginStore.userId,
+            ...config.data
+        },
     })
 }