feats

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

@@ -162,6 +162,15 @@ export default () => {
     })
   }
 
+  // 实勘列表
+  const getRescList = roomId => {
+    return request({
+      url: '/room/resc/list',
+      params: { roomId },
+      loadingId: 'room.resc.list',
+    })
+  }
+
 
   return {
     list,
@@ -181,5 +190,6 @@ export default () => {
     getBuilding,
     closeHouse,
     houseEdit,
+    getRescList,
   }
 }

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 || {},
       }
     })