Skip to content

H
hls-xcmg-vue-app
Commit 1a375898 authored by linxin's avatar linxin
Browse files
Options

Merge branch 'liuxin' into develop

parents 4919e022 8b2d4402
Show whitespace changes
Inline Side-by-side
Showing with 191 additions and 113 deletions
src/pages/distributorSign/contract-details.vue
View file @ 1a375898
......@@ -63,7 +63,7 @@
</div>
<div class="center">
<p>业务经办：{{ baseInfo.bp_user_id_n }}</p>
<p>联系电话：{{ baseInfo.phone }}</p>
<p>联系电话：{{ baseInfo.cell_phone }}</p>
</div>
<div class="right1" @click="callUp(baseInfo.phone)">
<img src="@/assets/distributorSign/calls.png" alt="">
......
src/pages/infoCenter/infoList.vue
View file @ 1a375898
......@@ -4,44 +4,51 @@
<div slot="center" class="top-word">消息通知</div>
</h-header>
<h-content class="content">
<div class="card-info">
<div v-for="(item,index) in list" :key="index" class="card-info">
<div class="card-position">
<div class="card-top">
<img src="@/assets/infoCenter/info.png" class="icon" >
<span class="title">进件确认</span>
<span class="time">2019-07-28</span>
<span class="title">{{ item.notice_title }}</span>
<span class="time">{{ item.notice_time }}</span>
</div>
<img src="@/assets/infoCenter/arrow.png" class="arrow">
<div class="message">进件号：201903022001待您确认，请确认</div>
</div>
</div>
<div class="card-info">
<div class="card-position">
<div class="card-top">
<img src="@/assets/infoCenter/info.png" class="icon" >
<span class="title">视屏面签</span>
<span class="time">2019-07-28</span>
</div>
<img src="@/assets/infoCenter/arrow.png" class="arrow">
<div class="message">进件号：201903022001于2019-08-29进行视频面签，届时请注意接收视频消息！</div>
</div>
</div>
<div class="card-info">
<div class="card-position">
<div class="card-top">
<img src="@/assets/infoCenter/info.png" class="icon" >
<span class="title">保证金确认</span>
<span class="time">2019-07-28</span>
</div>
<img src="@/assets/infoCenter/arrow.png" class="arrow">
<div class="message">您有一条保证金缴纳确认信息待确认，请确认！</div>
<div class="message">{{ item.notice_body }}</div>
</div>
</div>
</h-content>
</h-view>
</template>
<script>
export default {}
export default {
data () {
return {
list: [],
}
},
beforeRouteEnter (to, from, next) {
next(vm => {
vm.getInfo()
})
},
methods: {
getInfo () {
let vm = this
let url = process.env.basePath + 'hls_app_notice_query'
let param = {
phone: window.sessionStorage.getItem('user_phone'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.list = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
},
}
</script>
<style lang="less" scoped>
#info-center {
......
src/pages/pay/firstPay/contract-record.vue
View file @ 1a375898
......@@ -12,10 +12,7 @@
<div><span>￥</span>{{ money |currency }}</div>
</div>
</div>
<h-content v-if="prj_lists.length===0" class="none">
<p>暂无记录</p>
</h-content>
<h-content v-if="prj_lists.length!==0" class="pay-content">
<h-content class="pay-content">
<section v-for="(item,index) in prj_lists" :key="index" class="contract-item">
<div class="header">
<img src="@/assets/payment/contract.png" alt="">
......@@ -35,7 +32,7 @@
</div>
</section>
</h-content>
<div v-if="prj_lists.length!==0" class="prompt">
<div class="prompt">
<div><img src="@/assets/payment/prompt.png" alt=""></div>
<div>
<p>温馨提示</p>
......@@ -43,7 +40,7 @@
<p>由于存在款项到账时差性，“已还金额”字段可能XXX，给您造成的不便，请谅解，谢谢！</p>
</div>
</div>
<bottom-tab v-if="prj_lists.length!==0" >
<bottom-tab >
<tab-button class="footer" @click.native="createDetail">
支&nbsp;&nbsp;付
</tab-button>
......@@ -336,8 +333,6 @@ export default {
background: rgba(142,195,30,0.10);
height: 111px;
display: flex;
position: fixed;
bottom: 37px;
div:first-child {
flex: 1;
padding: 16px 0 0 16px;
......@@ -380,10 +375,6 @@ export default {
height: 40px;
margin: 4px 2% 0 2%;
}
.none{
display:flex;
justify-content: center;
align-items: center;
}
}
</style>
src/pages/pay/firstPay/first-pay.vue
View file @ 1a375898
......@@ -75,15 +75,17 @@ export default {
})
},
pay () {
let money = parseFloat(this.money)
let theDefault = parseFloat(this.default)
if (money > 0 && money <= theDefault) {
this.payProtocol()
} else if (money > theDefault) {
hlsPopup.showLongCenter('当前支付金额超出应还金额！')
} else if (money === 0) {
hlsPopup.showLongCenter('当前支付金额为0元，无需支付！')
}
// let money = parseFloat(this.money)
// let theDefault = parseFloat(this.default)
// if (money > 0 && money <= theDefault) {
// this.payProtocol()
// } else if (money > theDefault) {
// hlsPopup.showLongCenter('当前支付金额超出应还金额！')
// } else if (money === 0) {
// hlsPopup.showLongCenter('当前支付金额为0元，无需支付！')
// }
},
payProtocol () {
let vm = this
......
src/pages/pay/firstPay/pay-entry.vue
View file @ 1a375898
......@@ -9,7 +9,7 @@
<h-content class="entry-content">
<div class="amount">
<p>首付还款</p>
<p>交易金额</p>
<div>￥{{ money |currency }}</div>
</div>
<list-item :item-height="56" class="pay-way">
......@@ -27,26 +27,26 @@
<img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt="">
</section>
</item>
<item :proportion="[7,1,1]" @click.native="isSelect('three')">
<div slot="name" style="flex=3"> <img src="@/assets/payment/ly.png" alt="" class="icon"> 中国农业银行</div>
<item v-for="(item,index) in lists" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`three${index}`)">
<div slot="name" style="flex=3"> <img src="@/assets/payment/ly.png" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})</div>
<section slot="content">
<img v-show="select === 'three'" src="@/assets/payment/select.png" alt="">
<img v-show="select !== 'three'" src="@/assets/payment/unselect.png" alt="">
<img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt="">
<img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt="">
</section>
</item>
<item :proportion="[7,1,1]" @click.native="isSelect('four')">
<!-- <item :proportion="[7,1,1]" @click.native="isSelect('four')">
<div slot="name"> <img src="@/assets/payment/js.png" alt="" class="icon"> 中国建设银行</div>
<section slot="content">
<img v-show="select === 'four'" src="@/assets/payment/select.png" alt="">
<img v-show="select !== 'four'" src="@/assets/payment/unselect.png" alt="">
</section>
</item>
</item> -->
</list-item>
</h-content>
<bottom-tab>
<tab-button class="footer">
<tab-button class="footer" @click.native="pay">
立即付款
</tab-button>
</bottom-tab>
......@@ -64,7 +64,7 @@ export default {
money: '',
select: 'one',
name: '',
lists: [],
}
},
computed: {},
......@@ -72,15 +72,42 @@ export default {
beforeRouteEnter (to, from, next) {
next(vm => {
vm.name = from.name
vm.getType()
})
},
activated () {
this.money = this.$route.params.money
},
methods: {
selectLast (item) {
let num = item.bank_account_num
return num.substring(num.length - 4)
},
isSelect (way) {
this.select = way
},
pay () {
let vm = this
setTimeout(() => {
vm.hlsPopup.showSuccess('支付成功！')
}, 1000)
},
getType () {
let vm = this
let url = process.env.basePath + 'payment_method_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
},
}
</script>
......
src/pages/pay/payment/pay-entry.vue
View file @ 1a375898
......@@ -9,7 +9,7 @@
<h-content class="entry-content">
<div class="amount">
<p>首付还款</p>
<p>交易金额</p>
<div>￥{{ money |currency }}</div>
</div>
<list-item :item-height="56" class="pay-way">
......@@ -27,26 +27,26 @@
<img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt="">
</section>
</item>
<item :proportion="[7,1,1]" @click.native="isSelect('three')">
<div slot="name" style="flex=3"> <img src="@/assets/payment/ly.png" alt="" class="icon"> 中国农业银行</div>
<item v-for="(item,index) in lists" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`three${index}`)">
<div slot="name" style="flex=3"> <img src="@/assets/payment/ly.png" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})</div>
<section slot="content">
<img v-show="select === 'three'" src="@/assets/payment/select.png" alt="">
<img v-show="select !== 'three'" src="@/assets/payment/unselect.png" alt="">
<img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt="">
<img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt="">
</section>
</item>
<item :proportion="[7,1,1]" @click.native="isSelect('four')">
<!-- <item :proportion="[7,1,1]" @click.native="isSelect('four')">
<div slot="name"> <img src="@/assets/payment/js.png" alt="" class="icon"> 中国建设银行</div>
<section slot="content">
<img v-show="select === 'four'" src="@/assets/payment/select.png" alt="">
<img v-show="select !== 'four'" src="@/assets/payment/unselect.png" alt="">
</section>
</item>
</item> -->
</list-item>
</h-content>
<bottom-tab>
<tab-button class="footer">
<tab-button class="footer" @click.native="pay">
立即付款
</tab-button>
</bottom-tab>
......@@ -63,7 +63,7 @@ export default {
return {
money: '',
select: 'one',
lists: [],
}
},
computed: {},
......@@ -75,12 +75,39 @@ export default {
} else if (from.name === 'PaymentContractRecord') {
vm.money = vm.$route.params.sumMoney
}
vm.getType()
})
},
methods: {
pay () {
let vm = this
setTimeout(() => {
vm.hlsPopup.showSuccess('支付成功！')
}, 1000)
},
selectLast (item) {
let num = item.bank_account_num
return num.substring(num.length - 4)
},
isSelect (way) {
this.select = way
},
getType () {
let vm = this
let url = process.env.basePath + 'payment_method_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
changePage () {
this.$router.replace({
name: 'PaymentContractRecord',
......
src/pages/userBind/np/naturePerson.vue
View file @ 1a375898
......@@ -54,7 +54,12 @@
<img :src="idCardFront" style="width: 100%;height: 100%;margin: 0" >
</div>
<div v-if="isApproved && idCardFront">
<img v-if="idCardFront" :src="idCardFront" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardFront)">
<img
v-if="idCardFront"
:src="idCardFront"
style="width: 100%;height: 100%;margin: 0"
@click="showBigPicture(idCardFront)"
>
</div>
<div v-if="!idCardBack" @click="ocrShow('idCard', 'back')">
<img src="@/assets/userBind/back.png" >
......@@ -64,7 +69,12 @@
<img :src="idCardBack" style="width: 100%;height: 100%;margin: 0" >
</div>
<div v-if="isApproved && idCardBack">
<img v-if="idCardBack" :src="idCardBack" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardBack)">
<img
v-if="idCardBack"
:src="idCardBack"
style="width: 100%;height: 100%;margin: 0"
@click="showBigPicture(idCardBack)"
>
</div>
</div>
</div>
......@@ -204,23 +214,33 @@
<span>{{ list.description }}</span>
<div class="img-content">
<!--待上传图片列表-->
<div v-for="(item, index) in upload_list" v-if="item.check_id==list.check_id" :key="index" class="card-upload">
<img :src="item.picture" @click="showBigPicture(item.picture)">
<div
v-for="(item, index) in upload_list"
v-if="item.check_id==list.check_id"
:key="index"
class="card-upload"
>
<img :src="item.picture" @click="showBigPicture(item.picture)" >
<div class="close" @click="remove_pic(item.attachment_id,index)">
<img src="@/assets/userBind/deleteIcon.png">
<img src="@/assets/userBind/deleteIcon.png" >
</div>
</div>
<!--从服务器上下载的图片-->
<div v-for="item in dowload_list">
<div v-for="(pic, index) in item" v-if="pic.check_id==list.check_id" :key="index" class="card-upload">
<img :src="pic.url" @click="showBigPicture(pic.url)">
<div
v-for="(pic, index) in item"
v-if="pic.check_id==list.check_id"
:key="index"
class="card-upload"
>
<img :src="pic.url" @click="showBigPicture(pic.url)" >
<div class="close" @click="delete_pic(pic.attachment_id)">
<img src="@/assets/userBind/deleteIcon.png">
<img src="@/assets/userBind/deleteIcon.png" >
</div>
</div>
</div>
<div class="card-upload" @click="imgUploadShow(list.check_id)">
<img src="@/assets/userBind/camera.png" class="upload-btn">
<img src="@/assets/userBind/camera.png" class="upload-btn" >
</div>
</div>
</div>
......@@ -231,10 +251,15 @@
<p>已缴纳：500000</p>
</div>
<img src="@/assets/userBind/arrow-right.png" class="right-img">
</div> -->
</div>-->
</div>
<BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo" @getList="getList"/>
<BankInfo
v-show="tabNum==1"
:getBankList="getBankList"
@getInfo="getInfo"
@getList="getList"
/>
<InvoiceInfo
v-show="tabNum==2"
:baseInfo="baseInfo"
......@@ -266,11 +291,7 @@
style="height: 38%;"
@click="ocrShow('bankCard', '')"
>
<img
v-if="!bankImg && isApproved"
src="@/assets/userBind/addBack.png"
class="addBack"
>
<img v-if="!bankImg && isApproved" src="@/assets/userBind/addBack.png" class="addBack" >
<list-item :item-height="44" class="card-Info">
<item>
<div slot="name">银行卡卡号</div>
......@@ -900,7 +921,6 @@ export default {
},
addRowsLive (e) {
let addNum = parseInt(e.length / 16)
// console.log(this.$refs.myTestareaLive.offsetHeight)
if (addNum === 0) {
this.$refs.myTestareaLive.rows = 1
} else if (addNum >= addNum - 1 && addNum < addNum + 1) {
......@@ -1001,7 +1021,7 @@ export default {
this.showModalValue = false
},
getInfo (i, isClear) {
if(isClear){
if (isClear) {
this.bank = {}
}
this.showModalValue = i
......@@ -1263,43 +1283,47 @@ export default {
textarea {
text-align: right;
}
.tax{
width:351px;
// .compute{
// display:block;
// font-size: 14px;
// }
.tax {
width: 351px;
height: 78px;
background:#fff;
margin:0 auto;
background: #fff;
margin: 0 auto;
margin-bottom: 30px;
display:flex;
display: flex;
align-items: center;
.left-img{
width:24px;
height:28px;
flex:2.5;
padding-left:24px;
}
div{
flex:25;
padding-left:24px;
span{
.left-img {
width: 24px;
height: 28px;
flex: 2.5;
padding-left: 24px;
}
div {
flex: 25;
padding-left: 24px;
span {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #383F45;
color: #383f45;
letter-spacing: 0;
line-height: 22px;
}
p{
p {
font-family: PingFangSC-Regular;
font-size: 12px;
color: rgba(56,63,69,0.50);
color: rgba(56, 63, 69, 0.5);
letter-spacing: 0;
line-height: 22px;
}
}
.right-img{
width:10px;
height:16px;
flex:1;
padding-right:21px;
.right-img {
width: 10px;
height: 16px;
flex: 1;
padding-right: 21px;
}
}
.header {
......@@ -1420,10 +1444,10 @@ export default {
float: left;
.close {
position: relative;
color: #F96F68;
color: #f96f68;
margin-top: -100%;
margin-left: -10%;
img{
img {
width: 14px;
height: 14px;
}
......@@ -1432,7 +1456,7 @@ export default {
width: 88px;
height: 88px;
}
.upload-btn{
.upload-btn {
width: 24px;
height: 24px;
}
......
src/router/index.js
View file @ 1a375898
......@@ -178,7 +178,7 @@ export default new Router({
{path: '/contract-record', component: ContractRecord, name: 'ContractRecord', meta: {keepAlive: true}},
// 款项支付
{path: '/payment-first-pay', component: PaymentFirstPay, name: 'PaymentFirstPay', meta: {keepAlive: true}},
{path: '/payment-pay-entry', component: PaymentPayEntry, name: 'PaymentPayEntry', meta: {keepAlive: true}},
{path: '/payment-pay-entry', component: PaymentPayEntry, name: 'PaymentPayEntry', meta: {keepAlive: false}},
{path: '/payment-contract-record', component: PaymentContractRecord, name: 'PaymentContractRecord', meta: {keepAlive: true}},
// 保证金支付
{path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: true}},
......@@ -186,7 +186,7 @@ export default new Router({
// 产品查询
{path: '/query-home', component: QueryHome, name: 'QueryHome', meta: {keepAlive: true}},
{path: '/product-detailed', component: ProDetailed, name: 'ProDetailed', meta: {keepAlive: true}},
{path: '/product-list', component: ProductList, name: 'ProductList', meta: {keepAlive: true}},
{path: '/product-list', component: ProductList, name: 'ProductList', meta: {keepAlive: false}},
// 帮助与反馈
{path: '/help-list', component: HelpList, name: 'HelpList', meta: {keepAlive: true}},
{path: '/help-detail', component: HelpDetail, name: 'HelpDetail', meta: {keepAlive: true}},
......
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