From e6baac9d0497b0c75d767a57d62f62e6be312d8b Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Mon, 14 Aug 2023 15:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/apartmentDetail.vue |   2 +-
 单独的入口弹窗/css.css        |  93 +++++---
 单独的入口弹窗/css.less       | 408 ++++++++++++++++++----------------
 3 files changed, 281 insertions(+), 222 deletions(-)

diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 0460e6d..1d83622 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -220,7 +220,7 @@
                     </div>
                     <div class="facilities-box">
                         <template v-for="(item, key) of facilitiesKeyValue">
-                            <div class="facilities-item flexflex" v-if="info['facilities'][key].length != 0">
+                            <div class="facilities-item flexflex" v-if="info['facilities'][key] && info['facilities'][key].length != 0">
                                 <div class="facilities-header flexflex">
                                     <div class="item-title">{{ item }}</div>
                                 </div>
diff --git a/单独的入口弹窗/css.css b/单独的入口弹窗/css.css
index 8d63dc9..fdee1c2 100644
--- a/单独的入口弹窗/css.css
+++ b/单独的入口弹窗/css.css
@@ -1,11 +1,36 @@
-.btn {
+#fwin_login {
+  transform: translate(-50%, -50%);
+}
+.rental-listing * {
+  box-sizing: border-box;
+}
+.rental-listing .flexflex {
+  display: flex;
+}
+.rental-listing .flex1 {
+  flex: 1;
+}
+.rental-listing .flexcenter {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.rental-listing .flexacenter {
+  display: flex;
+  align-items: center;
+}
+.rental-listing .flexjcenter {
+  display: flex;
+  justify-content: center;
+}
+.rental-listing .btn {
   position: absolute;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
 }
-.pop-mask {
+.rental-listing .pop-mask {
   position: fixed;
   top: 0;
   left: 0;
@@ -14,38 +39,36 @@
   background: rgba(0, 0, 0, 0.81764706);
   z-index: 1000;
 }
-.pop-box {
+.rental-listing.pop-box {
   position: relative;
   z-index: 1111;
   box-sizing: border-box;
-  border-radius: 16px;
   padding-top: 39px;
   background-color: #ffffff;
-  width: 640px;
   -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.11764706);
   -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.11764706);
   box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.11764706);
   line-height: normal;
 }
-.pop-header {
+.rental-listing .pop-header {
   font-size: 24px;
   font-weight: 650;
   color: #000000;
 }
-.please-choose {
+.rental-listing .please-choose {
   color: #555555;
   font-size: 14px;
   margin-top: 26px;
   margin-bottom: 24px;
   padding-left: 35px;
 }
-.choice-box {
+.rental-listing .choice-box {
   justify-content: space-between;
   flex-wrap: wrap;
   padding: 0 35px 49px;
 }
-.choice-box .choice-item,
-.choice-box .choice-long-item {
+.rental-listing .choice-box .choice-item,
+.rental-listing .choice-box .choice-long-item {
   background-color: #f6f6f6;
   height: 160px;
   width: 220px;
@@ -54,8 +77,8 @@
   box-sizing: border-box;
   padding-top: 18px;
 }
-.choice-box .choice-item .choice-name,
-.choice-box .choice-long-item .choice-name {
+.rental-listing .choice-box .choice-item .choice-name,
+.rental-listing .choice-box .choice-long-item .choice-name {
   font-weight: 650;
   font-size: 18px;
   color: #000000;
@@ -63,8 +86,8 @@
   padding-left: 34px;
   text-align: left;
 }
-.choice-box .choice-item .choice-name::after,
-.choice-box .choice-long-item .choice-name::after {
+.rental-listing .choice-box .choice-item .choice-name::after,
+.rental-listing .choice-box .choice-long-item .choice-name::after {
   content: "";
   position: absolute;
   top: 50%;
@@ -75,27 +98,27 @@
   height: 16px;
   border-radius: 3px;
 }
-.choice-box .choice-item:hover,
-.choice-box .choice-long-item:hover {
+.rental-listing .choice-box .choice-item:hover,
+.rental-listing .choice-box .choice-long-item:hover {
   cursor: pointer;
   background-color: #f2f2f2;
 }
-.choice-box .choice-item:hover .choice-arrows,
-.choice-box .choice-long-item:hover .choice-arrows {
+.rental-listing .choice-box .choice-item:hover .choice-arrows,
+.rental-listing .choice-box .choice-long-item:hover .choice-arrows {
   background-color: #000;
   background-image: url('@/assets/img/edit/selectArrow-white.svg');
 }
-.choice-box .choice-long-item {
+.rental-listing .choice-box .choice-long-item {
   width: 450px;
   justify-content: space-between;
   height: 100px;
   padding-right: 20px;
 }
-.choice-box .choice-long-item .choice-arrows {
+.rental-listing .choice-box .choice-long-item .choice-arrows {
   margin: 0;
   margin-top: -18px;
 }
-.choice-box .choice-explain {
+.rental-listing .choice-box .choice-explain {
   color: #555555;
   font-size: 14px;
   font-weight: 400;
@@ -104,7 +127,7 @@
   padding-left: 34px;
   text-align: left;
 }
-.choice-box .choice-arrows {
+.rental-listing .choice-box .choice-arrows {
   width: 40px;
   height: 40px;
   background-color: #fddf6d;
@@ -115,7 +138,7 @@
   background-repeat: no-repeat;
   background-position: center;
 }
-.close-icon {
+.rental-listing .close-icon {
   position: absolute;
   top: 20px;
   right: 14px;
@@ -123,47 +146,47 @@
   height: 14px;
   cursor: pointer;
 }
-.affirm-hint {
+.rental-listing .affirm-hint {
   color: #333333;
   margin: 0 auto;
   text-align: left;
   padding: 0 30px;
 }
-.affirm-a-hint {
+.rental-listing .affirm-a-hint {
   text-align: center;
   margin-top: 20px;
 }
-.affirm-b-hint {
+.rental-listing .affirm-b-hint {
   margin: 36px auto 0;
 }
-.rules-box {
+.rental-listing .rules-box {
   background: #f6f6f6;
   margin: 30px;
   border-radius: 10px;
   padding: 15px;
 }
-.rules-box .rules-item {
+.rental-listing .rules-box .rules-item {
   line-height: 24px;
 }
-.rules-box .rules-item:not(:last-of-type) .rules-text {
+.rental-listing .rules-box .rules-item:not(:last-of-type) .rules-text {
   border-bottom: 1px dashed #ebebeb;
 }
-.rules-box .rules-item .rules-text {
+.rental-listing .rules-box .rules-item .rules-text {
   padding: 20px 0;
   font-size: 15px;
 }
-.rules-box .rules-icon {
+.rental-listing .rules-box .rules-icon {
   width: 15px;
   height: 15px;
   margin-top: 25px;
   margin-right: 12px;
 }
-.footer {
+.rental-listing .footer {
   padding: 0 15px;
   height: 100px;
   border-top: 1px solid #ebebeb;
 }
-.footer .footer-item {
+.rental-listing .footer .footer-item {
   width: 200px;
   height: 50px;
   border-radius: 40px;
@@ -172,10 +195,10 @@
   background-color: #ffffff;
   border: 1px solid #d7d7d7;
 }
-.footer .footer-item:first-of-type {
+.rental-listing .footer .footer-item:first-of-type {
   margin-right: 20px;
 }
-.footer .footer-item.affirm {
+.rental-listing .footer .footer-item.affirm {
   border: none;
   background-color: #62b1ff;
   color: #ffffff;
diff --git a/单独的入口弹窗/css.less b/单独的入口弹窗/css.less
index 2cedfa1..a2155af 100644
--- a/单独的入口弹窗/css.less
+++ b/单独的入口弹窗/css.less
@@ -1,211 +1,247 @@
-.btn {
-    position: absolute;
-    top: 0;
-    left: 0;
-    // background-color: #50e3c2;
-    width: 100%;
-    height: 100%;
+#fwin_login {
+    transform: translate(-50%, -50%);
 }
 
-.pop-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100vw;
-    height: 100vh;
-    background: rgba(0, 0, 0, 0.817647058823529);
-    z-index: 1000;
-}
+.rental-listing {
 
-.pop-box {
-    position: relative;
-    z-index: 1111;
-    box-sizing: border-box;
-    border-radius: 16px;
-    padding-top: 39px;
-    background-color: #ffffff;
-    // width: 520px;
-    width: 640px;
-    -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
-    -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
-    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
-    line-height: normal;
-}
-
-.pop-header {
-    font-size: 24px;
-    font-weight: 650;
-    color: #000000;
-    // margin-bottom: 35px;
-}
-
-.please-choose {
-    color: #555555;
-    font-size: 14px;
-    margin-top: 26px;
-    margin-bottom: 24px;
-    padding-left: 35px;
-}
-
-.choice-box {
-    justify-content: space-between;
-    flex-wrap: wrap;
-    padding: 0 35px 49px;
-
-    .choice-item,
-    .choice-long-item {
-        background-color: #f6f6f6;
-        height: 160px;
-        width: 220px;
-        border-radius: 16px;
-        margin-bottom: 10px;
+    * {
         box-sizing: border-box;
-        padding-top: 18px;
-
-        .choice-name {
-            font-weight: 650;
-            font-size: 18px;
-            color: #000000;
-            position: relative;
-            padding-left: 34px;
-            text-align: left;
-
-            &::after {
-                content: "";
-                position: absolute;
-                top: 50%;
-                left: 16px;
-                transform: translateY(-50%);
-                background-color: #50e3c2;
-                width: 6px;
-                height: 16px;
-                border-radius: 3px;
-            }
-        }
-
-        &:hover {
-            cursor: pointer;
-            background-color: rgb(242, 242, 242);
-
-            .choice-arrows {
-                background-color: #000;
-                background-image: url('@/assets/img/edit/selectArrow-white.svg');
-            }
-        }
     }
 
-    .choice-long-item {
-        width: 450px;
-        justify-content: space-between;
-        height: 100px;
-        padding-right: 20px;
-
-        .choice-arrows {
-            margin: 0;
-            margin-top: -18px;
-        }
+    .flexflex {
+        display: flex;
     }
 
-    .choice-explain {
+    .flex1 {
+        flex: 1;
+    }
+
+    .flexcenter {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .flexacenter {
+        display: flex;
+        align-items: center;
+    }
+
+    .flexjcenter {
+        display: flex;
+        justify-content: center;
+    }
+
+    .btn {
+        position: absolute;
+        top: 0;
+        left: 0;
+        // background-color: #50e3c2;
+        width: 100%;
+        height: 100%;
+    }
+
+    .pop-mask {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100vw;
+        height: 100vh;
+        background: rgba(0, 0, 0, 0.817647058823529);
+        z-index: 1000;
+    }
+
+    &.pop-box {
+        position: relative;
+        z-index: 1111;
+        box-sizing: border-box;
+        // border-radius: 16px;
+        padding-top: 39px;
+        background-color: #ffffff;
+        // width: 520px;
+        // width: 640px;
+        -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
+        -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
+        box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
+        line-height: normal;
+    }
+
+    .pop-header {
+        font-size: 24px;
+        font-weight: 650;
+        color: #000000;
+        // margin-bottom: 35px;
+    }
+
+    .please-choose {
         color: #555555;
         font-size: 14px;
-        font-weight: 400;
-        margin-top: 10px;
-        margin-bottom: 21px;
-        padding-left: 34px;
-        text-align: left;
+        margin-top: 26px;
+        margin-bottom: 24px;
+        padding-left: 35px;
     }
 
-    .choice-arrows {
-        width: 40px;
-        height: 40px;
-        background-color: #fddf6d;
-        border-radius: 50%;
-        margin: 0 auto;
-        background-image: url('@/assets/img/edit/selectArrow.png');
-        background-size: 24px;
-        background-repeat: no-repeat;
-        background-position: center;
-    }
-}
+    .choice-box {
+        justify-content: space-between;
+        flex-wrap: wrap;
+        padding: 0 35px 49px;
 
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 14px;
-    width: 14px;
-    height: 14px;
-    cursor: pointer;
-}
+        .choice-item,
+        .choice-long-item {
+            background-color: #f6f6f6;
+            height: 160px;
+            width: 220px;
+            border-radius: 16px;
+            margin-bottom: 10px;
+            box-sizing: border-box;
+            padding-top: 18px;
 
-.affirm-hint {
-    color: #333333;
-    margin: 0 auto;
-    text-align: left;
-    padding: 0 30px;
-}
+            .choice-name {
+                font-weight: 650;
+                font-size: 18px;
+                color: #000000;
+                position: relative;
+                padding-left: 34px;
+                text-align: left;
 
-.affirm-a-hint {
-    text-align: center;
-    margin-top: 20px;
-}
+                &::after {
+                    content: "";
+                    position: absolute;
+                    top: 50%;
+                    left: 16px;
+                    transform: translateY(-50%);
+                    background-color: #50e3c2;
+                    width: 6px;
+                    height: 16px;
+                    border-radius: 3px;
+                }
+            }
 
-.affirm-b-hint {
-    margin: 36px auto 0;
-}
+            &:hover {
+                cursor: pointer;
+                background-color: rgb(242, 242, 242);
 
-.rules-box {
-    background: rgba(246, 246, 246, 1);
-    margin: 30px;
-    border-radius: 10px;
-    padding: 15px;
-
-    .rules-item {
-        line-height: 24px;
-
-        &:not(:last-of-type) .rules-text {
-            border-bottom: 1px dashed #ebebeb;
+                .choice-arrows {
+                    background-color: #000;
+                    background-image: url('@/assets/img/edit/selectArrow-white.svg');
+                }
+            }
         }
 
-        .rules-text {
-            padding: 20px 0;
-            font-size: 15px;
+        .choice-long-item {
+            width: 450px;
+            justify-content: space-between;
+            height: 100px;
+            padding-right: 20px;
+
+            .choice-arrows {
+                margin: 0;
+                margin-top: -18px;
+            }
+        }
+
+        .choice-explain {
+            color: #555555;
+            font-size: 14px;
+            font-weight: 400;
+            margin-top: 10px;
+            margin-bottom: 21px;
+            padding-left: 34px;
+            text-align: left;
+        }
+
+        .choice-arrows {
+            width: 40px;
+            height: 40px;
+            background-color: #fddf6d;
+            border-radius: 50%;
+            margin: 0 auto;
+            background-image: url('@/assets/img/edit/selectArrow.png');
+            background-size: 24px;
+            background-repeat: no-repeat;
+            background-position: center;
         }
     }
 
-    .rules-icon {
-        width: 15px;
-        height: 15px;
-        margin-top: 25px;
-        margin-right: 12px;
-    }
-}
-
-.footer {
-    padding: 0 15px;
-    height: 100px;
-    border-top: 1px solid #ebebeb;
-
-    .footer-item {
-        width: 200px;
-        height: 50px;
-        border-radius: 40px;
-        font-size: 20px;
+    .close-icon {
+        position: absolute;
+        top: 20px;
+        right: 14px;
+        width: 14px;
+        height: 14px;
         cursor: pointer;
-
-        background-color: #ffffff;
-        border: 1px solid rgba(215, 215, 215, 1);
-
-        &:first-of-type {
-            margin-right: 20px;
-        }
-
-        &.affirm {
-            border: none;
-            background-color: rgba(98, 177, 255, 1);
-            color: #ffffff;
-            font-weight: 650;
-        }
-
     }
+
+    .affirm-hint {
+        color: #333333;
+        margin: 0 auto;
+        text-align: left;
+        padding: 0 30px;
+    }
+
+    .affirm-a-hint {
+        text-align: center;
+        margin-top: 20px;
+    }
+
+    .affirm-b-hint {
+        margin: 36px auto 0;
+    }
+
+    .rules-box {
+        background: rgba(246, 246, 246, 1);
+        margin: 30px;
+        border-radius: 10px;
+        padding: 15px;
+
+        .rules-item {
+            line-height: 24px;
+
+            &:not(:last-of-type) .rules-text {
+                border-bottom: 1px dashed #ebebeb;
+            }
+
+            .rules-text {
+                padding: 20px 0;
+                font-size: 15px;
+            }
+        }
+
+        .rules-icon {
+            width: 15px;
+            height: 15px;
+            margin-top: 25px;
+            margin-right: 12px;
+        }
+    }
+
+    .footer {
+        padding: 0 15px;
+        height: 100px;
+        border-top: 1px solid #ebebeb;
+
+        .footer-item {
+            width: 200px;
+            height: 50px;
+            border-radius: 40px;
+            font-size: 20px;
+            cursor: pointer;
+
+            background-color: #ffffff;
+            border: 1px solid rgba(215, 215, 215, 1);
+
+            &:first-of-type {
+                margin-right: 20px;
+            }
+
+            &.affirm {
+                border: none;
+                background-color: rgba(98, 177, 255, 1);
+                color: #ffffff;
+                font-weight: 650;
+            }
+
+        }
+    }
+
 }
\ No newline at end of file