月份修改

2023-07-28 10:37:17 +08:00
parent 556f40efe8
commit 96e7c86829
5 changed files with 4099 additions and 4093 deletions
--- a/src/components/biserialListItem/biserialListItem.vue
+++ b/src/components/biserialListItem/biserialListItem.vue
@@ -63,10 +63,9 @@
                            && data.data.rent }}</span>
                        <span class="price" v-if="Array.isArray(data && data.data && data.data.rent)">{{ data && data.data &&
                            data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }}</span>
-                        <span>/月</span>
-                        <span class="time" v-show="data && data.data && data.data.rentalduration != 0">[ 租期{{ data &&
-                            data.data && data.data.rentalduration }}{{
-        data && data.data && data.data.rentalperiod }} ]</span>
+                        <span>/{{data && data.data && data.data.rentalperiod}}</span>
+                        <span class="time" v-show="data && data.data && data.data.rentalduration != 0">[ 租期{{ config.rentalduration[data.data && data.data.rentalduration] 
+                             }}]</span>
                    </div>
                </div>
                <div class="img">
@@ -149,6 +148,9 @@ let loadFinish = () => {
 const route = useRouter()
 let routePath = ref('')
 routePath.value = route.currentRoute.value.meta.path
+//数据包
+let config=store.state.indexData.config
+
 //地区数据
 let location = reactive({ data: {} })
 location.data = store.state.indexData && store.state.indexData.config && store.state.indexData.config.location
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -18,7 +18,8 @@
            </div>
        </div>
        <div class="long-title">
-            <span class="type" v-if="itemData.type === 'housing'">{{ itemData.gptype }}</span>{{ itemData && itemData.title }}
+            <span class="type" v-if="itemData.type === 'housing'">{{ itemData.gptype }}</span>{{ itemData && itemData.title
+            }}
        </div>
        <div class="type-tab">
            <span v-if="itemData.type === 'housing'">
@@ -32,7 +33,8 @@
        </div>
        <div style="padding: 0 10px;margin-top:15px;" class="dis-f al-item" v-if="itemData.type === 'housing'">
            <img src="../../assets/homeImage/addMarker.png" class="add-marker" alt="">
-            <span class="address-text">{{ location.data && location.data[itemData.location && itemData.location.substring(0, 1)]
+            <span class="address-text">{{ location.data && location.data[itemData.location && itemData.location.substring(0,
+                1)]
            }} > {{ location.data && location.data[itemData.location] }}</span>
        </div>
        <div style="padding:0 10px;margin-top:12px;" v-if="itemData.type === 'housing'">
@@ -47,21 +49,21 @@
                年轻有活力且超有玩趣的公寓
            </div> -->
        <div class="suite-box" v-if="itemData.type === 'apartment'">
-            <div class="dis-f al-item jus-bet" v-if="itemData.specifications &&
-                        itemData.specifications[0] && itemData.specifications[0].value">
-                <div class="suite-type">
-                    {{ itemData.specifications && itemData.specifications[0] && itemData.specifications[0].title }}
-                </div>
-                <div>
-                    <span class="unit">HK$</span>
-                    <span class="price">{{ itemData.specifications &&
-                        itemData.specifications[0] && itemData.specifications[0].value }}</span>
-                    <span class="date">/月</span>
+            <div v-for="(item, i) in itemData.specifications">
+                <div class="line" v-if="i > 0"></div>
+                <div class="dis-f al-item jus-bet">
+                    <div class="suite-type">
+                        {{ item.title }}
+                    </div>
+                    <div>
+                        <span class="unit">HK$</span>
+                        <span class="price">{{ item.value }}</span>
+                        <span class="date">/月</span>
+                    </div>
                </div>
            </div>
-            <div class="line" v-if="itemData.specifications &&
-                        itemData.specifications[1] && itemData.specifications[1].value"></div>
-            <div class="dis-f al-item jus-bet" v-if="itemData.specifications &&
+
+            <!-- <div class="dis-f al-item jus-bet" v-if="itemData.specifications &&
                        itemData.specifications[1] && itemData.specifications[1].value">
                <div class="suite-type">
                    {{ itemData.specifications && itemData.specifications[1] && itemData.specifications[1].title }}
@@ -70,9 +72,9 @@
                    <span class="unit">HK$</span>
                    <span class="price">{{ itemData.specifications &&
                        itemData.specifications[1] && itemData.specifications[1].value }}</span>
-                    <span class="date">/月</span>
+                    <span class="date">{{ .rentalperiod }}</span>
                </div>
-            </div>
+            </div> -->
        </div>
        <div class="corner-box">
            <img src="../../assets/homeImage/corner.svg" v-if="itemData.type === 'housing' && itemData.intermediary !== 1"
@@ -439,5 +441,6 @@ let watchAdv = () => {
    -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
    -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
    box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
-}</style>
+}
+</style>
  
--- a/src/components/seachPage/input.vue
+++ b/src/components/seachPage/input.vue
@@ -84,7 +84,7 @@
                            v-show="tabType === 'apartment'">
                            品牌公寓 {{ seachKey.key && seachKey.key.studentapartment && seachKey.key.studentapartment.count }}
                        </div>
-                        学生公寓 {{ seachKey.key && seachKey.key.studentapartment && seachKey.key.studentapartment.count }}
+                        品牌公寓 {{ seachKey.key && seachKey.key.studentapartment && seachKey.key.studentapartment.count }}
                    </div>
                    <div class="top-btn dis-f jus-x al-item four" v-if="!isNeedHousing">
                        <div class="second-select-third-box" v-show="tabType === 'apartment'">
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -30,7 +30,7 @@
                                        housingInfo['data'] && housingInfo['data'].info.rent[1]
                                    }}
                                </span>
-                                <span>/月</span>
+                                <span>/{{ housingInfo['data'] && housingInfo['data'].info.rentalperiod }}</span>
                                <div class="line"></div>
                                <div class="dis-f al-item">
                                    {{ indexData['data'] &&
@@ -93,7 +93,7 @@
                                    housingInfo['data'] && housingInfo['data'].info.rent[1]
                                }}
                            </span>
-                            <span>/月</span>
+                            <span>/{{ housingInfo['data'] && housingInfo['data'].info.rentalperiod }}</span>
                        </div>
                        <div class="dis-f al-item detail-condition-box">
                            <div class="condition condition-border">
@@ -126,8 +126,7 @@
                                    {{ !housingInfo['data'] || housingInfo['data'] &&
                                        housingInfo['data'].info.rentalduration
                                        === '0' ?
-                                        '不限' : `${housingInfo['data'] && housingInfo['data'].info.rentalduration}
-                                                                        ${housingInfo['data'] && housingInfo['data'].info.rentalperiod}` }}
+                                        '不限' : `${config.rentalduration[housingInfo['data'] && housingInfo['data'].info.rentalduration]}` }}
                                </div>
                            </div>
                            <div class="condition">
@@ -442,7 +441,7 @@
                                </div>
                            </div>
                        </div>
-                        <div class="dis-f jus-x" v-if="distanceList.length && pageType != 3">
+                        <div class="dis-f jus-x" v-if="distanceList[0]&&distanceList[0].name && pageType != 3">
                            <div class="distance-box dis-f jus-bet">
                                <div class="distance-info-box pos-r" :class="{ 'show-distance-info-box': showDistance }"
                                    :style="{ 'height': showDistance ? `${70 + 42 + 82 * distanceList.length - 1}px` : '0px' }">
@@ -1129,6 +1128,8 @@ let setHousingArr = () => {


 }
+//总体数据
+let config=store.state.indexData.config

 let location = store.state.indexData.config && store.state.indexData.config.location
 //设置顶部导航
@@ -1155,9 +1156,9 @@ let setNavigation = () => {
                query: {
                    location: housingInfo['data']['info'].location.substring(0, 3),
                    areaItem: housingInfo['data']['info'].location.substring(0, 1),
-                    types: housingInfo['data']['info'].location.substring(0, 1)
+                    types: housingInfo['data']['info'].type
                },
-                path: `${store.state.routeList['secondaryIndex'].path}}/${JSON.stringify({ id: , name: location[housingInfo['data']['info'].location.substring(0, 1)] })}/${JSON.stringify({ type: 'types', data: { name: type[housingInfo['data']['info'].type.substring(0, 3)], id: housingInfo['data']['info'].type } })}`,
+                path: `${store.state.routeList['secondaryIndex'].path}`,
                title: `${location[housingInfo['data']['info'].location]}${type[housingInfo['data']['info'].type]}`
            }
    } else if (pageType.value == 4) {