Skip to content

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

Merge branch 'liuxin' into develop

parents f27f3b1a e1a049d6
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 79 deletions
src/pages/pay/firstPay/pay-entry.vue
View file @ d4bd1826
...@@ -356,7 +356,7 @@ export default { ...@@ -356,7 +356,7 @@ export default {
</script> </script>
<style lang='less' > <style lang='less' >
#pay-entry { #pay-entry {
.vue-better-scroll__wrapper { .vue-better-scroll__wrapper{
padding: 0; padding: 0;
} }
.trans-enter-active, .trans-enter-active,
...@@ -379,9 +379,9 @@ export default { ...@@ -379,9 +379,9 @@ export default {
.down { .down {
height: 466px; height: 466px;
width: 100%; width: 100%;
position: relative; position: relative;
top: 18%; top:18%;
background-color: #fff; background: #fff;
border-radius: 12px 12px 0 0; border-radius: 12px 12px 0 0;
overflow: scroll; overflow: scroll;
display: flex; display: flex;
...@@ -405,6 +405,9 @@ export default { ...@@ -405,6 +405,9 @@ export default {
text-align: center; text-align: center;
} }
} }
.info {
//margin-top: 60px;
}
} }
} }
.modal-show-bank { .modal-show-bank {
...@@ -419,19 +422,19 @@ export default { ...@@ -419,19 +422,19 @@ export default {
.down { .down {
height: 466px; height: 466px;
width: 100%; width: 100%;
position: relative; position: relative;
top: 18%; top:18%;
background-color: #fff; background: #fff;
border-radius: 12px 12px 0 0; border-radius: 12px 12px 0 0;
overflow: scroll; overflow: scroll;
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
.top { .top {
left: 24px;
width: 330px; width: 330px;
height: 54px; height: 54px;
display: flex; display: flex;
z-index: 999;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
img { img {
...@@ -447,8 +450,10 @@ export default { ...@@ -447,8 +450,10 @@ export default {
} }
} }
.pay-way { .pay-way {
//width: 350px;
//margin: 0 auto;
width: 100%; width: 100%;
padding: 0 4% 0 4%; padding: 0 4% 0 4%;
background: #fff; background: #fff;
.hls-item { .hls-item {
padding-left: 12px; padding-left: 12px;
...@@ -458,7 +463,7 @@ export default { ...@@ -458,7 +463,7 @@ export default {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #656464; color: #656464;
div { div{
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -567,7 +572,9 @@ export default { ...@@ -567,7 +572,9 @@ export default {
margin: 12px 8px 0 3px; margin: 12px 8px 0 3px;
} }
.push { .push {
margin-left:20px; /* position: absolute;
top: 10px;
margin-left: 10px;*/
width: 35px; width: 35px;
} }
.modal-show { .modal-show {
...@@ -575,7 +582,7 @@ export default { ...@@ -575,7 +582,7 @@ export default {
height: 100%; height: 100%;
position: absolute; position: absolute;
display: flex; display: flex;
z-index: 910; z-index: 900;
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;
...@@ -618,7 +625,6 @@ export default { ...@@ -618,7 +625,6 @@ export default {
} }
} }
} }
.entry-content { .entry-content {
.amount { .amount {
height: 166px; height: 166px;
...@@ -626,12 +632,10 @@ export default { ...@@ -626,12 +632,10 @@ export default {
padding-top: 55px; padding-top: 55px;
text-align: center; text-align: center;
p { p {
font-family: PingFangSC-Semibold; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #383f45; color: #656464;
letter-spacing: 0.43px; letter-spacing: 0;
font-weight: bold;
text-align: center;
} }
div { div {
...@@ -643,73 +647,45 @@ export default { ...@@ -643,73 +647,45 @@ export default {
margin-top: 10px; margin-top: 10px;
} }
} }
.info {
width: 100%; .pay-way {
height: 226px; .hls-item {
background-color: #fff; padding-left: 12px;
.info-item { .add-name {
height: 46px; flex: 3;
width: 335px; line-height: 56px;
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-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: rgba(56, 63, 69, 0.6); color: #656464;
letter-spacing: 0;
line-height: 18px; .icon1 {
width: 34px;
height: 34px;
display: block;
float: left;
margin-top: 10px;
margin-right: 5px;
}
.icon2 {
width: 32px;
display: block;
float: left;
margin-top: 12px;
margin-right: 8px;
}
} }
span:last-child {
font-family: Verdana; .add-content {
font-size: 14px; img {
color: #383f45; width: 21px;
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 {
background-color: @headerColor;
color: #fff; color: #fff;
background-color: @headerColor;
} }
} }
</style> </style>
src/pages/pay/payment/pay-entry.vue
View file @ d4bd1826
...@@ -580,7 +580,6 @@ export default { ...@@ -580,7 +580,6 @@ export default {
/* position: absolute; /* position: absolute;
top: 10px; top: 10px;
margin-left: 10px;*/ margin-left: 10px;*/
margin-left:20px;
width: 35px; width: 35px;
} }
.modal-show { .modal-show {
...@@ -637,8 +636,6 @@ export default { ...@@ -637,8 +636,6 @@ export default {
background-color: #fff; background-color: #fff;
padding-top: 55px; padding-top: 55px;
text-align: center; text-align: center;
border-bottom: 1px solid #d9dbdf;
p { p {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
......
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