Commit 6d9476fb authored by 786817560's avatar 786817560

'提交'

parent 92979b63
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-05 18:15:37
* @LastEditTime: 2019-11-06 16:47:37
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -113,7 +113,7 @@ export default {
// 合同查询
contractList () {
let vm = this
let url = $config.basePath + 'con_confirm_list_query'
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
}
......
......@@ -2,7 +2,7 @@
* @Descrip""/>User Settings Edit
* @Author: your name
* @Date: 2019-09-29 20:31:00
* @LastEditTime: 2019-11-06 14:58:45
* @LastEditTime: 2019-11-06 15:14:34
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -73,7 +73,7 @@
<item>
<div slot="name" class="font-color">预计付款日</div>
<!-- <input slot="content" placeholder="YYYY-MM-DD" readonly> -->
<div slot="content" class="autoColor">{{ price_date_to | dateFormat }}</div>
<div slot="content" class="autoColor">{{ price_date_to }}</div>
<img src="@/assets/trial/date.png" alt="" class="date-pic" @click="showTime('YYYY-MM-DD')">
</item>
<item @click.native="periodPull" :show-arrow="true">
......@@ -141,7 +141,7 @@ export default {
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'FinancingTrial') {
vm.price_date_to = vm.$route.params.price_date_to // 有效日期
// vm.price_date_to = vm.$route.params.price_date_to // 有效日期
vm.equip_price = vm.$route.params.plan_price // 参考价
if (vm.product_plan_id !== vm.$route.params.product_plan_id) {
vm.product_plan_id = vm.$route.params.product_plan_id
......
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-10-31 10:26:52
* @LastEditTime: 2019-11-06 15:56:54
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\src\pages\financingTrial\trial-repay-plan.vue
......@@ -36,15 +36,15 @@
</div>
<h-content id="content" class="plan-content">
<!-- 已结清 black , 逾期 orange , 还款中 blue , 未还款 green -->
<div v-for="(item,index) in 5" :key="index" :class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}">
<div v-for="(item,index) in repayLists" :key="index" :class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}">
<div :class="{'period':true,'orange':statu==='orange','blue':statu==='blue','green':statu==='green'}">{{ index + 1 }}</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>2019</p>
<span>01-01</span>
<p>{{ item.due_date.substr(0,4) }}</p>
<span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
</div>
<div class="name">
<p>现金流项目</p>
......@@ -52,7 +52,7 @@
</div>
<div class="number">
<p>租金</p>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">90,000.00</span>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental |currency }}</span>
</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">
......@@ -71,12 +71,13 @@ export default {
data () {
return {
// 已结清 black , 逾期 orange , 还款中 blue , 未还款 green
statu: 'black',
statu: 'orange',
info: {},
show: false,
height: 0,
oldHeight: 0,
newHeight: 0,
repayLists: [], // 每期还款
}
},
computed: {},
......@@ -90,6 +91,16 @@ export default {
next()
},
methods: {
dateConverse (date) {
return date.replace(/\//g, '-')
},
arrSort (property) {
return function (a, b) {
var value1 = a[property]
var value2 = b[property]
return value1 - value2
}
},
showDetails () {
if (!this.flag) {
this.flag = true
......@@ -124,6 +135,8 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.info = res.info
vm.repayLists = res.lists.sort(vm.arrSort('times')) // 根据还款期排序
} else {
hlsPopup.showLongCenter(res.message)
}
......@@ -283,7 +296,7 @@ export default {
display: flex;
padding-right: 20px;
padding-left: 10px;
padding-top: 16px;
padding-top: 20px;
margin-bottom: 10px;
.left {
......@@ -306,13 +319,14 @@ export default {
left: 0;
background: rgba(75,74,75,.5);
border-radius: 4px 0 4px 0;
width: 30px;
height: 15px;
// width: 30px;
padding: 1px 2px;
height: 20px;
color: #fff;
font-family: PingFangSC-Semibold;
font-size: 12px;
letter-spacing: 1.09px;
line-height: 15px;
line-height: 20px;
text-align: center;
}
......@@ -336,7 +350,7 @@ export default {
font-size: 12px;
color: rgba(56,63,69,0.60);
margin-bottom: 4px;
margin-top: 5px;
margin-top: 8px;
}
span {
......
......@@ -2,7 +2,7 @@
* @Descrip: 产品明细
* @Author: your name
* @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-11-06 13:56:38
* @LastEditTime: 2019-11-06 16:35:55
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -24,10 +24,13 @@
<!-- 基本信息 -->
<h-content v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)" class="hcontent">
<scroll class="scrolls" ref="scrolls">
<div id="baseInfo" class="base">
<img :src="picLists[0].url" alt="" class="detail-pic">
<!-- 基本信息 -->
<div id="baseInfo" class="base">
<swipe :interval="5000" class="hls-swipe">
<swipe-item v-for="(item,index) in picLists" :key="index" class="hls-swipe">
<img :src="item.url" alt="">
</swipe-item>
</swipe>
<div class="base-content">
<div class="top-code">
<div>参数项 &nbsp;{{ baseInfo.product_code }}</div>
......@@ -194,21 +197,16 @@ export default {
// console.log(s, e)
this.slide = true
// this.height = 0
// document.getElementsByTagName('hcontent')[0].addEventListener('touchmove',function(e){
// console.log("开始滑动了touchstart");
// let a = document.documentElement.scrollTop;
// console.log("滑动距离为:",a);
// });
// console.log(this.$refs.detail.style)
let clientHeight = document.body.clientHeight // 屏幕可视高度
let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
let baseGather = document.getElementsByClassName('base')[0].getBoundingClientRect() // 基本信息元素集合
if (clientHeight - procnfGather.top - 83 >= procnfGather.height) {
if (clientHeight - procnfGather.top >= procnfGather.height) {
this.num = 2
} else if (clientHeight - detailGather.top - 83 >= detailGather.height) {
} else if (clientHeight - detailGather.top >= detailGather.height) {
this.num = 1
} else if (clientHeight - baseGather.top - 83 >= baseGather.height) {
} else if ( -(baseGather.top) <= baseGather.height/2) {
this.num = 0
}
},
......
......@@ -23,7 +23,7 @@
<list-item v-for="(item,index) in lists" :key="index">
<item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)">
<div slot="name" class="item-pic">
<img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
<img :src="item.url" alt="">
</div>
<div slot="content" class="item-content">
<div class="pro-name">
......@@ -81,6 +81,11 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
res.lists.forEach(item => {
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