Skip to content

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

Merge branch 'ren' into develop

parents f2313a59 a2154a28
Show whitespace changes
Inline Side-by-side
Showing with 262 additions and 142 deletions
src/pages/contractInquire/contract-records.vue
View file @ 5a5bc33f
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-12-02 09:02:06
* @LastEditTime: 2019-12-02 09:50:30
* @LastEditors: Please set LastEditors
* @Description: 合同查询--记录
* @FilePath:
......@@ -93,9 +93,9 @@ export default {
unRepay_pagenum: 1, // 首付还款中页码
repaying_pagenum: 1, // 还款中页码
repayed_pagenum: 1, // 已结清页码
searchInput: '',
searchInput: '', // 搜索内容
contract_status_n: '全部', // 全部/待首付/首付还款中/还款中/已结清
unSigned_flag: false,
unSigned_flag: false, // 控制tab切换时再次请求
unRepay_flag: false,
repaying_flag: false,
repayed_flag: false,
......@@ -170,7 +170,6 @@ export default {
vm.unRepay_flag = false
vm.repaying_flag = false
vm.repayed_flag = false
vm.recordQuery('全部', vm.lists)
}
})
......@@ -185,6 +184,7 @@ export default {
},
})
},
// tab切换
isSelected (name) {
this.selected = name
},
......@@ -203,18 +203,16 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
// 判断有无数据
if (status === '全部' && res.lists.length === 0) {
vm.data = null
} else {
vm.data = 1
}
// console.log(arr)
// arr = res.lists
res.lists.forEach((data, index, array) => {
arr.push(array[index])
})
vm.showLists = arr
console.log('......', vm.lists)
vm.showLists = arr // 展示请求到的数据
if (res.lists.length >= 0 && res.lists.length < 10) {
if (status === '全部') {
vm.$refs.scroll.update(true)
......@@ -274,6 +272,7 @@ export default {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
// 加载更多时，将请求到的数据push到对应数组
if (this.selected === 'all') {
vm.lists.push(array[index])
} else if (this.selected === 'one') {
......@@ -308,6 +307,7 @@ export default {
}
})
},
// 搜索
async searchs () {
let resAll = await this.searchAll()
if (resAll) {
......@@ -338,6 +338,7 @@ export default {
if (res.result === 'S') {
vm.hlsPopup.hideLoading()
vm.lists = res.lists
// 展示数据更新通过watch监听，默认展示当前页面请求到的数据
if (vm.selected === 'all') {
vm.showLists = vm.lists
}
......@@ -392,7 +393,6 @@ export default {
pagenum: 1,
pagesize: 10,
}
// vm.hlsPopup.showLoading('数据加载中')
let res = await vm.$post(url, param)
if (res.result === 'S') {
vm.unRepayLists = res.lists
......@@ -421,7 +421,6 @@ export default {
pagenum: 1,
pagesize: 10,
}
// vm.hlsPopup.showLoading('数据加载中')
let res = await vm.$post(url, param)
if (res.result === 'S') {
vm.repayingLists = res.lists
......@@ -450,9 +449,7 @@ export default {
pagenum: 1,
pagesize: 10,
}
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
vm.repayedLists = res.lists
if (vm.selected === 'four') {
vm.showLists = vm.repayedLists
......
src/pages/contractSigning/contract-signing.vue
View file @ 5a5bc33f
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-29 17:31:00
* @LastEditTime: 2019-12-02 09:39:11
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -46,32 +46,6 @@
</div>
</div>
</scroll>
<!-- <scroll
v-show="num === 2"
ref="scroll"
:updateData="[approvedLists]"
:pullUp="true"
@pullingUp="loadMore"
>
<div class="wrap">
<div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
<div class="pro-code" @click="goDetails(item)">
<img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
<p>
<span>合同号</span>
<span>{{ item.project_number }}</span>
</p>
<img src="@/assets/constractSigning/righticon.png" alt="" class="arrow">
</div>
<div class="box">
<div><p>承租人</p><p>{{ item.bp_name }}</p></div>
<div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
<div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
</div>
</div>
</div>
</scroll> -->
</h-view>
</template>
......@@ -114,10 +88,8 @@ export default {
} else if (newVal === 1) {
this.showLists = this.submitLists
this.$refs.scroll.scrollToTop()
// this.$refs.scroll.update(false)
}
},
immediate: true,
},
searchInput () {
let vm = this
......@@ -333,9 +305,7 @@ export default {
confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.approvedLists = res.lists
if (vm.num === 2) {
vm.showLists = vm.approvedLists
......
src/pages/contractSigning/entry-info.vue
View file @ 5a5bc33f
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-28 18:19:14
* @LastEditTime: 2019-12-02 16:10:47
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -158,7 +158,7 @@ export default {
}
}
let error = function () {
hlsPopup.showLongCenter(error)
hlsPopup.showLongCenter('请拍照')
}
hlsUtil.openCamera(cameraoptions, success, error)
},
......
src/pages/distributorSign/contract-list.vue
View file @ 5a5bc33f
......@@ -44,31 +44,6 @@
</div>
</div>
</scroll>
<!-- <scroll
v-show="num === 2"
ref="scroll"
:updateData="[approvedLists]"
:pullUp="true"
@pullingUp="loadMore"
>
<div class="wrap">
<div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
<div class="pro-code" @click="goDetails(item)">
<img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
<p>
<span>合同号</span>
<span>{{ item.project_number }}</span>
</p>
<img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
</div>
<div class="box">
<div><p>承租人</p><p>{{ item.bp_name }}</p></div>
<div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
<div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
</div>
</div>
</div>
</scroll> -->
</h-view>
</template>
......@@ -109,7 +84,6 @@ export default {
} else if (newVal === 1) {
this.showLists = this.submitLists
this.$refs.scroll.scrollToTop()
// this.$refs.scroll.update(false)
}
},
immediate: true,
......@@ -218,7 +192,7 @@ export default {
confirm_status: 'SUBMIT',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsPopup.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
......@@ -252,7 +226,7 @@ export default {
confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsPopup.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
......@@ -312,10 +286,7 @@ export default {
confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// console.log(res.lists)
vm.approvedLists = res.lists
vm.showLists = vm.approvedLists
if (res.lists.length >= 0 && res.lists.length < 10) {
......
src/pages/help/detail.vue
View file @ 5a5bc33f
<!--
* @Author: your name
* @Date: 2019-11-11 16:28:45
* @LastEditTime: 2019-12-02 15:32:37
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\src\pages\help\detail.vue
-->
<template>
<h-view id="help-detail" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom">
......@@ -7,16 +15,39 @@
</div>
</h-header>
<h-content class="my-content">
<h4>如何进行客户绑定？</h4>
<div class="article">
<h4>{{ title }}</h4>
<div v-if="title === '如何进行客户绑定？'" class="article">
<p>进入“个人中心"界面,点击”用户绑定“按钮进入用户绑定界面，填写相关资料可进行用户绑定。</p>
</div>
<div v-if="title === '如何通过扫描录入进件？'" class="article">
<p>。</p>
</div>
<div v-if="title === '如何进行“产品试算”？'" class="article">
<p>进入首页“产品试算”功能，选择产品进入试算页面，填写相关数据，即可进行试算。</p>
</div>
<div v-if="title === '产品展示功能如何使用？'" class="article">
<p>进入首页“产品查询”功能，选择产品名称即可展示该类产品。</p>
</div>
<div v-if="title === '如何进行“合同还款”？'" class="article">
<p>进入首页“合同还款”功能，即可展示所有合同还款状态，点击“查看合同明细”，可查看还款的详细信息。</p>
</div>
</h-content>
</h-view>
</template>
<script>
export default {
data () {
return {
title: '',
}
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'HelpList') {
vm.title = vm.$route.params.title
}
})
},
}
</script>
<style lang="less" scoped>
......
src/pages/help/help-list.vue
View file @ 5a5bc33f
......@@ -21,8 +21,8 @@
<img class="img0" src="@/assets/help/down.png" >
</div>
<ul class="list0">
<li @click="changeDetail">如何进行客户绑定？</li>
<li>如何通过扫描录入进件？</li>
<li @click="changeDetail('如何进行客户绑定？')">如何进行客户绑定？</li>
<li @click="changeDetail('如何通过扫描录入进件？')">如何通过扫描录入进件？</li>
</ul>
</div>
<div class="question">
......@@ -41,9 +41,9 @@
<img class="img2" src="@/assets/help/down.png" >
</div>
<ul class="list2">
<li>产品展示功能如何使用？</li>
<li>如何进行“产品试算”？</li>
<li>如何进行“合同还款”？</li>
<li @click="changeDetail('产品展示功能如何使用？')">产品展示功能如何使用？</li>
<li @click="changeDetail('如何进行“产品试算”？')">如何进行“产品试算”？</li>
<li @click="changeDetail('如何进行“合同还款”？')">如何进行“合同还款”？</li>
</ul>
</div>
</h-content>
......@@ -76,9 +76,12 @@ export default {
this.isShow = true
}
},
changeDetail () {
changeDetail (val) {
this.$router.push({
name: 'HelpDetail',
params: {
title: val,
},
})
},
changeFeedback () {
......
src/pages/videoSign/video-list.vue
View file @ 5a5bc33f
......@@ -10,8 +10,10 @@
<div class="search has-header">
<input placeholder="请输入进件号/承租人名称" >
</div>
<scroll ref="scroll" :updateData="[showList]" :pullUp="true" class="scroll">
<div v-for="(item,index) in showList" :key="index" class="item">
<scroll
ref="scroll" :updateData="[showLists]" :pullUp="true" class="scroll"
@pullingUp="loadMore">
<div v-for="(item,index) in showLists" :key="index" class="item">
<div class="left">
<span>
<img src="@/assets/contractStart/icon.png" >
......@@ -68,14 +70,27 @@ export default {
tabNum: 0,
isSign: false,
lists: [],
showList: [],
showLists: [],
undo: [],
done: [],
searchInput: '',
pagenum: 1,
submitPagenum: 1,
approvedPagenum: 1,
approvedFlag: false,
}
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.searchInput = ''
vm.pagenum = 1
vm.tabNum = 1
vm.submitPagenum = 1
vm.approvedPagenum = 1
vm.approvedFlag = false
vm.undo = []
vm.done = []
vm.getList()
}
})
......@@ -84,13 +99,25 @@ export default {
tabNum: {
handler (newVal, oldVal) {
if (newVal === 0) {
this.showList = this.undo
this.showLists = this.undo
} else if (newVal === 1) {
this.showList = this.done
if (!this.approvedFlag) {
this.getList()
}
this.showLists = this.done
}
},
immediate: true,
},
searchInput () {
let vm = this
if (vm.timeout) {
clearTimeout(vm.timeout)
}
vm.timeout = setTimeout(() => {
vm.search()
}, 1000)
},
},
created () {},
methods: {
......@@ -178,59 +205,180 @@ export default {
hlsPopup.showLongCenter('敬请期待')
},
getList () {
this.lists = [
{
bp_name: '刘淼',
total_price: '2019-01-01',
project_number: 'PRJ2019174',
project_id: '49737',
division_n: '平地机',
leases_status: 'Y',
let vm = this
let url = process.env.basePath + 'interview_list_query'
if (vm.tabNum === 0) {
let param = {
pagesize: 10,
searchInput: vm.searchInput,
pagenum: vm.submitPagenum,
user_phone: window.localStorage.getItem('user_phone'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.undo = res.lists
vm.showLists = vm.undo
if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
} else if (vm.tabNum === 1) {
let param = {
pagesize: 10,
searchInput: vm.searchInput,
pagenum: vm.approvedPagenum,
user_phone: window.localStorage.getItem('user_phone'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.done = res.lists
vm.approvedFlag = true
vm.showLists = vm.done
if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
{
bp_name: '陈泽华',
total_price: '2019-01-01',
project_number: 'PRJ2019168',
project_id: '49680',
division_n: '平地机',
leases_status: 'N',
loadMore () {
let vm = this
let url = process.env.basePath + 'interview_list_query'
if (vm.tabNum === 0) {
vm.submitPagenum++
let param = {
pagesize: 10,
searchInput: vm.searchInput,
pagenum: vm.submitPagenum,
user_phone: window.localStorage.getItem('user_phone'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.undo.push(array[index])
})
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.undo.push(array[index])
})
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
} else if (vm.tabNum === 1) {
vm.approvedPagenum++
let param = {
pagesize: 10,
searchInput: vm.searchInput,
pagenum: vm.approvedPagenum,
user_phone: window.localStorage.getItem('user_phone'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.done.push(array[index])
})
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.done.push(array[index])
})
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
{
bp_name: '陈泽华',
total_price: '2019-01-01',
project_number: 'PRJ2019160',
project_id: '49494',
division_n: '平地机',
leases_status: 'N',
async search () {
let res = await this.submitSearch()
if (res) {
this.approvedearch()
}
},
{
bp_name: '郭云龙',
total_price: '2019-01-01',
project_number: 'PRJ2019170',
project_id: '49711',
division_n: '平地机',
leases_status: 'N',
async submitSearch () {
let vm = this
vm.submitPagenum = 1
let url = $config.basePath + 'interview_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.submitPagenum,
// confirm_status: 'SUBMIT',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('请稍后')
let res = await vm.$post(url, param)
if (res.result === 'S') {
vm.hlsPopup.hideLoading()
vm.submitLists = res.lists
if (vm.tabNum === 0) {
vm.showLists = vm.submitLists
}
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
}
return true
} else {
hlsPopup.showLongCenter(res.message)
return false
}
},
]
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 = {
// user_phone: window.localStorage.getItem('user_phone'),
// }
// hlsPopup.showLoading('请稍候')
// vm.$post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.lists = res.lists
// vm.selectShowList()
// } else {
// hlsPopup.showLongCenter(res.message)
// }
// })
approvedearch () {
let vm = this
let url = $config.basePath + 'interview_list_query'
vm.approvedPagenum = 1
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.approvedPagenum,
// confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
vm.hlsHttp.post(url, param).then(function (res) {
vm.approvedLists = res.lists
if (vm.tabNum === 1) {
vm.showLists = vm.approvedLists
}
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
}
})
},
},
}
......
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