Skip to content

H
hls-xcmg-vue-app
Commit 83b92b6e authored by 786817560's avatar 786817560
Browse files
Options

'解决冲突'

parents f2031c45 28d06d21
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 55 deletions
src/pages/contractInquire/contract-records.vue
View file @ 83b92b6e
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-11-27 17:41:11
* @LastEditTime: 2019-11-28 10:44:00
* @LastEditors: Please set LastEditors
* @Description: 合同查询--记录
* @FilePath:
......@@ -37,7 +37,7 @@
</div>
<!-- 全部合同记录 -->
<scroll
v-if="data!==null&&selected==='all'"
v-show="data!==null&&selected==='all'"
ref="scroll"
:updateData="[lists]"
:pullUp="true"
......@@ -69,7 +69,7 @@
</scroll>
<!-- 待首付 -->
<scroll
v-if="data!==null&&selected==='one'"
v-show="data!==null&&selected==='one'"
ref="scrollOne"
:updateData="[unSignedLists]"
:pullUp="true"
......@@ -99,7 +99,7 @@
<!-- 首付还款中 -->
<scroll
v-if="data!==null&&selected==='two'"
v-show="data!==null&&selected==='two'"
ref="scrollTwo"
:updateData="[unRepayLists]"
:pullUp="true"
......@@ -129,7 +129,7 @@
<!-- 还款中 -->
<scroll
v-if="data!==null&&selected==='three'"
v-show="data!==null&&selected==='three'"
ref="scrollThree"
:updateData="[repayingLists]"
:pullUp="true"
......@@ -159,7 +159,7 @@
<!-- 已结清 -->
<scroll
v-if="data!==null&&selected==='four'"
v-show="data!==null&&selected==='four'"
ref="scrollFour"
:updateData="[repayedLists]"
:pullUp="true"
......@@ -199,7 +199,6 @@ export default {
return {
// data: null, // 无记录时
data: 1,
showLists: [],
lists: [], // 全部记录
selected: 'all',
unSignedLists: [], // 待首付
......@@ -223,7 +222,7 @@ export default {
watch: {
selected () {
if (this.selected === 'all') {
// this.showLists = this.lists
} else if (this.selected === 'one') {
if (!this.unSigned_flag) {
this.recordQuery('待首付', this.unSignedLists)
......@@ -257,10 +256,17 @@ export default {
if (from.name === 'HomePage') {
vm.selected = 'all'
vm.pagenum = 1
vm.unSigned_pagenum = 1
vm.unRepay_pagenum = 1
vm.repaying_pagenum = 1
vm.repayed_pagenum = 1
vm.searchInput = ''
vm.contract_status_n = '全部'
vm.lists = []
vm.unSignedLists = []
vm.unRepayLists = []
vm.repayingLists = []
vm.repayedLists = []
vm.unSigned_flag = false
vm.unRepay_flag = false
vm.repaying_flag = false
......@@ -412,69 +418,168 @@ export default {
}
})
},
async searchs () {
searchs () {
// await this.search('全部',this.lists)
await this.search('待首付', this.unSignedLists = [])
// await this.search('首付还款中',this.unRepayLists)
// await this.search('还款中',this.repayingLists)
// await this.search('已结清',this.repayedLists)
// await this.search('待首付', this.unSignedLists = [])
// await this.search('首付还款中', this.unRepayLists = [])
// await this.search('还款中', this.repayingLists = [])
// await this.search('已结清', this.repayedLists = [])
// this.search('待首付', this.unSignedLists = [])
// setTimeout(this.search('首付还款中', this.unRepayLists = []), 1000)
// setTimeout(this.search('还款中', this.repayingLists = []), 1000)
// setTimeout(this.search('已结清', this.repayedLists = []), 1000)
this.searchUnsign()
// this.searchUnrepay()
setTimeout(this.searchUnrepay, 500)
setTimeout(this.searchRepaying, 1000)
setTimeout(this.searchRepayed, 1500)
},
async search (status, list) {
searchUnsign () {
let vm = this
let url = $config.basePath + 'con_contract_list'
let param = {
contract_status_n: status,
contract_status_n: '待首付',
user_phone: window.localStorage.user_phone,
searchInput: vm.searchInput,
pagenum: 1,
pagesize: 10,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsPopup.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (status === '全部') {
vm.lists = res.lists
} else if (status === '待首付') {
vm.unSignedLists = res.lists
} else if (status === '首付还款中') {
vm.unRepayLists = res.lists
} else if (status === '还款中') {
vm.repayingLists = res.lists
} else if (status === '已结清') {
vm.repayedLists = res.lists
vm.unSignedLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scrollOne.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scrollOne.update(false)
}
// vm.unSignedLists = res.lists
// res.lists.forEach((data, index, array) => {
// list.push(array[index])
// })
// console.log(vm.unSignedLists)
})
},
searchUnrepay () {
let vm = this
let url = $config.basePath + 'con_contract_list'
let param = {
contract_status_n: '首付还款中',
user_phone: window.localStorage.user_phone,
searchInput: vm.searchInput,
pagenum: 1,
pagesize: 10,
}
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
vm.unRepayLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
if (status === '全部') {
vm.$refs.scroll.update(true)
} else if (status === '待首付') {
vm.$refs.scrollOne.update(true)
} else if (status === '首付还款中') {
vm.$refs.scrollTwo.update(true)
} else if (status === '还款中') {
vm.$refs.scrollThree.update(true)
} else if (status === '已结清') {
vm.$refs.scrollFour.update(true)
}
vm.$refs.scrollTwo.update(true)
} else if (res.lists.length === 10) {
if (status === '全部') {
vm.$refs.scroll.update(false)
} else if (status === '待首付') {
vm.$refs.scrollOne.update(false)
} else if (status === '首付还款中') {
vm.$refs.scrollTwo.update(false)
} else if (status === '还款中') {
vm.$refs.scrollThree.update(false)
} else if (status === '已结清') {
vm.$refs.scrollFour.update(false)
}
vm.$refs.scrollTwo.update(false)
}
})
},
searchRepaying () {
let vm = this
let url = $config.basePath + 'con_contract_list'
let param = {
contract_status_n: '还款中',
user_phone: window.localStorage.user_phone,
searchInput: vm.searchInput,
pagenum: 1,
pagesize: 10,
}
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
vm.repayingLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scrollThree.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scrollThree.update(false)
}
})
},
searchRepayed () {
let vm = this
let url = $config.basePath + 'con_contract_list'
let param = {
contract_status_n: '已结清',
user_phone: window.localStorage.user_phone,
searchInput: vm.searchInput,
pagenum: 1,
pagesize: 10,
}
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
vm.repayedLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scrollFour.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scrollFour.update(false)
}
})
},
// search (status, list) {
// let vm = this
// let url = $config.basePath + 'con_contract_list'
// let param = {
// contract_status_n: status,
// user_phone: window.localStorage.user_phone,
// searchInput: vm.searchInput,
// pagenum: 1,
// pagesize: 10,
// }
// vm.hlsPopup.showLoading('数据加载中')
// vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (status === '全部') {
// vm.lists = res.lists
// } else if (status === '待首付') {
// vm.unSignedLists = res.lists
// } else if (status === '首付还款中') {
// vm.unRepayLists = res.lists
// } else if (status === '还款中') {
// vm.repayingLists = res.lists
// } else if (status === '已结清') {
// vm.repayedLists = res.lists
// }
// // vm.unSignedLists = res.lists
// // res.lists.forEach((data, index, array) => {
// // list.push(array[index])
// // })
// // console.log(vm.unSignedLists)
// if (res.lists.length >= 0 && res.lists.length < 10) {
// if (status === '全部') {
// vm.$refs.scroll.update(true)
// } else if (status === '待首付') {
// vm.$refs.scrollOne.update(true)
// } else if (status === '首付还款中') {
// vm.$refs.scrollTwo.update(true)
// } else if (status === '还款中') {
// vm.$refs.scrollThree.update(true)
// } else if (status === '已结清') {
// vm.$refs.scrollFour.update(true)
// }
// } else if (res.lists.length === 10) {
// if (status === '全部') {
// vm.$refs.scroll.update(false)
// } else if (status === '待首付') {
// vm.$refs.scrollOne.update(false)
// } else if (status === '首付还款中') {
// vm.$refs.scrollTwo.update(false)
// } else if (status === '还款中') {
// vm.$refs.scrollThree.update(false)
// } else if (status === '已结清') {
// vm.$refs.scrollFour.update(false)
// }
// }
// })
// },
},
}
</script>
......
src/pages/contractSigning/contract-signing.vue
View file @ 83b92b6e
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-25 15:50:46
* @LastEditTime: 2019-11-28 10:53:27
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......
src/pages/userBind/org/enterprise.vue
View file @ 83b92b6e
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-19 09:31:19
* @LastEditTime: 2019-11-28 09:16:46
* @LastEditTime: 2019-11-28 14:13:20
* @LastEditors: Please set LastEditors
-->
<template>
......
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