feats

src/store/models/room.js

@@ -114,12 +114,26 @@ export default () => {
     return request({
       url: '/room/protection/update-status',
       data,
+      toast: '请稍候...',
     }).then(() => {
       detail.roomInfo.protectionFlag = data.protectionFlag
       return
     })
   }
 
+  // 业主电话
+  const addOwnerTel = params => {
+    return request({
+      url: '/room/own-tel/add',
+      params,
+      toast: '请稍候...',
+    }).then(() => {
+      const ownerTel = detail.roomInfo.ownerTel || ''
+      detail.roomInfo.ownerTel = ownerTel.split(',').filter(Boolean).concat(params.newOwnerTel).join(',')
+      return
+    })
+  }
+
   return {
     list,
     page,
@@ -134,5 +148,6 @@ export default () => {
     getKey,
     roomKeyBox,
     updateProtection,
+    addOwnerTel,
   }
 }

src/utils/plugins/shiro.js

@@ -3,7 +3,7 @@ import store from '@/store'
 const shiro = {
   install: (app) => {
 
-    const removeNode = el => el.parentNode.removeChild(el)
+    const removeNode = el => el.parentNode && el.parentNode.removeChild(el)
 
     app.directive('shiro', (el, binding) => {      
       const { permissions, getPermission } = store.getState('shiro')

src/utils/request/index.js

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import { Toast } from 'vant'
 import { router } from '@/router'
 import store from '@/store'
 import { showDanger } from '../'
@@ -12,6 +13,14 @@ const requestInterceptor = config => {
     config.setLoading(true)
   }
 
+  if (config.toast) {    
+    config.toastInst = Toast.loading({
+      message: config.toast,
+      forbidClick: true,
+      duration: 0,
+    })
+  }
+
   return config
 }
 
@@ -27,13 +36,14 @@ const responseInterceptor = response => {
   if (response.config.setLoading) {
     response.config.setLoading(false)
   }
+
+  if (response.config.toastInst) {
+    response.config.toastInst.clear()
+  }
  
   if (/json/.test(contentType)) {
     if ('0' === data.code) {
       return data.data
-    } else if ('1' === data.code) {
-    
-      return Promise.reject('账号未登录或没有权限1')
     } else if ('-1' === data.code) {
       router.push('/login')
       // return Promise.reject(data.message)
@@ -58,6 +68,10 @@ const handleError = type => error => {
   if (error.config.setLoading) {
     error.config.setLoading(false)
   }
+  
+  if (error.config.toastInst) {
+    error.config.toastInst.clear()
+  }
 
   if (error.response) {
     console.error(`[${type}]:`)

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

@@ -100,7 +100,7 @@ export default {
 
     // 获取字典对应名称
     const getDictLabel = (val, key) => {
-      return dicts[key]?.filter(x => x.code === val)[0]?.name
+      return dicts[key]?.filter(x => x.value === val)[0]?.text
     }
 
     return {

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

@@ -12,6 +12,7 @@
           v-show="!roomInfo.protectionFlag || roomInfo.protectionFlag === '0'"
           title="设置房源保护"
           icon="fire"
+          @click="handleRoomProtection(1)"
         />
 
         <van-cell
@@ -19,12 +20,14 @@
           v-show="roomInfo.protectionFlag === '1'"
           title="取消房源保护"
           icon="fire"
+          @click="handleRoomProtection(0)"
         />
 
         <van-cell
           v-shiro="'room:info:addTel'"
           title="新增业主电话"
           icon="add"
+          @click="phoneShow = true"
         />
 
         <van-cell
@@ -32,6 +35,7 @@
           v-show="roomInfo.status === '0'"
           title="下架房源"
           icon="delete"
+          @click="$router.push({name: 'house.close', query: {roomId: roomInfo.id}})"
         />
 
         <van-cell
@@ -48,11 +52,27 @@
       </van-cell-group>
     </div>
   </van-popover>
+
+  <van-dialog
+    v-model:show="phoneShow"
+    title="新增电话"
+    show-cancel-button
+    @confirm="handleAddOwnerTel"
+    @cancel="phoneShow = false"
+  >
+    <van-field
+      v-model="newOwnerTel"
+      type="tel"
+      label="业主电话"
+      placeholder="请输入电话"
+    />
+  </van-dialog>
 </template>
 
 <script>
 import { ref } from 'vue'
-import { Popover, CellGroup, Cell, Icon } from 'vant'
+import { Dialog, Popover, CellGroup, Cell, Field, Icon, Notify } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
 
 export default {
   components: {
@@ -60,6 +80,7 @@ export default {
     [CellGroup.name]: CellGroup,
     [Cell.name]: Cell,
     [Icon.name]: Icon,
+    [Field.name]: Field,
   },
   props: {
     roomInfo: {
@@ -67,13 +88,53 @@ export default {
       default: () => ({})
     }
   },
-  setup() {
+  setup(props) {
     const show = ref(false)
+    const phoneShow = ref(false)
+    const newOwnerTel = ref()
+
+    const { updateProtection, addOwnerTel } = useModel('room')
+
+    // 房源(确定/取消)保护
+    const handleRoomProtection = status => {
+      show.value = false
+      const title = `${status === 1 ? '确定' : '取消'}房源保护`
+      const message = status === 1 ? '设为房源保护后，只有录入人、同部门的上级以及上级部门的上级可以看到房源敏感信息。' : '取消房源保护后，其他人可以查看当前房源的敏感信息。'
+
+      Dialog.confirm({title, message}).then(() => {
+        updateProtection({
+          id: props.roomInfo.id,
+          protectionFlag: status
+        }).then(() => {
+          Notify({ type: 'success', message: '设置成功' })
+        })
+      })
+    }
+
+    // 添加户主电话
+    const handleAddOwnerTel = () => {
+      if (!newOwnerTel.value || newOwnerTel.value.length !== 11) {
+        Notify({ type: 'warning', message: '请正确填写手机号' })
+        return
+      }
+
+      addOwnerTel({
+        newOwnerTel: newOwnerTel.value,
+        newOwnerRoomId: props.roomInfo.id,
+      }).then(() => {
+        Notify({ type: 'success', message: '设置成功' })
+      }).catch(e => {
+        Notify({ type: 'danger', message: e.message })
+      })
+    }
 
     return {
-      show
+      show,
+      phoneShow,
+      newOwnerTel,
+      handleRoomProtection,
+      handleAddOwnerTel,
     }
   }
 }
 </script>
-