Skip to content

H
hls-xcmg-vue-app
Commit f27f3b1a authored by 李晓兵's avatar 李晓兵
Browse files
Options

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents f54556aa 56a54d6f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 328 additions and 229 deletions
src/pages/contractRepayment/contract-repayment.vue
View file @ f27f3b1a
......@@ -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 @ f27f3b1a
......@@ -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/contractSigning/contract-detail.vue
View file @ f27f3b1a
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-13 09:37:51
* @LastEditTime: 2019-11-13 17:20:21
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -567,12 +567,11 @@ export default {
auth_credit_flag: 'Y',
},
}
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsPopup.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
// vm.guarantorInfo = res.lists
console.log('同意')
}
})
},
......
src/pages/contractStart/start-list.vue
View file @ f27f3b1a
......@@ -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/distributorSign/contract-list.vue
View file @ f27f3b1a
......@@ -19,55 +19,55 @@
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</div>
<scroll
v-if="tabNum === 0"
ref="scroll"
:updateData="[submitLists]"
:pullUp="true"
>
<div class="wrap">
<div v-for="(item,index) in submitLists" :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>
<scroll
v-if="tabNum === 0"
ref="scroll"
:updateData="[submitLists]"
:pullUp="true"
>
<div class="wrap">
<div v-for="(item,index) in submitLists" :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>
</scroll>
</div>
</scroll>
<scroll
v-if="tabNum === 1"
ref="scrollList"
:updateData="[approvedLists]"
:pullUp="true"
>
<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>
<scroll
v-if="tabNum === 1"
ref="scrollList"
:updateData="[approvedLists]"
:pullUp="true"
>
<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>
</scroll>
</div>
</scroll>
</h-view>
</template>
......@@ -96,34 +96,34 @@ export default {
let vm = this
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
}
user_phone: window.localStorage.user_phone,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
if (vm.submitLists.length > 0 && vm.submitLists.length < 10) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
if (vm.submitLists.length > 0 && vm.submitLists.length < 10) {
vm.$refs.scroll.update(true)
}
if (vm.approvedLists.length > 0 && vm.approvedLists.length < 10) {
vm.$refs.scrollList.update(true)
}
}else {
hlsPopup.showLongCenter(res.message)
}
})
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
goDetails (item) {
window.sessionStorage.setItem('confirm_id', item.confirm_id)
window.sessionStorage.setItem('bp_class', item.bp_class)
window.sessionStorage.setItem('project_id', item.project_id)
window.sessionStorage.setItem('confirm_status', item.confirm_status)
this.$router.push({
name: 'ContractDetails',
params: {
confirm_id: item.confirm_id,
confirm_status: item.confirm_status,
hasButtom: true,
},
})
},
......
src/pages/distributorSign/financ-details.vue
View file @ f27f3b1a
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-11-13 10:39:56
* @LastEditTime: 2019-11-13 16:36:01
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -17,7 +17,7 @@
<div class="total">
<div class="sum">
<div>融资额</div>
<div>租金总额</div>
<p>{{ info.total_rental_sum | currency }}</p>
<img src="@/assets/contractInquire/num.png" alt="">
<h3><span>{{ info.lease_times }}期</span></h3>
......@@ -46,11 +46,11 @@
<span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
</div>
<div class="name">
<p>款项</p>
<p>租金</p>
<span>款项</span>
<span>租金</span>
</div>
<div class="number">
<p>应还金额</p>
<span>应还金额</span>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental*product_num |currency }}</span>
</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">
......
src/pages/myInfo/my-info.vue
View file @ f27f3b1a
<!--
* @Author: your name
* @Date: 2019-11-07 17:48:53
* @LastEditTime: 2019-11-08 14:20:16
* @LastEditTime: 2019-11-13 11:29:25
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......
src/pages/pay/firstPay/contract-record.vue
View file @ f27f3b1a
......@@ -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 @ f27f3b1a
......@@ -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 @ f27f3b1a
......@@ -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 {
......
src/pages/productQuery/product-detailed.vue
View file @ f27f3b1a
......@@ -2,7 +2,7 @@
* @Descrip: 产品明细
* @Author: your name
* @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-11-08 14:06:15
* @LastEditTime: 2019-11-13 14:44:06
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -178,6 +178,7 @@ export default {
vueTouch: function (s, e) {
let clientHeight = document.body.clientHeight // 屏幕可视高度
let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
console.log(procnfGather)
let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
let baseGather = document.getElementsByClassName('base')[0].getBoundingClientRect() // 基本信息元素集合
if (clientHeight - procnfGather.top >= procnfGather.height) {
......@@ -277,7 +278,6 @@ export default {
item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
})
vm.picLists = res.lists
console.log(vm.picLists)
} else {
hlsPopup.showLongCenter(res.message)
}
......
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