Commit 0dfac473 authored by 李晓兵's avatar 李晓兵

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents 9b6078e9 3352ddd9
Pipeline #4273 canceled with stages
This diff is collapsed.
......@@ -87,7 +87,7 @@ export default {
watch: {},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'ContractDetail') {
if (from.name === 'ContractDetail' || from.name === 'CreateRentInfo') {
vm.product_num = vm.$route.params.product_num
vm.getInfo()
}
......
......@@ -2,7 +2,7 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-11-28 17:42:24
* @LastEditTime: 2019-12-20 15:36:19
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -167,6 +167,16 @@
</list-item>
</h-content>
<bottom-tab v-show="confirm_status!=='APPROVED'&&tabNum === 0" class="footer-button">
<tab-button class="approve" @click.native="goBodyCheck">
活体检测
</tab-button>
</bottom-tab>
<bottom-tab v-show="confirm_status!=='APPROVED'&&tabNum === 0" class="footer-button">
<tab-button class="approve" @click.native="goElectronicSign">
电子签
</tab-button>
</bottom-tab>
<bottom-tab v-if="confirm_status!=='APPROVED'" class="footer-button">
<tab-button class="approve" @click.native="contractConfirm('APPROVED')">
确认签约
......@@ -250,6 +260,33 @@ export default {
created () {},
methods:
{
goBodyCheck () { // 活体检测
this.$router.push({
name: 'BodyCheck',
})
},
goElectronicSign () { // 电子签
let vm = this
let url = process.env.basePath + 'get_sign_url'
let param = {
confirm_id: vm.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,
},
})
} else {
vm.hlsPopup.showLongCenter(res.info.msg)
}
})
},
// 签约确认
contractConfirm (status) {
let vm = this
......@@ -766,6 +803,32 @@ export default {
}
}
}
.footer-button:nth-of-type(1) {
bottom: 92px;
.approve {
width: 358.6px;
height: 44px;
background: @headerColor;
border-radius: 4px;
color: #fff;
font-family: PingFangSC-Semibold;
font-size: 15px;
line-height: 20px;
}
}
.footer-button:nth-of-type(2) {
bottom: 46px;
.approve {
width: 358.6px;
height: 44px;
background: @headerColor;
border-radius: 4px;
color: #fff;
font-family: PingFangSC-Semibold;
font-size: 15px;
line-height: 20px;
}
}
.approveContent {
position: absolute;
top: 50%;
......
......@@ -724,6 +724,7 @@ export default {
window.localStorage.setItem('user_bp_status', res.info.user_bp_status)
window.localStorage.setItem('bp_name', res.info.user_bp_name)
window.localStorage.setItem('bp_identity', res.info.bp_identity)
window.localStorage.setItem('bp_class', res.info.user_bp_class)
vm.user_bp_name = res.info.user_bp_name
vm.user_bp_type = res.info.user_bp_type
vm.user_phone = res.info.user_phone
......
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