Commit 1c952cda authored by linxin's avatar linxin

add

parent 21542aad
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<h-content class="my-content"> <h-content class="my-content">
<scroll <scroll
ref="scroll" ref="scroll"
:updateData="[contructs]" :updateData="[showList]"
:pullUp="true" :pullUp="true"
> >
<div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item.project_id)"> <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item.project_id)">
...@@ -57,7 +57,6 @@ export default { ...@@ -57,7 +57,6 @@ export default {
}, },
data () { data () {
return { return {
contructs: [],
tabNum: 0, tabNum: 0,
lists: [], lists: [],
showList: [], showList: [],
...@@ -124,6 +123,9 @@ export default { ...@@ -124,6 +123,9 @@ export default {
if (res.result === 'S') { if (res.result === 'S') {
vm.lists = res.lists vm.lists = res.lists
vm.selectShowList() vm.selectShowList()
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
</h-header> </h-header>
<h-content v-if="data!==null" class="pay-content"> <h-content v-if="data!==null" class="pay-content">
<scroll ref="scroll" :updateData="[lists]" :pullUp="true">
<div v-for="(item,index) in lists" :key="index" class="contract-item"> <div v-for="(item,index) in lists" :key="index" class="contract-item">
<div class="header"> <div class="header">
<img src="@/assets/contractRepayment/contract.png" alt=""> <img src="@/assets/contractRepayment/contract.png" alt="">
...@@ -25,7 +26,7 @@ ...@@ -25,7 +26,7 @@
</section> </section>
</div> </div>
</div> </div>
</h-content> </scroll></h-content>
<h-content v-if="data===null" class="null"> <h-content v-if="data===null" class="null">
<div class="display"> <div class="display">
<img src="@/assets/contractRepayment/null.png" alt=""> <img src="@/assets/contractRepayment/null.png" alt="">
...@@ -45,21 +46,7 @@ export default { ...@@ -45,21 +46,7 @@ export default {
data () { data () {
return { return {
// data: null, 无记录时 // data: null, 无记录时
lists: [{ 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',
}],
} }
}, },
computed: { computed: {
...@@ -91,6 +78,9 @@ export default { ...@@ -91,6 +78,9 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.lists = res.lists vm.lists = res.lists
if (res.listst.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
......
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
</div> </div>
<h-content id="content" class="plan-content"> <h-content id="content" class="plan-content">
<!-- 已结清 black , 逾期 orange , 还款中 blue , 未还款 green --> <!-- 已结清 black , 逾期 orange , 还款中 blue , 未还款 green -->
<scroll ref="scroll" :updateData="[lists]" :pullUp="true" style="background:#fff">
<div <div
v-for="(item,index) in lists" v-for="(item,index) in lists"
:key="index" :key="index"
...@@ -87,7 +89,7 @@ ...@@ -87,7 +89,7 @@
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt class="status" > <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" > <img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt class="status" >
</div> </div>
</h-content> </scroll></h-content>
</h-view> </h-view>
</template> </template>
...@@ -97,8 +99,8 @@ export default { ...@@ -97,8 +99,8 @@ export default {
data () { data () {
return { return {
// 已结清 black , 逾期 orange , 还款中 blue , 未还款 green // 已结清 black , 逾期 orange , 还款中 blue , 未还款 green
statu: 'orange', statu: 'blue',
show: true, show: false,
pop: {}, pop: {},
info: {}, info: {},
lists: [], lists: [],
...@@ -133,6 +135,9 @@ export default { ...@@ -133,6 +135,9 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.lists = res.lists vm.lists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -236,10 +241,13 @@ export default { ...@@ -236,10 +241,13 @@ export default {
.plan-content { .plan-content {
background-color: #fff; background-color: #fff;
padding: 0px 11px; // padding: 0px 11px;
.plan-list { .plan-list {
position: relative; position: relative;
background-color: #f7f7f7; background-color: #f7f7f7;
box-shadow: 0 0 15px #ccc;
width:349px;
margin:0 auto;
height: 126px; height: 126px;
display: flex; display: flex;
padding-right: 20px; padding-right: 20px;
...@@ -255,7 +263,7 @@ export default { ...@@ -255,7 +263,7 @@ export default {
height: 30px; height: 30px;
position: absolute; position: absolute;
left: -8px; left: -8px;
top: 24px; top: 44px;
} }
.status { .status {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<input placeholder="请输入合同号/产品线/承租人名称" > <input placeholder="请输入合同号/产品线/承租人名称" >
</div> </div>
<h-content class="my-content"> <h-content class="my-content">
<scroll ref="scroll" :updateData="[contructs]" :pullUp="true"> <scroll ref="scroll" :updateData="[showList]" :pullUp="true">
<div <div
v-for="(item,index) in showList" v-for="(item,index) in showList"
:key="index" :key="index"
...@@ -62,7 +62,6 @@ export default { ...@@ -62,7 +62,6 @@ export default {
data () { data () {
return { return {
tabNum: 0, tabNum: 0,
contructs: [],
lists: [], lists: [],
showList: [], showList: [],
undo: [], undo: [],
...@@ -134,6 +133,9 @@ export default { ...@@ -134,6 +133,9 @@ export default {
if (res.result === 'S') { if (res.result === 'S') {
vm.lists = res.lists vm.lists = res.lists
vm.selectShowList() vm.selectShowList()
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
......
...@@ -35,7 +35,13 @@ ...@@ -35,7 +35,13 @@
export default { export default {
data () { data () {
return { return {
reimburseList: [], reimburseList: [
{
order_date: '2019/10/24',
orderamount: '0',
order_id: '16',
},
],
keyWords: '', keyWords: '',
} }
}, },
...@@ -54,7 +60,7 @@ export default { ...@@ -54,7 +60,7 @@ export default {
}) })
}, },
getList () { getList () {
// let vm = this let vm = this
// let url = process.env.basePath + 'my_repayment_query' // let url = process.env.basePath + 'my_repayment_query'
// let param = { // let param = {
// user_phone: window.localStorage.getItem('user_phone'), // user_phone: window.localStorage.getItem('user_phone'),
...@@ -64,17 +70,16 @@ export default { ...@@ -64,17 +70,16 @@ export default {
// vm.hlsPopup.hideLoading() // vm.hlsPopup.hideLoading()
// if (res.result === 'S') { // if (res.result === 'S') {
// vm.reimburseList = res.lists // vm.reimburseList = res.lists
this.reimburseList = [ // this.reimburseList = [
{ // {
order_date: '2019/10/24', // order_date: '2019/10/24',
orderamount: '0', // orderamount: '0',
order_id: '16', // order_id: '16',
}, // },
] // ]
if (vm.reimburseList.length >= 0 && vm.reimburseList.length < 10) {
// if (res.lists.length > 0 && res.lists.length < 10) { vm.$refs.scroll.update(true)
// vm.$refs.scroll.update(true) }
// }
// } // }
// }) // })
}, },
......
...@@ -17,10 +17,16 @@ ...@@ -17,10 +17,16 @@
</h-header> </h-header>
<h-content class="entry-content"> <h-content class="entry-content">
<div class="amount"> <div class="amount">
<p>交易金额</p> <p>{{ userName }}</p>
<div>{{ money |currency }}</div> <div>{{ money |currency }}</div>
</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 <item
v-for="(item,index) in nongBank" v-for="(item,index) in nongBank"
:proportion="[7,1,1]" :proportion="[7,1,1]"
...@@ -79,7 +85,7 @@ ...@@ -79,7 +85,7 @@
<img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt > <img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt >
</section> </section>
</item> </item>
</list-item> </list-item>-->
</h-content> </h-content>
<bottom-tab> <bottom-tab>
<tab-button class="foot" @click.native="pay">立即付款</tab-button> <tab-button class="foot" @click.native="pay">立即付款</tab-button>
...@@ -113,6 +119,7 @@ export default { ...@@ -113,6 +119,7 @@ export default {
name: '', name: '',
downNum: false, downNum: false,
recommand: false, recommand: false,
userName: window.sessionStorage.getItem('bp_name'),
flag: false, // 用于判断是否有农业银行卡 flag: false, // 用于判断是否有农业银行卡
lists: [], lists: [],
nongBank: [], // 存农行卡 nongBank: [], // 存农行卡
...@@ -129,7 +136,7 @@ export default { ...@@ -129,7 +136,7 @@ export default {
} }
}) })
let notNong = vm.lists.filter(i => { let notNong = vm.lists.filter(i => {
return (i.bank_full_name.indexOf('农业') === -1) return i.bank_full_name.indexOf('农业') === -1
}) })
if (vm.flag) { if (vm.flag) {
vm.select = 'nong0' vm.select = 'nong0'
...@@ -244,6 +251,42 @@ export default { ...@@ -244,6 +251,42 @@ export default {
.trans-leave-active { .trans-leave-active {
opacity: 0; 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 { .modal-show {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -305,13 +348,13 @@ export default { ...@@ -305,13 +348,13 @@ export default {
background-color: #fff; background-color: #fff;
padding-top: 55px; padding-top: 55px;
text-align: center; text-align: center;
border-bottom: 1px solid #d9dbdf;
p { p {
font-family: PingFangSC-Regular; font-family: PingFangSC-Semibold;
font-size: 14px; font-size: 14px;
color: #656464; color: #383f45;
letter-spacing: 0; letter-spacing: 0.43px;
font-weight: bold;
text-align: center;
} }
div { div {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<input placeholder="请输入进件号/承租人名称" > <input placeholder="请输入进件号/承租人名称" >
</div> </div>
<h-content class="my-content"> <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 v-for="(item,index) in showList" :key="index" class="item">
<div class="left"> <div class="left">
<span> <span>
...@@ -63,7 +63,6 @@ export default { ...@@ -63,7 +63,6 @@ export default {
return { return {
tabNum: 0, tabNum: 0,
isSign: false, isSign: false,
contructs: [],
lists: [], lists: [],
showList: [], showList: [],
undo: [], undo: [],
...@@ -149,7 +148,9 @@ export default { ...@@ -149,7 +148,9 @@ export default {
}, },
] ]
this.selectShowList() this.selectShowList()
if (this.lists.length > 0 && this.lists.length < 10) {
this.$refs.scroll.update(true)
}
// let vm = this // let vm = this
// let url = process.env.basePath + 'car_apply_list_query' // let url = process.env.basePath + 'car_apply_list_query'
// let param = { // 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