Merge remote-tracking branch 'origin/main'

src/assets/img/apartmentDetail/media-icon.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="53px" height="53px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <filter x="-50.00%" y="-50.00%" width="200.00%" height="200.00%" filterUnits="objectBoundingBox" id="filter1182">
+      <feColorMatrix type="matrix" values="1 0 0 0 1  0 1 0 0 1  0 0 1 0 1  0 0 0 1 0  " in="SourceGraphic" />
+    </filter>
+    <filter x="400px" y="978px" width="53px" height="53px" filterUnits="userSpaceOnUse" id="filter1183">
+      <feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetInner" />
+      <feGaussianBlur stdDeviation="5" in="shadowOffsetInner" result="shadowGaussian" />
+      <feComposite in2="shadowGaussian" operator="atop" in="SourceAlpha" result="shadowComposite" />
+      <feColorMatrix type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  0 0 0 0.662745098039216 0  " in="shadowComposite" />
+    </filter>
+    <g id="widget1184">
+      <image preserveAspectRatio="none" style="overflow:visible" width="33" height="33" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAQKADAAQAAAABAAAAQAAAAABGUUKwAAAEVElEQVR4Ae2bvY7TQBDHly8JJIqUdFxJR3gCTEdHrqMjPMFBR3fhDe4NYp4guSe40NFd7g1S0iWRKJD4OH6j+KSNbzdex7N2LLzSyvYyOzP//87Mrp3DmK51DHQMdAz8xwzcqQP7fWNeYieh9+lH15srt9sNZ+aMLOhynf025ivXdrYHxrwD+OSeMddVuugQXa1goWdMD4dPAbysAtozdym6xcZBkhEReD6ClkTEycGQgDN9wF96Vi3vvNqz2BTbjRIhK1E38Ly9xqIBR8Z5Zxp8HtcWCVmhu2gQrDONSInJPgWy9DkAQxfs40ltjJcwBJgpZ4fjElMMCxneEJZQG4TPqF3y2d3NQes81HIwARSbD6z8p1DFDcrJrrT+a8y3EB+CUkC2GxRehig8FBki4cWvzZF6p0vIFTdWXkK/VS3U58IUIJxGKHurgZ5wu0LPI/pDDX0FOp6USQWnLtlWYEjrXJ+KEZAf4dgcvc7tTHl8WbQ17kyBHxQ+fEZH9cbqL0TLT66PN9vol+paCzX0MgyFgk4BxdW/llTKG5GdRXnFXVG1zNu1n70RgHNDBFVW3zZo31Olz4iMV4yt7XHle0njgU+nlwAKn3eST9k+45zcZjiRQIQUyCgN3UOf4l0EvPFN0h6X/VrqAo4Gn+DK+MBierE4CSBfkzIGNGRXxqyIhgEkfNbQl9fhw+QkgMlJXkFdz5AwwtYxXbsuJOi81XwE9G9J1jjwh7c6HNOuC05MPgKe1ojXaSpCXXBichJA0XCy5fQ04qBmXfBhchIQEdNeqqUu4Oh7JmvXBdMKAoQ1UiLlMqSrttYQoIraUtYaArLj7NjyXeW2FQRwiDkF7YTeU0FtKXESwGnsypJp7Ba08lvjhAo+quqED5OTAIwtqhqsOl++Q/IuL5/gB1V1ZfMXLj0+AuYu4brGJN/5CCvg+4o2nZh8BMwUDZdSFTHfnZiwd7vJOzqrUGvrke+E/Fgx5Lf8F0xbA9mDLwIMRePcNSHGmHwoVc73LTd3YdlFwHRLS6QHQjDhlHepnO9b3qI73RqwHrwEZEdP9bO3ZdtQ6U9w7oIxMiBaW8vrtU+7lwCZQOic+SZWGQetfKgcU+mj6Ld9q4Qhc3SFs67PzWXHUnEs+2Gkrj+pWQkGm5DS9+ToSIkA+W1AgGv90lS4AKTYhyLAREhxw/E5ufq8WPJwJAB2xdbXL/JoZw24mYyy4c19W66hPhORxY1i9Z0oWBMFr4ulm5dgVT+yi03VPYGtlF6Yew3LpOrAbYVEwrRhgN4FEN9sX6Pc99hWDpEE8Ul8iwLapfTA0iF1+Rh9TPbZptMhZK+PSgQOyJ+lzesmQmyK7ajgyijPokHr2OwtdBC9anzVfcRkBVKOzjGIWLHqo1oLnQ9oyDgkDKQyV02NTMcgxOY+MkHvAvsotucAIuFZuuSs/Kcp53uFnN/59wV9Tpf/NDXj2rWOgY6BjoGOgVgM/AP9HjGMza5aZwAAAABJRU5ErkJggg==" x="410px" y="988px" filter="url(#filter1182)" />
+    </g>
+  </defs>
+  <g transform="matrix(1 0 0 1 -400 -978 )">
+    <use xlink:href="#widget1184" filter="url(#filter1183)" />
+    <use xlink:href="#widget1184" />
+  </g>
+</svg>

src/components/apartment/seachModule.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="dis-f jus-x al-item" style="position: relative;z-index: 333;">
-        <div class="body-maxWidth">
+        <div class="body-maxWidth" :class="{ 'seachPage': !props.seachPage }">
             <div class="s-w-100 seach-box-bg">
                 <div class="seach-box">
                     <div class="top-seach dis-f al-item" v-if="props.seachPage">
@@ -18,7 +18,8 @@
                                 popper-style="background: transparent;padding:0;box-shadow: none;border: none;transform: translateX(50px);">
                                 <template #reference>
                                     <el-input class="search-input" v-model="pitchValue['keyword']" placeholder="搜索房源或输入房源ID"
-                                        @keyup.enter='handleKeyword(pitchValue["keyword"])' style="height:48px;width:460px;"></el-input>
+                                        @keyup.enter='handleKeyword(pitchValue["keyword"])'
+                                        style="height:48px;width:460px;"></el-input>
                                 </template>
                                 <div class="dis-f al-item pos-r">
                                     <div class="seach-hiosory-box scrollbar" :class="{ 'seach-history-h': historyShow }">
@@ -70,8 +71,8 @@
                                 </div>
                                 <div class="consult-hint">微信扫码添加好友</div>
                                 <div class="consult-remark flexacenter">备注：<b>寄托租房</b></div>
+
                             </div>
-                            <!-- <img class="QR-code" :src="wechat['wechatqrcode']" alt=""> -->
                         </el-popover>
                     </div>
 
@@ -347,6 +348,23 @@ const selectOption = (type, value) => {
     justify-content: space-between;
 }
 
+.seachPage {
+    .seach-box-bg {
+        background-color: none;
+        box-shadow: none;
+
+
+        .seach-box {
+            transform: translate(0, 0);
+            box-shadow: none;
+
+            .option-area {
+                border-top: none;
+            }
+        }
+    }
+}
+
 .seach-box-bg {
     background: #d7d7d7;
     border-radius: 16px;

src/components/public/head.vue

@@ -166,20 +166,12 @@ const tabList = [{
         transform: translateX(-50%);
         margin: 0 auto;
         width: 100%;
-        // <<<<<<< HEAD
-        //         height: 47px;
-        // =======
         height: 50px;
-        // >>>>>>> origin/main
         background: rgba(0, 0, 0, 0.596078431372549);
         border-bottom: 4px solid rgba(78, 144, 204, 1);
 
         .nav-list {
-            // <<<<<<< HEAD
+      
-            //             // background: red;
-            //             color: #e2edf7;
-            //             font-size: 18px;
-            // =======
             color: #E2EDF7;
             text-align: center;
             // >>>>>>> origin/main

src/router/index.js

@@ -98,13 +98,11 @@ const router = createRouter({
 
 
 router.beforeEach((to, from, next) => {
-  // <<<<<<< HEAD
   //导航数据
   if (/['seachPage','needHousing','intermediaryHousing','personHousing']/.test(from.path)) {
     store.state.routeList.secondaryIndex.title = from.meta.title
     store.state.routeList.secondaryIndex.path = from.path
   }
-  // >>>>>>> 542e853 (提交)
   next()
   let meta = to['meta'] || {}
   let title = meta['title']

src/views/apartmentDetail.vue

@@ -25,21 +25,49 @@
             <div class="details-left flex1">
                 <div class="type-box">
                     <div class="type-item">
+                        <div class="type-left flex1">
                             <div class="type-name">双人套间A</div>
+                            <div class="type-tags flexacenter">
+                                <div class="tags-item flexcenter" :class="{ 'first': item == 1 }" v-for="item in 4">仅剩1间
+                                </div>
+                            </div>
+                            <div class="media-box flexflex">
+                                <div class="media-item flexcenter" v-for="item in 5">
+                                    <img class="media-img"
+                                        src="https://axure-file.lanhuapp.com/md5__c1c85f2680e7e9a2026de4d381081fc6.svg">
+                                    <img class="media-icon" src="@/assets/img/apartmentDetail/media-icon.svg" />
                                 </div>
                             </div>
                         </div>
-            <div class="details-right"></div>
+                        <div class="type-right">
+                            <div class="price-box flexflex">
+                                <div class="former">HK$ 7600/月</div>
+                                <div class="new flexacenter">
+                                    <div class="unit">HK$</div>
+                                    <div class="cost">8200</div>
+                                    /月
+                                </div>
+                            </div>
+                            <div class="consult-btn flexcenter">咨询</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="details-right flexacenter">
+
+            </div>
         </div>
 
     </div>
 </template>
 
 <script setup>
+import { ref } from 'vue';
 import pageTopBar from '../components/pageTopBar/pageTopBar.vue';
 
 const uniqid = "1qfWOLTPbyPH"
 
+let input = ref("")
 </script>
 
 <style lang="less" scoped>
@@ -152,7 +180,100 @@ const uniqid = "1qfWOLTPbyPH"
         .details-left {
             .type-box {
                 .type-item {
-                    height: ;
+                    width: 876px;
+                    height: 230px;
+                    background-color: rgba(255, 255, 255, 1);
+                    border: 1px solid rgba(235, 235, 235, 1);
+                    border-radius: 16px;
+                    -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);
+                    font-size: 14px;
+
+                    .type-left {
+
+                        .type-name {
+                            font-weight: 650;
+                            font-size: 20px;
+                            color: #000000;
+                        }
+
+                        .type-tags {
+                            .tags-item {
+                                height: 24px;
+                                background-color: rgba(242, 242, 242, 1);
+                                border-radius: 4px;
+                                line-height: 26px;
+                                font-size: 14px;
+                                color: #7F7F7F;
+                                margin-right: 8px;
+                                padding: 0 9px;
+
+                                &.first {
+                                    border: 1px solid rgba(80, 227, 194, 1);
+                                    color: #50e3c2;
+                                    background-color: #fff;
+                                }
+                            }
+                        }
+
+                        .media-box {
+                            .media-item {
+                                position: relative;
+                                height: 80px;
+                                margin-right: 10px;
+
+
+                                .media-img {}
+
+                                .media-icon {
+                                    position: absolute;
+                                    top: 50%;
+                                    left: 50%;
+                                    transform: translate(-50%, -50%);
+                                    width: 53px;
+                                    height: 53px;
+                                }
+                            }
+                        }
+                    }
+
+                    .type-right {
+                        .price-box {
+                            flex-direction: column;
+                            align-items: flex-end;
+
+                            .former {
+                                color: #AAAAAA;
+                                font-size: 14px;
+                                text-decoration: line-through;
+                                text-decoration-color: #797979;
+                            }
+
+                            .new {
+                                .unit {
+                                    font-family: 'Arial-Black', 'Arial Black', sans-serif;
+                                    font-weight: 900;
+                                    color: #000000;
+                                    font-size: 16px;
+                                }
+                            }
+                        }
+
+                        .consult-btn {
+                            width: 90px;
+                            height: 40px;
+                            background: -webkit-linear-gradient(321.966692522331deg, rgba(98, 177, 255, 1) -13%, rgba(128, 255, 255, 1) 137%);
+                            background: -moz-linear-gradient(128.033307477669deg, rgba(98, 177, 255, 1) -13%, rgba(128, 255, 255, 1) 137%);
+                            background: linear-gradient(128.033307477669deg, rgba(98, 177, 255, 1) -13%, rgba(128, 255, 255, 1) 137%);
+                            border-radius: 36px;
+                            font-weight: 400;
+                            font-size: 16px;
+                            color: #FFFFFF;
+                            cursor: pointer;
+                        }
+                    }
+
                 }
             }
         }

src/views/housingView/apartment.vue

@@ -20,7 +20,6 @@
 
     <!-- 右下角咨询 -->
     <circle-btn></circle-btn>
-
 </template>
   
 <script setup>
@@ -104,7 +103,7 @@ const handleScroll = () => {
     const scrollHeight = document.documentElement.scrollHeight;
     const clientHeight = document.documentElement.clientHeight;
     const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-    if (scrollTop + clientHeight >= scrollHeight) getData()
+    if (scrollTop + clientHeight >= scrollHeight - 350) getData()
 };
 
 let pitchValue = {}
@@ -150,6 +149,4 @@ const handleTransfer = (data) => {
     justify-content: center;
     margin: 0 auto;
 }
-
-
 </style>

src/views/user.vue

@@ -288,7 +288,7 @@ const handleScroll = () => {
     const scrollHeight = document.documentElement.scrollHeight;
     const clientHeight = document.documentElement.clientHeight;
     const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-    if (scrollTop + clientHeight >= scrollHeight) {
+    if (scrollTop + clientHeight >= scrollHeight - 350) {
         if (tabState.value == 'publish') getPublishData()
         else getFavData()
     }