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

src/views/hotels/common.vue

@@ -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">

src/views/hotels/info/pay.vue

@@ -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

src/views/hotels/real/success.vue

@@ -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,136 +91,136 @@
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        info: {},
-      };
+export default {
+  data() {
+    return {
+      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;
-      if (info) {
-        info = JSON.parse(info);
-        this.info = info;
-      }
+    // 返回上一步
+    goback() {
+      this.$router.go(-1);
     },
-    methods: {
-      formatBirth(birth) {
-        return birth.substring(6, 14)
-      },
-      // 返回上一步
-      goback() {
-        this.$router.go(-1);
-      },
-      comfin() {
-        this.$router.push({
-          name: "hotelInfo",
-        });
-      },
+    comfin() {
+      this.$router.push({
+        name: "hotelInfo",
+      });
     },
-  };
+  },
+};
 </script>
 
 <style scoped>
-  .order {
-    width: 100%;
-    height: 100%;
-    padding: 0 30px;
-    box-sizing: border-box;
-    background: #f6f7fb;
-    border-radius: 14px;
-  }
+.order {
+  width: 100%;
+  height: 100%;
+  padding: 0 30px;
+  box-sizing: border-box;
+  background: #f6f7fb;
+  border-radius: 14px;
+}
 
-  .goback {
-    width: 94px;
-    height: 34px;
-    position: absolute;
-    top: 30px;
-    left: 0;
-    cursor: pointer;
-    font-size: 14px;
-    color: #666666;
-    background: #ffffff;
-    border-radius: 4px;
-    border: 1px solid #707070;
-    text-align: center;
-    line-height: 34px;
-  }
+.goback {
+  width: 94px;
+  height: 34px;
+  position: absolute;
+  top: 30px;
+  left: 0;
+  cursor: pointer;
+  font-size: 14px;
+  color: #666666;
+  background: #ffffff;
+  border-radius: 4px;
+  border: 1px solid #707070;
+  text-align: center;
+  line-height: 34px;
+}
 
-  .order_top {
-    height: 88px;
-    width: 100%;
-    position: relative;
-  }
+.order_top {
+  height: 88px;
+  width: 100%;
+  position: relative;
+}
 
-  .order_title {
-    font-size: 28px;
-    color: #000000;
-    width: 100%;
-    text-align: center;
-    line-height: 88px;
-  }
+.order_title {
+  font-size: 28px;
+  color: #000000;
+  width: 100%;
+  text-align: center;
+  line-height: 88px;
+}
 
-  .collection {
-    width: 100%;
-    background: white;
-    padding-top: 80px;
-    box-sizing: border-box;
-    height: 486px;
-  }
+.collection {
+  width: 100%;
+  background: white;
+  padding-top: 80px;
+  box-sizing: border-box;
+  height: 486px;
+}
 
-  .collection_info {
-    display: flex;
-    align-items: flex-start;
-    justify-content: center;
-  }
+.collection_info {
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+}
 
-  .collection_info_head {
-    width: 167px;
-    height: 194px;
-    margin-right: 40px;
-  }
+.collection_info_head {
+  width: 167px;
+  height: 194px;
+  margin-right: 40px;
+}
 
-  .collection_info_single {
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-  }
+.collection_info_single {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
 
-  .collection_info_single_title {
-    font-size: 20px;
-    color: #333333;
-    margin-right: 10px;
-  }
+.collection_info_single_title {
+  font-size: 20px;
+  color: #333333;
+  margin-right: 10px;
+}
 
-  .collection_info_single_text {
-    font-size: 20px;
-    color: #666666;
-  }
+.collection_info_single_text {
+  font-size: 20px;
+  color: #666666;
+}
 
-  .collection_bto {
-    width: 132px;
-    height: 50px;
-    background: #eb9c4e;
-    border-radius: 4px;
-    text-align: center;
-    line-height: 50px;
-    cursor: pointer;
-    font-size: 18px;
-    color: white;
-    margin: 56px auto 0;
-  }
+.collection_bto {
+  width: 132px;
+  height: 50px;
+  background: #eb9c4e;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 50px;
+  cursor: pointer;
+  font-size: 18px;
+  color: white;
+  margin: 56px auto 0;
+}
 
-  .collection_bto2 {
-    width: 132px;
-    height: 50px;
-    background: #eb9c4e;
-    border-radius: 4px;
-    text-align: center;
-    line-height: 50px;
-    cursor: pointer;
-    font-size: 18px;
-    color: white;
-    margin: 4px auto 0;
-  }
+.collection_bto2 {
+  width: 132px;
+  height: 50px;
+  background: #eb9c4e;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 50px;
+  cursor: pointer;
+  font-size: 18px;
+  color: white;
+  margin: 4px auto 0;
+}
 </style>
\ No newline at end of file

src/views/hotels/standbuy.vue

@@ -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">