fix

src/store/models/dicts.js

@@ -1,9 +1,12 @@
-import { reactive, computed } from 'vue'
+import {
+  reactive,
+  computed,
+  onMounted,
+} from 'vue'
 import request from '../../utils/request'
 
 // 户型
-const roomType = [
-  {
+const roomType = [{
     text: '一室',
     value: '1',
   },
@@ -22,8 +25,7 @@ const roomType = [
 ]
 
 // 实勘状态
-const rescStatus = [
-  {
+const rescStatus = [{
     text: '已实勘',
     value: '0',
   },
@@ -38,8 +40,7 @@ const rescStatus = [
 ]
 
 // 钥匙状态
-const keyStatus = [
-  {
+const keyStatus = [{
     text: '有钥匙',
     value: '0',
   },
@@ -54,8 +55,7 @@ const keyStatus = [
 ]
 
 // 业主委托
-const authStatus = [
-  {
+const authStatus = [{
     text: '有委托',
     value: '0',
   },
@@ -70,8 +70,7 @@ const authStatus = [
 ]
 
 // 电梯
-const elevator = [
-  {
+const elevator = [{
     text: '有',
     value: '0',
   },
@@ -82,8 +81,7 @@ const elevator = [
 ]
 
 // 带看
-const lookTimes = [
-  {
+const lookTimes = [{
     text: '有',
     value: '1',
   },
@@ -94,8 +92,7 @@ const lookTimes = [
 ]
 
 // 锁盘
-const lockRoom = [
-  {
+const lockRoom = [{
     text: '未锁盘',
     value: '0',
   },
@@ -110,8 +107,7 @@ const lockRoom = [
 ]
 
 //租房类型
-const leaseWay = [
-  {
+const leaseWay = [{
     text: '整租',
     value: '0',
   },
@@ -136,9 +132,14 @@ export default () => {
   const getDict = (key) => {
     request({
       url: '/comm/dict',
-      params: { groupCode: key },
+      params: {
+        groupCode: key
+      },
     }).then((res) => {
-      dicts[key] = (res || []).map((x) => ({ text: x.name, value: x.code }))
+      dicts[key] = (res || []).map((x) => ({
+        text: x.name,
+        value: x.code
+      }))
     })
   }
 
@@ -150,7 +151,10 @@ export default () => {
 
     request({
       url: '/comm/dict/business-city',
-      params: { areaType, pcode },
+      params: {
+        areaType,
+        pcode
+      },
     }).then((res) => {
       if (1 === areaType) {
         // 区县
@@ -162,10 +166,18 @@ export default () => {
     })
   }
 
-  const getBuilding = ({ buildingName, pageNo = 1, pageSize = 20 }) => {
+  const getBuilding = ({
+    buildingName,
+    pageNo = 1,
+    pageSize = 20
+  }) => {
     return request({
       url: '/comm/dict/building-list',
-      params: { buildingName, pageNo, pageSize },
+      params: {
+        buildingName,
+        pageNo,
+        pageSize
+      },
     }).then((res) => {
       if (res.result && res.result.length && !buildingName && pageNo === 1) {
         // 只缓存第一页的
@@ -259,6 +271,113 @@ export default () => {
     return buildTimeDict
   })
 
+  // 隔断
+  const separateOptions = computed(() => {
+    const separateDict = dicts['separate'] || []
+    if (!separateDict.length) {
+      getDict('separate')
+    }
+
+    return separateDict
+  })
+
+  // 付款方式
+  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 livingRoomOptions = computed(() => {
+    const livingRoomDict = dicts['livingRoom'] || []
+    // if (!livingRoomDict.length) {
+    //   getDict('livingRoom')
+    // }
+
+    return livingRoomDict
+  })
+
+  const loadDictOnMount = () =>
+    onMounted(() => {
+      if (!livingRoomOptions.value.length) {
+        getDict('livingRoom')
+      }
+    })
+
+  // 限制性别
+  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 namedDicts = reactive({
     decorationOptions,
     aspectOptions,
@@ -269,6 +388,16 @@ export default () => {
     purposeOptions,
     mortgageOptions,
     buildTimeOptions,
+    separateOptions,
+    payWayOptions,
+    liveStatusOptions,
+    livingRoomOptions,
+    limitSexOptions,
+    roomSpecialOptions,
+    parkingOptions,
+    basementOptions,
+    gasOptions,
+    electricEquipmentOptions,
   })
 
   return {
@@ -277,5 +406,6 @@ export default () => {
     getDict,
     getBusinessCity,
     getBuilding,
+    loadDictOnMount,
   }
-}
+}

src/store/models/renting.js

@@ -207,6 +207,27 @@ export default () => {
     })
   }
 
+  // 查看业务房源数
+  const countOwnerTel = (ownerTel) => {
+    return request({
+      url: '/rent/owner-tel/count',
+      params: {
+        ownerTel
+      },
+      toast: '请稍候...',
+    })
+  }
+
+  // 新增房源
+  const addHouse = (params, data) => {
+    return request({
+      url: '/rent/add',
+      params,
+      data,
+      toast: '请稍候...',
+    })
+  }
+
   return {
     list,
     page,
@@ -226,5 +247,7 @@ export default () => {
     setRescCover,
     saveResc,
     deleteResc,
+    countOwnerTel,
+    addHouse,
   }
 }

src/view/addhouse/addrenting/components/BuildingPicker.vue

@@ -0,0 +1,43 @@
+<template>
+  <van-popup
+    v-model:show="showPicker"
+    position="right"
+    get-container="#app"
+    style="width: 90vw; height: 100vh"
+  >
+    <BuildingSelector @change="handleChange" @cancel="showPicker = false" />
+  </van-popup>
+</template>
+
+<script>
+import { computed } from 'vue'
+import { Popup } from 'vant'
+import BuildingSelector from './BuildingSelector'
+
+export default {
+  components: {
+    [Popup.name]: Popup,
+    BuildingSelector,
+  },
+  emits: ['change', 'update:show'],
+  props: {
+    show: Boolean,
+  },
+  setup(props, { emit }) {
+    const showPicker = computed({
+      get: () => props.show,
+      set: (val) => emit('update:show', val),
+    })
+
+    const handleChange = (e) => {
+      showPicker.value = false
+      emit('change', e)
+    }
+
+    return {
+      showPicker,
+      handleChange,
+    }
+  },
+}
+</script>

src/view/addhouse/addrenting/components/BuildingSelector.vue

@@ -0,0 +1,163 @@
+<template>
+  <div class="building-sider">
+    <div class="search-box">
+      <van-search
+        v-model="params.buildingName"
+        placeholder="请输入搜索关键词"
+        @search="handleSearch"
+        @cancel="handleReset"
+      />
+    </div>
+    <div class="list-box">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="handleLoad"
+      >
+        <van-cell
+          v-for="item in list"
+          :key="item.buildingId"
+          :title="item.buildingName"
+          @click="handleSelect(item)"
+        >
+          <template #right-icon v-if="item.id === selectedId">
+            <van-icon name="success" color="#07c160" />
+          </template>
+        </van-cell>
+      </van-list>
+    </div>
+    <div class="action-box">
+      <van-button size="small" type="warning" @click="handleSubmit">
+        确定
+      </van-button>
+      <van-button size="small" @click="handleCancel">取消</van-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { reactive, ref } from 'vue'
+import { Button, Search, List, Cell, Icon } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+
+export default {
+  components: {
+    [Button.name]: Button,
+    [Search.name]: Search,
+    [List.name]: List,
+    [Cell.name]: Cell,
+    [Icon.name]: Icon,
+  },
+
+  emits: ['change', 'cancel'],
+
+  setup(props, { emit }) {
+    const loading = ref(false)
+    const finished = ref(false)
+    const selectedId = ref()
+    const selectedItem = ref()
+
+    const params = reactive({
+      buildingName: undefined,
+      pageNo: 1,
+      pageSize: 20,
+    })
+
+    const { dicts, getBuilding } = useModel('dicts')
+    const list = ref(dicts.building || [])
+
+    const handleSearch = () => {
+      params.pageNo = 1
+      finished.value = false
+      handleLoad()
+    }
+
+    const handleReset = () => {
+      params.pageNo = 1
+      params.buildingName = undefined
+      finished.value = false
+      handleLoad()
+    }
+
+    const handleLoad = () => {
+      if (loading.value) {
+        return
+      }
+
+      loading.value = true
+      getBuilding(params)
+        .then((res) => {
+          params.pageNo += 1
+          loading.value = false
+          finished.value = res.currentPage >= res.totalPages
+          if (res.currentPage === 1) {
+            list.value = res.result || []
+          } else {
+            list.value = list.value.concat(res.result || [])
+          }
+        })
+        .catch((e) => {
+          console.error(e)
+          loading.value = false
+        })
+    }
+
+    const handleSelect = (item) => {
+      selectedId.value = item.id
+      selectedItem.value = item
+    }
+
+    const handleSubmit = () => {
+      emit('change', { id: selectedId.value, item: selectedItem.value })
+    }
+
+    const handleCancel = () => {
+      emit('cancel')
+    }
+
+    return {
+      loading,
+      params,
+      finished,
+      list,
+      selectedId,
+      handleSelect,
+      handleLoad,
+      handleSearch,
+      handleReset,
+      handleSubmit,
+      handleCancel,
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.building-sider {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  .search-box {
+    flex: none;
+  }
+
+  .action-box {
+    flex: none;
+    padding: 1em 0;
+    display: flex;
+    justify-content: space-around;
+
+    & > * {
+      padding: 0 2em;
+    }
+  }
+
+  .list-box {
+    flex: auto;
+    overflow-y: auto;
+  }
+}
+</style>

src/view/addhouse/addrenting/components/Floor.vue

@@ -0,0 +1,51 @@
+<template>
+  <van-row gutter="16">
+    <van-col span="12">
+      <van-field v-model="current" placeholder="所在楼层">
+        <template #extra>/ </template>
+      </van-field>
+    </van-col>
+    <van-col span="12">
+      <van-field v-model="total" placeholder="总楼层"></van-field>
+    </van-col>
+  </van-row>
+</template>
+
+<script>
+import { watch, ref } from 'vue'
+import { Row, Col, Field } from 'vant'
+
+export default {
+  components: {
+    [Row.name]: Row,
+    [Col.name]: Col,
+    [Field.name]: Field,
+  },
+
+  props: {
+    modelValue: undefined,
+  },
+
+  emits: ['update:modelValue'],
+
+  setup(props, { emit }) {
+    const current = ref('')
+    const total = ref('')
+
+    watch([current, total], (nw) => {
+      emit('update:modelValue', nw.join(','))
+    })
+
+    return {
+      current,
+      total,
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+:deep(.van-cell) {
+  padding: 0;
+}
+</style>

src/view/addhouse/addrenting/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/addhouse/addrenting/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/addhouse/addsecondhand/index.vue

@@ -648,7 +648,14 @@ export default {
 .addsecondhand {
   text-align: left;
 }
-.secondhand-main::-webkit-scrollbar {
+
+.addsecondhand {
+  width: 100%;
+  height: calc(100vh - 94px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.addsecondhand::-webkit-scrollbar {
   display: none; /*隐藏滚动条*/
 }
 

src/view/addhouse/index.vue

@@ -14,13 +14,13 @@
 </template>
 
 <script>
-import { ref } from "vue"
-import { Tab, Tabs } from "vant"
-import Addsecondhand from "./addsecondhand"
-import Addrenting from "./addrenting"
+import { ref } from 'vue'
+import { Tab, Tabs } from 'vant'
+import Addsecondhand from './addsecondhand'
+import Addrenting from './addrenting'
 
 export default {
-  name: "home",
+  name: 'home',
   components: {
     [Tab.name]: Tab,
     [Tabs.name]: Tabs,

src/view/home/index.vue

@@ -14,13 +14,13 @@
 </template>
 
 <script>
-import { ref } from "vue"
-import { Tab, Tabs } from "vant"
-import secondhand from "../secondhand"
-import renting from "../renting"
+import { ref } from 'vue'
+import { Tab, Tabs } from 'vant'
+import secondhand from '../secondhand'
+import renting from '../renting'
 
 export default {
-  name: "home",
+  name: 'home',
   components: {
     [Tab.name]: Tab,
     [Tabs.name]: Tabs,

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

@@ -476,7 +476,7 @@ export default {
         return false
       }
       if (!formData.aspect) {
-        showWarn("请选择朝向")
+        showWarn('请选择朝向')
         return false
       }
       if (!formData.sourceFrom) {