fix

src/store/models/renting.js

@@ -1,6 +1,11 @@
-import { reactive, ref } from "vue"
+import {
+  reactive,
+  ref
+} from "vue"
 import request from "@/utils/request"
-import { showDanger } from "@/utils"
+import {
+  showDanger
+} from "@/utils"
 
 export default () => {
   const loading = ref(false)
@@ -12,16 +17,21 @@ export default () => {
   const getList = (data) => {
     loading.value = true
     request({
-      loadingId: "renting.list",
-      url: "/rent/list",
-      data: {
-        pageNo: 1,
-        pageSize: 10,
-        ...data,
-      },
-    })
+        loadingId: "renting.list",
+        url: "/rent/list",
+        data: {
+          pageNo: 1,
+          pageSize: 10,
+          ...data,
+        },
+      })
       .then((res) => {
-        const { pageNo, pageSize, endRow, result } = res || {}
+        const {
+          pageNo,
+          pageSize,
+          endRow,
+          result
+        } = res || {}
         Object.assign(page, {
           pageNo,
           pageSize,
@@ -39,12 +49,12 @@ export default () => {
   const getDetail = (data) => {
     // loading.value = true
     request({
-      loadingId: "rent.view",
-      url: "/rent/view",
-      params: {
-        id: data,
-      },
-    })
+        loadingId: "rent.view",
+        url: "/rent/view",
+        params: {
+          id: data,
+        },
+      })
       .then((res) => {
         console.log(res, "res")
 
@@ -60,12 +70,12 @@ export default () => {
   // 角色人信息
   const getRole = (data) => {
     request({
-      loadingId: "rent.role.view",
-      url: "/rent/role/view",
-      params: {
-        roomId: data,
-      },
-    })
+        loadingId: "rent.role.view",
+        url: "/rent/role/view",
+        params: {
+          roomId: data,
+        },
+      })
       .then((res) => {
         Object.assign(rentRole, res)
       })
@@ -78,12 +88,12 @@ export default () => {
   // 钥匙信息
   const getKey = (data) => {
     request({
-      loadingId: "rent.key.view",
-      url: "/rent/key/view",
-      params: {
-        roomId: data,
-      },
-    })
+        loadingId: "rent.key.view",
+        url: "/rent/key/view",
+        params: {
+          roomId: data,
+        },
+      })
       .then((res) => {
         Object.assign(rentKeyBox, res)
       })
@@ -93,6 +103,96 @@ export default () => {
       })
   }
 
+  // 业主电话
+  const addOwnerTel = (params) => {
+    return request({
+      url: "/rent/own-tel/add",
+      params,
+      toast: "请稍候...",
+    }).then(() => {
+      const ownerTel = detail.roomInfo.ownerTel || ""
+      detail.roomInfo.ownerTel = ownerTel
+        .split(",")
+        .filter(Boolean)
+        .concat(params.newOwnerTel)
+        .join(",")
+      return
+    })
+  }
+
+  // 获取楼栋详情
+  const getBuilding = (estateId) => {
+    return request({
+      url: "/rent/building",
+      params: {
+        estateId
+      },
+    })
+  }
+
+  // 房源下架
+  const closeHouse = (data) => {
+    return request({
+      url: "/rent/close",
+      params: {
+        estateId: data.estateId
+      },
+      data,
+      toast: "请稍候...",
+    }).then(() => {
+      return
+    })
+  }
+
+  // 房源编辑
+  const houseEdit = (data) => {
+    return request({
+      url: "/rent/save",
+      data,
+      toast: "请稍候...",
+    })
+  }
+
+   // 实勘列表
+   const getRescList = (roomId) => {
+    return request({
+      url: "/rent/resc/list",
+      params: { roomId },
+      loadingId: "room.resc.list",
+    })
+  }
+
+  // 设置封面
+  const setRescCover = (rescId) => {
+    return request({
+      url: "/rent/resc/cover",
+      params: { id: rescId },
+      toast: "请稍候...",
+    })
+  }
+
+  // 保存
+  const saveResc = (data, roomId) => {
+    return request({
+      url: "/rent/resc/save",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      params: { roomId },
+      data,
+      toast: "请稍候...",
+    })
+  }
+
+  // 删除
+  const deleteResc = ({ roomId, rescId, rescType }) => {
+    return request({
+      url: "/rent/resc/delete",
+      params: { roomId, rescId, rescType },
+      toast: "请稍候...",
+    })
+  }
+
   return {
     list,
     page,
@@ -104,5 +204,13 @@ export default () => {
     rentRole,
     getKey,
     rentKeyBox,
+    addOwnerTel,
+    getBuilding,
+    closeHouse,
+    houseEdit,
+    getRescList,
+    setRescCover,
+    saveResc,
+    deleteResc,
   }
-}
+}

src/view/closehouse/index.vue

@@ -94,7 +94,10 @@ export default {
   setup() {
     const route = useRoute()
     const router = useRouter()
-    const { detail, getDetail, getBuilding, closeHouse } = useModel("room")
+    const type = router.currentRoute.value.query.type
+    const { detail, getDetail, getBuilding, closeHouse } = useModel(
+      type === "room" ? "room" : "renting"
+    )
 
     const building = ref({})
 

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

@@ -0,0 +1,162 @@
+<template>
+  <van-popover v-model:show="show" placement="bottom-end">
+    <template #reference>
+      <div style="width: 64px; text-align: center">
+        <van-icon name="wap-nav" />
+      </div>
+    </template>
+    <div style="width: 160px">
+      <van-cell-group>
+        <!-- <van-cell
+          v-shiro="'room:info:protection'"
+          v-show="!roomInfo.protectionFlag || roomInfo.protectionFlag === '0'"
+          title="设置房源保护"
+          icon="fire"
+          @click="handleRoomProtection(1)"
+        />
+
+        <van-cell
+          v-shiro="'room:info:protection'"
+          v-show="roomInfo.protectionFlag === '1'"
+          title="取消房源保护"
+          icon="fire"
+          @click="handleRoomProtection(0)"
+        /> -->
+
+        <van-cell
+          v-shiro="'room:renting:addTel'"
+          title="新增业主电话"
+          icon="add"
+          @click="phoneShow = true"
+        />
+
+        <van-cell
+          v-shiro="'room:renting:doneRoom'"
+          v-show="roomInfo.status === '0'"
+          title="下架房源"
+          icon="delete"
+          @click="
+            $router.push({
+              name: 'house.close',
+              query: { roomId: roomInfo.id, type: 'rent' },
+            })
+          "
+        />
+
+        <van-cell
+          v-shiro="'room:renting:edit'"
+          v-show="roomInfo.status !== '7' && roomInfo.status !== '8'"
+          title="修改房源"
+          icon="expand"
+          @click="
+            $router.push({
+              name: 'renting.edit',
+              query: { roomId: roomInfo.id, type: 'rent' },
+            })
+          "
+        />
+
+        <van-cell
+          title="房源实勘"
+          icon="photograph"
+          @click="
+            $router.push({
+              name: 'resc',
+              query: { roomId: roomInfo.id, type: 'rent' },
+            })
+          "
+        />
+      </van-cell-group>
+    </div>
+  </van-popover>
+
+  <van-dialog
+    v-model:show="phoneShow"
+    title="新增电话"
+    show-cancel-button
+    @confirm="handleAddOwnerTel"
+    @cancel="phoneShow = false"
+  >
+    <van-field
+      v-model="newOwnerTel"
+      type="tel"
+      label="业主电话"
+      placeholder="请输入电话"
+    />
+  </van-dialog>
+</template>
+
+<script>
+import { ref } from "vue"
+import { Dialog, Popover, CellGroup, Cell, Field, Icon, Notify } from "vant"
+import { useModel } from "@zjxpcyc/vue-tiny-store"
+
+export default {
+  components: {
+    [Popover.name]: Popover,
+    [CellGroup.name]: CellGroup,
+    [Cell.name]: Cell,
+    [Icon.name]: Icon,
+    [Field.name]: Field,
+  },
+  props: {
+    roomInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  setup(props) {
+    const show = ref(false)
+    const phoneShow = ref(false)
+    const newOwnerTel = ref()
+
+    const { updateProtection, addOwnerTel } = useModel("renting")
+
+    // 房源(确定/取消)保护
+    const handleRoomProtection = (status) => {
+      show.value = false
+      const title = `${status === 1 ? "确定" : "取消"}房源保护`
+      const message =
+        status === 1
+          ? "设为房源保护后，只有录入人、同部门的上级以及上级部门的上级可以看到房源敏感信息。"
+          : "取消房源保护后，其他人可以查看当前房源的敏感信息。"
+
+      Dialog.confirm({ title, message }).then(() => {
+        updateProtection({
+          id: props.roomInfo.id,
+          protectionFlag: status,
+        }).then(() => {
+          Notify({ type: "success", message: "设置成功" })
+        })
+      })
+    }
+
+    // 添加户主电话
+    const handleAddOwnerTel = () => {
+      if (!newOwnerTel.value || newOwnerTel.value.length !== 11) {
+        Notify({ type: "warning", message: "请正确填写手机号" })
+        return
+      }
+
+      addOwnerTel({
+        newOwnerTel: newOwnerTel.value,
+        newOwnerRoomId: props.roomInfo.id,
+      })
+        .then(() => {
+          Notify({ type: "success", message: "设置成功" })
+        })
+        .catch((e) => {
+          Notify({ type: "danger", message: e.message })
+        })
+    }
+
+    return {
+      show,
+      phoneShow,
+      newOwnerTel,
+      handleRoomProtection,
+      handleAddOwnerTel,
+    }
+  },
+}
+</script>

src/view/renting/detail/index.vue

@@ -8,8 +8,8 @@
 
       <div class="title">
         <p class="body">{{ detail.roomInfo?.title }}</p>
-
-        <van-popover
+        <MoreActions :room-info="detail.roomInfo" />
+        <!-- <van-popover
           v-model:show="showPopover"
           :actions="actions"
           @select="onSelect"
@@ -20,7 +20,7 @@
               <van-icon name="wap-nav" />
             </div>
           </template>
-        </van-popover>
+        </van-popover> -->
       </div>
 
       <van-cell-group title="房源信息">
@@ -128,6 +128,7 @@ import {
   CollapseItem,
 } from "vant"
 import { useModel } from "@zjxpcyc/vue-tiny-store"
+import MoreActions from "./components/MoreActions"
 import RoomMain from "./components/Main"
 import RoomBase from "./components/Base"
 // import RoomEstate from './components/Estate'
@@ -158,6 +159,7 @@ export default {
     [Dialog.Component.name]: Dialog.Component,
 
     Swiper: Swiper,
+    MoreActions,
     RoomMain,
     RoomBase,
     // RoomEstate,

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

@@ -0,0 +1,62 @@
+<template>
+  <van-collapse v-model="activeName" accordion>
+    <van-collapse-item title="基础信息" name="1">
+      <!-- <x-field label="房源编号">
+        {{ roomInfo.roomCode }}{{ roomInfo.id }}
+      </x-field> -->
+      <x-field label="楼盘名称">
+        {{ building.buildingName }}
+      </x-field>
+      <!-- <x-field label="楼盘地址">
+        {{ building.address }}
+      </x-field> -->
+      <x-field label="栋号">
+        {{ roomInfo.roomBuild }}
+      </x-field>
+      <x-field label="单元">
+        {{ roomInfo.roomUnit }}
+      </x-field>
+      <x-field label="楼层">
+        {{ floor }}
+      </x-field>
+      <x-field label="房号">
+        {{ roomInfo.roomNum }}
+      </x-field>
+    </van-collapse-item>
+  </van-collapse>
+</template>
+
+<script>
+import { computed, ref } from "vue"
+import { Collapse, CollapseItem } from "vant"
+
+export default {
+  components: {
+    [Collapse.name]: Collapse,
+    [CollapseItem.name]: CollapseItem,
+  },
+  props: {
+    roomInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+    building: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  setup(props) {
+    const activeName = ref("1")
+
+    const floor = computed(() => {
+      const roomFloor = (props.roomInfo.roomFloor || "").split(",")
+      return `${roomFloor[0]}/${roomFloor[1]}(${roomFloor[2]})`
+    })
+
+    return {
+      activeName,
+      floor,
+    }
+  },
+}
+</script>

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

@@ -0,0 +1,532 @@
+<template>
+  <van-form @submit="handleSumbit">
+    <van-field
+      v-model="formData.title"
+      name="title"
+      label="标题"
+      placeholder="请输入"
+      :rules="[{ required: true, message: '请填写标题' }]"
+    />
+
+    <van-field
+      v-model="formData.buildingName"
+      name="buildingName"
+      label="楼盘名称"
+      placeholder="请输入"
+    />
+
+    <van-field name="aspect" label="朝向" required>
+      <template #input>
+        <Picker
+          :options="aspectOptions"
+          v-model="formData.aspect"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="leaseWay" label="出租方式" required>
+      <template #input>
+        <Picker
+          :options="leaseWayOptions"
+          v-model="formData.leaseWay"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field
+      v-model="formData.acreage"
+      name="totalPrice"
+      label="租金"
+      placeholder="请输入"
+      required
+      type="number"
+      :rules="[{ required: true, message: '请填写租金' }]"
+    >
+      <template #extra> 元/月 </template>
+    </van-field>
+
+    <van-field name="decoration" label="装修" required>
+      <template #input>
+        <Picker
+          :options="decorationOptions"
+          v-model="formData.decoration"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field
+      v-model="formData.acreage"
+      name="acreage"
+      label="面积"
+      placeholder="请输入"
+      required
+      type="number"
+      :rules="[{ required: true, message: '请填写面积' }]"
+    >
+      <template #extra> ㎡ </template>
+    </van-field>
+
+    <van-field
+      v-model="formData.innerAcreage"
+      name="innerAcreage"
+      label="套内面积"
+      placeholder="请输入"
+    />
+
+    <van-field name="roomType" label="户型" placeholder="请输入" required>
+      <template #input>
+        <RoomType v-model="formData.roomType" />
+      </template>
+    </van-field>
+
+    <van-field name="sourceFrom" label="房源来源" required>
+      <template #input>
+        <Picker
+          :options="sourceFromOptions"
+          v-model="formData.sourceFrom"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="payWay" label="付款方式">
+      <template #input>
+        <Picker
+          :options="payWayOptions"
+          v-model="formData.payWay"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="liveStatus" label="居住现状">
+      <template #input>
+        <Picker
+          :options="liveStatusOptions"
+          v-model="formData.liveStatus"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="limitSex" label="限制性别">
+      <template #input>
+        <Picker
+          :options="limitSexOptions"
+          v-model="formData.limitSex"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="roomSpecial" label="房屋特色">
+      <template #input>
+        <Picker
+          :options="roomSpecialOptions"
+          v-model="formData.roomSpecial"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="proportion" label="梯户比例" placeholder="请输入">
+      <template #input>
+        <Proportion v-model="formData.proportion" />
+      </template>
+    </van-field>
+
+    <van-field name="buildType" label="建筑类型">
+      <template #input>
+        <Picker
+          :options="buildTypeOptions"
+          v-model="formData.buildType"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="purpose" label="房屋用途">
+      <template #input>
+        <Picker
+          :options="purposeOptions"
+          v-model="formData.purpose"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="mortgage" label="抵押信息">
+      <template #input>
+        <Picker
+          :options="mortgageOptions"
+          v-model="formData.isMortgage"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field
+      v-model="formData.buildYear"
+      label="建筑年代"
+      placeholder="请输入"
+      type="number"
+    />
+
+    <van-field name="elevator" label="电梯">
+      <template #input>
+        <Picker
+          :options="elevatorOptions"
+          v-model="formData.elevator"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="parking" label="车位">
+      <template #input>
+        <Picker
+          :options="parkingOptions"
+          v-model="formData.parking"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="basement" label="地下室">
+      <template #input>
+        <Picker
+          :options="basementOptions"
+          v-model="formData.basement"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field
+      v-model="formData.propertyFee"
+      name="propertyFee"
+      label="面积"
+      placeholder="请输入"
+      type="number"
+    >
+      <template #extra> 元/月/平 </template>
+    </van-field>
+
+    <van-field name="gas" label="燃气">
+      <template #input>
+        <Picker
+          :options="gasOptions"
+          v-model="formData.gas"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="electricEquipment" label="家电">
+      <template #input>
+        <Picker
+          :options="electricEquipmentOptions"
+          v-model="formData.electricEquipment"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field name="separate" label="隔断">
+      <template #input>
+        <Picker
+          :options="separateOptions"
+          v-model="formData.separate"
+          placeholder="请选择"
+        />
+      </template>
+    </van-field>
+
+    <van-field
+      v-model="formData.specialDesc"
+      label="优势推荐"
+      placeholder="请输入"
+      rows="3"
+      type="textarea"
+    />
+
+    <div style="margin: 1em">
+      <van-button block type="warning" native-type="submit"> 提交 </van-button>
+    </div>
+  </van-form>
+</template>
+
+<script>
+import { reactive, computed, watch } from "vue"
+import { Form, Field, Button } from "vant"
+import { useModel } from "@zjxpcyc/vue-tiny-store"
+import Picker from "@/components/Picker"
+import { showWarn } from "@/utils"
+import RoomType from "./RoomType"
+import Proportion from "./Proportion"
+
+export default {
+  components: {
+    [Form.name]: Form,
+    [Field.name]: Field,
+    [Button.name]: Button,
+    RoomType,
+    Proportion,
+    Picker,
+  },
+  emits: ["submit"],
+  setup(props, { emit }) {
+    const formData = reactive({})
+    const { dicts, getDict } = useModel("dicts")
+    const { detail } = useModel("renting")
+
+    // 装修
+    const decorationOptions = computed(() => {
+      const decorationDict = dicts.decoration || []
+      if (!decorationDict.length) {
+        getDict("decoration")
+      }
+
+      return decorationDict
+    })
+
+    // 朝向
+    const aspectOptions = computed(() => {
+      const aspectDict = dicts.aspect || []
+      if (!aspectDict.length) {
+        getDict("aspect")
+      }
+
+      return aspectDict
+    })
+
+    // 房源来源
+    const sourceFromOptions = computed(() => {
+      const sourceFromDict = dicts.sourceFrom || []
+      if (!sourceFromDict.length) {
+        getDict("sourceFrom")
+      }
+
+      return sourceFromDict
+    })
+
+    // 建筑类型
+    const buildTypeOptions = computed(() => {
+      const buildTypeDict = dicts["build_type"] || []
+      if (!buildTypeDict.length) {
+        getDict("build_type")
+      }
+
+      return buildTypeDict
+    })
+
+    // 电梯
+    const elevatorOptions = dicts.elevator
+
+    //出租方式
+    const leaseWayOptions = dicts.leaseWay
+
+    // 交易属性
+    const natureOptions = computed(() => {
+      const natureDict = dicts.nature || []
+      if (!natureDict.length) {
+        getDict("nature")
+      }
+
+      return natureDict
+    })
+
+    // 房屋用途
+    const purposeOptions = computed(() => {
+      const purposeDict = dicts.purpose || []
+      if (!purposeDict.length) {
+        getDict("purpose")
+      }
+
+      return purposeDict
+    })
+
+    // 抵押信息
+    const mortgageOptions = computed(() => {
+      const mortgageDict = dicts.mortgage || []
+      if (!mortgageDict.length) {
+        getDict("mortgage")
+      }
+
+      return mortgageDict
+    })
+
+    // 税费
+    const buildTimeOptions = computed(() => {
+      const buildTimeDict = dicts["build_time"] || []
+      if (!buildTimeDict.length) {
+        getDict("build_time")
+      }
+
+      return buildTimeDict
+    })
+
+    // 付款方式
+    const payWayOptions = computed(() => {
+      const payWayDict = dicts["payWay"] || []
+      if (!payWayDict.length) {
+        getDict("payWay")
+      }
+
+      return payWayDict
+    })
+
+    // 居住现状
+    const liveStatusOptions = computed(() => {
+      const liveStatusDict = dicts["liveStatus"] || []
+      if (!liveStatusDict.length) {
+        getDict("liveStatus")
+      }
+
+      return liveStatusDict
+    })
+
+    //性别限制
+    const limitSexOptions = computed(() => {
+      const limitSexDict = dicts["limitSex"] || []
+      if (!limitSexDict.length) {
+        getDict("limitSex")
+      }
+
+      return limitSexDict
+    })
+
+    //房屋特色
+    const roomSpecialOptions = computed(() => {
+      const roomSpecialDict = dicts["roomSpecial"] || []
+      if (!roomSpecialDict.length) {
+        getDict("roomSpecial")
+      }
+
+      return roomSpecialDict
+    })
+
+    //车位
+    const parkingOptions = computed(() => {
+      const parkingDict = dicts["parking"] || []
+      if (!parkingDict.length) {
+        getDict("parking")
+      }
+
+      return parkingDict
+    })
+
+    //地下室
+    const basementOptions = computed(() => {
+      const basementDict = dicts["basement"] || []
+      if (!basementDict.length) {
+        getDict("basement")
+      }
+
+      return basementDict
+    })
+
+    //燃气
+    const gasOptions = computed(() => {
+      const gasDict = dicts["gas"] || []
+      if (!gasDict.length) {
+        getDict("gas")
+      }
+
+      return gasDict
+    })
+
+    //家电
+    const electricEquipmentOptions = computed(() => {
+      const electricEquipmentDict = dicts["electricEquipment"] || []
+      if (!electricEquipmentDict.length) {
+        getDict("electricEquipment")
+      }
+
+      return electricEquipmentDict
+    })
+
+    //隔断
+    const separateOptions = computed(() => {
+      const separateDict = dicts["separate"] || []
+      if (!separateDict.length) {
+        getDict("separate")
+      }
+
+      return separateDict
+    })
+
+    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
+      // }
+
+      return true
+    }
+
+    // 提交
+    const handleSumbit = () => {
+      console.log(formData)
+      if (!validManually()) {
+        return
+      }
+      console.log(formData, "console.log(formData)")
+      emit("submit", formData)
+    }
+
+    //
+    watch(
+      () => detail.roomInfo,
+      (nw, od) => {
+        if (nw && !od) {
+          Object.assign(formData, { ...nw })
+        }
+      },
+      { immediate: true }
+    )
+
+    return {
+      formData,
+      handleSumbit,
+      decorationOptions,
+      aspectOptions,
+      sourceFromOptions,
+      buildTypeOptions,
+      elevatorOptions,
+      natureOptions,
+      purposeOptions,
+      mortgageOptions,
+      buildTimeOptions,
+      leaseWayOptions,
+      payWayOptions,
+      liveStatusOptions,
+      limitSexOptions,
+      roomSpecialOptions,
+      parkingOptions,
+      basementOptions,
+      gasOptions,
+      electricEquipmentOptions,
+      separateOptions,
+    }
+  },
+}
+</script>

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

@@ -0,0 +1,66 @@
+<template>
+  <div style="width: 100%">
+    <van-field type="number" v-model="proportion.elevator" placeholder="请输入">
+      <template #extra>梯</template>
+    </van-field>
+    <van-field type="number" v-model="proportion.family" placeholder="请输入">
+      <template #extra>户</template>
+    </van-field>
+  </div>
+</template>
+
+<script>
+import { reactive, watch } from "vue"
+import { Field } from "vant"
+
+export default {
+  components: {
+    [Field.name]: Field,
+  },
+
+  props: {
+    modelValue: undefined,
+  },
+
+  emits: ["update:modelValue"],
+
+  setup(props, { emit }) {
+    const proportion = reactive({
+      room: undefined,
+      family: undefined,
+    })
+
+    watch(
+      () => props.modelValue,
+      (nw, od) => {
+        if (nw && !od) {
+          const typeArr = props.modelValue.split(",")
+          proportion.elevator = typeArr[0]
+          proportion.family = typeArr[1]
+        }
+      },
+      { immediate: true }
+    )
+
+    watch(
+      proportion,
+      () => {
+        const vals = [proportion.elevator, proportion.family]
+        emit("update:modelValue", vals.join(","))
+      },
+      { deep: true }
+    )
+
+    return {
+      proportion,
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+:deep(.van-cell) {
+  padding-left: 0;
+  padding-right: 0;
+}
+</style>

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

@@ -0,0 +1,87 @@
+<template>
+  <div style="width: 100%">
+    <van-field type="number" v-model="roomType.room" placeholder="请输入">
+      <template #extra>室</template>
+    </van-field>
+    <van-field type="number" v-model="roomType.hall" placeholder="请输入">
+      <template #extra>厅</template>
+    </van-field>
+    <van-field type="number" v-model="roomType.kitchen" placeholder="请输入">
+      <template #extra>厨</template>
+    </van-field>
+    <van-field type="number" v-model="roomType.toilet" placeholder="请输入">
+      <template #extra>卫</template>
+    </van-field>
+    <van-field type="number" v-model="roomType.balcony" placeholder="请输入">
+      <template #extra>阳台</template>
+    </van-field>
+  </div>
+</template>
+
+<script>
+import { reactive, watch } from "vue"
+import { Field } from "vant"
+
+export default {
+  components: {
+    [Field.name]: Field,
+  },
+
+  props: {
+    modelValue: undefined,
+  },
+
+  emits: ["update:modelValue"],
+
+  setup(props, { emit }) {
+    const roomType = reactive({
+      room: undefined,
+      hall: undefined,
+      kitchen: undefined,
+      toilet: undefined,
+      balcony: undefined,
+    })
+
+    watch(
+      () => props.modelValue,
+      (nw, od) => {
+        if (nw && !od) {
+          const typeArr = props.modelValue.split(",")
+          roomType.room = typeArr[0]
+          roomType.hall = typeArr[1]
+          roomType.kitchen = typeArr[2]
+          roomType.toilet = typeArr[3]
+          roomType.balcony = typeArr[4]
+        }
+      },
+      { immediate: true }
+    )
+
+    watch(
+      roomType,
+      () => {
+        const vals = [
+          roomType.room,
+          roomType.hall,
+          roomType.kitchen,
+          roomType.toilet,
+          roomType.balcony,
+        ]
+        emit("update:modelValue", vals.join(","))
+      },
+      { deep: true }
+    )
+
+    return {
+      roomType,
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+:deep(.van-cell) {
+  padding-left: 0;
+  padding-right: 0;
+}
+</style>

src/view/renting/edithouse/index.vue

@@ -1,263 +1,60 @@
 <template>
-  <div class="secondhanddetail">
-    <div class="detailcard van-hairline--bottom">
-      <div class="detailcard-title">
-        <span>编辑房源信息</span>
-      </div>
-      <Contextc :options="baseInformationOptions"></Contextc>
-    </div>
-
-    <div>
-      <van-form @submit="onSubmit">
-        <van-field
-          v-model="state.username"
-          name="title"
-          label="标题"
-          placeholder="请输入"
-          required
-          :rules="[{ required: true, message: '请填写标题' }]"
-        />
-        <van-field
-          v-model="state.username"
-          name="aaaa"
-          label="面积"
-          placeholder="请输入"
-          required
-          type="number"
-          :rules="[{ required: true, message: '请填写面积' }]"
-        >
-          <template #extra> ㎡ </template>
-        </van-field>
-        <van-field
-          v-model="state.username"
-          name="3333"
-          label="出租方式"
-          placeholder="请输入"
-          type="number"
-          :rules="[{ required: true, message: '请填写出租方式' }]"
-        />
-        <van-field
-          v-model="state.username"
-          name="aaaa"
-          label="租金"
-          placeholder="请输入"
-          required
-          type="number"
-          :rules="[{ required: true, message: '请填写租金' }]"
-        >
-          <template #extra> 元/月 </template>
-        </van-field>
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="装修"
-          required
-        ></Pickerc>
-
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="朝向"
-          required
-        ></Pickerc>
-
-        <van-field
-          v-model="state.username"
-          name="title"
-          label="户型"
-          placeholder="请输入"
-          required
-          :rules="[{ required: true, message: '请填写楼户比例' }]"
-        />
-
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="房源来源"
-          required
-        ></Pickerc>
-
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="付款方式"
-        ></Pickerc>
-
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="居住现状"
-        ></Pickerc>
-
-        <Pickerc v-model="state.username" name="title" label="卧室"></Pickerc>
-
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="性别限制"
-        ></Pickerc>
-
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="房屋特色"
-        ></Pickerc>
-
-        <van-field
-          v-model="state.username"
-          name="title"
-          label="楼户比例"
-          placeholder="请输入"
-          required
-          :rules="[{ required: true, message: '请填写楼户比例' }]"
-        />
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="建筑类型"
-        ></Pickerc>
-
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="房屋用途"
-        ></Pickerc>
-        <van-field
-          v-model="state.username"
-          name="title"
-          label="建成年代"
-          placeholder="请输入"
-          :rules="[{ required: true, message: '请填写楼户比例' }]"
-        />
-
-        <Pickerc v-model="state.username" name="title" label="电梯"></Pickerc>
-        <Pickerc v-model="state.username" name="title" label="车位"></Pickerc>
-
-        <Pickerc v-model="state.username" name="title" label="地下室"></Pickerc>
-
-        <van-field
-          v-model="state.username"
-          name="aaaa"
-          label="物业费"
-          placeholder="请输入"
-          type="number"
-        >
-          <template #extra> 元/月/平 </template>
-        </van-field>
+  <x-loading x-id="rent.view">
+    <div class="secondhanddetail">
+      <RoomBasic :room-info="detail.roomInfo" :building="detail.building" />
 
-        <Pickerc v-model="state.username" name="title" label="燃气"></Pickerc>
-
-        <Pickerc v-model="state.username" name="title" label="家电"></Pickerc>
-
-        <van-field
-          v-model="state.username"
-          name="aaaa1"
-          label="物业推荐"
-          placeholder="请输入"
-          type="textarea"
-        >
-        </van-field>
-
-        <div style="margin: 16px">
-          <van-button round block type="primary" native-type="submit">
-            提交
-          </van-button>
-        </div>
-      </van-form>
+      <div style="margin-top: 1em">
+        <RoomForm @submit="handleSumbit" />
+      </div>
     </div>
-  </div>
+  </x-loading>
 </template>
 
 <script>
-import { reactive } from "vue"
-
-import {
-  Icon,
-  Popover,
-  Row,
-  Col,
-  Button,
-  steps,
-  step,
-  //   Dialog,
-  Form,
-  Field,
-} from "vant"
-import Contextc from "../../../components/contextC"
-import { Pickerc } from "../../../components/editCompents"
-
-// import { router } from "../../../router";
+import { watch } from "vue"
+import { useModel } from "@zjxpcyc/vue-tiny-store"
+import { useRoute, useRouter } from "vue-router"
+import { alert, showDanger } from "@/utils"
+import RoomBasic from "./components/Basic"
+import RoomForm from "./components/Form"
 
 export default {
   name: "secondhanddetail",
   components: {
-    [Row.name]: Row,
-    [Col.name]: Col,
-    [Popover.name]: Popover,
-    [Icon.name]: Icon,
-    [Button.name]: Button,
-    [steps.name]: steps,
-    [step.name]: step,
-    [Form.name]: Form,
-    [Field.name]: Field,
-    Pickerc: Pickerc,
-    Contextc: Contextc,
-  },
-  data() {
-    return {}
+    RoomBasic,
+    RoomForm,
   },
 
   setup() {
-    const state = reactive({
-      username: "",
-      password: "",
-    })
-
-    // 房源信息
-    const baseInformationOptions = [
-      {
-        name: "房源编号",
-        value: "123",
+    const route = useRoute()
+    const router = useRouter()
+    const { detail, getDetail, houseEdit } = useModel("renting")
+
+    watch(
+      () => route.query.roomId,
+      (nw, od) => {
+        if (nw != od && nw) {
+          getDetail(nw)
+        }
       },
-      {
-        name: "楼盘名称",
-        value: "123",
-      },
-      {
-        name: "楼盘地址",
-        value: "123",
-        span: 24,
-      },
-      {
-        name: "栋号",
-        value: "123",
-        required: true,
-      },
-      {
-        name: "单元",
-        value: "123",
-        required: true,
-      },
-      {
-        name: "楼层",
-        value: "123",
-        required: true,
-      },
-      {
-        name: "房号",
-        value: "123",
-        required: true,
-      },
-    ]
-
-    const onSubmit = (values) => {
-      console.log("submit", values)
+      { immediate: true }
+    )
+
+    const handleSumbit = (values) => {
+      houseEdit(values)
+        .then(() => {
+          alert("编辑成功").then(() => {
+            router.go(-1)
+          })
+        })
+        .catch((e) => {
+          showDanger(e.message)
+        })
     }
 
     return {
-      state,
-      onSubmit,
-      baseInformationOptions,
+      handleSumbit,
+      detail,
     }
   },
 }
@@ -266,7 +63,7 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="less" scoped>
 .secondhanddetail {
-  text-align: left;
+  // padding: 1em;
 }
 .secondhand-main::-webkit-scrollbar {
   display: none; /*隐藏滚动条*/

src/view/resc/index.vue

@@ -135,7 +135,7 @@ export default {
     const route = useRoute()
     const router = useRouter()
     const willSave = ref([])
-
+    const type = router.currentRoute.value.query.type
     const {
       detail,
       getRescList,
@@ -143,7 +143,7 @@ export default {
       setRescCover,
       saveResc,
       deleteResc,
-    } = useModel("room")
+    } = useModel(type === "room" ? "room" : "renting")
 
     const roomId = route.query.roomId - 0
 

src/view/secondhand/detail/components/MoreActions.vue

@@ -38,7 +38,7 @@
           @click="
             $router.push({
               name: 'house.close',
-              query: { roomId: roomInfo.id },
+              query: { roomId: roomInfo.id, type: 'room' },
             })
           "
         />
@@ -51,7 +51,7 @@
           @click="
             $router.push({
               name: 'secondhand.edit',
-              query: { roomId: roomInfo.id },
+              query: { roomId: roomInfo.id, type: 'room' },
             })
           "
         />
@@ -61,7 +61,10 @@
           title="房源实勘"
           icon="photograph"
           @click="
-            $router.push({ name: 'resc', query: { roomId: roomInfo.id } })
+            $router.push({
+              name: 'resc',
+              query: { roomId: roomInfo.id, type: 'room' },
+            })
           "
         />