Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

public/config/appconfig.json

@@ -1,6 +1,6 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://8.130.72.213:8280/cfg?key=mtp_20",
+  "apiUrl": "http://192.168.31.175:8080/cfg?key=test_175",
   "shwoRegister": true
 }

src/business/user/account.ts

@@ -18,9 +18,10 @@ export function addAuthReq() {
     const formSubmit = async () => {
         try {
             loading.value = true
-            await requestAddAuth({
+            const res = await requestAddAuth({
                 data: formData
             })
+            return res
         } finally {
             loading.value = false
         }

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

@@ -89,7 +89,12 @@ const formRules: { [key in keyof Model.AddAuthReq]?: FieldRule[] } = {
 
 const onSubmit = () => {
     fullloading((hideLoading) => {
-        formSubmit().then(() => {
+        formSubmit().then((res) => {
+            /// 失败
+            if (res.code != '0') {
+                showFailToast(res.message)
+                return
+            }
             hideLoading()
             dialog('实名认证提交请求成功').then(() => {
                 router.back()

src/packages/mobile/views/bank/sign/Index.vue

@@ -8,7 +8,7 @@
                 <Cell title="开户银行" :value="bankInfo.bankname" />
                 <Cell title="银行卡号" :value="bankInfo.bankaccountno" />
                 <Cell title="姓名" :value="bankInfo.bankaccountname" />
-                <Cell title="支行名称" :value="bankInfo.branchbankname" />
+                <Cell title="支行名称" v-if="bankInfo.branchbankname !=''" :value="bankInfo.branchbankname" />
                 <Cell title="状态" :value="getSignStatusName(bankInfo.signstatus)" />
             </CellGroup>
         </div>

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

@@ -4,8 +4,8 @@
         :expand-row-keys="expandKeys" @row-click="rowClick">
         <template #headerLeft>
             <el-button type="primary"
-                v-if="authStatus === AuthStatus.Certified && ![SignStatus.Audit, SignStatus.Signed].includes(signStatus)"
-                @click="openComponent('sign')">添加签约账户</el-button>
+                v-if="[AuthStatus.Certified, AuthStatus.Submitted].includes(authStatus) && ![SignStatus.Audit, SignStatus.Signed].includes(signStatus)"
+                @click="showComponent('sign')">添加签约账户</el-button>
             <!-- <el-button type="warning" v-if="authStatus === AuthStatus.Uncertified"
                 @click="openComponent('certification')">实名认证</el-button> -->
             <el-button type="warning" v-if="authStatus === AuthStatus.Uncertified"
@@ -44,6 +44,7 @@ import { getSignStatusName, SignStatus } from '@/constants/bank'
 import { getCertificateTypeCodeName } from '@/constants/account'
 import { queryUserAccount } from '@/services/api/account'
 import { AuthStatus } from '@/constants/account'
+import { ElMessage } from 'element-plus'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -81,6 +82,15 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
     run()
 })
 
+const showComponent = ((componentName: string) => {
+    /// 认证请求中 不能操作
+    if (authStatus.value === AuthStatus.Submitted) {
+        ElMessage.error('实名认证正在审核中，暂不能进行签约请求操作！')
+        return
+    }
+    openComponent(componentName)
+})
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'accountcode', label: '资金账号' },
     { prop: 'accountname', label: '名称' },

src/services/api/account/index.ts

@@ -113,7 +113,7 @@ export function queryWrDraftUserInfo(config: RequestConfig<Model.WrDraftUserInfo
  * 实名认证请求
  */
 export function requestAddAuth(config: RequestConfig<Model.AddAuthReq> = {}) {
-    return http.request({
+    return http.request<Model.AddAuthRsp>({
         method: 'post',
         url: service.getConfig('openApiUrl') + '/onlineopen/userInfo/addAuth',
         data: config.data,

src/types/model/bank.d.ts

@@ -219,6 +219,15 @@ declare namespace Model {
         userinfotype?: number; // 用户类型
     }
 
+    interface AddAuthRsp {
+        // 返回码
+        code: string
+        // 返回信息
+        message: string
+        /// 是否实名
+        hasAuth: number
+    }
+
     /** 资金流水查询（当前） 请求 */
     interface AmountLogReq {
         // 页码