Skip to content

H
hls-xcmg-vue-app
Commit e3de6ee7 authored by 李晓兵's avatar 李晓兵
Browse files
Options

'待签约认证'

parent 0dfac473
Show whitespace changes
Inline Side-by-side
Showing with 904 additions and 841 deletions
config/uat.env.js
View file @ e3de6ee7
......@@ -10,5 +10,5 @@ module.exports = {
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
ocrPath:'"http://180.104.121.66:8088/r/api"',
appId: '"com.xcmg.app"',
currentVersion: '"1.1.8"'
currentVersion: '"1.1.9"'
}
src/main.js
View file @ e3de6ee7
......@@ -59,8 +59,8 @@ import Jpush from './scripts/jpushService'
import Jmessage from './scripts/jmessageService'
// if (process.env.CONFIG_ENV === 'uat') {
const VConsole = require('vconsole')
new VConsole() // eslint-disable-line
// const VConsole = require('vconsole')
// new VConsole() // eslint-disable-line
// }
Vue.use(componentInstall)
......
src/pages/contractSigning/body-check.vue
View file @ e3de6ee7
......@@ -62,7 +62,7 @@
</h-view>
</template>
<script>
export default {
export default {
data () {
return {
downNum: false,
......@@ -80,9 +80,6 @@ export default {
vm.downNum = false // 模态框消失
let onSuccess = function (mediaFiles) {
// 遍历获取录制的文件（iOS 只支持一次录制一个视频）
/* for (let i = 0; i < mediaFiles.length; i++) {
alert('录制成功！\n\n' + '文件名：' + mediaFiles[i].name + '\n' + '大小：' + mediaFiles[i].size + '\n\n' + 'localURL地址：' + mediaFiles[i].localURL + '\n\n' + 'fullPath地址：' + mediaFiles[i].fullPath)
} */
console.log('录制成功！\n\n' + '文件名：' + mediaFiles[0].name + '\n' + '大小：' + mediaFiles[0].size + '\n\n' + 'localURL地址：' + mediaFiles[0].localURL + '\n\n' + 'fullPath地址：' + mediaFiles[0].fullPath)
vm.succesCall(mediaFiles[0].fullPath) // 开始检测
// vm.svaeVideo(mediaFiles[0].fullPath) // 上传视频文件至业务系统
......@@ -166,9 +163,27 @@ export default {
vm.hlsPopup.hideLoading()
console.log('##########res ' + JSON.stringify(res))
if (res.result.result.thresholds.frr_1e - 2 < 0.9) {
hlsPopup.showConfirm({
title: '提示',
content: `检测失败，是否重新重新尝试？`,
onConfirm: data => {
if (data) {
// 重新尝试
vm.getCode()
} else {
}
},
})
vm.hlsPopup.showLongCenter('检测失败，请重新尝试')
} else {
vm.hlsPopup.showLongCenter('检测成功')
hlsPopup.showPopup({
title: '提示',
content: `检测成功，请进行电子签认证`,
onConfirm: () => {
// 电子签认证
vm.goElectronicSign()
},
})
}
})
},
......@@ -192,6 +207,29 @@ export default {
/* let str = '098672'
vm.codeList = [...str] */
},
goElectronicSign () { // 电子签
let vm = this
let url = process.env.basePath + 'get_sign_url'
let param = {
confirm_id: vm.$route.params.confirm_id,
data_class: 'PRJ_PROJECT',
}
vm.hlsPopup.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.info.msg === 'success') {
/* vm.$router.push({
name: 'ElectronicSign',
params: {
url: res.info.data.url,
},
})*/
cordova.InAppBrowser.open(res.info.data.url, '_blank', 'location=yes')
} else {
vm.hlsPopup.showLongCenter(res.info.msg)
}
})
},
computeTime () { // 倒计时
let vm = this
let timer = setInterval(() => {
......@@ -211,10 +249,10 @@ export default {
},
},
}
}
</script>
<style lang="less" scoped>
#body-check {
#body-check {
.trans-enter-active,
.trans-leave-active {
transition: opacity 0.5s;
......@@ -370,5 +408,5 @@ export default {
font-family: PingFangSC-Semibold;
font-size: 15px;
}
}
}
</style>
src/pages/contractSigning/contract-detail.vue
View file @ e3de6ee7
......@@ -109,12 +109,12 @@
<p>本人同意接收来自于徐工融资租赁有限公司或第三方发出的提醒付款、确认付款、催款等短信(不含广告),同意接收来自于徐工融资租赁有限公司的录音电话,并积极配合。</p>
</div>
</div>
<div v-if="tabNum === 1" class="bodyCheck">
<button @click="goBodyCheck">活体检测</button>
</div>
<div v-if="tabNum === 1" class="sign-elect">
<!-- <div v-if="tabNum === 1" class="bodyCheck">
<button @click="iFram">iFram</button>
</div>-->
<!-- <div v-if="tabNum === 1" class="sign-elect">
<button @click="goElectronicSign">电子签</button>
</div>
</div>-->
</div>
</h-content>
<h-content v-if="num === 2">
......@@ -266,14 +266,11 @@
</div>
</div>
</h-content>
<!-- <bottom-tab v-if="con_confirm_status == 'SUBMIT'">
<tab-button class="footer" @click.native="inSure">
审批
<bottom-tab v-if="con_confirm_status!=='APPROVED'" class="add-box">
<tab-button class="before" @click.native="takePhonto">
<img src="@/assets/constractSigning/certification.png" >认证
</tab-button>
</bottom-tab>-->
<bottom-tab v-if="con_confirm_status!=='APPROVED'" class="footer-button">
<!-- <tab-button class="approve" @click.native="showModalValue=true"> -->
<tab-button class="approve" @click.native="inSure">
<tab-button class="next" @click.native="inSure">
<img src="@/assets/intoApproval/approve.png" >审批
</tab-button>
</bottom-tab>
......@@ -444,15 +441,16 @@ export default {
}
})
},
goBodyCheck () { // 活体检测
goBodyCheck (confirm_id) { // 活体检测
this.$router.push({
name: 'BodyCheck',
params: {
check_id: this.$route.params.check_id,
confirm_id: confirm_id,
},
})
},
goElectronicSign () { // 电子签
/* goElectronicSign () { // 电子签
let vm = this
let url = process.env.basePath + 'get_sign_url'
let param = {
......@@ -463,17 +461,18 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.info.msg === 'success') {
vm.$router.push({
/!* vm.$router.push({
name: 'ElectronicSign',
params: {
url: res.info.data.url,
},
})
})*!/
cordova.InAppBrowser.open(res.info.data.url, '_blank', 'location=yes')
} else {
vm.hlsPopup.showLongCenter(res.info.msg)
}
})
},
}, */
charge (val, status) {
let vm = this
this.hlsPopup.showConfirm({
......@@ -481,25 +480,24 @@ export default {
content: `您确认${val}吗？`,
onConfirm: data => {
if (data) {
// 执行同意的逻辑,先打开相机自拍一张
vm.takePhonto(status)
// this.confirmContractSign()
// 需要先校验是否认证通过
vm.doConfirm(status)
}
},
})
},
takePhonto (status) {
takePhonto () {
let vm = this
hlsPopup.showPopup({
title: '提示',
content: `请自拍一张`,
onConfirm: () => {
vm.takePhontoOpenCamera(status)
vm.takePhontoOpenCamera()
},
})
},
// 打开相机自拍
takePhontoOpenCamera (status) {
takePhontoOpenCamera () {
let vm = this
vm.faceListUpload = []
let obj = {
......@@ -518,7 +516,7 @@ export default {
let success = function (imgdata) {
obj.filePath = imgdata
// obj.filePath = 'http://hlsapp.hand-china.com/file/XCMG/2.jpg'
vm.confirmContractSign(imgdata, status)
vm.confirmContractSign(imgdata)
vm.faceListUpload.push(obj)
}
let error = function () {
......@@ -527,11 +525,11 @@ export default {
hlsUtil.openCamera(cameraoptions, success, error)
// this.confirmContractSign('', status)
},
// 执行同意的逻辑(查询对应的身份证正面图片->人脸识别->确认签约)
async confirmContractSign (faceImg, status) {
// 执行同意的逻辑(查询对应的身份证正面图片->人脸识别->活体检测)
async confirmContractSign (faceImg) {
let idCardImgUrl = await this.idCardImgUrlGet()
if (idCardImgUrl) {
this.faceIdentify(faceImg, idCardImgUrl, status)
this.faceIdentify(faceImg, idCardImgUrl)
}
},
// 获取身份证照片
......@@ -561,7 +559,7 @@ export default {
}
},
// 人脸比对
faceIdentify (faceImg, idCardImgUrl, status) {
faceIdentify (faceImg, idCardImgUrl) {
let vm = this
let obj = {
fileUrl: faceImg,
......@@ -572,21 +570,31 @@ export default {
hlsUtil.baiduOcrFace(obj, url, function (res) {
hlsPopup.hideLoading()
if (res.success) {
vm.save_picture(vm.faceListUpload)
let identifyScore = res.result.result.score.toFixed(0)
hlsPopup.showConfirm({
hlsPopup.showPopup({
title: '提示',
content: `识别分数为${identifyScore}`,
onConfirm: data => {
if (data) {
vm.doConfirm(status)
} else {
}
content: `识别分数为${identifyScore},请进行活体检测`,
onConfirm: () => {
// 进入活体检测页面
vm.goBodyCheck(vm.confirm_id)
},
})
} else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
}
})
/* vm.save_picture(vm.faceListUpload)
let identifyScore = 90
hlsPopup.showPopup({
title: '提示',
content: `识别分数为${identifyScore},请进行活体检测`,
onConfirm: () => {
// 进入活体检测页面
vm.goBodyCheck(vm.confirm_id)
},
}) */
},
// 确认签约逻辑
doConfirm (status) {
......@@ -603,7 +611,6 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.save_picture(vm.faceListUpload)
vm.hlsPopup.showSuccess('审批成功')
window.localStorage.setItem('backFlag', true)
vm.$routeGo()
......@@ -848,7 +855,7 @@ export default {
}
</script>
<style lang="less" rel="stylesheet">
#contract-details {
#contract-details {
.sign-elect {
width:100%;
height:1.1rem;
......@@ -871,7 +878,7 @@ export default {
letter-spacing: 0.2rem;
}
}
.bodyCheck{
.bodyCheck{
width:100%;
height:1.1rem;
position: fixed;
......@@ -891,7 +898,7 @@ export default {
line-height: 0.88rem;
letter-spacing: 0.2rem;
}
}
}
.footer-button {
.approve {
width: 358.6px;
......@@ -965,7 +972,7 @@ export default {
height: 16px;
}
.alert {
padding-bottom: 160px;
padding-bottom: 30px;
width: 100%;
//margin-top: -10px;
background: #fbf2d2;
......@@ -1451,8 +1458,26 @@ export default {
background: #00469c;
border: 1px solid #00469c;
}
}
.modal {
.add-box {
.before {
border: 1px solid #fdb62f;
border-radius: 4px;
color: #fdb62f;
img{
width: 18px;
}
}
.next {
background: #1d3fff;
border-radius: 4px;
color: #fff;
img{
width: 18px;
}
}
}
}
.modal {
background-color: rgba(0, 0, 0, 0) !important;
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment