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

src/layout/index.vue

@@ -6,11 +6,9 @@
 
     <div class="lay-footer">
       <van-tabbar route>
-        <van-tabbar-item replace to="/home" icon="home-o">首页</van-tabbar-item>
-        <van-tabbar-item replace to="/house/add" icon="add-o"
-          >录入</van-tabbar-item
-        >
-        <van-tabbar-item replace to="/user" icon="user-o">我的</van-tabbar-item>
+        <van-tabbar-item to="/home" icon="home-o">首页</van-tabbar-item>
+        <van-tabbar-item to="/house/add" icon="add-o">录入</van-tabbar-item>
+        <van-tabbar-item to="/user" icon="user-o">我的</van-tabbar-item>
       </van-tabbar>
     </div>
   </div>
@@ -18,10 +16,10 @@
 
 <script>
 // import Vue from 'vue';
-import { Tabbar, TabbarItem } from "vant"
+import { Tabbar, TabbarItem } from 'vant'
 
 export default {
-  name: "layout",
+  name: 'layout',
   components: {
     [Tabbar.name]: Tabbar,
     [TabbarItem.name]: TabbarItem,

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

@@ -2,7 +2,8 @@
   <x-loading x-id="room.auth">
     <div v-if="!roomAuth">
       <p>暂无业主委托书</p>
-      <template v-if="roomInfo.status !== '7'">
+      <!-- <template v-if="roomInfo.status !== '7'"> -->
+      <template v-if="roomInfo.status === '0'">
         <van-button
           block
           size="small"
@@ -35,7 +36,11 @@
         <x-field
           label=" "
           v-shiro="'room:info:delAuth'"
-          v-if="roomAuthBox.isCreate && roomAuth.status === '0'"
+          v-if="
+            roomAuthBox.isCreate &&
+            roomAuth.status === '0' &&
+            roomInfo.status === '0'
+          "
         >
           <van-button block size="small" type="danger" @click="toggleDialog">
             删除委托书
@@ -59,7 +64,7 @@
         </x-field>
 
         <x-field label="截止时间">
-          {{ roomAuth.startTime || "售出为止" }}
+          {{ roomAuth.startTime || '售出为止' }}
         </x-field>
 
         <van-image width="100" height="100" :src="roomAuth.url" />
@@ -87,11 +92,11 @@
 </template>
 
 <script>
-import { computed, onMounted, ref } from "vue"
-import { Button, Image, Field, Dialog } from "vant"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import { showDanger, showSuccess, showWarn } from "@/utils"
-import request from "@/utils/request"
+import { computed, onMounted, ref } from 'vue'
+import { Button, Image, Field, Dialog } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import { showDanger, showSuccess, showWarn } from '@/utils'
+import request from '@/utils/request'
 
 export default {
   components: {
@@ -102,15 +107,18 @@ export default {
   },
   props: {
     roomId: undefined,
+    roomInfo: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   setup(props) {
-    const { detail, roomAuthBox, getAuth } = useModel("room")
+    const { detail, roomAuthBox, getAuth } = useModel('room')
 
     const delReason = ref()
     const showDialog = ref(false)
 
     const roomAuth = computed(() => roomAuthBox.roomAuth)
-    const roomInfo = computed(() => detail.roomInfo)
 
     const toggleDialog = () => {
       showDialog.value = !showDialog.value
@@ -118,7 +126,7 @@ export default {
 
     const handleDelete = () => {
       if (!delReason.value) {
-        showWarn("请填写删除原因")
+        showWarn('请填写删除原因')
         return
       }
 
@@ -127,17 +135,17 @@ export default {
       const params = {
         id: roomAuth.value.id,
         reason: delReason.value,
-        roomId: roomInfo.value.id,
+        roomId: props.roomInfo.id,
       }
 
       request({
-        url: "/room/auth/delete",
+        url: '/room/auth/delete',
         params,
-        toast: "请稍候...",
+        toast: '请稍候...',
       })
         .then(() => {
           roomAuthBox.roomAuth = undefined
-          showSuccess("删除成功")
+          showSuccess('删除成功')
         })
         .catch((e) => {
           showDanger(e.message)
@@ -154,7 +162,6 @@ export default {
       detail,
       roomAuthBox,
       roomAuth,
-      roomInfo,
       delReason,
       showDialog,
       handleDelete,

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

@@ -5,7 +5,7 @@
       <van-step v-for="(item, index) in list" :key="index">
         <p>{{ item.followUserName }} {{ item.createTime }}</p>
         <p>
-          {{ item.followType === "0" ? "看房, " : "" }}
+          {{ item.followType === '0' ? '看房, ' : '' }}
           {{ item.followDesc }}
         </p>
         <p v-if="item.followImg">
@@ -17,6 +17,7 @@
       block
       size="small"
       type="warning"
+      v-if="roomInfo.status === '0'"
       v-shiro="'room:info:addFollow'"
       @click="goToAddFollow"
     >
@@ -26,10 +27,10 @@
 </template>
 
 <script>
-import { onMounted, ref } from "vue"
-import { List, Step, Steps, Image, Button } from "vant"
-import { useRouter } from "vue-router"
-import request from "@/utils/request"
+import { onMounted, ref } from 'vue'
+import { List, Step, Steps, Image, Button } from 'vant'
+import { useRouter } from 'vue-router'
+import request from '@/utils/request'
 
 export default {
   components: {
@@ -41,6 +42,10 @@ export default {
   },
   props: {
     roomId: undefined,
+    roomInfo: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   setup(props) {
     const list = ref([])
@@ -48,8 +53,8 @@ export default {
 
     const handleLoad = () => {
       request({
-        loadingId: "room.follow.list",
-        url: "/room/follow/list",
+        loadingId: 'room.follow.list',
+        url: '/room/follow/list',
         params: {
           roomId: props.roomId,
           pageNo: 1,
@@ -61,8 +66,8 @@ export default {
     }
     const goToAddFollow = () =>
       router.push({
-        name: "followup",
-        query: { roomId: props.roomId, type: "room" },
+        name: 'followup',
+        query: { roomId: props.roomId, type: 'room' },
       })
 
     onMounted(() => {

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

@@ -2,7 +2,8 @@
   <x-loading x-id="room.key">
     <div v-if="!roomKey">
       <p>暂无钥匙信息</p>
-      <template v-if="roomInfo.status !== '7'">
+      <!-- <template v-if="roomInfo.status !== '7'"> -->
+      <template v-if="roomInfo.status === '0'">
         <van-button
           block
           size="small"
@@ -34,7 +35,11 @@
 
         <x-field
           label=" "
-          v-if="roomKeyBox.isCreate && roomKey.status === '0'"
+          v-if="
+            roomKeyBox.isCreate &&
+            roomKey.status === '0' &&
+            roomInfo.status === '0'
+          "
           v-shiro="'room:info:delKey'"
         >
           <van-button block size="small" type="danger" @click="toggleDialog"
@@ -83,11 +88,11 @@
 </template>
 
 <script>
-import { Button, Image } from "vant"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import { computed, onMounted, ref } from "vue"
-import { showDanger, showSuccess, showWarn } from "@/utils"
-import request from "@/utils/request"
+import { Button, Image } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import { computed, onMounted, ref } from 'vue'
+import { showDanger, showSuccess, showWarn } from '@/utils'
+import request from '@/utils/request'
 
 export default {
   components: {
@@ -96,12 +101,15 @@ export default {
   },
   props: {
     roomId: undefined,
+    roomInfo: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   setup(props) {
-    const { detail, roomKeyBox, getKey } = useModel("room")
+    const { detail, roomKeyBox, getKey } = useModel('room')
 
     const roomKey = computed(() => roomKeyBox.roomKey)
-    const roomInfo = computed(() => detail.roomInfo)
 
     const delReason = ref()
     const showDialog = ref(false)
@@ -112,7 +120,7 @@ export default {
 
     const handleDelete = () => {
       if (!delReason.value) {
-        showWarn("请填写删除原因")
+        showWarn('请填写删除原因')
         return
       }
 
@@ -121,17 +129,17 @@ export default {
       const params = {
         id: roomKey.value.id,
         reason: delReason.value,
-        roomId: roomInfo.value.id,
+        roomId: props.roomInfo.id,
       }
 
       request({
-        url: "/room/key/delete",
+        url: '/room/key/delete',
         params,
-        toast: "请稍候...",
+        toast: '请稍候...',
       })
         .then(() => {
           roomKeyBox.roomKey = undefined
-          showSuccess("删除成功")
+          showSuccess('删除成功')
         })
         .catch((e) => {
           showDanger(e.message)
@@ -148,7 +156,6 @@ export default {
       detail,
       roomKeyBox,
       roomKey,
-      roomInfo,
       toggleDialog,
       handleDelete,
     }

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

@@ -5,7 +5,7 @@
       <van-step v-for="(item, index) in list" :key="index">
         <p>{{ item.followUserName }} {{ item.createTime }}</p>
         <p>
-          {{ item.followType === "0" ? "看房, " : "" }}
+          {{ item.followType === '0' ? '看房, ' : '' }}
           {{ item.followDesc }}
         </p>
         <p v-if="item.followImg">
@@ -17,6 +17,7 @@
       block
       size="small"
       type="warning"
+      v-if="roomInfo.status === '0'"
       v-shiro="'room:info:addFollow'"
       @click="goToAddLook"
     >
@@ -26,10 +27,10 @@
 </template>
 
 <script>
-import { onMounted, ref } from "vue"
-import { List, Step, Steps, Image, Button } from "vant"
-import request from "@/utils/request"
-import { useRouter } from "vue-router"
+import { onMounted, ref } from 'vue'
+import { List, Step, Steps, Image, Button } from 'vant'
+import request from '@/utils/request'
+import { useRouter } from 'vue-router'
 export default {
   components: {
     [List.name]: List,
@@ -40,6 +41,10 @@ export default {
   },
   props: {
     roomId: undefined,
+    roomInfo: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   setup(props) {
     const list = ref([])
@@ -47,8 +52,8 @@ export default {
 
     const handleLoad = () => {
       request({
-        loadingId: "room.look.list",
-        url: "/room/look/list",
+        loadingId: 'room.look.list',
+        url: '/room/look/list',
         params: {
           roomId: props.roomId,
           pageNo: 1,
@@ -61,8 +66,8 @@ export default {
 
     const goToAddLook = () =>
       router.push({
-        name: "look",
-        query: { roomId: props.roomId,type:'room' },
+        name: 'look',
+        query: { roomId: props.roomId, type: 'room' },
       })
 
     onMounted(() => {

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

@@ -25,27 +25,27 @@
     </x-field>
 
     <x-field label="创建方式">
-      {{ roomInfo.createMethod === "1" ? "外部录入" : "荟居录入" }}
+      {{ roomInfo.createMethod === '1' ? '外部录入' : '荟居录入' }}
     </x-field>
 
     <x-field label="楼栋">
-      {{ securityInfo.roomBuild || "敏感信息" }}
+      {{ securityInfo.roomBuild || '敏感信息' }}
     </x-field>
 
     <x-field label="单元">
-      {{ securityInfo.roomUnit || "敏感信息" }}
+      {{ securityInfo.roomUnit || '敏感信息' }}
     </x-field>
 
     <x-field label="楼房号">
-      {{ securityInfo.roomNum || "敏感信息" }}
+      {{ securityInfo.roomNum || '敏感信息' }}
     </x-field>
 
     <x-field label="业主姓名">
-      {{ securityInfo.ownerName || "敏感信息" }}
+      {{ securityInfo.ownerName || '敏感信息' }}
     </x-field>
 
     <x-field label="业主电话">
-      {{ securityInfo.ownerTel || "敏感信息" }}
+      {{ securityInfo.ownerTel || '敏感信息' }}
     </x-field>
 
     <x-field label=" " v-shiro="'room:info:security'">
@@ -71,16 +71,16 @@
 </template>
 
 <script>
-import { computed, ref } from "vue"
-import { useRouter } from "vue-router"
-import { Button, Dialog } from "vant"
-import request from "@/utils/request"
-import { showDanger } from "@/utils"
+import { computed, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { Button, Dialog } from 'vant'
+import request from '@/utils/request'
+import { showDanger } from '@/utils'
 
 const getSecurity = (roomId) => {
   return request({
-    loadingId: "room.security",
-    url: "/room/security",
+    loadingId: 'room.security',
+    url: '/room/security',
     params: { roomId },
   })
     .then((res) => {
@@ -108,8 +108,8 @@ export default {
     const unfollowRoom = ref()
 
     const floor = computed(() => {
-      const [a, b, c] = (props.roomInfo.roomFloor || "").split(",")
-      return `${a || ""}/${b || ""}(${c || ""})`
+      const [a, b, c] = (props.roomInfo.roomFloor || '').split(',')
+      return `${a || ''}/${b || ''}(${c || ''})`
     })
 
     const avgPrice = computed(() => {
@@ -120,7 +120,7 @@ export default {
 
     const goToAddFollow = () =>
       router.push({
-        name: "secondhand.detail",
+        name: 'secondhand.detail',
         query: { roomId: unfollowRoom.value.id },
       })
 
@@ -132,18 +132,18 @@ export default {
             unfollowRoom.value = undefined
           })
           .catch((e) => {
-            if ("1003" === e.code) {
+            if ('1003' === e.code) {
               unfollowRoom.value = JSON.parse(e.message)
 
               Dialog.alert({
-                title: "去跟进",
+                title: '去跟进',
                 message: `您存在未跟进的房源，房源编号: ${unfollowRoom.value.id}`,
               }).then(() => {
                 // todo
               })
             } else {
               unfollowRoom.value = undefined
-              showDanger("查看敏感信息失败")
+              showDanger('查看敏感信息失败')
             }
           })
       }

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

@@ -73,9 +73,9 @@
 </template>
 
 <script>
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import { computed, onMounted } from "vue"
-import { Button } from "vant"
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import { computed, onMounted } from 'vue'
+import { Button } from 'vant'
 
 export default {
   components: {
@@ -88,16 +88,16 @@ export default {
     },
   },
   setup(props) {
-    const { roomRole, getRole } = useModel("room")
+    const { roomRole, getRole } = useModel('room')
 
     const getNameFormated = (name, id) => {
-      return name + (name ? `(ID：${id})` : "")
+      return name + (name ? `(ID：${id})` : '')
     }
 
     const firstInputUser = computed(() => {
       const createMethod = props.roomInfo?.createMethod
-      if (createMethod === "1") {
-        return "外部录入"
+      if (createMethod === '1') {
+        return '外部录入'
       } else {
         return getNameFormated(roomRole.createName, roomRole.createId)
       }
@@ -105,8 +105,8 @@ export default {
 
     const inputUser = computed(() => {
       const createMethod = props.roomInfo?.createMethod
-      if (createMethod === "1") {
-        return "外部录入"
+      if (createMethod === '1') {
+        return '外部录入'
       } else {
         return getNameFormated(roomRole.recordName, roomRole.recordId)
       }

src/view/secondhand/detail/index.vue

@@ -9,7 +9,7 @@
       <div class="title">
         <p class="body">{{ detail.roomInfo?.title }}</p>
 
-        <MoreActions :room-info="detail.roomInfo" />
+        <MoreActions v-if="isNormalStatus" :room-info="detail.roomInfo" />
       </div>
 
       <van-cell-group title="房源信息">
@@ -43,28 +43,28 @@
             <template #title>
               <div>委托书</div>
             </template>
-            <RoomAuth :room-id="roomId" />
+            <RoomAuth :room-info="detail.roomInfo" :room-id="roomId" />
           </van-collapse-item>
 
           <van-collapse-item name="key">
             <template #title>
               <div>钥匙</div>
             </template>
-            <RoomKey :room-id="roomId" />
+            <RoomKey :room-info="detail.roomInfo" :room-id="roomId" />
           </van-collapse-item>
 
           <van-collapse-item name="follow">
             <template #title>
               <div>跟进记录</div>
             </template>
-            <RoomFollow :room-id="roomId" />
+            <RoomFollow :room-info="detail.roomInfo" :room-id="roomId" />
           </van-collapse-item>
 
           <van-collapse-item name="look">
             <template #title>
               <div>空看记录</div>
             </template>
-            <RoomLook :room-id="roomId" />
+            <RoomLook :room-info="detail.roomInfo" :room-id="roomId" />
           </van-collapse-item>
         </van-collapse>
       </van-cell-group>
@@ -89,9 +89,9 @@
 </template>
 
 <script>
-import { ref, onMounted, computed } from "vue"
-import { useRouter } from "vue-router"
-import { Swiper } from "@/components/detailCompents"
+import { ref, onMounted, computed } from 'vue'
+import { useRouter } from 'vue-router'
+import { Swiper } from '@/components/detailCompents'
 import {
   Icon,
   Popover,
@@ -108,22 +108,22 @@ import {
   CellGroup,
   Collapse,
   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"
-import RoomRole from "./components/Role"
-import RoomAuth from "./components/Auth"
-import RoomKey from "./components/Key"
-import RoomFollow from "./components/Follow"
-import RoomLook from "./components/Look"
+} 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'
+import RoomRole from './components/Role'
+import RoomAuth from './components/Auth'
+import RoomKey from './components/Key'
+import RoomFollow from './components/Follow'
+import RoomLook from './components/Look'
 // import Contextc from "../../../components/contextC"
 // import { router } from "../../../router";
 
 export default {
-  name: "secondhanddetail",
+  name: 'secondhanddetail',
   components: {
     [CellGroup.name]: CellGroup,
     [Cell.name]: Cell,
@@ -162,34 +162,38 @@ export default {
     const showShare = ref(false)
     const phoneShow = ref(false)
     const collapseItem = ref()
-    const phone = ref("")
+    const phone = ref('')
 
-    const { detail, getDetail } = useModel("room")
+    const { detail, getDetail } = useModel('room')
 
-    const { dicts, getDict } = useModel("dicts")
+    const { dicts, getDict } = useModel('dicts')
+
+    const isNormalStatus = computed(() => {
+      return detail.roomInfo?.status === '0'
+    })
 
     const getRescType = (val) => {
-      const rescTypes = dicts["roomResc_type"] || []
+      const rescTypes = dicts['roomResc_type'] || []
       return (rescTypes.filter((x) => x.value === val)[0] || {}).text
     }
 
     const imageList = computed(() => {
       return (detail.RoomResc || [])
-        .filter((x) => x.imgType !== "0")
+        .filter((x) => x.imgType !== '0')
         .map((x) => ({ image: x.url, text: getRescType(x.imgType) }))
     })
 
     onMounted(() => {
       getDetail(roomId)
-      getDict("roomResc_type")
+      getDict('roomResc_type')
     })
 
     const shareOptions = [
-      { name: "微信", icon: "wechat" },
-      { name: "微博", icon: "weibo" },
-      { name: "复制链接", icon: "link" },
-      { name: "分享海报", icon: "poster" },
-      { name: "二维码", icon: "qrcode" },
+      { name: '微信', icon: 'wechat' },
+      { name: '微博', icon: 'weibo' },
+      { name: '复制链接', icon: 'link' },
+      { name: '分享海报', icon: 'poster' },
+      { name: '二维码', icon: 'qrcode' },
     ]
 
     const onShareSelect = (option) => {
@@ -215,6 +219,7 @@ export default {
       onShareSelect,
       shareOptions,
       detail,
+      isNormalStatus,
       collapseItem,
       roomId,
       roomOtherData,