Skip to content

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

Merge branch 'liuxin' into develop

parents dde74047 1c952cda
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 111 deletions
src/pages/carConfirm/confirm-list.vue
View file @ fbb040e7
......@@ -13,7 +13,7 @@
<h-content class="my-content">
<scroll
ref="scroll"
:updateData="[contructs]"
:updateData="[showList]"
:pullUp="true"
>
<div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item.project_id)">
......@@ -57,7 +57,6 @@ export default {
},
data () {
return {
contructs: [],
tabNum: 0,
lists: [],
showList: [],
......@@ -124,6 +123,9 @@ export default {
if (res.result === 'S') {
vm.lists = res.lists
vm.selectShowList()
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
} else {
hlsPopup.showLongCenter(res.message)
}
......
src/pages/contractRepayment/contract-repayment.vue
View file @ fbb040e7
......@@ -8,24 +8,25 @@
</h-header>
<h-content v-if="data!==null" class="pay-content">
<div v-for="(item,index) in lists" :key="index" class="contract-item">
<div class="header">
<img src="@/assets/contractRepayment/contract.png" alt="">
<h2>{{ item.project_number }}</h2>
<!-- 状态用类名控制 待还款orange,待签约blue,还款中green -->
<p class="green">待还款</p>
<scroll ref="scroll" :updateData="[lists]" :pullUp="true">
<div v-for="(item,index) in lists" :key="index" class="contract-item">
<div class="header">
<img src="@/assets/contractRepayment/contract.png" alt="">
<h2>{{ item.project_number }}</h2>
<!-- 状态用类名控制 待还款orange,待签约blue,还款中green -->
<p class="green">待还款</p>
</div>
<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_days }}天</span>
<section @click="toRepayDetails(item.project_id)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
</section>
</div>
</div>
<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_days }}天</span>
<section @click="toRepayDetails(item.project_id)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
</section>
</div>
</div>
</h-content>
</scroll></h-content>
<h-content v-if="data===null" class="null">
<div class="display">
<img src="@/assets/contractRepayment/null.png" alt="">
......@@ -45,21 +46,7 @@ export default {
data () {
return {
// data: null, 无记录时
lists: [{
'total_price': '150000',
'recivied_amount': '50000',
'overdue_days': 'AA',
'repayment_status': 'BB',
'project_number': 'PRJ2019118',
'project_id': '48871',
}, {
'total_price': '200000',
'recivied_amount': '60000',
'overdue_days': 'AA',
'repayment_status': 'BB',
'project_number': 'PRJ2019128',
'project_id': '48612',
}],
lists: [],
}
},
computed: {
......@@ -91,6 +78,9 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
if (res.listst.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
} else {
hlsPopup.showLongCenter(res.message)
}
......
src/pages/contractRepayment/refund.vue
View file @ fbb040e7
......@@ -47,47 +47,49 @@
</div>
<h-content id="content" class="plan-content">
<!-- 已结清 black , 逾期 orange , 还款中 blue , 未还款 green -->
<div
v-for="(item,index) in lists"
:key="index"
:class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}"
@click="showModel(item)"
>
<scroll ref="scroll" :updateData="[lists]" :pullUp="true" style="background:#fff">
<div
:class="{'period':true,'orange':statu==='orange','blue':statu==='blue','green':statu==='green'}"
>{{ item.times }}期</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/black.png" alt class="left" >
<img v-if="statu === 'orange'" src="@/assets/contractInquire/orange.png" alt class="left" >
<img v-if="statu === 'blue'" src="@/assets/contractInquire/blue.png" alt class="left" >
<img v-if="statu === 'green'" src="@/assets/contractInquire/green.png" alt class="left" >
<div class="time">
<p>{{ selectYear(item.repayment_date) }}</p>
<span>{{ selectMonth(item.repayment_date) }}</span>
</div>
<div class="message">
<p class="top">
款项
<span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 付款方式
<span>{{ item.pay_method }}</span>
</p>
<div class="name">
<p>
应还金额
<span>已还金额</span>
</p>
<p>
{{ item.due_amount|currency }}
<span
:class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
>{{ item.received_amount|currency }}</span>
v-for="(item,index) in lists"
:key="index"
:class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}"
@click="showModel(item)"
>
<div
:class="{'period':true,'orange':statu==='orange','blue':statu==='blue','green':statu==='green'}"
>{{ item.times }}期</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/black.png" alt class="left" >
<img v-if="statu === 'orange'" src="@/assets/contractInquire/orange.png" alt class="left" >
<img v-if="statu === 'blue'" src="@/assets/contractInquire/blue.png" alt class="left" >
<img v-if="statu === 'green'" src="@/assets/contractInquire/green.png" alt class="left" >
<div class="time">
<p>{{ selectYear(item.repayment_date) }}</p>
<span>{{ selectMonth(item.repayment_date) }}</span>
</div>
<div class="message">
<p class="top">
款项
<span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 付款方式
<span>{{ item.pay_method }}</span>
</p>
<div class="name">
<p>
应还金额
<span>已还金额</span>
</p>
<p>
{{ item.due_amount|currency }}
<span
:class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
>{{ item.received_amount|currency }}</span>
</p>
</div>
</div>
</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt class="status" >
<img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt class="status" >
</div>
</h-content>
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt class="status" >
<img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt class="status" >
</div>
</scroll></h-content>
</h-view>
</template>
......@@ -97,8 +99,8 @@ export default {
data () {
return {
// 已结清 black , 逾期 orange , 还款中 blue , 未还款 green
statu: 'orange',
show: true,
statu: 'blue',
show: false,
pop: {},
info: {},
lists: [],
......@@ -133,6 +135,9 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
} else {
hlsPopup.showLongCenter(res.message)
}
......@@ -236,10 +241,13 @@ export default {
.plan-content {
background-color: #fff;
padding: 0px 11px;
// padding: 0px 11px;
.plan-list {
position: relative;
background-color: #f7f7f7;
box-shadow: 0 0 15px #ccc;
width:349px;
margin:0 auto;
height: 126px;
display: flex;
padding-right: 20px;
......@@ -255,7 +263,7 @@ export default {
height: 30px;
position: absolute;
left: -8px;
top: 24px;
top: 44px;
}
.status {
......
src/pages/contractStart/start-list.vue
View file @ fbb040e7
......@@ -11,7 +11,7 @@
<input placeholder="请输入合同号/产品线/承租人名称" >
</div>
<h-content class="my-content">
<scroll ref="scroll" :updateData="[contructs]" :pullUp="true">
<scroll ref="scroll" :updateData="[showList]" :pullUp="true">
<div
v-for="(item,index) in showList"
:key="index"
......@@ -62,7 +62,6 @@ export default {
data () {
return {
tabNum: 0,
contructs: [],
lists: [],
showList: [],
undo: [],
......@@ -134,6 +133,9 @@ export default {
if (res.result === 'S') {
vm.lists = res.lists
vm.selectShowList()
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
} else {
hlsPopup.showLongCenter(res.message)
}
......
src/pages/drawback/drawback-list.vue
View file @ fbb040e7
......@@ -35,7 +35,13 @@
export default {
data () {
return {
reimburseList: [],
reimburseList: [
{
order_date: '2019/10/24',
orderamount: '0',
order_id: '16',
},
],
keyWords: '',
}
},
......@@ -54,27 +60,26 @@ export default {
})
},
getList () {
// let vm = this
// let url = process.env.basePath + 'my_repayment_query'
// let param = {
// user_phone: window.localStorage.getItem('user_phone'),
// }
// vm.hlsPopup.showLoading('数据加载中，请稍后!')
// vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
let vm = this
// let url = process.env.basePath + 'my_repayment_query'
// let param = {
// user_phone: window.localStorage.getItem('user_phone'),
// }
// vm.hlsPopup.showLoading('数据加载中，请稍后!')
// vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.reimburseList = res.lists
this.reimburseList = [
{
order_date: '2019/10/24',
orderamount: '0',
order_id: '16',
},
]
// if (res.lists.length > 0 && res.lists.length < 10) {
// vm.$refs.scroll.update(true)
// }
// this.reimburseList = [
// {
// order_date: '2019/10/24',
// orderamount: '0',
// order_id: '16',
// },
// ]
if (vm.reimburseList.length >= 0 && vm.reimburseList.length < 10) {
vm.$refs.scroll.update(true)
}
// }
// })
},
......
src/pages/pay/firstPay/pay-entry.vue
View file @ fbb040e7
......@@ -17,10 +17,16 @@
</h-header>
<h-content class="entry-content">
<div class="amount">
<p>交易金额</p>
<p>{{ userName }}</p>
<div>￥{{ money |currency }}</div>
</div>
<list-item :item-height="56" class="pay-way">
<div class="info">
<div class="info-item">
<span>还款金额</span>
<span>¥50600.00</span>
</div>
</div>
<!-- <list-item :item-height="56" class="pay-way">
<item
v-for="(item,index) in nongBank"
:proportion="[7,1,1]"
......@@ -79,7 +85,7 @@
<img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt >
</section>
</item>
</list-item>
</list-item>-->
</h-content>
<bottom-tab>
<tab-button class="foot" @click.native="pay">立即付款</tab-button>
......@@ -113,6 +119,7 @@ export default {
name: '',
downNum: false,
recommand: false,
userName: window.sessionStorage.getItem('bp_name'),
flag: false, // 用于判断是否有农业银行卡
lists: [],
nongBank: [], // 存农行卡
......@@ -129,7 +136,7 @@ export default {
}
})
let notNong = vm.lists.filter(i => {
return (i.bank_full_name.indexOf('农业') === -1)
return i.bank_full_name.indexOf('农业') === -1
})
if (vm.flag) {
vm.select = 'nong0'
......@@ -244,6 +251,42 @@ export default {
.trans-leave-active {
opacity: 0;
}
.info {
width: 100%;
height: 226px;
background-color: #fff;
.info-item {
border: 1px solid #d9dbdf;
height: 46px;
width: 335px;
margin: 0 auto;
display: flex;
justify-content: space-between;
align-items: center;
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;
}
}
.info-item:nth-of-type(1)::after{
content:"";
display:block;
width: 16px;
height: 16px;
border-bottom: 16px solid rgba(75,74,75,0.10);
border-top:transparent;
}
}
.modal-show {
width: 100%;
height: 100%;
......@@ -293,7 +336,7 @@ export default {
}
}
.push {
margin-left: 0.2rem;
margin-left: 0.2rem;
width: 0.7rem;
float: right;
margin-top: 11px;
......@@ -305,13 +348,13 @@ export default {
background-color: #fff;
padding-top: 55px;
text-align: center;
border-bottom: 1px solid #d9dbdf;
p {
font-family: PingFangSC-Regular;
font-family: PingFangSC-Semibold;
font-size: 14px;
color: #656464;
letter-spacing: 0;
color: #383f45;
letter-spacing: 0.43px;
font-weight: bold;
text-align: center;
}
div {
......
src/pages/videoSign/video-list.vue
View file @ fbb040e7
......@@ -11,7 +11,7 @@
<input placeholder="请输入进件号/承租人名称" >
</div>
<h-content class="my-content">
<scroll ref="scroll" :updateData="[contructs]" :pullUp="true" class="scroll">
<scroll ref="scroll" :updateData="[showList]" :pullUp="true" class="scroll">
<div v-for="(item,index) in showList" :key="index" class="item">
<div class="left">
<span>
......@@ -63,7 +63,6 @@ export default {
return {
tabNum: 0,
isSign: false,
contructs: [],
lists: [],
showList: [],
undo: [],
......@@ -149,7 +148,9 @@ export default {
},
]
this.selectShowList()
if (this.lists.length > 0 && this.lists.length < 10) {
this.$refs.scroll.update(true)
}
// let vm = this
// let url = process.env.basePath + 'car_apply_list_query'
// let param = {
......
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