Skip to content

S
sim
Commit 43891851 authored by limeimei's avatar limeimei
Browse files
Options

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

parents bd07be1e 0dec3253
Pipeline #2076 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 132 additions and 131 deletions
      src/views/hotels/common.vue
      View file @ 43891851
      ...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
      <img src="@/assets/hotel/home.png" class="home" /> <img src="@/assets/hotel/home.png" class="home" />
      <div>返回主页</div> <div>返回主页</div>
      </div> </div>
      <div class="hotel_header_title">陆瑞酒店智能化自助入住系统</div> <div class="hotel_header_title">酒店智能化自助入住系统</div>
      <div class="hotel_header_time">{{ date }}</div> <div class="hotel_header_time">{{ date }}</div>
      </div> </div>
      <div class="hotel_step"> <div class="hotel_step">
      ......
      src/views/hotels/info/pay.vue
      View file @ 43891851
      ...@@ -117,15 +117,15 @@ export default { ...@@ -117,15 +117,15 @@ export default {
      color: #eb9c4e; color: #eb9c4e;
      } }
      .success_back { .success_back {
      width: 208px; width: 132px;
      height: 70px; height: 50px;
      background: #eb9c4e;
      text-align: center; text-align: center;
      line-height: 70px; line-height: 50px;
      color: white; font-size: 18px;
      font-size: 24px;
      cursor: pointer; cursor: pointer;
      color: #ffffff;
      margin: 12px auto 0;
      background: #eb9c4e;
      border-radius: 4px; border-radius: 4px;
      margin: 0 auto;
      } }
      </style> </style>
      \ No newline at end of file
      src/views/hotels/real/success.vue
      View file @ 43891851
      ...@@ -10,29 +10,29 @@ ...@@ -10,29 +10,29 @@
      <div> <div>
      <div class="collection_info_single"> <div class="collection_info_single">
      <div class="collection_info_single_title">姓名:</div> <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>
      <div class="collection_info_single"> <div class="collection_info_single">
      <div class="collection_info_single_title">性别:</div> <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>
      <div class="collection_info_single"> <div class="collection_info_single">
      <div class="collection_info_single_title">民族:</div> <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>
      <div class="collection_info_single"> <div class="collection_info_single">
      <div class="collection_info_single_title">出生:</div> <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>
      <div class="collection_info_single"> <div class="collection_info_single">
      <div class="collection_info_single_title">住址:</div> <div class="collection_info_single_title">住址:</div>
      <div class="collection_info_single_text"> <div class="collection_info_single_text">
      {{ info.address }} 广东省广州市海珠区盈丰路丰瑞街1-5号万华花园
      </div> </div>
      </div> </div>
      <div class="collection_info_single"> <div class="collection_info_single">
      <div class="collection_info_single_title">身份证号码:</div> <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> </div>
      </div> </div>
      ...@@ -49,7 +49,9 @@ ...@@ -49,7 +49,9 @@
      </div> </div>
      <div class="collection_info_single"> <div class="collection_info_single">
      <div class="collection_info_single_title">出生:</div> <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>
      <div class="collection_info_single"> <div class="collection_info_single">
      <div class="collection_info_single_title">出生地点:</div> <div class="collection_info_single_title">出生地点:</div>
      ...@@ -89,136 +91,136 @@ ...@@ -89,136 +91,136 @@
      </template> </template>
      <script> <script>
      export default { export default {
      data() { data() {
      return { return {
      info: {}, info: {},
      }; };
      },
      created() {
      var info = this.$route.params.info;
      if (info) {
      info = JSON.parse(info);
      this.info = info;
      }
      },
      methods: {
      formatBirth(birth) {
      return birth.substring(6, 14);
      }, },
      created() { // 返回上一步
      var info = this.$route.params.info; goback() {
      if (info) { this.$router.go(-1);
      info = JSON.parse(info);
      this.info = info;
      }
      }, },
      methods: { comfin() {
      formatBirth(birth) { this.$router.push({
      return birth.substring(6, 14) name: "hotelInfo",
      }, });
      // 返回上一步
      goback() {
      this.$router.go(-1);
      },
      comfin() {
      this.$router.push({
      name: "hotelInfo",
      });
      },
      }, },
      }; },
      };
      </script> </script>
      <style scoped> <style scoped>
      .order { .order {
      width: 100%; width: 100%;
      height: 100%; height: 100%;
      padding: 0 30px; padding: 0 30px;
      box-sizing: border-box; box-sizing: border-box;
      background: #f6f7fb; background: #f6f7fb;
      border-radius: 14px; border-radius: 14px;
      } }
      .goback { .goback {
      width: 94px; width: 94px;
      height: 34px; height: 34px;
      position: absolute; position: absolute;
      top: 30px; top: 30px;
      left: 0; left: 0;
      cursor: pointer; cursor: pointer;
      font-size: 14px; font-size: 14px;
      color: #666666; color: #666666;
      background: #ffffff; background: #ffffff;
      border-radius: 4px; border-radius: 4px;
      border: 1px solid #707070; border: 1px solid #707070;
      text-align: center; text-align: center;
      line-height: 34px; line-height: 34px;
      } }
      .order_top { .order_top {
      height: 88px; height: 88px;
      width: 100%; width: 100%;
      position: relative; position: relative;
      } }
      .order_title { .order_title {
      font-size: 28px; font-size: 28px;
      color: #000000; color: #000000;
      width: 100%; width: 100%;
      text-align: center; text-align: center;
      line-height: 88px; line-height: 88px;
      } }
      .collection { .collection {
      width: 100%; width: 100%;
      background: white; background: white;
      padding-top: 80px; padding-top: 80px;
      box-sizing: border-box; box-sizing: border-box;
      height: 486px; height: 486px;
      } }
      .collection_info { .collection_info {
      display: flex; display: flex;
      align-items: flex-start; align-items: flex-start;
      justify-content: center; justify-content: center;
      } }
      .collection_info_head { .collection_info_head {
      width: 167px; width: 167px;
      height: 194px; height: 194px;
      margin-right: 40px; margin-right: 40px;
      } }
      .collection_info_single { .collection_info_single {
      display: flex; display: flex;
      align-items: center; align-items: center;
      margin-bottom: 12px; margin-bottom: 12px;
      } }
      .collection_info_single_title { .collection_info_single_title {
      font-size: 20px; font-size: 20px;
      color: #333333; color: #333333;
      margin-right: 10px; margin-right: 10px;
      } }
      .collection_info_single_text { .collection_info_single_text {
      font-size: 20px; font-size: 20px;
      color: #666666; color: #666666;
      } }
      .collection_bto { .collection_bto {
      width: 132px; width: 132px;
      height: 50px; height: 50px;
      background: #eb9c4e; background: #eb9c4e;
      border-radius: 4px; border-radius: 4px;
      text-align: center; text-align: center;
      line-height: 50px; line-height: 50px;
      cursor: pointer; cursor: pointer;
      font-size: 18px; font-size: 18px;
      color: white; color: white;
      margin: 56px auto 0; margin: 56px auto 0;
      } }
      .collection_bto2 { .collection_bto2 {
      width: 132px; width: 132px;
      height: 50px; height: 50px;
      background: #eb9c4e; background: #eb9c4e;
      border-radius: 4px; border-radius: 4px;
      text-align: center; text-align: center;
      line-height: 50px; line-height: 50px;
      cursor: pointer; cursor: pointer;
      font-size: 18px; font-size: 18px;
      color: white; color: white;
      margin: 4px auto 0; margin: 4px auto 0;
      } }
      </style> </style>
      \ No newline at end of file
      src/views/hotels/standbuy.vue
      View file @ 43891851
      ...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
      <div class="hotel_top"> <div class="hotel_top">
      <div class="hotel_left"> <div class="hotel_left">
      <img src="" /> <img src="" />
      <div>四季酒店</div>
      </div> </div>
      <div class="hotel_right"> <div class="hotel_right">
      <div class="hotel_right_date"> <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