上传公寓收藏和公寓附近房源

2024-04-17 18:40:28 +08:00
parent 5a4e6e79cd
commit a1ec98685e
31 changed files with 526 additions and 309 deletions
--- a/src/components/apartment/seachModule.vue
+++ b/src/components/apartment/seachModule.vue
@@ -288,7 +288,8 @@ let pitchValue = ref({
 })

 watchEffect(() => {
-    nearSchoolList = store.state.apartment.school || []
+    // nearSchoolList = store.state.apartment.school || []
+    nearSchoolList = store.state.schoolList || []
    roomTypeList = store.state.apartment.roomtype || []
    roomTypeKey = store.state.roomTypeKey || {}
    roomlistingsList = store.state.apartment.roomlistings || []
--- a/src/components/public/group-QRcode.vue
+++ b/src/components/public/group-QRcode.vue
@@ -1,33 +1,34 @@
 <template>
-    <div class="QRcode-box group-QRcode flexflex" v-if="true">
-        <img class="group-title" src="@/assets/img/apartmentDetail/group-title.png">
+    <div class="QRcode-box group-QRcode flexflex" :class="{ 'apartment-box': props['type'] == 'apartment' }">
+        <img class="group-title" src="@/assets/img/apartmentDetail/group-title.png" />
        <div class="QRcode-case flexcenter">
-            <img class="QRcode-img" :src="wechat['wechatqrcode']" alt="">
+            <img class="QRcode-img" :src="wechat['wechatqrcode']" alt="" />
        </div>

        <div class="group-QRcode-hint flexacenter">
-            <img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png">
+            <img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png" />
            入群请添加
            <b>方同学的小助手</b>
-            <!-- <b>{{ wechat['nickname'] }}</b> -->
        </div>
    </div>
 </template>

 <script setup>
-import { toRefs } from 'vue';
-import { useStore } from 'vuex';
+import { toRefs, defineProps } from "vue"
+import { useStore } from "vuex"

-const store = useStore();
-
-const { wechat } = toRefs(store.state);
+const props = defineProps({
+    type: String,
+})
+const store = useStore()

+const { wechat } = toRefs(store.state)
 </script>

 <style lang="less" scoped>
 .QRcode-box {
    width: 304px;
-    font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif;
+    font-family: "PingFangSC-Semibold", "PingFang SC Semibold", "PingFang SC", sans-serif;
    // height: 304px;
    background-color: rgba(255, 255, 255, 1);
    border: 1px solid rgba(235, 235, 235, 1);
@@ -39,6 +40,10 @@ const { wechat } = toRefs(store.state);
    align-items: center;
    margin-bottom: 20px;

+    &.apartment-box {
+        box-shadow: none;
+    }
+
    .scan-icon {
        width: 14px;
        height: 14px;
@@ -83,4 +88,4 @@ const { wechat } = toRefs(store.state);
        }
    }
 }
-</style>
+</style>
--- a/src/components/public/phoneQRcode.vue
+++ b/src/components/public/phoneQRcode.vue
@@ -1,18 +1,18 @@
 <template>
-    <div class="QRcode-box apartment-QRcode flexflex" v-if="true">
-        <img class="mini-program-title" src="@/assets/img/apartmentDetail/mini-program-title.png">
+    <div class="QRcode-box apartment-QRcode flexflex" :class="{ 'apartment-box': props['type'] == 'apartment' }">
+        <img class="mini-program-title" src="@/assets/img/apartmentDetail/mini-program-title.png" />
        <div class="QRcode-case flexcenter">
-            <img class="QRcode-img" :src="props['qrcode']" alt="">
+            <img class="QRcode-img" :src="props['qrcode']" alt="" />
        </div>
        <div class="apartment-QRcode-hint flexacenter">
-            <img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png">
-            手机查看该{{ props['type'] == 'apartment' ? '公寓' : '房源' }}
+            <img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png" />
+            手机查看该{{ props["type"] == "apartment" ? "公寓" : "房源" }}
        </div>
    </div>
 </template>

 <script setup>
-import { defineProps } from 'vue';
+import { defineProps } from "vue"

 const props = defineProps({
    qrcode: String,
@@ -42,6 +42,10 @@ const props = defineProps({
    &.apartment-QRcode {
        padding: 40px 0;

+        &.apartment-box {
+            box-shadow: none;
+        }
+
        .mini-program-title {
            width: 168px;
            height: 20px;
@@ -71,4 +75,4 @@ const props = defineProps({
        }
    }
 }
-</style>
+</style>
--- a/src/components/seachModule/seachModule1.vue
+++ b/src/components/seachModule/seachModule1.vue
@@ -479,7 +479,6 @@ let setLocation = (type, data, isupdate = true) => {

 //设置搜索数据  type: 类型  data: 数据  second: 二级数据
 let setSeachConditions = (type, data, second = null) => {
-    console.log("赋值前的数据：", seachAllType)
    if (type === "rent") {
        seachAllType["rent_min"] = data.min
        seachAllType["rent_max"] = data.max
@@ -500,8 +499,6 @@ let setSeachConditions = (type, data, second = null) => {
    if (second) {
        seachAllType[second.type] = second.id
    }
-    console.log(type, data, second)
-    console.log("保存前的处理数据：", seachAllType)

    getDataList(seachAllType)
 }
--- a/src/components/selectTabBox/selectTabBox.vue
+++ b/src/components/selectTabBox/selectTabBox.vue
@@ -21,7 +21,7 @@
                            <div class="check-none dis-f al-item" :class="{ 'check-text': selectTabCheck.id === item.id }"
                                @click="setSelectData(item.id, item.data, item.name)" v-for="(item, i) in list" :key="i">
                                <div class="dis-f al-item">{{ item.name }} <div class="dis-f al-item"
-                                        v-show="selectTabCheck.id === item.id && selectTabCheck.id">&nbsp>&nbsp
+                                        v-show="selectTabCheck.id === item.id && selectTabCheck.id">&nbsp;>&nbsp;
                                        <div
                                            :class="{ 'check-data': selectData.data && selectData.data.length > 0 && selectData.data.length !== selectTabCheck.data.length && selectData.data[0].id }">
                                            {{
@@ -82,7 +82,7 @@
                                :class="[{ 'btn-check': selectTabCheck.id === item.id }]" style="margin-right:10px;"
                                @click="setSelectData(item.id, item.data, item.name)" v-for="(item, i) in list" :key="i">
                                <div class="dis-f al-item">{{ item.name }} <div class="dis-f al-item"
-                                        v-show="selectTabCheck.id === item.id && selectTabCheck.id">&nbsp>&nbsp
+                                        v-show="selectTabCheck.id === item.id && selectTabCheck.id">&nbsp;>&nbsp;
                                        <div
                                            :class="{ 'select-num': selectData.data && selectData.data.length && selectData.data && selectData.data[0] && selectData.data[0].id }">
                                            {{
@@ -119,7 +119,7 @@
                            <el-dropdown trigger="click">
                                <span class="dropdown-btn jus-x dis-f al-item"
                                    :class="{ 'btn-check': hireTypeObj.hireId === item.title }" @click="setHireId(item)">
-                                    {{ item.title }}<span v-show="hireTypeObj.hireId === item.title"> &nbsp> {{
+                                    {{ item.title }}<span v-show="hireTypeObj.hireId === item.title"> &nbsp;> {{
                                        hireTypeObj.title || '不限' }}</span>
                                    <img :src="hireTypeObj.hireId === item.title ? require('../../assets/homeImage/dropDownIcon.svg') : require('../../assets/homeImage/selectInfoTabIcon.svg')"
                                        class="img" :class="{ 'mg-l-30': hireTypeObj.hireId === item.title }" alt="">
@@ -498,14 +498,12 @@ let seachAreaId = (data) => {
 //设置当前地区选项
 let checkBoxGroupInfo = ref(null)
 let setCheckBoxData = (data) => {
-    console.log("data", data);
    checkBoxGroupInfo.value && checkBoxGroupInfo.value.setCheckData(data)
 }

 let loactionArr=shallowReactive({data:null})
 //确认按钮
 let selectSeach = (data = []) => {
-    console.log("data", data);
    selectData.data = seachAreaId(data)
    showSelect.value = false
    if (data.length === 0 && selectTabCheck.id) {