提交 62f04a12 authored 作者: lihuihui's avatar lihuihui

update

上级 5465f800
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
html{
}
body { body {
background: #f7f7f7; background: #f7f7f7;
} }
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
margin-top: 0.15rem; margin-top: 0.15rem;
} }
.main_footer_bottom { .main_footer_bottom {
margin-top: -0.18rem; margin: -0.18rem auto;
cursor: pointer; cursor: pointer;
width: 6.9rem; width: 6.9rem;
display: flex; display: flex;
......
...@@ -46,12 +46,17 @@ export default { ...@@ -46,12 +46,17 @@ export default {
.main { .main {
background: #f7f7f7; background: #f7f7f7;
.main_content { .main_content {
padding: 0.21rem 0.3rem 3.13rem 0.3rem; // padding: 0.21rem 0.3rem 3.13rem 0.3rem;
.show_content { .show_content {
width: 6.9rem; // width: 6.9rem;
margin: 0.84rem auto; margin: 0.84rem auto;
.show_content_img { .show_content_img {
width: 6.9rem; // width: 6.9rem;
::v-deep{
p{
font-size: .24rem;
}
}
} }
} }
.main_content_footer { .main_content_footer {
......
...@@ -296,15 +296,21 @@ export default { ...@@ -296,15 +296,21 @@ export default {
background-color: #f7f7f7; background-color: #f7f7f7;
.main_content { .main_content {
padding: 0.21rem 0.3rem 4.13rem 0.3rem; // padding: 0.21rem 0.3rem 4.13rem 0.3rem;
.main_content_banner { .main_content_banner {
margin-top: 0.84rem; margin-top: 0.84rem;
width: 100%; width: 100%;
::v-deep{
p{
font-size: .24rem;
}
}
} }
.main_content_form { .main_content_form {
width: 6.9rem; width: 6.9rem;
opacity: 1; opacity: 1;
margin-top: 0.32rem; // margin-top: 0.32rem;
margin: 0.32rem auto;
} }
.main_content_form_list { .main_content_form_list {
border-radius: 20px; border-radius: 20px;
...@@ -373,7 +379,7 @@ export default { ...@@ -373,7 +379,7 @@ export default {
margin-top: 0.15rem; margin-top: 0.15rem;
} }
.main_footer_bottom { .main_footer_bottom {
margin-top: -0.18rem; margin: -0.18rem auto;
cursor: pointer; cursor: pointer;
.main_content_btn { .main_content_btn {
...@@ -399,8 +405,7 @@ export default { ...@@ -399,8 +405,7 @@ export default {
overflow: hidden; overflow: hidden;
} }
.main_content_banner p img { .main_content_banner p img {
width: 6.9rem; width: 100%;
height: 100%;
border-radius: 0.1rem; border-radius: 0.1rem;
} }
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<van-tabs v-model="active" animated sticky> <van-tabs v-model="active" animated sticky>
<van-tab v-for="(it, index) in orderTab" :key="index" :title="it.title"> <van-tab v-for="(it, index) in orderTab" :key="index" :title="it.title">
<div v-if="getDataByType(it.type).length" class="main_content_ticket"> <div v-if="getDataByType(it.type).length" class="main_content_ticket">
<a href="https://accounts.ezijing.com/h5/payment"> <a href="https://accounts.ezijing.com/h5/payment" style="margin-left: auto;">
<van-button round icon="https://webapp-pub.oss-cn-beijing.aliyuncs.com/highway/h5/ticket.png"> <van-button round icon="https://webapp-pub.oss-cn-beijing.aliyuncs.com/highway/h5/ticket.png">
开发票 开发票
</van-button> </van-button>
...@@ -139,13 +139,14 @@ export default { ...@@ -139,13 +139,14 @@ export default {
margin-top: 0.9rem; margin-top: 0.9rem;
.main_content_ticket { .main_content_ticket {
padding-right: 0.3rem; padding-right: 0.3rem;
float: right; // float: right;
display: flex;
margin-bottom: 0.3rem; margin-bottom: 0.3rem;
margin-top: 0.8rem; margin-top: 0.8rem;
} }
.main_content_orderList { .main_content_orderList {
.orderList { .orderList {
margin: 0.3rem; margin: 0.3rem auto;
padding: 0.3rem 0.2rem 0.3rem 0.34rem; padding: 0.3rem 0.2rem 0.3rem 0.34rem;
width: 6.9rem; width: 6.9rem;
height: 3.62rem; height: 3.62rem;
......
...@@ -420,7 +420,6 @@ export default { ...@@ -420,7 +420,6 @@ export default {
padding-bottom: 0.3rem; padding-bottom: 0.3rem;
} }
.pay-list { .pay-list {
width: 6.9rem;
background: rgba(255, 255, 255); background: rgba(255, 255, 255);
border-radius: 0.18rem; border-radius: 0.18rem;
padding-bottom: 0.38rem; padding-bottom: 0.38rem;
......
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
align-items: center; align-items: center;
padding: 0 0.25rem 0 0.3rem; padding: 0 0.25rem 0 0.3rem;
box-sizing: border-box; box-sizing: border-box;
margin-top: 0.21rem; margin: 0.21rem auto;
.main_content_order_text { .main_content_order_text {
font-size: 0.28rem; font-size: 0.28rem;
font-weight: 400; font-weight: 400;
...@@ -73,6 +73,8 @@ export default { ...@@ -73,6 +73,8 @@ export default {
line-height: 0.88rem; line-height: 0.88rem;
text-align: center; text-align: center;
position: fixed; position: fixed;
left: 50%;
transform: translateX(-50%);
bottom: 4.37rem; bottom: 4.37rem;
cursor: pointer; cursor: pointer;
} }
......
...@@ -45,6 +45,7 @@ const store = new Vuex.Store({ ...@@ -45,6 +45,7 @@ const store = new Vuex.Store({
.then(response => { .then(response => {
if (response.code === 0) { if (response.code === 0) {
window.localStorage.userInfo = JSON.stringify(response.data) window.localStorage.userInfo = JSON.stringify(response.data)
store.dispatch('getAllSetting')
commit('setUser', response.data) commit('setUser', response.data)
return true return true
} else { } else {
...@@ -66,5 +67,4 @@ const store = new Vuex.Store({ ...@@ -66,5 +67,4 @@ const store = new Vuex.Store({
} }
} }
}) })
store.dispatch('getAllSetting')
export default store export default store
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论