fix

src/store/models/renting.js

@@ -3,6 +3,7 @@ import {
   ref
 } from "vue"
 import request from '@/utils/request'
+import { showDanger } from '@/utils'
 
 export default () => {
   const loading = ref(false)
@@ -43,8 +44,8 @@ export default () => {
   const getDetail = data => {
     // loading.value = true
     request({
-      loadingId: 'room.view',
-      url: '/rent/detail',
+      loadingId: 'rent.view',
+      url: '/rent/view',
       params: {
 
         id:data,
@@ -53,16 +54,16 @@ export default () => {
       console.log(res, 'res')
 
     Object.assign(detail, res)
-      // const { pageNo, pageSize, endRow, result } = res || {}
-      // Object.assign(page, {pageNo, pageSize, endRow})
-      // list.value = pageNo <= 1 ? result : list.value.concat(list.value)
-      // loading.value = false
+    
     }).catch(e => {
       console.error(e)
       // loading.value = false
+      showDanger('获取详情失败')
     })
   }
 
+  
+
 
 
   return {

src/utils/plugins/shiro.js

@@ -3,7 +3,7 @@ import store from '@/store'
 const shiro = {
   install: (app) => {
 
-    const removeNode = el => el.parentNode.removeChild(el)
+    const removeNode = el => el.parentNode && el.parentNode.removeChild(el)
 
     app.directive('shiro', (el, binding) => {      
       const { permissions, getPermission } = store.getState('shiro')

src/view/renting/detail/components/Base.vue

@@ -1,112 +1,225 @@
 <template>
   <div>
-    <x-field label="户型">
-      {{roomType}}
+    <x-field label="楼层">
+      {{ floor }}
+    </x-field>
+
+    <x-field label="居住现状">
+      {{ getDictLabel(roomInfo.liveStatus, "liveStatus") }}
     </x-field>
 
     <x-field label="朝向">
-      {{getDictLabel(roomInfo.aspect, 'aspect')}}
+      {{ getDictLabel(roomInfo.aspect, "aspect") }}
     </x-field>
 
-    <x-field label="装修">
-      {{getDictLabel(roomInfo.decoration, 'decoration')}}
+    <x-field label="卧室">
+      {{ getDictLabel(roomInfo.livingRoom, "liveRoom") }}
     </x-field>
 
-    <x-field label="房屋用途">
-      {{getDictLabel(roomInfo.purpose, 'purpose')}}
+    <x-field label="性别限制">
+      {{ getDictLabel(roomInfo.limitSex, "limitSex") }}
+    </x-field>
+
+    <x-field label="房屋特色">
+      {{ getDictLabel(roomInfo.roomSpecial, "roomSpecial") }}
+    </x-field>
+
+    <x-field label="梯户比例">
+      {{ proportion }}
     </x-field>
 
     <x-field label="建筑类型">
-      {{getDictLabel(roomInfo.buildType, 'build_type')}}
+      {{ getDictLabel(roomInfo.buildType, "build_type") }}
     </x-field>
 
-    <x-field label="配备电梯">
-      {{getDictLabel(roomInfo.elevator, 'elevator')}}
+    <x-field label="房屋用途">
+      {{ getDictLabel(roomInfo.purpose, "purpose") }}
     </x-field>
 
     <x-field label="抵押信息">
-      {{getDictLabel(roomInfo.isMortgage, 'mortgage') || '无'}}
+      {{ getDictLabel(roomInfo.isMortgage, "mortgage") || "无" }}
+    </x-field>
+
+    <x-field label="建成年代">
+      {{ roomInfo.buildYear }}
+    </x-field>
+
+    <x-field label="配备电梯">
+      {{ getDictLabel(roomInfo.elevator, "elevator") }}
+    </x-field>
+
+    <x-field label="车位">
+      {{ getDictLabel(roomInfo.parking, "parking") }}
+    </x-field>
+
+    <x-field label="地下室">
+      {{ getDictLabel(roomInfo.buildTime, "build_time") }}
+    </x-field>
+
+ <x-field label="物业费">
+      {{building.propertyPrice}} 元/m²/月
     </x-field>
 
-    <x-field label="税费">
-      {{getDictLabel(roomInfo.buildTime, 'build_time') || '未知'}}
+    
+<x-field label="燃气管道">
+      {{ getDictLabel(roomInfo.gas, "gas") }}
     </x-field>
 
+    <x-field label="家电">
+      {{ getDictLabel(roomInfo.electricEquipment, "electricEquipment") }}
+    </x-field>
+
+    <x-field label="隔断">
+      {{ getDictLabel(roomInfo.separate, "separate") }}
+    </x-field>
+    
+
+
     <x-field label="来源">
-      {{getDictLabel(roomInfo.sourceFrom, 'sourceFrom')}}
+      {{ getDictLabel(roomInfo.sourceFrom, "sourceFrom") }}
     </x-field>
 
+        <x-field label="优势推荐">
+      {{ roomInfo.specialDesc }}
+    </x-field>
+    
   </div>
 </template>
 
 <script>
-import { computed } from 'vue'
-import { useModel } from '@zjxpcyc/vue-tiny-store'
+import { computed } from "vue";
+import { useModel } from "@zjxpcyc/vue-tiny-store";
 
 export default {
   props: {
     roomInfo: {
       type: Object,
-      default: () => ({})
-    }
+      default: () => ({}),
+    },
+    building: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   setup(props) {
-    const { dicts, getDict } = useModel('dicts')
+    const { dicts, getDict } = useModel("dicts");
 
     // 朝向
     if (!dicts.aspect || !dicts.aspect.length) {
-      getDict('aspect')
+      getDict("aspect");
     }
 
     // 装修
     if (!dicts.decoration || !dicts.decoration.length) {
-      getDict('decoration')
+      getDict("decoration");
     }
 
     // 房屋用途
     if (!dicts.purpose || !dicts.purpose.length) {
-      getDict('purpose')
+      getDict("purpose");
     }
 
     // 建筑类型
-    if (!dicts['build_type'] || !dicts['build_type'].length) {
-      getDict('build_type')
+    if (!dicts["build_type"] || !dicts["build_type"].length) {
+      getDict("build_type");
     }
 
     // 电梯
     if (!dicts.elevator || !dicts.elevator.length) {
-      getDict('elevator')
+      getDict("elevator");
     }
 
     // 抵押信息
     if (!dicts.mortgage || !dicts.mortgage.length) {
-      getDict('mortgage')
+      getDict("mortgage");
     }
 
     // 税费
-    if (!dicts['build_time'] || !dicts['build_time'].length) {
-      getDict('build_time')
+    if (!dicts["build_time"] || !dicts["build_time"].length) {
+      getDict("build_time");
     }
 
     // 来源
     if (!dicts.sourceFrom || !dicts.sourceFrom.length) {
-      getDict('sourceFrom')
+      getDict("sourceFrom");
+    }
+
+    //居住现状
+    if (!dicts.liveStatus || !dicts.liveStatus.length) {
+      getDict("liveStatus");
     }
 
+    // 性别限制
+    if (!dicts.limitSex || !dicts.limitSex.length) {
+      getDict("limitSex");
+    }
+
+    //卧室
+    if (!dicts.liveRoom || !dicts.liveRoom.length) {
+      getDict("liveRoom");
+    }
+    // 房屋特色
+    if (!dicts.roomSpecial || !dicts.roomSpecial.length) {
+      getDict("roomSpecial");
+    }
+
+    //车位
+    if (!dicts.parking || !dicts.parking.length) {
+      getDict("parking");
+    }
+
+// 地下室
+     if (!dicts.build_time || !dicts.build_time.length) {
+      getDict("build_time");
+    }
+// 物业费
+      if (!dicts.basement || !dicts.basement.length) {
+      getDict("basement");
+    }
+
+    // 燃气管道
+      if (!dicts.gas || !dicts.gas.length) {
+      getDict("gas");
+    }
+
+// 家电
+    if (!dicts.electricEquipment || !dicts.electricEquipment.length) {
+      getDict("electricEquipment");
+    }
+
+// 隔断
+    if (!dicts.separate || !dicts.separate.length) {
+      getDict("separate");
+    }
+    
+
     const roomType = computed(() => {
-      const [a, b, c, d] = (props.roomInfo.roomType || '').split(',')
-      return `${a || ''}室 ${b || '0'}厅 ${c || '0'}厨 ${d || '0'}卫`
-    })
+      const [a, b, c, d] = (props.roomInfo.roomType || "").split(",");
+      return `${a || ""}室 ${b || "0"}厅 ${c || "0"}厨 ${d || "0"}卫`;
+    });
+
+    const floor = computed(() => {
+      const [a, b, c] = (props.roomInfo.roomFloor || "").split(",");
+      return `${a || ""}/${b || ""}(${c || ""})`;
+    });
+
+    // 梯户比例
+    const proportion = computed(() => {
+      const [a, b] = (props.roomInfo.proportion || "").split(",");
+      return `${a || ""}梯${b || ""}户`;
+    });
 
     // 获取字典对应名称
     const getDictLabel = (val, key) => {
-      return dicts[key]?.filter(x => x.code === val)[0]?.name
-    }
+      return dicts[key]?.filter((x) => x.value === val)[0]?.text;
+    };
 
     return {
+      floor,
       roomType,
+      proportion,
       getDictLabel,
-    }
-  }
-}
+    };
+  },
+};
 </script>

src/view/renting/detail/components/Main.vue

@@ -27,9 +27,7 @@
       }}
     </x-field>
 
-    <x-field label="楼层">
-      {{ floor }}
-    </x-field>
+
 
     <x-field label="创建方式">
       {{ roomInfo.createMethod === "1" ? "外部录入" : "荟居录入" }}
@@ -131,10 +129,10 @@ export default {
     const unfollowRoom = ref();
     const { dicts, getDict } = useModel("dicts");
 
-    const floor = computed(() => {
-      const [a, b, c] = (props.roomInfo.roomFloor || "").split(",");
-      return `${a || ""}/${b || ""}(${c || ""})`;
-    });
+    // const floor = computed(() => {
+    //   const [a, b, c] = (props.roomInfo.roomFloor || "").split(",");
+    //   return `${a || ""}/${b || ""}(${c || ""})`;
+    // });
 
     // 居室
     const roomType = computed(() => {
@@ -206,7 +204,7 @@ export default {
     };
 
     return {
-      floor,
+      // floor,
       roomType,
       avgPrice,
       leaseWay,

src/view/renting/detail/index.vue

@@ -33,7 +33,7 @@
             <template #title>
               <div>基础信息</div>
             </template>
-            <RoomBase :room-info="detail.roomInfo" />
+            <RoomBase :room-info="detail.roomInfo" :building="detail.building" />
           </van-collapse-item>
 
           <van-collapse-item name="2">
@@ -174,7 +174,7 @@ export default {
     const collapseItem = ref()
     const phone = ref("")
 
-    const { detail, getDetail } = useModel("room")
+    const { detail, getDetail } = useModel("renting")
 
     onMounted(() => {
       getDetail(roomId);

vue.config.js

@@ -12,7 +12,7 @@ module.exports = {
     proxy: {
       '/mp': {
         target: 'http://10.161.7.66:8080/',
-        target: 'http://localhost:8080/',
+        // target: 'http://localhost:8080/',
         ws: true,
         changeOrigin: true,
         // pathRewrite: {'^/mp': ''}