Skip to content

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

Merge branch 'liuxin' into develop

parents 7a7ed1d0 559ce305
Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 306 deletions
src/assets/payment/select.png
View replaced file @ 7a7ed1d0 View file @ 20db385d
src/assets/payment/select.png

1.25 KB | W: | H:

src/assets/payment/select.png

1.13 KB | W: | H:

src/assets/payment/select.png
src/assets/payment/select.png
src/assets/payment/select.png
src/assets/payment/select.png
  • 2-up
  • Swipe
  • Onion skin
src/pages/carConfirm/confirm-detail.vue
View file @ 20db385d
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
</item> </item>
<item> <item>
<div slot="name">车辆型号 </div> <div slot="name">车辆型号 </div>
<input slot="content" v-model="info.type" readonly placeholder="自动识别车辆型号" > <input slot="content" v-model="rentInfo.type" readonly placeholder="自动识别车辆型号" >
</item> </item>
<item> <item>
<div slot="name">合格证编号 </div> <div slot="name">合格证编号 </div>
<input slot="content" v-model="info.number" readonly placeholder="自动识别合格证编号" > <input slot="content" v-model="rentInfo.number" readonly placeholder="自动识别合格证编号" >
</item> </item>
<item> <item>
<div slot="name">厂商型号</div> <div slot="name">厂商型号</div>
...@@ -53,6 +53,15 @@ ...@@ -53,6 +53,15 @@
placeholder="请输入车牌号" placeholder="请输入车牌号"
> >
</item> </item>
<item>
<div slot="name">发车日期</div>
<input
slot="content"
v-model="rentInfo.date"
readonly
placeholder="请输入发车日期"
>
</item>
</list-item> </list-item>
</div> </div>
</div> </div>
...@@ -98,10 +107,10 @@ ...@@ -98,10 +107,10 @@
</list-item> </list-item>
<div class="userInfo">设备清单</div> <div class="userInfo">设备清单</div>
<div <div
v-for="(item,index) in numInt" v-for="(item,index) in equip"
:key="index" :key="index"
class="equipment" class="equipment"
@click="downNum=true;getRent()" @click="downNum=true;getRent(item.contract_id)"
> >
<div class="left"> <div class="left">
<span> <span>
...@@ -134,15 +143,15 @@ export default { ...@@ -134,15 +143,15 @@ export default {
downNum: false, downNum: false,
show: false, show: false,
info: { info: {
product_plan_id: '29', product_plan_id: '',
product_num: '1', product_num: '',
first_pay: '102500', first_pay: '',
division_n: '平地机', division_n: '',
gps_fee: '500', gps_fee: '',
bp_name: '黄冲', bp_name: '',
project_number: 'PJ2019050043', project_number: '',
bp_agent_name: '上海汉得信息技术股份有限公司 ', bp_agent_name: ' ',
product_plan_id_n: 'PDJ', product_plan_id_n: '',
}, },
rentInfo: { rentInfo: {
frame_number: '', frame_number: '',
...@@ -161,18 +170,11 @@ export default { ...@@ -161,18 +170,11 @@ export default {
} }
}, },
computed: { computed: {
numInt () {
if (this.info.product_num !== null && this.info.product_num !== '') {
return parseInt(this.info.product_num)
} else {
return 0
}
},
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
// vm.getDetail() vm.getDetail()
// vm.getEquipment() vm.getEquipment()
}) })
}, },
methods: { methods: {
...@@ -223,11 +225,11 @@ export default { ...@@ -223,11 +225,11 @@ export default {
} }
}) })
}, },
getRent () { getRent (e) {
let vm = this let vm = this
let url = process.env.basePath + 'leases_info_query' let url = process.env.basePath + 'leases_info_query'
let param = { let param = {
contract_id: vm.equip.contract_id, contract_id: e,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -297,7 +299,7 @@ export default { ...@@ -297,7 +299,7 @@ export default {
.down { .down {
position: relative; position: relative;
width: 314px; width: 314px;
height: 466px; height: 506px;
background-size: 301px 24.7px; background-size: 301px 24.7px;
background-color: #fff; background-color: #fff;
} }
......
src/pages/carConfirm/confirm-list.vue
View file @ 20db385d
...@@ -59,30 +59,7 @@ export default { ...@@ -59,30 +59,7 @@ export default {
return { return {
contructs: [], contructs: [],
tabNum: 0, tabNum: 0,
lists: [{ lists: [],
'project_id': '48812',
'project_number': '',
'bp_name': '张三',
'total_price': '51',
'division_n': 'PDJ',
'confirm_status': 'SUBMIT',
},
{
'project_id': '48800',
'project_number': '',
'bp_name': '李四',
'total_price': '51',
'division_n': 'PDJ',
'confirm_status': 'APPROVED',
},
{
'project_id': '48800',
'project_number': '',
'bp_name': '王五',
'total_price': '51',
'division_n': 'PDJ',
'confirm_status': 'APPROVED',
}],
showList: [], showList: [],
undo: [], undo: [],
done: [], done: [],
...@@ -101,7 +78,13 @@ export default { ...@@ -101,7 +78,13 @@ export default {
}, },
}, },
created () { created () {
this.selectShowList() },
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.getList()
}
})
}, },
methods: { methods: {
selectShowList () { selectShowList () {
...@@ -136,6 +119,31 @@ export default { ...@@ -136,6 +119,31 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.lists = res.lists vm.lists = res.lists
// vm.lists = [{
// 'project_id': '48812',
// 'project_number': '',
// 'bp_name': '张三',
// 'total_price': '51',
// 'division_n': 'PDJ',
// 'confirm_status': 'SUBMIT',
// },
// {
// 'project_id': '48800',
// 'project_number': '',
// 'bp_name': '李四',
// 'total_price': '51',
// 'division_n': 'PDJ',
// 'confirm_status': 'APPROVED',
// },
// {
// 'project_id': '48800',
// 'project_number': '',
// 'bp_name': '王五',
// 'total_price': '51',
// 'division_n': 'PDJ',
// 'confirm_status': 'APPROVED',
// }]
vm.selectShowList()
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
......
src/pages/contractStart/add-car.vue
View file @ 20db385d
...@@ -42,6 +42,10 @@ ...@@ -42,6 +42,10 @@
<div slot="name">车牌号</div> <div slot="name">车牌号</div>
<input slot="content" v-model="info.license_plate_number" placeholder="请输入车牌号" > <input slot="content" v-model="info.license_plate_number" placeholder="请输入车牌号" >
</item> </item>
<item>
<div slot="name">发车日期</div>
<input slot="content" v-model="showDate" placeholder="请输入发车日期" @click="showTime('YYYY-MM-DD')">
</item>
<!-- <item :showArrow="true" @click.native="showModalValue=true"> <!-- <item :showArrow="true" @click.native="showModalValue=true">
<div slot="name">产品参数</div> <div slot="name">产品参数</div>
<input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight"> <input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight">
...@@ -141,7 +145,7 @@ ...@@ -141,7 +145,7 @@
v-for="(item,index) in equip" v-for="(item,index) in equip"
:key="index" :key="index"
class="equipment" class="equipment"
@click="downNum = true;addContractId(item.contract_id)" @click="downNum = true;getRent(item.contract_id)"
> >
<div class="left"> <div class="left">
<span> <span>
...@@ -217,7 +221,8 @@ export default { ...@@ -217,7 +221,8 @@ export default {
num: null, num: null,
downNum: false, downNum: false,
show: false, show: false,
read: false, read: false, // 表示只读
showDate: '',
productLine: [ productLine: [
{ {
code: '5', code: '5',
...@@ -282,6 +287,7 @@ export default { ...@@ -282,6 +287,7 @@ export default {
license_plate_number: '', license_plate_number: '',
type: '', type: '',
number: '', number: '',
date: '',
}, },
detail: { detail: {
product_num: '', product_num: '',
...@@ -298,23 +304,37 @@ export default { ...@@ -298,23 +304,37 @@ export default {
project_id: '', project_id: '',
bp_id: '', bp_id: '',
}, },
equip: [ equip: [],
{ // {
product_id: '3', // product_id: '3',
product_code: 'GTC389', // product_code: 'GTC389',
contract_id: '231', // contract_id: '231',
}, // },
],
} }
}, },
computed: { computed: {
numInt () { numInt () { // 添加设备的时候处理值为空或者nul的情况
if (this.detail.product_num !== null && this.detail.product_num !== '') { if (this.detail.product_num !== null && this.detail.product_num !== '') {
return parseInt(this.detail.product_num) return parseInt(this.detail.product_num)
} else { } else {
return 0 return 0
} }
}, },
carDate () {
let date = new Date()
let y = date.getFullYear()
let m = date.getMonth() + 1
let d = date.getDate()
if ((m.toString()).length < 2) {
m = `0${m}`
} else if ((d.toString()).length < 2) {
d = `0${d}`
}
return `${y}-${m}-${d}`
},
},
created () {
this.showDate = this.carDate
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
...@@ -331,9 +351,19 @@ export default { ...@@ -331,9 +351,19 @@ export default {
}) })
}, },
methods: { methods: {
showTime (format) {
this.hlsPopup.showTime({
nowDate: `${this.carDate}`,
format: format,
callback: (date) => {
this.showDate = date
},
})
},
save () { save () {
let vm = this let vm = this
let url = process.env.basePath + 'leases_info_save' let url = process.env.basePath + 'leases_info_save'
this.info.date = this.showDate
let param = { let param = {
master: this.info, master: this.info,
} }
...@@ -369,11 +399,12 @@ export default { ...@@ -369,11 +399,12 @@ export default {
}, },
}) })
}, },
getRent () { getRent (e) {
let vm = this let vm = this
vm.info.contract_id = e
let url = process.env.basePath + 'leases_info_query' let url = process.env.basePath + 'leases_info_query'
let param = { let param = {
contract_id: vm.equip.contract_id, contract_id: e,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -385,9 +416,7 @@ export default { ...@@ -385,9 +416,7 @@ export default {
} }
}) })
}, },
addContractId (e) {
this.info.contract_id = e
},
approve () { approve () {
let vm = this let vm = this
let url = process.env.basePath + 'car_apply_submit' let url = process.env.basePath + 'car_apply_submit'
...@@ -417,7 +446,6 @@ export default { ...@@ -417,7 +446,6 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.equip = res.lists vm.equip = res.lists
vm.getRent()
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -488,33 +516,33 @@ export default { ...@@ -488,33 +516,33 @@ export default {
}) })
}, },
getDetail () { getDetail () {
let obj = { // let obj = {
product_plan_id: '29', // product_plan_id: '29',
product_num: '1', // product_num: '1',
first_pay: '102500', // first_pay: '102500',
division_n: '平地机', // division_n: '平地机',
gps_fee: '500', // gps_fee: '500',
bp_name: '黄冲', // bp_name: '黄冲',
project_number: 'PJ2019050043', // project_number: 'PJ2019050043',
bp_agent_name: '上海汉得信息技术股份有限公司 ', // bp_agent_name: '上海汉得信息技术股份有限公司 ',
product_plan_id_n: 'PDJ', // product_plan_id_n: 'PDJ',
total_price: '1111111111', // total_price: '1111111111',
}
Object.assign(this.detail, obj)
// let vm = this
// let url = process.env.basePath + 'con_contract_detial'
// let param = {
// project_id: this.$route.params.project_id,
// } // }
// hlsPopup.showLoading('请稍候') // Object.assign(this.detail, obj)
// vm.$post(url, param).then(function (res) { let vm = this
// vm.hlsPopup.hideLoading() let url = process.env.basePath + 'con_contract_detial'
// if (res.result === 'S') { let param = {
// Object.assign(vm.detail, res.info) project_id: this.$route.params.project_id,
// } else { }
// hlsPopup.showLongCenter(res.message) hlsPopup.showLoading('请稍候')
// } vm.$post(url, param).then(function (res) {
// }) vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.detail, res.info)
} else {
hlsPopup.showLongCenter(res.message)
}
})
}, },
changeHeight () { changeHeight () {
let popClient = document.querySelector('.bottom-content') let popClient = document.querySelector('.bottom-content')
...@@ -631,7 +659,7 @@ export default { ...@@ -631,7 +659,7 @@ export default {
.down { .down {
position: relative; position: relative;
width: 314px; width: 314px;
height: 536px; height: 586px;
background-size: 301px 24.7px; background-size: 301px 24.7px;
background-color: #fff; background-color: #fff;
} }
......
src/pages/contractStart/start-list.vue
View file @ 20db385d
...@@ -63,24 +63,7 @@ export default { ...@@ -63,24 +63,7 @@ export default {
return { return {
tabNum: 0, tabNum: 0,
contructs: [], contructs: [],
lists: [ lists: [],
{
project_id: '48812',
project_number: '',
bp_name: '李四',
total_price: '51',
division_n: 'PDJ',
leases_status: 'Y',
},
{
project_id: '48800',
project_number: '',
bp_name: '张三',
total_price: '51',
division_n: 'PDJ',
leases_status: 'N',
},
],
showList: [], showList: [],
undo: [], undo: [],
done: [], done: [],
...@@ -106,7 +89,6 @@ export default { ...@@ -106,7 +89,6 @@ export default {
}, },
}, },
created () { created () {
this.selectShowList()
}, },
methods: { methods: {
selectShowList () { selectShowList () {
...@@ -148,6 +130,25 @@ export default { ...@@ -148,6 +130,25 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.lists = res.lists vm.lists = res.lists
// vm.lists = [
// {
// project_id: '48812',
// project_number: '',
// bp_name: '李四',
// total_price: '51',
// division_n: 'PDJ',
// leases_status: 'Y',
// },
// {
// project_id: '48800',
// project_number: '',
// bp_name: '张三',
// total_price: '51',
// division_n: 'PDJ',
// leases_status: 'N',
// },
// ]
vm.selectShowList()
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
......
src/pages/pay/firstPay/contract-record.vue
View file @ 20db385d
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
background-color: #00469C; background-color: #00469C;
.now-pay { .now-pay {
background: url('../../../assets/payment/background.png'); // background: url('../../../assets/payment/background.png');
background-size: 365px; background-size: 365px;
background-position: -5px; background-position: -5px;
position: absolute; position: absolute;
......
src/pages/pay/firstPay/first-pay.vue
View file @ 20db385d
...@@ -2,47 +2,59 @@ ...@@ -2,47 +2,59 @@
<h-view id="first-pay" class="public-style"> <h-view id="first-pay" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="goHome"> <img src="@/assets/userBind/arrow.png" @click="goHome" >
<span>首付款支付</span> <span>首付款支付</span>
</div> </div>
</h-header> </h-header>
<div class="center"> <h-content>
<div class="now-pay"> <div class="top-head">
<div>当前应付</div> <div class="center">
<div><span>￥</span>{{ money |currency }}</div> <div class="now-pay">
<div class="title">当前应付</div>
<div class="data">
<span>￥</span>
{{ money |currency }}
</div>
</div>
</div>
</div> </div>
</div>
<h-content class="pay-content"> <section class="pay-content">
<div class="pay-money"> <div class="pos">
<div class="pay-icon"><img src="@/assets/payment/first-pay.png" alt="">首付款支付</div> <div class="pay-money">
<div class="pay-input"> <div class="pay-icon">
<span>应还首付款</span> <img src="@/assets/payment/first-pay.png" >首付款支付
<input v-model="money" type="text" placeholder="请输入支付金额"> </div>
<div @click="createOrder"><i class="icon ion-ios-arrow-right"/></div> <div class="pay-input">
<span>应还首付款</span>
<input v-model="money" type="text" placeholder="请输入支付金额" >
<div @click="createOrder">
<i class="icon ion-ios-arrow-right" />
</div>
</div>
</div>
</div>
</section>
<div class="prompt">
<div>
<img src="@/assets/payment/prompt.png" alt >
</div>
<div>
<p>温馨提示</p>
<p>推荐使用农行卡，农行卡支付免收手续费！</p>
</div> </div>
</div> </div>
</h-content> </h-content>
<div class="prompt">
<div><img src="@/assets/payment/prompt.png" alt=""></div>
<div>
<p>温馨提示</p>
<p>推荐使用农行卡，农行卡支付免收手续费！</p>
</div>
</div>
<bottom-tab> <bottom-tab>
<tab-button class="footer" @click.native="pay"> <tab-button class="footer" @click.native="pay">支&nbsp;&nbsp;付</tab-button>
支&nbsp;&nbsp;付
</tab-button>
</bottom-tab> </bottom-tab>
</h-view> </h-view>
</template> </template>
<script> <script>
export default { export default {
name: 'FirstPay', name: 'FirstPay',
components: { components: {},
},
data () { data () {
return { return {
money: 0, money: 0,
...@@ -54,7 +66,9 @@ export default { ...@@ -54,7 +66,9 @@ export default {
if (from.name === 'MyInfo') { if (from.name === 'MyInfo') {
vm.getDownPayment() vm.getDownPayment()
} else if (from.name === 'Success') { } else if (from.name === 'Success') {
vm.money = parseInt(vm.default) - parseInt(window.sessionStorage.getItem('money')) vm.money =
parseInt(vm.default) -
parseInt(window.sessionStorage.getItem('money'))
vm.default = vm.money vm.default = vm.money
} }
}) })
...@@ -156,80 +170,64 @@ export default { ...@@ -156,80 +170,64 @@ export default {
</script> </script>
<style lang='less' > <style lang='less' >
#first-pay { #first-pay {
.h-header { .top-head {
background-color: #00469C; width: 100%;
.h-header-btn { height: 206px;
img { background: url("../../../assets/payment/back1.png");
width: 16px; background-size: 100% 206px;
height: 16px;
margin-left: 4px;
}
span {
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
letter-spacing: 0.61px;
line-height: 24px;
}
}
}
.center {
position: relative;
height: 50px;
background-color: #00469C;
.now-pay { .now-pay {
background: url('../../../assets/payment/background.png'); width: 90px;
background-size: 365px; margin: 0 auto;
background-position: -5px; display: flex;
position: absolute; justify-content: center;
left: 10px; flex-wrap: wrap;
z-index: 2; .title {
text-align: center;
width: 355px;
height: 89px;
border-radius: 4px;
box-shadow: 0 1px 3px 2px rgba(168,168,168,0.14);
:first-child {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #383F45; color: #ffffff;
height: 35px; margin-top: 20px;
line-height: 42px;
} }
.data {
:last-child { font-family: Verdana-Bold;
font-family: DIN-Bold;
font-size: 24px; font-size: 24px;
color: #FF8300; color: #ffffff;
font-weight: 700; letter-spacing: 0;
line-height: 18px;
span { text-align: center;
font-size: 16px; margin-top: 16px;
margin-right: 5px;
}
} }
} }
} }
.pay-content { .pay-content {
padding-top: 50px; position: relative;
top: -47px;
width: 100%;
height: 94px;
display: flex;
justify-content: center;
.pos {
width: 96%;
height: 100%;
background: #ffffff;
box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);
}
.pay-money { .pay-money {
height: 74px; width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex: 1;
background-color: #fff; background-color: #fff;
padding-left: 16px; padding-left: 16px;
.pay-icon { .pay-icon {
height: 50%;
display: flex;
align-items: center;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #00469C; color: #00469c;
padding-top: 12px;
img{ img {
width: 18px; width: 18px;
display: block; display: block;
float: left; float: left;
...@@ -238,17 +236,21 @@ export default { ...@@ -238,17 +236,21 @@ export default {
} }
.pay-input { .pay-input {
margin-top: 11px; height: 50%;
display: flex; display: flex;
align-items: center;
flex:1;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #656464; color: #656464;
height: 37px;
span { span {
flex: 2; flex: 2;
text-align: left; text-align: left;
line-height: 37px; line-height: 37px;
height: 100%;
display: flex;
align-items: center;
} }
input { input {
...@@ -257,14 +259,16 @@ export default { ...@@ -257,14 +259,16 @@ export default {
padding-right: 5px; padding-right: 5px;
} }
div{ div {
display: flex;
height: 100%;
align-items: center;
flex: 1; flex: 1;
text-align: center; text-align: center;
line-height: 37px; background: rgba(0, 70, 156, 0.08);
background: rgba(0,70,156,0.08);
i { i {
color: #00469C; color: #00469c;
font-size: 16px; font-size: 16px;
} }
} }
...@@ -272,17 +276,19 @@ export default { ...@@ -272,17 +276,19 @@ export default {
input::placeholder { input::placeholder {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #B4B4B5; color: #b4b4b5;
} }
} }
} }
} }
.prompt { .prompt {
background: rgba(142,195,30,0.10); background: rgba(142, 195, 30, 0.1);
height: 77px; height: 77px;
display: flex; display: flex;
position: absolute;
width: 100%;
bottom: 0;
div:first-child { div:first-child {
flex: 1; flex: 1;
padding: 16px 0 0 16px; padding: 16px 0 0 16px;
...@@ -294,13 +300,13 @@ export default { ...@@ -294,13 +300,13 @@ export default {
} }
div:last-child { div:last-child {
flex:12; flex: 12;
p:first-child { p:first-child {
padding-top: 16px; padding-top: 16px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 14px; font-size: 14px;
color: #8EC31E; color: #8ec31e;
letter-spacing: 0.5px; letter-spacing: 0.5px;
} }
...@@ -308,16 +314,16 @@ export default { ...@@ -308,16 +314,16 @@ export default {
padding-top: 15px; padding-top: 15px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 12px; font-size: 12px;
color: rgba(101,100,100,0.80); color: rgba(101, 100, 100, 0.8);
letter-spacing: 0.37px; letter-spacing: 0.37px;
} }
} }
} }
.bottom-tab-button{ .bottom-tab-button {
background: #00469C; background: #00469c;
border-radius: 4px; border-radius: 4px;
color:white; color: white;
height: 40px; height: 40px;
margin: 4px 2% 0 2%; margin: 4px 2% 0 2%;
} }
......
src/pages/pay/firstPay/pay-entry.vue
View file @ 20db385d
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
<div>￥{{ money |currency }}</div> <div>￥{{ money |currency }}</div>
</div> </div>
<list-item :item-height="56" class="pay-way"> <list-item :item-height="56" class="pay-way">
<item v-for="(item,index) in nongBank" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`nong${index}`)">
<div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})<img v-show="item.recommand" class="push" src="@/assets/payment/push.png"></div>
<section slot="content">
<img v-show="select === `nong${index}`" src="@/assets/payment/select.png" alt="">
<img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt="">
</section>
</item>
<item :proportion="[7,1,1]" @click.native="isSelect('one')"> <item :proportion="[7,1,1]" @click.native="isSelect('one')">
<div slot="name"> <img src="@/assets/payment/alipay.png" alt="" class="icon1"> 支付宝</div> <div slot="name"> <img src="@/assets/payment/alipay.png" alt="" class="icon1"> 支付宝</div>
<section slot="content"> <section slot="content">
...@@ -40,7 +47,7 @@ ...@@ -40,7 +47,7 @@
</h-content> </h-content>
<bottom-tab> <bottom-tab>
<tab-button class="footer" @click.native="pay"> <tab-button class="foot" @click.native="pay">
立即付款 立即付款
</tab-button> </tab-button>
</bottom-tab> </bottom-tab>
...@@ -75,22 +82,22 @@ export default { ...@@ -75,22 +82,22 @@ export default {
recommand: false, recommand: false,
flag: false, // 用于判断是否有农业银行卡 flag: false, // 用于判断是否有农业银行卡
lists: [], lists: [],
nongBank: [], // 存农行卡
} }
}, },
computed: { computed: {
newList () { newList () {
let vm = this let vm = this
let value let value
let flag
vm.lists.forEach((item, i) => { vm.lists.forEach((item, i) => {
if (item.bank_full_name.indexOf('农业') !== -1) { if (item.bank_full_name.indexOf('农业') !== -1) {
value = vm.lists.splice(i, 1) value = vm.lists.splice(i, 1)
vm.lists.unshift(...value) vm.nongBank.push(...value)
flag = true vm.flag = true
} }
}) })
if (flag) { if (vm.flag) {
vm.select = 'three0' vm.select = 'nong0'
} else { } else {
vm.select = 'one' vm.select = 'one'
} }
...@@ -195,24 +202,7 @@ export default { ...@@ -195,24 +202,7 @@ export default {
margin-left:10px; margin-left:10px;
width:35px; width:35px;
} }
.h-header {
background-color: #00469C;
.h-header-btn {
img {
width: 16px;
height: 16px;
margin-left: 4px;
}
span {
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
letter-spacing: 0.61px;
line-height: 24px;
}
}
}
.entry-content { .entry-content {
.amount { .amount {
height: 166px; height: 166px;
...@@ -281,13 +271,9 @@ export default { ...@@ -281,13 +271,9 @@ export default {
} }
} }
.foot{
.bottom-tab-button{ background-color: @headerColor;
background: #00469C; color: #fff;
border-radius: 4px; }
color:white;
height: 40px;
margin: 4px 2% 0 2%;
}
} }
</style> </style>
src/pages/pay/marginPay/first-pay.vue
View file @ 20db385d
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
background-color: #00469C; background-color: #00469C;
.now-pay { .now-pay {
background: url('../../../assets/payment/background.png'); // background: url('../../../assets/payment/background.png');
background-size: 365px; background-size: 365px;
background-position: -5px; background-position: -5px;
position: absolute; position: absolute;
......
src/pages/pay/marginPay/pay-entry.vue
View file @ 20db385d
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<span>支付中心</span> <span>支付中心</span>
</div> </div>
</h-header> </h-header>
<h-content class="entry-content"> <h-content class="entry-content">
<div class="amount"> <div class="amount">
<p>首付还款</p> <p>首付还款</p>
......
src/pages/pay/payment/contract-record.vue
View file @ 20db385d
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</section> </section>
<list-item :item-height="44"> <list-item :item-height="44">
<item> <item>
<div slot="name">应还违约金</div> <div slot="name">逾期利息</div>
<span slot="content">{{ money|currency }}</span> <span slot="content">{{ money|currency }}</span>
</item> </item>
</list-item></h-content> </list-item></h-content>
...@@ -221,7 +221,7 @@ export default { ...@@ -221,7 +221,7 @@ export default {
background-color: #00469C; background-color: #00469C;
.now-pay { .now-pay {
background: url('../../../assets/payment/background.png'); // background: url('../../../assets/payment/background.png');
background-size: 365px; background-size: 365px;
background-position: -5px; background-position: -5px;
position: absolute; position: absolute;
......
src/pages/pay/payment/first-pay.vue
View file @ 20db385d
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
background-color: #00469C; background-color: #00469C;
.now-pay { .now-pay {
background: url('../../../assets/payment/background.png'); // background: url('../../../assets/payment/background.png');
background-size: 365px; background-size: 365px;
background-position: -5px; background-position: -5px;
position: absolute; position: absolute;
......
src/pages/pay/payment/pay-entry.vue
View file @ 20db385d
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
<div>￥{{ money |currency }}</div> <div>￥{{ money |currency }}</div>
</div> </div>
<list-item :item-height="56" class="pay-way"> <list-item :item-height="56" class="pay-way">
<item v-for="(item,index) in nongBank" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`nong${index}`)">
<div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})<img v-show="item.recommand" class="push" src="@/assets/payment/push.png"></div>
<section slot="content">
<img v-show="select === `nong${index}`" src="@/assets/payment/select.png" alt="">
<img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt="">
</section>
</item>
<item :proportion="[7,1,1]" @click.native="isSelect('one')"> <item :proportion="[7,1,1]" @click.native="isSelect('one')">
<div slot="name"> <img src="@/assets/payment/alipay.png" alt="" class="icon1"> 支付宝</div> <div slot="name"> <img src="@/assets/payment/alipay.png" alt="" class="icon1"> 支付宝</div>
<section slot="content"> <section slot="content">
...@@ -67,7 +74,8 @@ export default { ...@@ -67,7 +74,8 @@ export default {
data () { data () {
return { return {
money: '', money: '',
select: 'three0', select: 'one',
nongBank: [], // 存农行卡
flag: false, // 用于判断是否有农业银行卡 flag: false, // 用于判断是否有农业银行卡
lists: [], lists: [],
} }
...@@ -76,16 +84,15 @@ export default { ...@@ -76,16 +84,15 @@ export default {
newList () { newList () {
let vm = this let vm = this
let value let value
let flag
vm.lists.forEach((item, i) => { vm.lists.forEach((item, i) => {
if (item.bank_full_name.indexOf('农业') !== -1) { if (item.bank_full_name.indexOf('农业') !== -1) {
value = vm.lists.splice(i, 1) value = vm.lists.splice(i, 1)
vm.lists.unshift(...value) vm.nongBank.push(...value)
flag = true vm.flag = true
} }
}) })
if (flag) { if (vm.flag) {
vm.select = 'three0' vm.select = 'nong0'
} else { } else {
vm.select = 'one' vm.select = 'one'
} }
...@@ -191,30 +198,19 @@ export default { ...@@ -191,30 +198,19 @@ export default {
</script> </script>
<style lang='less' > <style lang='less' >
#payment-pay-entry { #payment-pay-entry {
.icon {
width: 30px;
display: block;
float: left;
position: relative;
margin: 12px 8px 0 3px;
}
.push{ .push{
position: absolute; position: absolute;
top:10px; top:10px;
margin-left:10px; margin-left:10px;
width:35px; width:35px;
} }
.h-header {
background-color: #00469C;
.h-header-btn {
img {
width: 16px;
height: 16px;
margin-left: 4px;
}
span {
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
letter-spacing: 0.61px;
line-height: 24px;
}
}
}
.entry-content { .entry-content {
.amount { .amount {
height: 166px; height: 166px;
...@@ -265,13 +261,7 @@ export default { ...@@ -265,13 +261,7 @@ export default {
margin-top: 12px; margin-top: 12px;
margin-right: 8px; margin-right: 8px;
} }
.icon {
width: 30px;
display: block;
float: left;
position: relative;
margin: 12px 8px 0 3px;
}
} }
.add-content { .add-content {
...@@ -283,13 +273,9 @@ export default { ...@@ -283,13 +273,9 @@ export default {
} }
} }
.footer{
.bottom-tab-button{ color: #fff;
background: #00469C; background-color: @headerColor;
border-radius: 4px; }
color:white;
height: 40px;
margin: 4px 2% 0 2%;
}
} }
</style> </style>
src/pages/pay/success.vue
View file @ 20db385d
...@@ -80,23 +80,6 @@ export default { ...@@ -80,23 +80,6 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
#result { #result {
background-color: #fafafa; background-color: #fafafa;
.h-header {
background-color: #00469c;
.h-header-btn {
img {
width: 16px;
height: 16px;
margin-left: 4px;
}
span {
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
letter-spacing: 0.61px;
line-height: 24px;
}
}
}
.my-content { .my-content {
height: 400px; height: 400px;
background-color: #fff; background-color: #fff;
......
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