Commit 2cd2a2dc authored by 李晓兵's avatar 李晓兵

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

parents 1af4f69a f8ea1ab5
Pipeline #2886 canceled with stages
......@@ -28,11 +28,11 @@
</item>
<item>
<div slot="name">车辆型号 </div>
<input slot="content" v-model="rentInfo.type" readonly placeholder="自动识别车辆型号" >
<input slot="content" v-model="rentInfo.vehicle_model" readonly placeholder="自动识别车辆型号" >
</item>
<item>
<div slot="name">合格证编号 </div>
<input slot="content" v-model="rentInfo.number" readonly placeholder="自动识别合格证编号" >
<input slot="content" v-model="rentInfo.certificate_number" readonly placeholder="自动识别合格证编号" >
</item>
<!-- <item>
<div slot="name">厂商型号</div>
......
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-11-13 10:07:57
* @LastEditTime: 2019-11-14 16:32:55
* @LastEditors: Please set LastEditors
* @Description: 合同查询--记录
* @FilePath:
......@@ -58,8 +58,8 @@
<div><span>承租人</span><p>{{ item.bp_name }}</p></div>
<div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
<div><span>期限</span><p>{{ item.lease_times }}</p></div>
<div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
<span class="red">逾期{{ item.due_times }}</span>
<div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
<span class="red">已逾</span>
<section @click="toRepayDetail(item.project_id)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
......@@ -88,8 +88,8 @@
<div><span>承租人</span><p>{{ item.bp_name }}</p></div>
<div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
<div><span>期限</span><p>{{ item.lease_times }}</p></div>
<div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
<span class="red">逾期{{ item.due_times }}</span>
<div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
<span class="red">已逾</span>
<section @click="toRepayDetail(item.project_id)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
......@@ -117,8 +117,8 @@
<div><span>承租人</span><p>{{ item.bp_name }}</p></div>
<div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
<div><span>期限</span><p>{{ item.lease_times }}</p></div>
<div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
<span class="red">逾期{{ item.due_times }}</span>
<div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
<span class="red">已逾</span>
<section @click="toRepayDetail(item.project_id)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
......@@ -146,8 +146,8 @@
<div><span>承租人</span><p>{{ item.bp_name }}</p></div>
<div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
<div><span>期限</span><p>{{ item.lease_times }}</p></div>
<div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
<span class="red">逾期{{ item.due_times }}</span>
<div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
<span class="red">已逾</span>
<section @click="toRepayDetail(item.project_id)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
......@@ -175,8 +175,8 @@
<div><span>承租人</span><p>{{ item.bp_name }}</p></div>
<div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
<div><span>期限</span><p>{{ item.lease_times }}</p></div>
<div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
<span class="red">逾期{{ item.due_times }}</span>
<div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
<span class="red">已逾</span>
<section @click="toRepayDetail(item.project_id)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
......
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-11-08 09:23:51
* @LastEditTime: 2019-11-14 17:40:59
* @LastEditors: Please set LastEditors
* @Description: 合同查询--明细
* @FilePath:
......@@ -64,15 +64,16 @@
<span>{{ item.lease_item_engine_num }}</span>
</div>
<div class="list">
<p>厂商型号</p>
<span>{{ item.lease_item_factory_num }}</span>
<p>车辆型号</p>
<span>{{ item.vehicle_model }}</span>
</div>
<div class="list">
<p>车牌</p>
<span>{{ item.lease_item_car_num }}</span>
<p>合格证编</p>
<span>{{ item.certificate_number }}</span>
</div>
</div>
<div slot="content">
<span v-if="item.overdue_times!=undefined" :class="['status','red']">逾期{{ item.overdue_times }}</span>
<div class="plan" @click="toRepayPlans(item.contract_id)">
<img src="@/assets/contractRepayment/plan.png" alt="">
<span>还款计划</span>
......@@ -157,25 +158,14 @@ export default {
</script>
<style lang='less' >
#repay-detail {
.h-header {
background-color: #1D3FFF;
.h-header-btn {
img {
width: 16px;
height: 16px;
margin-left: 4px;
}
span {
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
letter-spacing: 0.61px;
line-height: 24px;
}
}
.status{
margin-bottom:20px;
display: inline-block;
}
.red{
color: red;
border-bottom: 1px solid red;
}
.repay-content {
.header {
position: relative;
......
......@@ -53,16 +53,16 @@
<span>{{ item.lease_item_engine_num }}</span>
</div>
<div class="list">
<p>厂商型号</p>
<span>{{ item.lease_item_factory_num }}</span>
<p>车辆型号</p>
<span>{{ item.vehicle_model }}</span>
</div>
<div class="list">
<p>车牌</p>
<span>{{ item.lease_item_car_num }}</span>
<p>合格证编</p>
<span>{{ item.certificate_number }}</span>
</div>
</div>
<div slot="content">
<span :class="['status','red']">{{ '逾期X期' }}</span>
<span v-if="item.overdue_times!=undefined" :class="['status','red']">逾期{{ item.overdue_times }}</span>
<div class="plan" @click="toRepayPlan(item.contract_id)">
<img src="@/assets/contractRepayment/plan.png" alt="">
<span>还款计划</span>
......@@ -92,13 +92,7 @@ export default {
product_plan_id_n: '',
product_num: '',
},
lists: [{
'lease_item_car_num': 'GH',
'product_code': 'GTC389',
'lease_item_factory_num': 'EF',
'lease_item_engine_num': 'CD',
'contract_id': '123',
}],
lists: [],
}
},
computed: {},
......
......@@ -448,6 +448,11 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showSuccess('申请成功')
setTimeout(() => {
vm.$router.push({
name: 'StartList',
})
}, 2000)
} else {
hlsPopup.showLongCenter(res.message)
}
......
......@@ -70,9 +70,9 @@ export default {
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.getList()
}
// if (from.name === 'MyInfo') {
vm.getList()
// }
})
},
watch: {
......
......@@ -2,7 +2,7 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-11-13 18:38:45
* @LastEditTime: 2019-11-14 09:08:44
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -190,16 +190,7 @@
<div slot="content" class="in-detail"><img src="@/assets/constractSigning/detail.png" alt=""></div>
</item>
</list-item>
<!-- <list-item :item-height="56">
<item :proportion="[4,1]">
<div slot="name" class="aguremrnt-list">
<img src="@/assets/distributorSign/gray.png" alt="" class="pics">
<p class="second">经销商担保协议</p>
<img src="@/assets/distributorSign/unread.png" alt="" class="read">
</div>
<img slot="content" src="@/assets/distributorSign/into.png" alt="">
</item>
</list-item> -->
</h-content>
<bottom-tab v-if="confirm_status!=='APPROVED'" class="footer-button">
<tab-button class="approve" @click.native="contractConfirm('APPROVED')">
......
......@@ -2,7 +2,7 @@
* @Descrip: 主页
* @Author: your name
* @Date: 2019-10-10 14:25:15
* @LastEditTime: 2019-11-13 11:04:08
* @LastEditTime: 2019-11-14 09:56:22
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -106,6 +106,7 @@ export default {
vm.province = window.localStorage.getItem('province')
} else {
// 没有就定位当前位置
console.log(res)
vm.city = res.address.city
vm.province = res.address.province
}
......
......@@ -170,6 +170,7 @@ export default {
watchBpStatus () {
if (!this.bp_id && this.user_bp_status === 'NEW') {
this.description = '用户绑定'
this.approveBtn = false
} else if (this.bp_id && this.user_bp_status === 'NEW') {
this.description = '待提交'
} else if (this.bp_id && this.user_bp_status === 'APPROVED') {
......
......@@ -93,10 +93,10 @@
<span>¥{{ money |currency }}</span>
</div>
<div class="interest">
<span>本次交易收取{{ rate }}%服务</span>
<span>本次交易收取{{ rate }}%手续</span>
</div>
<div class="info-item">
<span>服务</span>
<span>手续</span>
<span>{{ serviceCharge |currency }}</span>
</div>
<div class="info-item" @click="show=true">
......
......@@ -2,7 +2,7 @@
* @Descrip: 产品明细
* @Author: your name
* @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-11-13 14:44:06
* @LastEditTime: 2019-11-14 15:19:39
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -178,7 +178,6 @@ export default {
vueTouch: function (s, e) {
let clientHeight = document.body.clientHeight // 屏幕可视高度
let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
console.log(procnfGather)
let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
let baseGather = document.getElementsByClassName('base')[0].getBoundingClientRect() // 基本信息元素集合
if (clientHeight - procnfGather.top >= procnfGather.height) {
......
......@@ -238,7 +238,7 @@ export default new Router({
{path: '/add-car', component: AddCar, name: 'AddCar', meta: {keepAlive: false}},
// 发车确认
{path: '/confirm-detail', component: ConfirmDetail, name: 'ConfirmDetail', meta: {keepAlive: true}},
{path: '/confirm-list', component: ConfirmList, name: 'ConfirmList', meta: {keepAlive: true}},
{path: '/confirm-list', component: ConfirmList, name: 'ConfirmList', meta: {keepAlive: false}},
// 合同查询
{path: '/contract-records', component: ContractRecords, name: 'ContractRecords', meta: {keepAlive: true}},
{path: '/repay-detail', component: RepayDetail, name: 'RepayDetail', meta: {keepAlive: true}},
......
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