www

src/store/models/dicts.js

@@ -121,10 +121,6 @@ const leaseWay = [
   },
 ]
 
-
-
-
-
 export default () => {
   const dicts = reactive({
     roomType,

src/view/closehouse/index.vue

@@ -1,10 +1,10 @@
 <template>
-  <van-nav-bar
+  <!-- <van-nav-bar
     title="关闭房源"
     left-text="返回"
     left-arrow
     @click-left="$router.go(-1)"
-  />
+  /> -->
   <x-loading x-id="room.view">
     <div class="closehouse">
       <van-cell-group>
@@ -142,7 +142,7 @@ export default {
 
     // 获取房源详情
     watch(() => route.query.roomId, (nw, od) => {
-      if (nw && !od && !detail.roomInfo) {
+      if (nw && !od && nw) {
         getDetail(nw)
       }
     }, {immediate: true})

src/view/login/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="login">
-    <p>经纪人平台</p>
+    <h3 class="title">经纪人平台</h3>
     <div class="login-from">
       <van-form @submit="onSubmit">
         <van-field
@@ -20,15 +20,15 @@
           :left-icon="passwordicon"
           placeholder="请输入密码"
         />
-        <van-field :border="false">
+        <!-- <van-field :border="false">
           <template #input>
             <van-checkbox shape="square" v-model="remember"
               >记住密码</van-checkbox
             >
           </template>
-        </van-field>
+        </van-field> -->
 
-        <div style="margin: 16px;">
+        <div style="margin: 2em;">
           <van-button
             class="loginbutton"
             block
@@ -111,5 +111,10 @@ export default {
       letter-spacing: 6px;
     }
   }
+
+  .title {
+    text-align: center;
+    font-weight: 500;
+  }
 }
 </style>

src/view/secondhand/components/secondhandmorescreen/index.vue

@@ -198,7 +198,7 @@ export default {
     return {};
   },
   emits:["back", 'search'],
-  setup(props,{emit}) {
+  setup(props, {emit}) {
     const formData = reactive({
       // 楼盘
       estateName: undefined,

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

@@ -43,7 +43,9 @@
           v-show="roomInfo.status !== '7'"
           title="修改房源"
           icon="expand"
+          @click="$router.push({name: 'secondhand.edit', query: {roomId: roomInfo.id}})"
         />
+
         <van-cell
           v-shiro="'room:info:share'"
           title="分享房源"

src/view/secondhand/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/secondhand/edithouse/components/Form.vue

@@ -0,0 +1,291 @@
+<template>
+  <van-form @submit="handleSumbit">
+    <van-field
+      v-model="formData.title"
+      name="title"
+      label="标题"
+      placeholder="请输入"
+      :rules="[{ required: true, message: '请填写标题' }]"
+    />
+
+    <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="proportion"
+      label="楼户比例"
+      placeholder="请输入"
+      required
+    >
+      <template #input>
+        <Proportion v-model="formData.proportion" />
+      </template>
+    </van-field>
+    
+    <van-field
+      name="decoration"
+      label="装修"
+      required
+    >
+      <template #input>
+        <Picker :options="decorationOptions" v-model="formData.decoration" />
+      </template>
+    </van-field>
+    
+    <van-field
+      v-model="formData.totalPrice"
+      name="totalPrice"
+      label="总价"
+      placeholder="请输入"
+      required
+      type="number"
+      :rules="[{ required: true, message: '请填写总价' }]"
+    >
+      <template #extra>
+        万元
+      </template>
+    </van-field>
+    
+    <van-field
+      name="aspect"
+      label="朝向"
+      required
+    >
+      <template #input>
+        <Picker :options="aspectOptions" v-model="formData.aspect" />
+      </template>
+    </van-field>
+    
+    <van-field
+      name="sourceFrom"
+      label="房屋来源"
+      required
+    >
+      <template #input>
+        <Picker :options="sourceFromOptions" v-model="formData.sourceFrom" />
+      </template>
+    </van-field>
+    
+    <van-field
+      name="buildType"
+      label="建筑类型"
+      required
+    >
+      <template #input>
+        <Picker :options="buildTypeOptions" v-model="formData.buildType" />
+      </template>
+    </van-field>
+    
+    <van-field
+      name="elevator"
+      label="电梯"
+      required
+    >
+      <template #input>
+        <Picker :options="elevatorOptions" v-model="formData.elevator" />
+      </template>
+    </van-field>
+    
+    <van-field
+      name="nature"
+      label="交易属性"
+      required
+    >
+      <template #input>
+        <Picker :options="natureOptions" v-model="formData.nature" />
+      </template>
+    </van-field>
+    
+    <van-field
+      name="purpose"
+      label="房屋用途"
+      required
+    >
+      <template #input>
+        <Picker :options="purposeOptions" v-model="formData.purpose" />
+      </template>
+    </van-field>
+
+    <van-field
+      v-model="formData.buildYear"
+      label="建筑年代"
+      placeholder="请输入"
+      type="number"
+    />
+    
+    <van-field
+      name="mortgage"
+      label="抵押信息"
+      required
+    >
+      <template #input>
+        <Picker :options="mortgageOptions" v-model="formData.isMortgage" />
+      </template>
+    </van-field>
+    
+    <van-field
+      name="buildTime"
+      label="税 费"
+      required
+    >
+      <template #input>
+        <Picker :options="buildTimeOptions" v-model="formData.buildTime" />
+      </template>
+    </van-field>
+
+  </van-form>
+</template>
+
+<script>
+import { reactive } from 'vue'
+import {
+  Form,
+  Field,
+} from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import Picker from '@/components/Picker'
+import RoomType from './RoomType'
+import Proportion from './Proportion'
+
+export default {
+  components: {
+    [Form.name]: Form,
+    [Field.name]: Field,
+    RoomType,
+    Proportion,
+    Picker,
+  },
+  setup(props) {
+    const formData = reactive({})
+    const { dicts, getDict } = useModel('dicts')
+    
+    // 装修
+    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 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 handleSumbit = () => {}
+
+    return {
+      formData,
+      handleSumbit,
+      decorationOptions,
+      aspectOptions,
+      sourceFromOptions,
+      buildTypeOptions,
+      elevatorOptions,
+      natureOptions,
+      purposeOptions,
+      mortgageOptions,
+      buildTimeOptions,
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,58 @@
+<template>
+  <div class="proportion-box">
+    <div class="proportion-item">
+      <input type="number" v-model="proportion.elevator" /> 梯
+    </div>
+    <div class="proportion-item">
+      <input type="number" v-model="proportion.family" /> 户
+    </div>
+  </div>
+</template>
+
+<script>
+import { reactive, watch } from 'vue'
+
+export default {
+  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(','))
+    }, {immediate: true, deep: true})
+
+    return {
+      proportion
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.proportion-box {
+  display: flex;
+
+  .proportion-item {
+    flex: auto;
+  }
+}
+</style>

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

@@ -0,0 +1,73 @@
+<template>
+  <div class="room-type-box">
+    <div class="room-type-item">
+      <input type="number" v-model="roomType.room" /> 室
+    </div>
+    <div class="room-type-item">
+      <input type="number" v-model="roomType.hall" /> 厅
+    </div>
+    <div class="room-type-item">
+      <input type="number" v-model="roomType.kitchen" /> 厨
+    </div>
+    <div class="room-type-item">
+      <input type="number" v-model="roomType.toilet" /> 卫
+    </div>
+    <div class="room-type-item">
+      <input type="number" v-model="roomType.balcony" /> 阳台
+    </div>
+  </div>
+</template>
+
+<script>
+import { reactive, watch } from 'vue'
+
+export default {
+  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(','))
+    }, {immediate: true, deep: true})
+
+    return {
+      roomType
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.room-type-box {
+  display: flex;
+
+  .room-type-item {
+    flex: auto;
+  }
+}
+</style>

src/view/secondhand/edithouse/index.vue

@@ -1,224 +1,163 @@
 <template>
-  <div class="secondhanddetail ">
-    <div class="detailcard van-hairline--bottom">
-      <div class="detailcard-title">
-        <span>基础信息</span>
-      </div>
-      <Contextc :options="baseInformationOptions"></Contextc>
+  <x-loading x-id="room.view">
+    <div class="secondhanddetail ">
+      <RoomBasic :room-info="detail.roomInfo" :building="detail.building" />
+<!-- 
+      <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="请输入"
+          />
+          <van-field
+            v-model="state.username"
+            name="title"
+            label="户型"
+            placeholder="请输入"
+            required
+            :rules="[{ required: true, message: '请填写楼户比例' }]"
+          />
+
+          <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>
+          <van-field
+            v-model="state.username"
+            name="title"
+            label="总价"
+            placeholder="请输入"
+            type="number"
+            required
+            :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>
+
+          <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="请输入"
+            :rules="[{ required: true, message: '请填写楼户比例' }]"
+          />
+          <Pickerc
+            v-model="state.username"
+            name="title"
+            label="抵押信息"
+          ></Pickerc>
+
+          <Pickerc v-model="state.username" name="title" label="税费"></Pickerc>
+
+          <div style="margin: 16px;">
+            <van-button round block type="primary" native-type="submit">
+              提交
+            </van-button>
+          </div>
+        </van-form>
+      </div> -->
     </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="请输入"
-        />
-        <van-field
-          v-model="state.username"
-          name="title"
-          label="户型"
-          placeholder="请输入"
-          required
-          :rules="[{ required: true, message: '请填写楼户比例' }]"
-        />
-
-        <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>
-        <van-field
-          v-model="state.username"
-          name="title"
-          label="总价"
-          placeholder="请输入"
-          type="number"
-          required
-          :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>
-
-        <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="请输入"
-          :rules="[{ required: true, message: '请填写楼户比例' }]"
-        />
-        <Pickerc
-          v-model="state.username"
-          name="title"
-          label="抵押信息"
-        ></Pickerc>
-
-        <Pickerc v-model="state.username" name="title" label="税费"></Pickerc>
-
-        <div style="margin: 16px;">
-          <van-button round block type="primary" native-type="submit">
-            提交
-          </van-button>
-        </div>
-      </van-form>
-    </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 { watch } from "vue"
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import { useRoute } from 'vue-router'
+import RoomBasic from './components/Basic'
 
 // import { router } from "../../../router";
 
 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,
   },
 
   setup() {
-    const state = reactive({
-      username: "",
-      password: "",
-    });
-
-    // 房源信息
-    const baseInformationOptions = [
-      {
-        name: "房源编号",
-        value: "123",
-      },
-      {
-        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 route = useRoute()
+    const { detail, getDetail } = useModel('room')
+    
+    watch(() => route.query.roomId, (nw, od) => {
+      if (nw != od && nw) {
+        getDetail(nw)
+      }
+    }, {immediate: true})
+
 
     const onSubmit = (values) => {
       console.log("submit", values);
     };
 
     return {
-      state,
       onSubmit,
-      baseInformationOptions,
+      detail,
     };
   },
 };
@@ -227,7 +166,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; /*隐藏滚动条*/

vue.config.js

@@ -41,8 +41,8 @@ module.exports = {
             // // 或者可以通过 less 文件覆盖（文件路径为绝对路径）
             // hack: `true; @import "your-less-file-path.less";`,
             '@dialog-border-radius': '4px',
-            '@nav-bar-icon-color': '#d75e3a',
-            '@nav-bar-text-color': '#d75e3a'
+            '@nav-bar-icon-color': '#d7693a',
+            '@nav-bar-text-color': '#d7693a'
           },
         },
       },