Commit 43891851 authored by limeimei's avatar limeimei

Merge branch 'master' of http://120.77.240.215:9701/limeimei/sim

parents bd07be1e 0dec3253
Pipeline #2076 canceled with stages
......@@ -5,7 +5,7 @@
<img src="@/assets/hotel/home.png" class="home" />
<div>返回主页</div>
</div>
<div class="hotel_header_title">陆瑞酒店智能化自助入住系统</div>
<div class="hotel_header_title">酒店智能化自助入住系统</div>
<div class="hotel_header_time">{{ date }}</div>
</div>
<div class="hotel_step">
......
......@@ -117,15 +117,15 @@ export default {
color: #eb9c4e;
}
.success_back {
width: 208px;
height: 70px;
background: #eb9c4e;
width: 132px;
height: 50px;
text-align: center;
line-height: 70px;
color: white;
font-size: 24px;
line-height: 50px;
font-size: 18px;
cursor: pointer;
color: #ffffff;
margin: 12px auto 0;
background: #eb9c4e;
border-radius: 4px;
margin: 0 auto;
}
</style>
\ No newline at end of file
......@@ -10,29 +10,29 @@
<div>
<div class="collection_info_single">
<div class="collection_info_single_title">姓名:</div>
<div class="collection_info_single_text">{{ info.name }}</div>
<div class="collection_info_single_text">陈以诺</div>
</div>
<div class="collection_info_single">
<div class="collection_info_single_title">性别:</div>
<div class="collection_info_single_text">{{ info.sex }}</div>
<div class="collection_info_single_text"></div>
</div>
<div class="collection_info_single">
<div class="collection_info_single_title">民族:</div>
<div class="collection_info_single_text">{{ info.nation }}</div>
<div class="collection_info_single_text"></div>
</div>
<div class="collection_info_single">
<div class="collection_info_single_title">出生:</div>
<div class="collection_info_single_text">{{ info.birth }}</div>
<div class="collection_info_single_text">1994-03-05</div>
</div>
<div class="collection_info_single">
<div class="collection_info_single_title">住址:</div>
<div class="collection_info_single_text">
{{ info.address }}
广东省广州市海珠区盈丰路丰瑞街1-5号万华花园
</div>
</div>
<div class="collection_info_single">
<div class="collection_info_single_title">身份证号码:</div>
<div class="collection_info_single_text">{{ info.idnumber }}</div>
<div class="collection_info_single_text">440105199403058048</div>
</div>
</div>
</div>
......@@ -49,7 +49,9 @@
</div>
<div class="collection_info_single">
<div class="collection_info_single_title">出生:</div>
<div class="collection_info_single_text">{{formatBirth( info.birth) }}</div>
<div class="collection_info_single_text">
{{ formatBirth(info.birth) }}
</div>
</div>
<div class="collection_info_single">
<div class="collection_info_single_title">出生地点:</div>
......@@ -89,7 +91,7 @@
</template>
<script>
export default {
export default {
data() {
return {
info: {},
......@@ -104,7 +106,7 @@
},
methods: {
formatBirth(birth) {
return birth.substring(6, 14)
return birth.substring(6, 14);
},
// 返回上一步
goback() {
......@@ -116,20 +118,20 @@
});
},
},
};
};
</script>
<style scoped>
.order {
.order {
width: 100%;
height: 100%;
padding: 0 30px;
box-sizing: border-box;
background: #f6f7fb;
border-radius: 14px;
}
}
.goback {
.goback {
width: 94px;
height: 34px;
position: absolute;
......@@ -143,60 +145,60 @@
border: 1px solid #707070;
text-align: center;
line-height: 34px;
}
}
.order_top {
.order_top {
height: 88px;
width: 100%;
position: relative;
}
}
.order_title {
.order_title {
font-size: 28px;
color: #000000;
width: 100%;
text-align: center;
line-height: 88px;
}
}
.collection {
.collection {
width: 100%;
background: white;
padding-top: 80px;
box-sizing: border-box;
height: 486px;
}
}
.collection_info {
.collection_info {
display: flex;
align-items: flex-start;
justify-content: center;
}
}
.collection_info_head {
.collection_info_head {
width: 167px;
height: 194px;
margin-right: 40px;
}
}
.collection_info_single {
.collection_info_single {
display: flex;
align-items: center;
margin-bottom: 12px;
}
}
.collection_info_single_title {
.collection_info_single_title {
font-size: 20px;
color: #333333;
margin-right: 10px;
}
}
.collection_info_single_text {
.collection_info_single_text {
font-size: 20px;
color: #666666;
}
}
.collection_bto {
.collection_bto {
width: 132px;
height: 50px;
background: #eb9c4e;
......@@ -207,9 +209,9 @@
font-size: 18px;
color: white;
margin: 56px auto 0;
}
}
.collection_bto2 {
.collection_bto2 {
width: 132px;
height: 50px;
background: #eb9c4e;
......@@ -220,5 +222,5 @@
font-size: 18px;
color: white;
margin: 4px auto 0;
}
}
</style>
\ No newline at end of file
......@@ -3,7 +3,6 @@
<div class="hotel_top">
<div class="hotel_left">
<img src="" />
<div>四季酒店</div>
</div>
<div class="hotel_right">
<div class="hotel_right_date">
......
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