Skip to content

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

Merge branch 'ren' into develop

parents 745cb6cd 450afb92
Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 106 deletions
src/pages/contractInquire/contract-records.vue
View file @ 93254b5f
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-11-11 16:58:14
* @LastEditTime: 2019-11-13 10:07:57
* @LastEditors: Please set LastEditors
* @Description: 合同查询--记录
* @FilePath:
......@@ -14,6 +14,13 @@
<span>合同记录</span>
</div>
</h-header>
<h-content v-if="data===null" class="null">
<div class="display">
<img src="@/assets/contractRepayment/null.png" alt="">
<p>暂时没有还款记录</p>
<div @click="$routeGo()">返回</div>
</div>
</h-content>
<div v-if="data!==null">
<div class="tab">
<p><span :class="{'selected':selected === 'all'}" @click="isSelected('all')">全部</span></p>
......@@ -178,13 +185,7 @@
</div>
</div>
</scroll>
<h-content v-if="data===null" class="null">
<div class="display">
<img src="@/assets/contractRepayment/null.png" alt="">
<p>暂时没有还款记录</p>
<div @click="$routeGo()">返回</div>
</div>
</h-content>
</h-view>
</template>
......@@ -496,7 +497,7 @@ export default {
left: 50%;
transform: translateX(-50%);
top: 100px;
z-index: 999;
img {
width:150px;
}
......
src/pages/contractInquire/repay-plans.vue
View file @ 93254b5f
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-11-07 19:38:49
* @LastEditTime: 2019-11-13 10:38:46
* @LastEditors: Please set LastEditors
* @Description: 还款
* @FilePath:
......@@ -48,10 +48,10 @@
</div>
<div class="name">
<p>款项</p>
<p>应还金额</p>
<p>租金</p>
</div>
<div class="number">
<p>租金</p>
<p>应还金额</p>
<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">
......@@ -325,7 +325,6 @@ export default {
}
.time {
flex: 5;
p {
font-family: DIN-Regular;
......@@ -344,28 +343,30 @@ export default {
}
.name {
flex: 9;
opacity: 0.6;
// flex: 9;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
p {
margin-bottom: 17px;
padding-top: 20px;
margin-left: 22px;
span:nth-of-type(2) {
margin-left: 8px;
}
span:nth-of-type(1) {
opacity: 0.6;
}
}
.number {
flex: 9;
text-align: right;
// flex: 9;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
p {
margin-bottom: 17px;
padding-top: 20px;
margin-left: 40px;
span:nth-of-type(2) {
margin-left: 8px;
}
span.orang {
color: rgb(253, 182, 47);
font-weight: 700;
......
src/pages/contractSigning/contract-detail.vue
View file @ 93254b5f
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-11 13:58:43
* @LastEditTime: 2019-11-13 09:37:51
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -22,7 +22,7 @@
<span>合同详情</span>
</div>
</h-header>
<div v-if="!isConfirm&&con_confirm_status!=='APPROVED'" v-once class="myModal">
<div v-if="!isConfirm&&con_confirm_status!=='APPROVED'&&auth_credit_flag!=='Y'" v-once class="myModal">
<div class="box">
<span class="title-box">征信授权书</span>
<div class="content-box">
......@@ -313,7 +313,8 @@ export default {
uncheck3: unCheck3,
con_confirm_status: this.$route.params.item.confirm_status,
entry_info_flag: false,
faceListUpload: [],//自拍照上传
faceListUpload: [], // 自拍照上传
auth_credit_flag: 'N', // 征信授权书确认状态
}
},
computed: {},
......@@ -343,6 +344,7 @@ export default {
vm.ischecked = false
vm.bp_name = vm.$route.params.item.bp_name
vm.user_bp_type = vm.$route.params.user_bp_type
vm.auth_credit_flag = vm.$route.params.item.auth_credit_flag // 征信授权书确认状态
vm.project_id = vm.$route.params.item.project_id
vm.confirm_id = vm.$route.params.item.confirm_id
vm.con_confirm_status = vm.$route.params.item.confirm_status
......@@ -413,8 +415,8 @@ export default {
}
let success = function (imgdata) {
obj.filePath = imgdata
//obj.filePath = 'http://hlsapp.hand-china.com/file/XCMG/2.jpg'
vm.confirmContractSign(imgdata,status)
// obj.filePath = 'http://hlsapp.hand-china.com/file/XCMG/2.jpg'
vm.confirmContractSign(imgdata, status)
vm.faceListUpload.push(obj)
}
let error = function () {
......@@ -423,9 +425,9 @@ export default {
hlsUtil.openCamera(cameraoptions, success, error)
},
// 执行同意的逻辑(查询对应的身份证正面图片->人脸识别->确认签约)
async confirmContractSign (faceImg,status) {
async confirmContractSign (faceImg, status) {
let idCardImgUrl = await this.idCardImgUrlGet()
this.faceIdentify(faceImg, idCardImgUrl,status)
this.faceIdentify(faceImg, idCardImgUrl, status)
},
// 获取身份证照片
async idCardImgUrlGet () {
......@@ -446,7 +448,7 @@ export default {
}
},
// 人脸比对
faceIdentify (faceImg, idCardImgUrl,status) {
faceIdentify (faceImg, idCardImgUrl, status) {
let vm = this
let obj = {
'fileUrl': faceImg,
......@@ -464,7 +466,7 @@ export default {
onConfirm: (data) => {
if (data) {
vm.doConfirm(status)
} else{
} else {
}
},
......@@ -555,6 +557,22 @@ export default {
// 授权书同意
confirm () {
this.ischecked ? (this.isConfirm = true) : (this.isConfirm = false)
let vm = this
let url = $config.basePath + 'prj_auth_credit_upd'
let param = {
master: {
confirm_id: vm.confirm_id,
auth_credit_flag: 'Y',
},
}
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
if (res.result === 'S') {
// vm.guarantorInfo = res.lists
console.log('同意')
}
})
},
// 担保人
getGuarantor () {
......
src/pages/contractSigning/contract-repay-plan.vue
View file @ 93254b5f
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-11-08 09:13:12
* @LastEditTime: 2019-11-13 10:38:32
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -49,10 +49,10 @@
</div>
<div class="name">
<p>款项</p>
<p>应还金额</p>
<p>租金</p>
</div>
<div class="number">
<p>租金</p>
<p>应还金额</p>
<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">
......@@ -362,7 +362,6 @@ export default {
}
.time {
flex: 5;
p {
font-family: DIN-Regular;
......@@ -381,28 +380,30 @@ export default {
}
.name {
flex: 9;
opacity: 0.6;
// flex: 9;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
p {
margin-bottom: 17px;
padding-top: 20px;
margin-left: 22px;
span:nth-of-type(2) {
margin-left: 8px;
}
span:nth-of-type(1) {
opacity: 0.6;
}
}
.number {
flex: 9;
text-align: right;
// flex: 9;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
p {
margin-bottom: 17px;
padding-top: 20px;
margin-left: 40px;
span:nth-of-type(2) {
margin-left: 8px;
}
span.orang {
color: rgb(253, 182, 47);
font-weight: 700;
......
src/pages/distributorSign/financ-details.vue
View file @ 93254b5f
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-11-08 15:44:27
* @LastEditTime: 2019-11-13 10:39:56
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -18,7 +18,7 @@
<div class="total">
<div class="sum">
<div>融资额</div>
<p>{{info.total_rental_sum | currency}}</p>
<p>{{ info.total_rental_sum | currency }}</p>
<img src="@/assets/contractInquire/num.png" alt="">
<h3><span>{{ info.lease_times }}期</span></h3>
</div>
......@@ -47,10 +47,10 @@
</div>
<div class="name">
<p>款项</p>
<p>应还金额</p>
<p>租金</p>
</div>
<div class="number">
<p>租金</p>
<p>应还金额</p>
<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">
......@@ -138,7 +138,6 @@ export default {
if (res.result === 'S') {
vm.info = res.info
vm.repayLists = res.lists.sort(vm.arrSort('times')) // 根据还款期排序
} else {
hlsPopup.showLongCenter(res.message)
}
......@@ -327,7 +326,6 @@ export default {
}
.time {
flex: 5;
p {
font-family: DIN-Regular;
......@@ -346,28 +344,30 @@ export default {
}
.name {
flex: 9;
opacity: 0.6;
// flex: 9;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
p {
margin-bottom: 17px;
padding-top: 20px;
margin-left: 22px;
span:nth-of-type(2) {
margin-left: 8px;
}
span:nth-of-type(1) {
opacity: 0.6;
}
}
.number {
flex: 9;
text-align: right;
// flex: 9;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
p {
margin-bottom: 17px;
padding-top: 20px;
margin-left: 40px;
span:nth-of-type(2) {
margin-left: 8px;
}
span.orang {
color: rgb(253, 182, 47);
font-weight: 700;
......
src/pages/distributorSign/legal-person.vue
View file @ 93254b5f
......@@ -2,7 +2,7 @@
* @Description: 法人信息
* @Author: your name
* @Date: 2019-09-26 15:09:24
* @LastEditTime: 2019-11-11 14:00:00
* @LastEditTime: 2019-11-13 09:21:26
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -48,7 +48,7 @@
<input slot="content" v-model="baseInfo.auth_flag" readonly>
</item>
</list-item>
<div class="equipment-list" v-if="baseInfo.auth_flag === '是'">{{ '法定授权人' }}</div>
<div v-if="baseInfo.auth_flag === '是'" class="equipment-list">{{ '法定授权人' }}</div>
<!-- 授权人 -->
<list-item v-show="baseInfo.auth_flag === '是'" :item-height="44" class="second-part">
......@@ -90,7 +90,7 @@
<input slot="content" v-model="baseInfo.cell_phone" readonly>
</item>
<item>
<div slot="name" class="font-color">居住地址</div>
<div slot="name" class="font-color">联系地址</div>
<input slot="content" v-model="baseInfo.living_address" readonly>
</item>
</list-item>
......
src/pages/distributorSign/personal.vue
View file @ 93254b5f
......@@ -2,7 +2,7 @@
* @Descrip：个人信息
* @Author: your name
* @Date: 2019-09-26 15:47:45
* @LastEditTime: 2019-09-30 09:46:08
* @LastEditTime: 2019-11-13 09:21:48
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -32,7 +32,7 @@
<input slot="content" v-model="baseInfo.cell_phone" readonly>
</item>
<item>
<div slot="name" class="font-color">居住地址</div>
<div slot="name" class="font-color">联系地址</div>
<input slot="content" v-model="baseInfo.living_address" readonly>
</item>
<item>
......@@ -48,8 +48,8 @@
<input slot="content" v-model="baseInfo.marital_status_n" readonly>
</item>
</list-item>
<div class="equipment-list" v-if="baseInfo.marital_status == 'MARRIED'">配偶信息</div>
<list-item :item-height="44" class="second-part" v-if="baseInfo.marital_status == 'MARRIED'">
<div v-if="baseInfo.marital_status == 'MARRIED'" class="equipment-list">配偶信息</div>
<list-item :item-height="44" v-if="baseInfo.marital_status == 'MARRIED'" class="second-part">
<item>
<div slot="name" class="font-color">姓名</div>
<input slot="content" v-model="baseInfo.bp_name_sp" readonly>
......@@ -63,7 +63,7 @@
<input slot="content" v-model="baseInfo.working_place_sp" readonly>
</item>
<item>
<div slot="name" class="font-color">居住地址</div>
<div slot="name" class="font-color">联系地址</div>
<input slot="content" v-model="baseInfo.address_sp" readonly>
</item>
</list-item>
......
src/pages/financingTrial/financing-details.vue
View file @ 93254b5f
......@@ -2,7 +2,7 @@
* @Descrip""/>User Settings Edit
* @Author: your name
* @Date: 2019-09-29 20:31:00
* @LastEditTime: 2019-11-11 11:30:04
* @LastEditTime: 2019-11-13 09:31:10
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -144,14 +144,15 @@ export default {
next(vm => {
if (from.name === 'FinancingTrial') {
vm.equip_price = vm.$route.params.plan_price // 参考价
if (vm.product_plan_id !== vm.$route.params.product_plan_id) {
// if (vm.product_plan_id !== vm.$route.params.product_plan_id) {
// 重置产品id、试算返回id、试算状态、保险押金、gps费用、预计还款日
vm.product_plan_id = vm.$route.params.product_plan_id
vm.quotation_id = ''
vm.trial_flag = false
vm.insurance_fee = ''
vm.gps_fee = ''
vm.price_date_to = '请选择时间'
}
// }
vm.detailsQuery()
vm.repayPeriod()
}
......
src/pages/financingTrial/trial-repay-plan.vue
View file @ 93254b5f
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-11-08 09:36:20
* @LastEditTime: 2019-11-13 10:34:23
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -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 |currency }}</span>
</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">
......@@ -343,7 +343,7 @@ export default {
}
.time {
flex: 5;
// flex: 5;
p {
font-family: DIN-Regular;
......@@ -362,28 +362,30 @@ export default {
}
.name {
flex: 9;
opacity: 0.6;
// flex: 9;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
p {
margin-bottom: 17px;
padding-top: 20px;
margin-left: 22px;
span:nth-of-type(2) {
margin-left: 8px;
}
span:nth-of-type(1) {
opacity: 0.6;
}
}
.number {
flex: 9;
text-align: right;
// flex: 9;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
p {
margin-bottom: 17px;
padding-top: 20px;
margin-left: 40px;
span:nth-of-type(2) {
margin-left: 8px;
}
span.orang {
color: rgb(253, 182, 47);
font-weight: 700;
......
src/pages/home/home-page.vue
View file @ 93254b5f
......@@ -2,7 +2,7 @@
* @Descrip: 主页
* @Author: your name
* @Date: 2019-10-10 14:25:15
* @LastEditTime: 2019-10-29 09:50:16
* @LastEditTime: 2019-11-13 11:04:08
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -54,7 +54,7 @@
<img src="@/assets/homePage/hot.png" class="hot">
<div class="center"><span class="firsts">经销商</span> <span class="seconds">{{ list.bp_name }}</span></div>
<div class="center"><span class="firsts">参数项</span> <span class="seconds">{{ list.product_code }}</span></div>
<div class="center"><span class="firsts">地址</span> <span class="seconds">{{ list.province_id_n + list.city_id_n + list.district_id_n}}</span></div>
<div class="center"><span class="firsts">地址</span> <span class="seconds">{{ list.province_id_n + list.city_id_n + list.district_id_n }}</span></div>
</div>
</item>
</list-item>
......@@ -168,13 +168,12 @@ export default {
})
},
// 进入产品明细
goProductDetail(list){
let vm = this
goProductDetail (list) {
this.$router.push({
name: 'ProDetailed',
params: {
product_id: list.product_id,
bp_id: vm.bp_id
bp_id: list.bp_id,
},
})
},
......
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