fix

src/store/models/room.js

@@ -41,7 +41,6 @@ export default () => {
   }
 
   const getDetail = data => {
-    // loading.value = true
     request({
       loadingId: 'room.view',
       url: '/room/detail',
@@ -53,16 +52,29 @@ 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
     })
   }
 
+  const getSecurity = id => {
+  return  request({
+      loadingId: 'room.security',
+      url: '/room/security',
+      params: {
+
+        roomId:id,
+      }
+    }).then(res => {
+      console.log(res, 'res')
+   return res
+    }).catch(e => {
+      console.error(e)
+    })
+  }
+
+
 
 
   return {
@@ -71,6 +83,7 @@ export default () => {
     getList,
     detail,
     getDetail,
+    getSecurity,
     loading
   }
 }

src/utils/request/index.js

@@ -35,7 +35,7 @@ const responseInterceptor = response => {
       return data.data
     } else if ('1' === data.code) {
     
-      return Promise.reject('账号未登录或没有权限')
+      return Promise.reject('账号未登录或没有权限1')
     } else if ('-1' === data.code) {
       console.log(router,'router')
       router.push('/login')

src/view/secondhand/detail/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="secondhanddetail">
     <!-- xId='room.view' -->
-    <XLoading  tip='正在加载详情'>
+    <XLoading tip="正在加载详情">
       <div>
         <Swiper></Swiper>
       </div>
 
       <div class="title">
-        <p>{{detail.roomInfo?.title}}</p>
+        <p>{{ detail.roomInfo?.title }}</p>
       </div>
 
       <div class="detailcard">
@@ -133,7 +133,7 @@ import Contextc from "../../../components/contextC";
 import Stepc from "../../../components/stepC";
 // import { router } from "../../../router";
 
-import  XLoading  from "../../../components/XLoading";
+import XLoading from "../../../components/XLoading";
 
 export default {
   name: "secondhanddetail",
@@ -165,13 +165,90 @@ export default {
     const showShare = ref(false);
     const phoneShow = ref(false);
     const phone = ref("");
-    const { detail, getDetail } = useModel("room");
-    // const { detail,  getDetail } = detail;
+    const showInfo = ref(false);
+    const { detail, getDetail, getSecurity } = useModel("room");
+    const { dicts, getDict } = useModel("dicts");
 
     onMounted(() => {
       getDetail(roomId);
     });
 
+    // 字典
+    // 朝向
+    const aspectOptions = computed(() => {
+      const aspectDict = dicts.aspect || [];
+      if (!aspectDict.length) {
+        getDict("aspect");
+      }
+      console.log(aspectDict, "aspectDict");
+      return aspectDict;
+    });
+    // 装修
+    const decorationOptions = computed(() => {
+      const decorationDict = dicts.decoration || [];
+      if (!decorationDict.length) {
+        getDict("decoration");
+      }
+
+      return decorationDict;
+    });
+    //房屋用途
+    const purposeOptions = computed(() => {
+      const purposeDict = dicts.purpose || [];
+      if (!purposeDict.length) {
+        getDict("purpose");
+      }
+
+      return purposeDict;
+    });
+    //建筑类型
+    const buildTypeOptions = computed(() => {
+      const buildTypeDict = dicts.buildType || [];
+      if (!buildTypeDict.length) {
+        getDict("build_type");
+      }
+
+      return buildTypeDict;
+    });
+
+    //配备电梯
+    const elevatorOptions = computed(() => {
+      const elevatorDict = dicts.elevator || [];
+      if (!elevatorDict.length) {
+        getDict("elevator");
+      }
+
+      return elevatorDict;
+    });
+    // 抵押信息
+    const mortgageOptions = computed(() => {
+      const mortgageDict = dicts.mortgage || [];
+      if (!mortgageDict.length) {
+        getDict("mortgage");
+      }
+
+      return mortgageDict;
+    });
+    // 税费
+    const buildTimeOptions = computed(() => {
+      const buildTimeDict = dicts.buildTime || [];
+      if (!buildTimeDict.length) {
+        getDict("build_time");
+      }
+
+      return buildTimeDict;
+    });
+
+    // 来源
+    const sourceFromOptions = computed(() => {
+      const sourceFromDict = dicts.sourceFrom || [];
+      if (!sourceFromDict.length) {
+        getDict("sourceFrom");
+      }
+
+      return sourceFromDict;
+    });
+
     // 通过 actions 属性来定义菜单选项
     const actions = [
       { text: "设置房源保护", value: "1" },
@@ -218,12 +295,17 @@ export default {
     };
     const onLookClick = () => {
       console.log("onLookClick");
+      if (showInfo.value) return;
+
+      getSecurity(roomId).then((res) => {
+        console.log(res, "getSecurity");
+        showInfo.value = true;
+      });
     };
     const getRoomFloor = (data) => {
-     
-const [a,b,c] = (data||'').split(',')
- console.log(a,b,c,`${a}/${b}(${c})`,"data");
-      return `${a||''}/${b||''}(${c||''})`
+      const [a, b, c] = (data || "").split(",");
+
+      return `${a || ""}/${b || ""}(${c || ""})`;
     };
 
     // 房源信息
@@ -235,7 +317,7 @@ const [a,b,c] = (data||'').split(',')
       },
       {
         name: "房源id",
-        value: `${detail.roomInfo?.roomCode||''}${detail.roomInfo?.id||''}`,
+        value: `${detail.roomInfo?.roomCode || ""}${detail.roomInfo?.id || ""}`,
       },
       {
         name: "楼层",
@@ -247,186 +329,161 @@ const [a,b,c] = (data||'').split(',')
       },
       {
         name: "面积",
-        value: detail.roomInfo?.acreage + '㎡',
+        value: detail.roomInfo?.acreage + "㎡",
       },
       {
         name: "所属商圈",
-        value: detail.roomBusi?.areaName,
+        value: detail.roomBusiness?.areaName,
       },
       {
         name: "价格",
-        value: detail.building?.buildingName,
+        value: `${detail.roomInfo?.totalPrice}万元/${(
+          (detail.roomInfo?.totalPrice * 1000) /
+          detail.roomInfo?.acreage
+        ).toFixed(2)}元/㎡`,
       },
       {
         name: "楼房号",
-        value: detail.building?.buildingName,
+        value: showInfo.value ? detail.roomInfo?.roomNum : "敏感信息",
       },
       {
         name: "单元",
-        value: detail.building?.buildingName,
+        value: showInfo.value ? detail.roomInfo?.roomUnit : "敏感信息",
       },
       {
         name: "业主姓名",
-        value: detail.building?.buildingName,
+        value: showInfo.value ? detail.roomInfo?.ownerName : "敏感信息",
       },
       {
         name: "楼栋",
-        value: detail.building?.buildingName,
+        value: showInfo.value ? detail.roomInfo?.roomBuild : "敏感信息",
       },
       {
         name: "业主电话",
-        value: detail.building?.buildingName,
+        value: showInfo.value
+          ? (detail.roomInfo?.ownerTel || "").split(",")[0]
+          : "敏感信息",
       },
       {
-        name: "查看敏感信息",
+        name: `查看敏感信息(${detail.leftSecurityNum})`,
         value: "123",
         type: "BUTTOM",
         click: () => onLookClick(),
       },
     ]);
 
-    // const housingInformationOptions = [
-    //   {
-    //     name: "所属楼盘",
-    //     value: detail.building?.buildingName,
-    //     span: 24,
-    //   },
-    //   {
-    //     name: "房源id",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "楼层",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "所属区县",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "面积",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "所属商圈",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "价格",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "楼房号",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "单元",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "业主姓名",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "楼栋",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "业主电话",
-    //     value: "123",
-    //   },
-    //   {
-    //     name: "查看敏感信息",
-    //     value: "123",
-    //     type: "BUTTOM",
-    //     click: () => onLookClick(),
-    //   },
-    // ];
-    console.log(housingInformationOptions, "housingInformationOption s");
+    const getRoomType = (data) => {
+      const [a, b, c, d] = (data || "").split(",");
+
+      return `${a || ""}室 ${b || ""}厅 ${c || ""}厨 ${d || ""}卫`;
+    };
     // 基本信息
-    const baseInformationOptions = [
+    const baseInformationOptions = computed(() => [
       {
         name: "户型",
-        value: "123",
+        value: getRoomType(detail.roomInfo?.roomType),
       },
       {
         name: "朝向",
-        value: "123",
+        value: aspectOptions.value.filter(
+          (x) => x.value == detail.roomInfo?.aspect
+        )[0]?.text,
       },
       {
         name: "装修",
-        value: "123",
+        value: decorationOptions.value.filter(
+          (x) => x.value == detail.roomInfo?.decoration
+        )[0]?.text,
       },
       {
         name: "房屋用途",
-        value: "123",
+        value: purposeOptions.value.filter(
+          (x) => x.value == detail.roomInfo?.purpose
+        )[0]?.text,
       },
       {
         name: "建筑类型",
-        value: "123",
+        value: buildTypeOptions.value.filter(
+          (x) => x.value == detail.roomInfo?.buildType
+        )[0]?.text,
       },
       {
         name: "配备电梯",
-        value: "123",
+        value: elevatorOptions.value.filter(
+          (x) => x.value == detail.roomInfo?.elevator
+        )[0]?.text,
       },
       {
         name: "抵押信息",
-        value: "123",
+        value:
+          mortgageOptions.value.filter(
+            (x) => x.value == detail.roomInfo?.isMortgage
+          )[0]?.text || "暂无",
       },
       {
         name: "税费",
-        value: "123",
+        value:
+          buildTimeOptions.value.filter(
+            (x) => x.value == detail.roomInfo?.buildTime
+          )[0]?.text || "未知",
       },
+
       {
         name: "来源",
-        value: "123",
+        value: sourceFromOptions.value.filter(
+          (x) => x.value == detail.roomInfo?.sourceFrom
+        )[0]?.text,
+
         span: 24,
       },
-    ];
+    ]);
     // 物业信息
-    const propertyInformationOptions = [
+    const propertyInformationOptions = computed(() =>[
       {
         name: "物业费",
-        value: "123",
+        value: `${(detail.building?.propertyPrice||0).toFixed(2)}元/m²/月`
       },
       {
         name: "建筑年代",
-        value: "123",
+        value:  detail.building?.buildYear
       },
       {
         name: "均价",
-        value: "123",
+        value: `${(detail.building?.averagePrice||0).toFixed(2)}元/m²` 
       },
       {
         name: "开发商",
-        value: "123",
+        value:  detail.building?.developer
       },
       {
         name: "物业公司",
-        value: "123",
+        value: detail.building?.propertyCompany
       },
-    ];
+    ]);
+
+   const getNameFormat=(name,id)=>(name||'') + (name?`(ID:${id})`:'')
+   
     // 角色人
-    const roleInformationOptions = [
+    const roleInformationOptions =computed(() => [
       {
         name: "首次录入人",
-        value: "123",
+        value: getNameFormat(detail.roomRole?.createName,detail.roomRole?.createId),
       },
       {
         name: "时间",
-        value: "123",
+        value:detail.roomRole?.createTime
       },
       {
         name: "录入人",
-        value: "123",
+        value: getNameFormat(detail.roomRole?.recordName,detail.roomRole?.recordId), 
       },
       {
         name: "时间",
-        value: "123",
+        value: detail.roomRole?.recordTime
       },
       {
         name: "维护人",
-        value: "123",
+        value:  getNameFormat(detail.roomRole?.belongName,detail.roomRole?.belongId), 
       },
       {
         name: "查看电话",
@@ -436,34 +493,34 @@ const [a,b,c] = (data||'').split(',')
       },
       {
         name: "实勘人",
-        value: "123",
+        value:   getNameFormat(detail.roomRole?.rescName,detail.roomRole?.rescId),  
       },
       {
         name: "时间",
-        value: "123",
+        value: detail.roomRole?.rescTime,
       },
       {
         name: "钥匙人",
-        value: "123",
+        value:  getNameFormat(detail.roomRole?.keyName,detail.roomRole?.keyId),  
         span: 24,
       },
       {
         name: "委托人",
-        value: "123",
+        value: getNameFormat(detail.roomRole?.authName,detail.roomRole?.authId), 
       },
       {
         name: "时间",
-        value: "123",
+        value:  detail.roomRole?.authTime,
       },
       {
         name: "最后修改人",
-        value: "123",
+        value:  getNameFormat(detail.roomRole?.updateName,detail.roomRole?.updateId),  
       },
       {
         name: "时间",
         value: "123",
       },
-    ];
+    ]);
 
     // 委托书
     const entrustOptions = [

vue.config.js

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