Skip to content

H
hls-xcmg-vue-app
Commit f19a8380 authored by linxin's avatar linxin
Browse files
Options

Merge branch 'liuxin' into develop

parents 8f2ac57a b8f0964d
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 86 deletions
src/pages/contractRepayment/contract-repayment.vue
View file @ f19a8380
......@@ -19,8 +19,8 @@
<div class="center">
<div><span>合同金额</span><p>{{ item.total_price|currency }}</p></div>
<div><span>已还金额</span><p class="bold">{{ item.recivied_amount|currency }}</p></div>
<span class="red">逾期{{ item.overdue_times }}期</span>
<section @click="toRepayDetails(item.project_id)">
<span v-if="item.overdue_status==='Y'" class="red">已逾期</span>
<section @click="toRepayDetails(item)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
</section>
......@@ -90,7 +90,8 @@ export default {
this.$router.push({
name: 'RepayDetails',
params: {
project_id: e,
project_id: e.project_id,
overdue_status: e.overdue_status,
},
})
},
......@@ -213,7 +214,6 @@ export default {
div:first-child {
border-top: 1px solid #F3F3F7;
}
span.red{
margin-top: 10px;
position: relative;
......
src/pages/contractRepayment/repay-details.vue
View file @ f19a8380
......@@ -62,6 +62,7 @@
</div>
</div>
<div slot="content">
<span :class="['status','red']">{{ '逾期X期' }}</span>
<div class="plan" @click="toRepayPlan(item.contract_id)">
<img src="@/assets/contractRepayment/plan.png" alt="">
<span>还款计划</span>
......@@ -81,6 +82,7 @@ export default {
},
data () {
return {
overdue_status: this.$route.params.overdue_status,
detailInfo: {
project_number: '',
agent_bp_name: '',
......@@ -155,6 +157,18 @@ export default {
</script>
<style lang='less' >
#repay-details {
.status{
margin-bottom:20px;
display: inline-block;
}
.red{
color: red;
border-bottom: 1px solid red;
}
.blue{
color: blue;
border-bottom: 1px solid blue;
}
.h-header {
background-color: @headerColor;
.h-header-btn {
......
src/pages/contractStart/start-list.vue
View file @ f19a8380
......@@ -96,10 +96,10 @@ export default {
vm.done = []
vm.tabNum = 0
vm.undo = vm.lists.filter(i => {
return i.leases_status === 'N'
return i.car_start_status === 'REJECTED' || i.car_start_status === 'NEW'
})
vm.done = vm.lists.filter(i => {
return i.leases_status === 'Y'
return i.car_start_status === 'APPROVED'
})
this.showList = this.undo
},
......
src/pages/pay/firstPay/contract-record.vue
View file @ f19a8380
......@@ -172,7 +172,6 @@ export default {
<style lang='less' >
#contract-record {
.top-head {
position: fixed;
width: 100%;
height: 142px;
background: url("../../../assets/payment/back1.png");
......@@ -204,8 +203,7 @@ export default {
.pay-content {
width: 100%;
position: relative;
top: 80px;
margin-top:-60px;
height: 370px;
overflow: scroll;
.contract-item {
......
src/pages/pay/firstPay/pay-entry.vue
View file @ f19a8380
......@@ -77,7 +77,8 @@
</section>
</item>
</list-item>
</scroll></div>
</scroll>
</div>
</div>
</transition>
<transition name="trans">
......@@ -202,7 +203,7 @@ export default {
return (this.money * (this.rate / 100)).toFixed(2)
},
rate () {
return this.checkType.bank_full_name.indexOf('农业') !== -1 ? 0.00 : 0.18
return this.checkType.bank_full_name.indexOf('农业') !== -1 ? 0.0 : 0.18
},
sumMoney () {
return (parseFloat(this.serviceCharge) + parseFloat(this.money)).toFixed(
......@@ -355,7 +356,7 @@ export default {
</script>
<style lang='less' >
#pay-entry {
.vue-better-scroll__wrapper{
.vue-better-scroll__wrapper {
padding: 0;
}
.trans-enter-active,
......@@ -378,12 +379,12 @@ export default {
.down {
height: 466px;
width: 100%;
position: relative;
top:16%;
position: relative;
top: 18%;
background-color: #fff;
border-radius: 12px 12px 0 0;
overflow: scroll;
display: flex;
display: flex;
align-items: center;
flex-direction: column;
.top {
......@@ -404,7 +405,6 @@ export default {
text-align: center;
}
}
}
}
.modal-show-bank {
......@@ -419,12 +419,12 @@ export default {
.down {
height: 466px;
width: 100%;
position: relative;
top:16%;
position: relative;
top: 18%;
background-color: #fff;
border-radius: 12px 12px 0 0;
overflow: scroll;
display: flex;
display: flex;
align-items: center;
flex-direction: column;
.top {
......@@ -447,9 +447,8 @@ export default {
}
}
.pay-way {
width: 100%;
padding: 0 4% 0 4%;
width: 100%;
padding: 0 4% 0 4%;
background: #fff;
.hls-item {
padding-left: 12px;
......@@ -459,7 +458,7 @@ export default {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
div{
div {
display: flex;
justify-content: center;
align-items: center;
......@@ -484,7 +483,7 @@ export default {
display: block;
float: left;
position: relative;
margin: 0 8px 0 3px;
margin: 0 8px 0 3px;
}
}
......@@ -497,7 +496,7 @@ export default {
}
}
}
.info {
.info {
width: 100%;
height: 226px;
background-color: #fff;
......@@ -560,7 +559,7 @@ export default {
background-color: rgba(75, 74, 75, 0.1);
}
}
.icon {
.icon {
width: 30px;
display: block;
float: left;
......@@ -568,7 +567,8 @@ export default {
margin: 12px 8px 0 3px;
}
.push {
width: 35px;
margin-left:20px;
width: 35px;
}
.modal-show {
width: 100%;
......@@ -643,69 +643,69 @@ export default {
margin-top: 10px;
}
}
.info {
width: 100%;
height: 226px;
background-color: #fff;
.info-item {
height: 46px;
width: 335px;
margin: 0 auto;
position: relative;
display: flex;
justify-content: space-between;
align-items: center;
.arrow {
margin-right: -10px;
.info {
width: 100%;
height: 226px;
background-color: #fff;
.info-item {
height: 46px;
width: 335px;
margin: 0 auto;
position: relative;
display: flex;
justify-content: space-between;
align-items: center;
.arrow {
margin-right: -10px;
}
img {
width: 17px;
margin-right: 10px;
}
span:first-child {
font-family: PingFangSC-Regular;
font-size: 14px;
color: rgba(56, 63, 69, 0.6);
letter-spacing: 0;
line-height: 18px;
}
span:last-child {
font-family: Verdana;
font-size: 14px;
color: #383f45;
letter-spacing: 0;
line-height: 18px;
display: flex;
align-items: center;
}
}
img {
width: 17px;
margin-right: 10px;
.info-item:nth-of-type(1)::after {
content: "";
display: block;
position: absolute;
right: 20px;
top: 25px;
border: 10px solid #fff;
border-left-color: transparent;
border-right-color: transparent;
border-top-color: transparent;
border-bottom-color: rgba(75, 74, 75, 0.1);
}
span:first-child {
font-family: PingFangSC-Regular;
font-size: 14px;
color: rgba(56, 63, 69, 0.6);
letter-spacing: 0;
line-height: 18px;
.info-item:nth-of-type(1) {
border-top: 1px solid #d9dbdf;
}
span:last-child {
font-family: Verdana;
font-size: 14px;
color: #383f45;
.interest {
width: 100%;
height: 37px;
line-height: 37px;
font-family: PingFangSC-Medium;
font-size: 11px;
color: #4b4a4b;
letter-spacing: 0;
line-height: 18px;
display: flex;
align-items: center;
text-indent: 215px;
background-color: rgba(75, 74, 75, 0.1);
}
}
.info-item:nth-of-type(1)::after {
content: "";
display: block;
position: absolute;
right: 20px;
top: 25px;
border: 10px solid #fff;
border-left-color: transparent;
border-right-color: transparent;
border-top-color: transparent;
border-bottom-color: rgba(75, 74, 75, 0.1);
}
.info-item:nth-of-type(1) {
border-top: 1px solid #d9dbdf;
}
.interest {
width: 100%;
height: 37px;
line-height: 37px;
font-family: PingFangSC-Medium;
font-size: 11px;
color: #4b4a4b;
letter-spacing: 0;
text-indent: 215px;
background-color: rgba(75, 74, 75, 0.1);
}
}
}
.foot {
background-color: @headerColor;
......
src/pages/pay/payment/pay-entry.vue
View file @ f19a8380
......@@ -385,7 +385,7 @@ export default {
height: 466px;
width: 100%;
position: relative;
top:16%;
top:18%;
background: #fff;
border-radius: 12px 12px 0 0;
overflow: scroll;
......@@ -428,7 +428,7 @@ export default {
height: 466px;
width: 100%;
position: relative;
top:16%;
top:18%;
background: #fff;
border-radius: 12px 12px 0 0;
overflow: scroll;
......@@ -580,6 +580,7 @@ export default {
/* position: absolute;
top: 10px;
margin-left: 10px;*/
margin-left:20px;
width: 35px;
}
.modal-show {
......
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