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

src/components/GSection/index.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="g-section">
+    <h2 class="g-section-title">{{title}}</h2>
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    title: String,
+  },
+  setup() {
+    
+  }
+}
+</script>
+
+<style lang="less">
+.g-section {
+  width: 100%;
+
+  &-title {
+    margin: 0;
+    padding: 1.5em 1em 1em;
+    color: rgba(69, 90, 100, 0.6);
+    font-size: 1em;
+    font-weight: 500;
+    line-height: 1.2em;
+  }
+}
+</style>

src/main.js

@@ -6,6 +6,7 @@ import store from './store'
 import 'vant/lib/index.css';
 
 import { Notify, Dialog } from 'vant'
+import GSection from './components/GSection'
 import Shiro from './components/Shiro'
 import XLoading from './components/XLoading'
 import XField from './components/XField'
@@ -18,6 +19,7 @@ app.use(shiro);
 
 app.component(Notify.Component.name, Notify.Component)
 app.component(Dialog.Component.name, Dialog.Component)
+app.component('g-section', GSection)
 app.component('x-loading', XLoading)
 app.component('x-field', XField)
 app.component('shiro', Shiro)

src/store/models/room.js

@@ -151,6 +151,26 @@ export default () => {
     })
   }
 
+  // 房源编辑
+  const houseEdit = data => {
+    return request({
+      url: '/room/save',
+      data,
+      toast: '请稍候...',
+    }).then(() => {
+      return
+    })
+  }
+
+  // 实勘列表
+  const getRescList = roomId => {
+    return request({
+      url: '/room/resc/list',
+      params: { roomId },
+      loadingId: 'room.resc.list',
+    })
+  }
+
 
   return {
     list,
@@ -169,5 +189,7 @@ export default () => {
     addOwnerTel,
     getBuilding,
     closeHouse,
+    houseEdit,
+    getRescList,
   }
 }

src/utils/index.js

@@ -1,10 +1,21 @@
 
-import { Notify } from 'vant'
+import { Notify, Dialog } from 'vant'
 
 export function showDanger(message) {
   return Notify({ type: 'danger', message })
 }
 
+export function showWarn(message) {
+  return Notify({ type: 'warning', message })
+}
+
+export function alert(message, opts) {
+  return Dialog({
+    ...(opts || {}),
+    message
+  })
+}
+
 export function isEmpty (o) {
   if (o === undefined || o === null || o === '') {
     return true

src/utils/request/index.js

@@ -17,6 +17,7 @@ const requestInterceptor = config => {
     config.toastInst = Toast.loading({
       message: config.toast,
       forbidClick: true,
+      overlay: true,
       duration: 0,
     })
   }

src/view/resc/index.vue

@@ -1,83 +1,105 @@
 <template>
-  <div class="resc ">
-    <div class="resc-top van-hairline--bottom">
-      <van-row>
-        <van-col span="12">
-          <p>门牌</p>
-          <van-uploader
-            v-model="houseNumberImg"
-            max-count="1"
-            :after-read="afterRead"
-          />
-        </van-col>
-        <van-col span="12">
-          <p>户型</p>
-          <van-uploader
-            v-model="houseNumberImg"
-            max-count="1"
-            :after-read="afterRead"
-          />
-        </van-col>
-      </van-row>
-    </div>
-    <div class="resc-top van-hairline--bottom">
-      <p>客厅</p>
-      <van-uploader v-model="houseNumberImg" :after-read="afterRead" />
-    </div>
-    <div class="resc-top van-hairline--bottom">
-      <p>卧室</p>
-      <van-uploader v-model="houseNumberImg" :after-read="afterRead" />
-    </div>
-    <div class="resc-top van-hairline--bottom">
-      <p>厨房</p>
-      <van-uploader v-model="houseNumberImg" :after-read="afterRead" />
-    </div>
-    <div class="resc-top van-hairline--bottom">
-      <p>卫生间</p>
-      <van-uploader v-model="houseNumberImg" :after-read="afterRead" />
-    </div>
-    <div class=" resc-top van-hairline--bottom">
-      <p>其他</p>
-      <van-uploader v-model="houseNumberImg" :after-read="afterRead" />
-    </div>
-    <div class=" resc-top van-hairline--bottom">
-      <van-button color="rgb(215, 105, 58)" round type="primary"
-      style="border-radius:5px"
-        >保存审核并提交</van-button
-      >
+  <x-loading x-id="room.resc.list">
+    <div class="resc">
+      <div class="mgtp" v-if="initData.limitFlag === 'rescLimit' && initData.rescStatus === '9'">
+        <p>房源录入后4小时内仅允许房源录入人上传图片，目前尚无权限上传实勘图</p>
+      </div>
+      <div class="mgtp" v-if="initData.rescStatus === '1'">
+        <p>当前实勘图正在审核中</p>
+      </div>
+      <div class="mgtp" v-if="initData.rescStatus === '0'">
+        <x-field label="实勘人">{{initData.rescUser}}</x-field>
+        <x-field label="达成时间">{{initData.rescTime}}</x-field>
+      </div>
+
+      <g-section title="门牌">
+        <van-uploader
+          v-model="houseNumberImg"
+          max-count="1"
+          :after-read="afterRead"
+        />
+      </g-section>
+
+      <g-section title="户型">
+        <van-uploader
+          v-model="houseNumberImg"
+          max-count="1"
+          :after-read="afterRead"
+        />
+      </g-section>
+
+      <g-section title="客厅">
+        <van-uploader
+          v-model="houseNumberImg"
+          :after-read="afterRead"
+        />
+      </g-section>
+
+      <g-section title="卧室">
+        <van-uploader
+          v-model="houseNumberImg"
+          :after-read="afterRead"
+        />
+      </g-section>
+
+      <g-section title="厨房">
+        <van-uploader
+          v-model="houseNumberImg"
+          :after-read="afterRead"
+        />
+      </g-section>
+
+      <g-section title="卫生间">
+        <van-uploader
+          v-model="houseNumberImg"
+          :after-read="afterRead"
+        />
+      </g-section>
+
+      <g-section title="其他">
+        <van-uploader
+          v-model="houseNumberImg"
+          :after-read="afterRead"
+        />
+      </g-section>
+
+      <div style="margin-top: 2em">
+        <van-button block type="warning">
+          保存审核并提交
+        </van-button>
+      </div>
     </div>
-  </div>
+  </x-loading>
 </template>
 
 <script>
 import { ref } from "vue";
+import { useRoute } from 'vue-router'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
 //
 import {
   Uploader,
-  Row,
-  Col,
   Button,
-
-  //   Dialog,
-} from "vant";
-
-// import { router } from "../../../router";
+} from "vant"
+import { showDanger } from '@/utils';
 
 export default {
-  name: "secondhanddetail",
   components: {
-    [Row.name]: Row,
-    [Col.name]: Col,
-
     [Uploader.name]: Uploader,
     [Button.name]: Button,
   },
-  data() {
-    return {};
-  },
 
   setup() {
-    const houseNumberImg = ref([]);
+    const initData = ref({})
+    const route = useRoute()
+
+    const { getRescList } = useModel('room')
+
+    getRescList(route.query.roomId).then(res => {
+      initData.value = res
+    }).catch(e => {
+      showDanger(e.message)
+    })
 
     const fileList = ref([
       { url: "https://img.yzcdn.cn/vant/leaf.jpg" },
@@ -92,7 +114,7 @@ export default {
     };
 
     return {
-      houseNumberImg,
+      initData,
       fileList,
       afterRead,
     };
@@ -103,8 +125,11 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="less" scoped>
 .resc {
-  &-top {
-    padding: 20px;
+  background: #fff;
+  padding: 1em;
+
+  .mgtp {
+    margin-top: 1em;
   }
 }
 </style>

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

@@ -5,7 +5,7 @@
     </x-field>
     
     <x-field label="所属楼盘">
-      {{roomInfo.buildingName}}
+      {{otherData.building.buildingName}}
     </x-field>
     
     <x-field label="所属区县">

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

@@ -46,6 +46,13 @@
           @click="$router.push({name: 'secondhand.edit', query: {roomId: roomInfo.id}})"
         />
 
+        <van-cell
+          v-shiro="'room:info'"
+          title="房源实勘"
+          icon="photograph"
+          @click="$router.push({name: 'resc', query: {roomId: roomInfo.id}})"
+        />
+        
         <van-cell
           v-shiro="'room:info:share'"
           title="分享房源"

src/view/secondhand/detail/index.vue

@@ -168,7 +168,6 @@ export default {
     const {
       detail,
       getDetail,
-      updateProtection,
     } = useModel("room")
 
     onMounted(() => {
@@ -236,8 +235,9 @@ export default {
     const roomOtherData = computed(() => {
       return {
         leftSecurityNum: detail.leftSecurityNum,
-        roomCity: {},
-        roomBusi: {}
+        roomCity: detail.roomCity || {},
+        roomBusi: detail.roomBusiness || {},
+        building: detail.building || {},
       }
     })
 

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

@@ -44,7 +44,6 @@
       name="proportion"
       label="楼户比例"
       placeholder="请输入"
-      required
     >
       <template #input>
         <Proportion v-model="formData.proportion" />
@@ -57,7 +56,7 @@
       required
     >
       <template #input>
-        <Picker :options="decorationOptions" v-model="formData.decoration" />
+        <Picker :options="decorationOptions" v-model="formData.decoration" placeholder="请选择" />
       </template>
     </van-field>
     
@@ -81,57 +80,53 @@
       required
     >
       <template #input>
-        <Picker :options="aspectOptions" v-model="formData.aspect" />
+        <Picker :options="aspectOptions" v-model="formData.aspect" placeholder="请选择" />
       </template>
     </van-field>
     
     <van-field
       name="sourceFrom"
-      label="房屋来源"
+      label="房源来源"
       required
     >
       <template #input>
-        <Picker :options="sourceFromOptions" v-model="formData.sourceFrom" />
+        <Picker :options="sourceFromOptions" v-model="formData.sourceFrom" placeholder="请选择" />
       </template>
     </van-field>
     
     <van-field
       name="buildType"
       label="建筑类型"
-      required
     >
       <template #input>
-        <Picker :options="buildTypeOptions" v-model="formData.buildType" />
+        <Picker :options="buildTypeOptions" v-model="formData.buildType" placeholder="请选择" />
       </template>
     </van-field>
     
     <van-field
       name="elevator"
       label="电梯"
-      required
     >
       <template #input>
-        <Picker :options="elevatorOptions" v-model="formData.elevator" />
+        <Picker :options="elevatorOptions" v-model="formData.elevator" placeholder="请选择" />
       </template>
     </van-field>
     
     <van-field
       name="nature"
       label="交易属性"
-      required
     >
       <template #input>
-        <Picker :options="natureOptions" v-model="formData.nature" />
+        <Picker :options="natureOptions" v-model="formData.nature" placeholder="请选择" />
       </template>
     </van-field>
     
     <van-field
       name="purpose"
       label="房屋用途"
-      required
     >
       <template #input>
-        <Picker :options="purposeOptions" v-model="formData.purpose" />
+        <Picker :options="purposeOptions" v-model="formData.purpose" placeholder="请选择" />
       </template>
     </van-field>
 
@@ -145,34 +140,40 @@
     <van-field
       name="mortgage"
       label="抵押信息"
-      required
     >
       <template #input>
-        <Picker :options="mortgageOptions" v-model="formData.isMortgage" />
+        <Picker :options="mortgageOptions" v-model="formData.isMortgage" placeholder="请选择" />
       </template>
     </van-field>
     
     <van-field
       name="buildTime"
       label="税 费"
-      required
     >
       <template #input>
-        <Picker :options="buildTimeOptions" v-model="formData.buildTime" />
+        <Picker :options="buildTimeOptions" v-model="formData.buildTime" placeholder="请选择" />
       </template>
     </van-field>
 
+    <div style="margin: 1em">
+      <van-button block type="warning" native-type="submit">
+        提交
+      </van-button>
+    </div>
+
   </van-form>
 </template>
 
 <script>
-import { reactive } from 'vue'
+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'
 
@@ -180,13 +181,16 @@ export default {
   components: {
     [Form.name]: Form,
     [Field.name]: Field,
+    [Button.name]: Button,
     RoomType,
     Proportion,
     Picker,
   },
-  setup(props) {
+  emits: ['submit'],
+  setup(props, {emit}) {
     const formData = reactive({})
     const { dicts, getDict } = useModel('dicts')
+    const { detail } = useModel('room')
     
     // 装修
     const decorationOptions = computed(() => {
@@ -271,7 +275,42 @@ export default {
       return buildTimeDict
     })
 
-    const handleSumbit = () => {}
+    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 = () => {
+      if (!validManually()) {
+        return
+      }
+
+      emit('submit', formData)
+    }
+
+    //
+    watch(() => detail.roomInfo, (nw, od) => {
+      if (nw && !od) {
+        Object.assign(formData, {...nw})
+      }
+    }, {immediate: true})
 
     return {
       formData,

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

@@ -1,18 +1,23 @@
 <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 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,
   },
@@ -38,7 +43,7 @@ export default {
     watch(proportion, () => {
       const vals = [proportion.elevator, proportion.family]
       emit('update:modelValue', vals.join(','))
-    }, {immediate: true, deep: true})
+    }, {deep: true})
 
     return {
       proportion
@@ -48,11 +53,8 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.proportion-box {
-  display: flex;
-
-  .proportion-item {
-    flex: auto;
-  }
+:deep(.van-cell) {
+  padding-left: 0;
+  padding-right: 0;
 }
 </style>

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

@@ -1,27 +1,32 @@
 <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 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,
   },
@@ -53,7 +58,7 @@ export default {
     watch(roomType, () => {
       const vals = [roomType.room, roomType.hall, roomType.kitchen, roomType.toilet, roomType.balcony]
       emit('update:modelValue', vals.join(','))
-    }, {immediate: true, deep: true})
+    }, {deep: true})
 
     return {
       roomType
@@ -63,11 +68,8 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.room-type-box {
-  display: flex;
-
-  .room-type-item {
-    flex: auto;
-  }
+:deep(.van-cell) {
+  padding-left: 0;
+  padding-right: 0;
 }
 </style>

src/view/secondhand/edithouse/index.vue

@@ -2,126 +2,10 @@
   <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 style="margin-top: 1em">
+        <RoomForm @submit="handleSumbit"/>
+      </div>
     </div>
   </x-loading>
 </template>
@@ -129,20 +13,22 @@
 <script>
 import { watch } from "vue"
 import { useModel } from '@zjxpcyc/vue-tiny-store'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
+import { alert, showDanger } from '@/utils'
 import RoomBasic from './components/Basic'
-
-// import { router } from "../../../router";
+import RoomForm from './components/Form'
 
 export default {
   name: "secondhanddetail",
   components: {
     RoomBasic,
+    RoomForm,
   },
 
   setup() {
     const route = useRoute()
-    const { detail, getDetail } = useModel('room')
+    const router = useRouter()
+    const { detail, getDetail, houseEdit } = useModel('room')
     
     watch(() => route.query.roomId, (nw, od) => {
       if (nw != od && nw) {
@@ -150,13 +36,18 @@ export default {
       }
     }, {immediate: true})
 
-
-    const onSubmit = (values) => {
-      console.log("submit", values);
+    const handleSumbit = (values) => {
+      houseEdit(values).then(() => {
+        alert('编辑成功').then(() => {
+          router.go(-1)
+        })
+      }).catch(e => {
+        showDanger(e.message)
+      })
     };
 
     return {
-      onSubmit,
+      handleSumbit,
       detail,
     };
   },