Skip to content

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

fix

parent 25c2904a
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 79 deletions
src/pages/pay/firstPay/pay-entry.vue
View file @ cfc44b72
...@@ -178,7 +178,6 @@ export default { ...@@ -178,7 +178,6 @@ export default {
data () { data () {
return { return {
money: '', money: '',
rate: 0.03,
select: 'three0', select: 'three0',
name: '', name: '',
sectctNong: false, sectctNong: false,
...@@ -201,6 +200,9 @@ export default { ...@@ -201,6 +200,9 @@ export default {
serviceCharge () { serviceCharge () {
return (this.money * (this.rate / 100)).toFixed(2) return (this.money * (this.rate / 100)).toFixed(2)
}, },
rate () {
return this.checkType.bank_full_name.indexOf('农业') !== -1 ? 0.00 : 0.18
},
sumMoney () { sumMoney () {
return (parseFloat(this.serviceCharge) + parseFloat(this.money)).toFixed( return (parseFloat(this.serviceCharge) + parseFloat(this.money)).toFixed(
2 2
...@@ -372,18 +374,18 @@ export default { ...@@ -372,18 +374,18 @@ export default {
.down { .down {
height: 466px; height: 466px;
width: 100%; width: 100%;
position: absolute; position: relative;
bottom: 0px; bottom: -18%;
background-color: #fff; background-color: #fff;
border-radius: 12px 12px 0 0; border-radius: 12px 12px 0 0;
overflow: scroll; overflow: scroll;
.top { .top {
position: fixed; position: fixed;
left: 24px; padding-left:24px;
width: 330px; width: 330px;
height: 54px; height: 54px;
display: flex; display: flex;
z-index: 999; z-index: 900;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
img { img {
...@@ -399,7 +401,68 @@ export default { ...@@ -399,7 +401,68 @@ export default {
} }
} }
.info { .info {
margin-top: 60px; width: 100%;
height: 226px;
background-color: #fff;
margin-top:65px;
.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;
}
}
.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);
}
} }
} }
} }
...@@ -415,14 +478,14 @@ export default { ...@@ -415,14 +478,14 @@ export default {
.down { .down {
height: 466px; height: 466px;
width: 100%; width: 100%;
position: absolute; position: relative;
bottom: 0px; bottom: -18%;
background-color: #fff; background-color: #fff;
border-radius: 12px 12px 0 0; border-radius: 12px 12px 0 0;
overflow: scroll; overflow: scroll;
.top { .top {
position: fixed; position: fixed;
left: 24px; padding-left: 24px;
width: 330px; width: 330px;
height: 54px; height: 54px;
display: flex; display: flex;
...@@ -488,75 +551,13 @@ export default { ...@@ -488,75 +551,13 @@ export default {
} }
} }
} }
.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;
}
}
.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);
}
}
.modal-show { .modal-show {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
display: flex; display: flex;
z-index: 999; z-index: 910;
background-color: rgba(56, 63, 69, 0.3); background-color: rgba(56, 63, 69, 0.3);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -629,6 +630,69 @@ export default { ...@@ -629,6 +630,69 @@ export default {
font-weight: 700; font-weight: 700;
margin-top: 10px; 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;
}
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;
}
}
.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 { .foot {
......
src/pages/pay/payment/pay-entry.vue
View file @ cfc44b72
...@@ -180,7 +180,6 @@ export default { ...@@ -180,7 +180,6 @@ export default {
return { return {
money: '', money: '',
select: 'one', select: 'one',
rate: 0.03,
name: '', name: '',
sectctNong: false, sectctNong: false,
checkType: { checkType: {
...@@ -201,6 +200,9 @@ export default { ...@@ -201,6 +200,9 @@ export default {
serviceCharge () { serviceCharge () {
return (this.money * (this.rate / 100)).toFixed(2) return (this.money * (this.rate / 100)).toFixed(2)
}, },
rate () {
return this.checkType.bank_full_name.indexOf('农业') !== -1 ? 0.00 : 0.18
},
sumMoney () { sumMoney () {
return (parseFloat(this.serviceCharge) + parseFloat(this.money)).toFixed( return (parseFloat(this.serviceCharge) + parseFloat(this.money)).toFixed(
2 2
...@@ -379,8 +381,8 @@ export default { ...@@ -379,8 +381,8 @@ export default {
.down { .down {
height: 466px; height: 466px;
width: 100%; width: 100%;
position: absolute; position: relative;
bottom: 0px; bottom: -18%;
background: #fff; background: #fff;
border-radius: 12px 12px 0 0; border-radius: 12px 12px 0 0;
overflow: scroll; overflow: scroll;
...@@ -388,7 +390,7 @@ export default { ...@@ -388,7 +390,7 @@ export default {
justify-content: center; justify-content: center;
.top { .top {
position: fixed; position: fixed;
left: 24px; padding-left: 24px;
width: 330px; width: 330px;
height: 54px; height: 54px;
display: flex; display: flex;
...@@ -424,8 +426,8 @@ export default { ...@@ -424,8 +426,8 @@ export default {
.down { .down {
height: 466px; height: 466px;
width: 100%; width: 100%;
position: absolute; position: relative;
bottom: 0px; bottom: -18%;
background: #fff; background: #fff;
border-radius: 12px 12px 0 0; border-radius: 12px 12px 0 0;
overflow: scroll; overflow: scroll;
......
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