Merge branch 'master' of http://git.ycjcjy.com/ershoufang/mp-agent into master

src/store/models/renting.js

   // 获取楼栋详情
   const getBuilding = (estateId) => {
     return request({
-      url: "/rent/building",
+      url: "/room/building",
       params: {
-        estateId
+        estateId,
       },
     })
   }
     return request({
       url: "/rent/close",
       params: {
-        estateId: data.estateId
+        estateId: data.estateId,
       },
       data,
       toast: "请稍候...",
     })
   }
 
-   // 实勘列表
-   const getRescList = (roomId) => {
+  // 实勘列表
+  const getRescList = (roomId) => {
     return request({
       url: "/rent/resc/list",
-      params: { roomId },
+      params: {
+        roomId
+      },
       loadingId: "room.resc.list",
     })
   }
   const setRescCover = (rescId) => {
     return request({
       url: "/rent/resc/cover",
-      params: { id: rescId },
+      params: {
+        id: rescId
+      },
       toast: "请稍候...",
     })
   }
       headers: {
         "Content-Type": "application/json",
       },
-      params: { roomId },
+      params: {
+        roomId
+      },
       data,
       toast: "请稍候...",
     })
   }
 
   // 删除
-  const deleteResc = ({ roomId, rescId, rescType }) => {
+  const deleteResc = ({
+    roomId,
+    rescId,
+    rescType
+  }) => {
     return request({
       url: "/rent/resc/delete",
-      params: { roomId, rescId, rescType },
+      params: {
+        roomId,
+        rescId,
+        rescType
+      },
       toast: "请稍候...",
     })
   }

src/view/addhouse/index.vue

 <template>
-  <div class="addhouse">
+  <div class="home">
     <van-tabs
-      v-model="active"
-      background="#e6e4e4"
-      color="#d75e3a"
+      v-model:active="active"
+      background="#d75e3a"
+      color="#fff"
       line-width="30%"
-      title-active-color="#d75e3a"
+      title-active-color="#fff"
     >
-      <div class="addhouse-main">
-        <van-tab title="二手房"><Addsecondhand /></van-tab>
-        <van-tab title="租房"> <Addrenting /></van-tab>
-      </div>
+      <van-tab title="二手房"><Addsecondhand /></van-tab>
+      <van-tab title="租房"> <Addrenting /></van-tab>
     </van-tabs>
   </div>
 </template>
 
 <script>
-// import Vue from 'vue';
+import { ref } from "vue"
 import { Tab, Tabs } from "vant"
 import Addsecondhand from "./addsecondhand"
 import Addrenting from "./addrenting"
 
 export default {
-  name: "addhouse",
+  name: "home",
   components: {
     [Tab.name]: Tab,
     [Tabs.name]: Tabs,
-    Addsecondhand: Addsecondhand,
-    Addrenting: Addrenting,
+    Addsecondhand,
+    Addrenting,
   },
   data() {
-    return {
-      msg: "222",
-    }
+    return {}
+  },
+  setup() {
+    const active = ref(0)
+    return { active }
   },
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
-.addhouse-main {
-  width: 100%;
-  height: calc(100vh - 94px);
-  overflow: hidden;
-  overflow-y: auto;
-}
-.addhouse-main::-webkit-scrollbar {
-  display: none; /*隐藏滚动条*/
+:deep(.van-tab) {
+  color: #000;
 }
 </style>

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

       {{ roomInfo.createMethod === "1" ? "外部录入" : "荟居录入" }}
     </x-field>
 
-    <!-- 
-
-
-    <x-field label="所属区县">
-      {{ otherData.roomCity.areaName }}
-    </x-field>
-
-    <x-field label="所属商圈">
-      {{ otherData.roomBusi.areaName }}
-    </x-field>
-
-  
-
-    <x-field label="价格">
-      {{ roomInfo.totalPrice }} 万元 / {{ avgPrice }} 元/㎡
-    </x-field> -->
+    <div
+      v-if="
+        roomInfo.status == '2' ||
+        roomInfo.status == '4' ||
+        roomInfo.status == '6'
+      "
+    >
+      <x-field label="关闭原因">
+        {{ getDictLabel(roomLog.type, "closeType")
+        }}<span v-show="roomLog.type == '1'"
+          >({{ getDictLabel(roomLog.reason, "closeReason") }})</span
+        >
+      </x-field>
+
+      <x-field label="关闭人">
+        {{ roomLog.createName }}
+      </x-field>
+
+      <x-field label="关闭时间">
+        {{ roomLog.createTime }}
+      </x-field>
+    </div>
 
     <x-field label="楼栋">
       {{ securityInfo.roomBuild || "敏感信息" }}
       type: Object,
       default: () => ({}),
     },
-
-    otherData: Object,
+    roomLog: {
+      type: Object,
+      default: () => ({}),
+    },
+    otherData: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   setup(props) {
     const router = useRouter()
     const unfollowRoom = ref()
     const { dicts, getDict } = useModel("dicts")
 
-    // const floor = computed(() => {
-    //   const [a, b, c] = (props.roomInfo.roomFloor || "").split(",");
-    //   return `${a || ""}/${b || ""}(${c || ""})`;
-    // });
+    // 关闭类型
+    if (!dicts.closeType || !dicts.closeType.length) {
+      getDict("closeType")
+    }
+
+    // 关闭原因
+    if (!dicts.closeReason || !dicts.closeReason.length) {
+      getDict("closeReason")
+    }
 
     // 居室
     const roomType = computed(() => {
       }
     }
 
+    // 获取字典对应名称
+    const getDictLabel = (val, key) => {
+      return dicts[key]?.filter((x) => x.value === val)[0]?.text
+    }
+
     return {
       // floor,
       roomType,
       goToAddFollow,
       payWayOptions,
       decorationOptions,
+      getDictLabel,
     }
   },
 }

src/view/renting/detail/index.vue

         <RoomMain
           :room-info="detail.roomInfo"
           :building="detail.building"
+          :roomLog="detail.roomLog || {}"
           :other-data="roomOtherData"
         />
       </van-cell-group>

src/view/renting/edithouse/components/Form.vue

     />
 
     <van-field
-      v-model="formData.buildingName"
+      v-model="buildingName"
       name="buildingName"
       label="楼盘名称"
-      placeholder="请输入"
+      disabled
     />
 
     <van-field name="aspect" label="朝向" required>
     </van-field>
 
     <van-field
-      v-model="formData.acreage"
+      v-model="formData.totalPrice"
       name="totalPrice"
       label="租金"
       placeholder="请输入"
 </template>
 
 <script>
-import { reactive, computed, watch } from "vue"
+import { reactive, computed, watch, ref } from "vue"
 import { Form, Field, Button } from "vant"
 import { useModel } from "@zjxpcyc/vue-tiny-store"
 import Picker from "@/components/Picker"
   },
   emits: ["submit"],
   setup(props, { emit }) {
+    const buildingName = ref("")
+
     const formData = reactive({})
     const { dicts, getDict } = useModel("dicts")
     const { detail } = useModel("renting")
 
+    //  const mustEdit = computed(()=>detail.building.is)
+
     // 装修
     const decorationOptions = computed(() => {
       const decorationDict = dicts.decoration || []
     })
 
     const validManually = () => {
-      // if (
-      //   !formData.roomType ||
-      //   formData.roomType.split(",").filter(Boolean).length != 5
-      // ) {
-      //   showWarn("请正确设置户型")
-      //   return false
-      // }
-      // if (!formData.decoration) {
-      //   showWarn("请选择装修")
-      //   return false
-      // }
-      // if (!formData.aspect) {
-      //   showWarn("请选择朝向")
-      //   return false
-      // }
-      // if (!formData.sourceFrom) {
-      //   showWarn("请选择房源来源")
-      //   return false
-      // }
+      if (
+        !formData.roomType ||
+        formData.roomType.split(",").filter(Boolean).length != 5
+      ) {
+        showWarn("请正确设置户型")
+        return false
+      }
+      if (!formData.decoration) {
+        showWarn("请选择装修")
+        return false
+      }
+      if (!formData.aspect) {
+        showWarn("请选择朝向")
+        return false
+      }
+      if (!formData.sourceFrom) {
+        showWarn("请选择房源来源")
+        return false
+      }
 
       return true
     }
       (nw, od) => {
         if (nw && !od) {
           Object.assign(formData, { ...nw })
+          buildingName.value = detail.building?.buildingName
         }
       },
       { immediate: true }
     )
 
     return {
+      // mustEdit,
+      buildingName,
       formData,
       handleSumbit,
       decorationOptions,