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

src/business/user/account.ts

@@ -1,6 +1,6 @@
 import { shallowRef, reactive } from 'vue'
 import { useLoginStore, useAccountStore } from '@/stores'
-import { investorDel, modifyPassword, requestAddAuth, requestAddUser, requestCreateContractAndAddSigner, requestSignCompleted } from '@/services/api/account'
+import { investorDel, modifyPassword, requestAddAuth, requestAddUser, requestCreateContractAndAddSigner, requestSignCompleted, requestWillFace } from '@/services/api/account'
 import cryptojs from 'crypto-js'
 
 const loginStore = useLoginStore()
@@ -167,4 +167,32 @@ export function useRequestSignCompleted() {
         loading,
         signCompleted
     }
+}
+
+/**
+ * 个人意愿核身认证
+ */
+export function useRequestWillFace() {
+    const loading = shallowRef(false)
+
+    const willFaceFormData = reactive<Model.WillFaceReq>({})
+
+    const willFace = async () => {
+        try {
+            loading.value = true
+            return await requestWillFace({
+                data: {
+                    ... willFaceFormData
+                }
+            })
+        } finally {
+            loading.value = false
+        }
+    }
+
+    return {
+        loading,
+        willFaceFormData,
+        willFace
+    }
 }

src/packages/pc/components/layouts/header/components/modify/index.vue

@@ -0,0 +1,84 @@
+<!-- 系统公告 -->
+<template>
+    <app-drawer class="app-notice" title="修改登录密码" :width="400" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" label-width="100px" :model="formData" :rules="formRules">
+            <el-form-item label="原密码" prop="OldPwd">
+                <el-input placeholder="请输入原密码" show-password v-model="formData.OldPwd" />
+            </el-form-item>
+            <el-form-item label="新密码" prop="NewPwd">
+                <el-input placeholder="请输入新密码" show-password v-model="formData.NewPwd" />
+            </el-form-item>
+            <el-form-item label="确认密码" prop="Confirmpassword">
+                <el-input placeholder="请重新输入新密码" show-password v-model="Confirmpassword" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button type="info" @click="onCancel(false)">取消</el-button>
+            <el-button type="danger" @click="onSubmit">修改密码</el-button>
+        </template>
+    </app-drawer>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import { useAccountPassword } from '@/business/user'
+import eventBus from '@/services/bus'
+import { validateRules } from '@/constants/regex'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
+
+const { formData, loading, formSubmit } = useAccountPassword(1)
+const show = ref(true)
+const refresh = ref(false)
+const formRef = ref<FormInstance>()
+const Confirmpassword = ref('')
+
+const formRules: FormRules = {
+    OldPwd: [{ required: true, message: '请输入原密码', trigger: 'blur' }],
+    NewPwd: [{
+        required: true,
+        validator: (rule, value, callback) => {
+            if (validateRules.password.validate(value)) {
+                callback()
+            } else {
+                callback(new Error(validateRules.password.message))
+            }
+        },
+        trigger: 'blur'
+    }],
+    Confirmpassword: [
+        {
+            required: true,
+            validator: (rule, value, callback) => {
+                if (value === formData.NewPwd) {
+                    callback()
+                } else {
+                    callback(new Error('密码输入不一致！'))
+                }
+            },
+            trigger: 'blur'
+        },
+    ],
+}
+
+const onCancel = (isRefresh = false) => {
+    show.value = false
+    refresh.value = isRefresh
+}
+
+const onSubmit = () => {
+    formRef.value?.validate((valid) => {
+        if (valid) {
+            formSubmit().then(() => {
+                ElMessage.success('密码修改成功').then.then(() => {
+                    eventBus.$emit('LogoutNotify')
+                })
+            }).catch((err) => {
+                ElMessage.error('提交失败：' + err)
+            })
+        }
+    })
+}
+
+</script>

src/packages/pc/components/layouts/header/index.vue

@@ -21,6 +21,8 @@
                 </span>
                 <template #dropdown>
                     <el-dropdown-menu>
+                        <el-dropdown-item :icon="Unlock"
+                            @click="openComponent('modify')">修改密码</el-dropdown-item>
                         <el-dropdown-item :icon="SwitchButton"
                             @click="eventBus.$emit('LogoutNotify')">退出登录</el-dropdown-item>
                     </el-dropdown-menu>
@@ -33,7 +35,7 @@
 
 <script lang="ts" setup>
 import { ref, onMounted, computed, defineAsyncComponent } from 'vue'
-import { SwitchButton } from '@element-plus/icons-vue'
+import { SwitchButton, Unlock } from '@element-plus/icons-vue'
 import { getFileUrl } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import { useUserStore, useGlobalStore, useNoticeStore } from '@/stores'
@@ -42,6 +44,7 @@ import AppIcon from '@pc/components/base/icon/index.vue'
 
 const componentMap = new Map<string, unknown>([
     ['notice', defineAsyncComponent(() => import('./components/notice/index.vue'))],
+    ['modify', defineAsyncComponent(() => import('./components/modify/index.vue'))],
 ])
 
 const { componentId, openComponent, closeComponent } = useComponent()

src/packages/qxst/views/account/certification/components/certification-next/Index.vue

@@ -21,11 +21,11 @@
                 </Field>
             </CellGroup>
             <CellGroup inset>
-                <Cell v-for="(item, index) in dataList" :key="index" :title="item.templatename" :icon="iconName(item.recordstatus)" :disable="[2, 4].includes(item.recordstatus)" @click="signer(item)" />
+                <Cell v-for="(item, index) in dataList.filter(obj => obj.templatetype === 2)" :key="index" :title="item.templatename" :icon="iconName(item.recordstatus)" :disable="[2, 4].includes(item.recordstatus)" @click="signer(item)" />
             </CellGroup>
             <template #footer>
                 <div class="g-form__footer inset">
-                    <Button type="danger" :disable="!canAdd" @click="completed()" round block>提交认证</Button>
+                    <Button type="danger" :disable="!canAdd" @click="onSubmit()" round block>提交认证</Button>
                 </div>
             </template>
         </app-view>
@@ -39,7 +39,7 @@ import { fullloading, dialog } from '@/utils/vant';
 import { getAQCertificateTypeListName } from "@/constants/account";
 import { useRequest } from '@/hooks/request'
 import { queryUserESignRecord } from '@/services/api/account';
-import { useRequestCreateContractAndAddSigner, useRequestSignCompleted } from '@/business/user/account';
+import { useRequestCreateContractAndAddSigner, useRequestSignCompleted, useRequestWillFace } from '@/business/user/account';
 import plus from '@/utils/h5plus'
 import eventBus from '@/services/bus'
 import { getFileUrl } from '@/filters';
@@ -50,6 +50,8 @@ const showModal = shallowRef(true)
 const refresh = shallowRef(false)
 const dataList = shallowRef<Model.UserESignRecordRsq[]>([])
 const { createSigner, templateNoFormData} = useRequestCreateContractAndAddSigner()
+/// 意愿视频认证
+const { willFace, willFaceFormData} = useRequestWillFace()
 const { signCompleted} = useRequestSignCompleted()
 /// 可以认证
 const canAdd = shallowRef(false)
@@ -57,24 +59,18 @@ const canAdd = shallowRef(false)
 /// 查询
 const { run } = useRequest(queryUserESignRecord, {
     onSuccess: (res) => {
-        if (res.data.length != 0) {
-            dataList.value = res.data.filter(obj => obj.templatetype === 2)
-        }
+        if (res.data.length != 0) { dataList.value = res.data  }
         /// 只有全部签署才可以进行下一步
-        canAdd.value = dataList.value.some(obj => [1, 4].includes(obj.recordstatus) )
+        canAdd.value = dataList.value.some(obj => obj.templatetype === 2 && [2, 3].includes(obj.recordstatus) )
     }
 })
 
 const iconName = (type: number) => {
     switch (type) {
-        case 2:
-            return 'info-o'
-        case 4:
-            return 'close'
-        case 3:
-            return 'passed'
-        default:
-            return 'circle'
+        case 2: return 'info-o'
+        case 4: return 'close'
+        case 3: return 'passed'
+        default: return 'circle'
     }
 }
 
@@ -119,17 +115,9 @@ const completed = () => {
 const signer = (item: Model.UserESignRecordRsq) => {
     ///  如果是已签署
     if (item.recordstatus === 2) {
-        if (item.signurl != '') {
-            openURL(item.signurl)
-        } else {
-            showFailToast('合同地址错误')
-        }
+        item.signurl != '' ? openURL(item.signurl) : showFailToast('合同地址错误')
     } else if (item.recordstatus === 3) { 
-        if (item.contractfileaddr != '') {
-            openURL(item.contractfileaddr)
-        } else {
-            showFailToast('已签署文件地址错误')
-        }
+        item.contractfileaddr != '' ? openURL(item.contractfileaddr) : showFailToast('合同地址错误')
     } else {
         fullloading((hideLoading) => {
             templateNoFormData.templateNo = item.templateno
@@ -144,6 +132,32 @@ const signer = (item: Model.UserESignRecordRsq) => {
     }
 }
 
+/// 最终提交
+const onSubmit = () => {
+    /// 如果类型为3 状态为3的 已经进行视频认证成功
+    if (dataList.value.some(obj => obj.templatetype === 3 && obj.recordstatus === 3)) {
+        completed()
+    } else {
+        willface()
+    }
+}
+
+/// 进行视频认证
+const willface = () => {
+    /// 参数信息
+    willFaceFormData.idCardNo = props.formData.idCard
+    willFaceFormData.realName = props.formData.name
+    /// loading
+    fullloading((hideLoading) => {
+        willFace().then((res) => {
+            hideLoading()
+            openURL(res.data.faceUrl)
+        }).catch((err) => {
+            showFailToast(err)
+        })
+    })
+}
+
 // 接收窗口页面状态通知
 const documentVisibilityStateNotify = eventBus.$on('DocumentVisibilityStateNotify', (state) => {
   if (state === 'visible') {

src/services/api/account/index.ts

@@ -184,4 +184,15 @@ export function requestSignCompleted(config: RequestConfig<Model.ContractAndAddS
         url: '/Account/SignCompleted',
         data: config.data,
     })
+}
+
+/**
+ * 个人意愿核身认证
+ */
+export function requestWillFace(config: RequestConfig<Model.WillFaceReq> = {}) {
+    return http.goRequest<Model.WillFaceRsq>({
+        method: 'post',
+        url: '/Account/WillFace',
+        data: config.data,
+    })
 }

src/types/model/bank.d.ts

@@ -363,4 +363,18 @@ declare namespace Model {
         /// 文件路径
         signUrl: string
     }
+
+    /// 个人意愿核身认证-请求
+    interface WillFaceReq {
+        /// 身份证号
+        idCardNo?: string
+        /// 真实姓名
+        realName?: string
+    }
+
+    /// 个人意愿核身认证-回应
+    interface WillFaceRsq {
+        /// 文件路径
+        faceUrl: string
+    }
 }