feats

src/router.js

@@ -1,133 +1,133 @@
-import { createRouter, createWebHashHistory } from "vue-router"
+import { createRouter, createWebHashHistory } from 'vue-router'
 
 const routes = [
   {
-    name: "notFound",
-    path: "/:path(.*)+",
+    name: 'notFound',
+    path: '/:path(.*)+',
     redirect: {
-      name: "home",
+      name: 'home',
     },
   },
   {
-    name: "login",
-    path: "/login",
-    component: () => import("./view/login"),
+    name: 'login',
+    path: '/login',
+    component: () => import('./view/login'),
     meta: {
-      title: "登录",
+      title: '登录',
     },
   },
   {
-    path: "/",
-    redirect: "/home",
-    name: "layout",
-    component: () => import("./layout"),
+    path: '/',
+    redirect: '/home',
+    name: 'layout',
+    component: () => import('./layout'),
     children: [
       {
-        path: "/home",
-        name: "home",
-        component: () => import("./view/home"),
+        path: '/home',
+        name: 'home',
+        component: () => import('./view/home'),
         meta: {
-          title: "房源管理",
+          title: '房源管理',
         },
       },
       {
-        path: "/house/add",
-        name: "house.add",
-        component: () => import("./view/addhouse"),
+        path: '/house/add',
+        name: 'house.add',
+        component: () => import('./view/addhouse'),
         meta: {
-          title: "房源录入",
+          title: '房源录入',
         },
       },
       {
-        name: "user",
-        path: "/user",
-        component: () => import("./view/user"),
+        name: 'user',
+        path: '/user',
+        component: () => import('./view/user'),
         meta: {
-          title: "我的",
+          title: '我的',
         },
       },
     ],
   },
   {
-    path: "/secondhand/detail",
-    name: "secondhand.detail",
-    component: () => import("./view/secondhand/detail"),
+    path: '/secondhand/detail',
+    name: 'secondhand.detail',
+    component: () => import('./view/secondhand/detail'),
     meta: {
-      title: "二手房详情",
+      title: '二手房详情',
     },
   },
   {
-    path: "/renting/detail",
-    name: "renting.detail",
-    component: () => import("./view/renting/detail"),
+    path: '/renting/detail',
+    name: 'renting.detail',
+    component: () => import('./view/renting/detail'),
     meta: {
-      title: "租房详情",
+      title: '租房详情',
     },
   },
 
   {
-    path: "/house/close",
-    name: "house.close",
-    component: () => import("./view/closehouse"),
+    path: '/house/close',
+    name: 'house.close',
+    component: () => import('./view/closehouse'),
     meta: {
-      title: "关闭房源",
+      title: '关闭房源',
     },
   },
   {
-    path: "/followup",
-    name: "followup",
-    component: () => import("./view/followup"),
+    path: '/followup',
+    name: 'followup',
+    component: () => import('./view/followup'),
     meta: {
-      title: "跟进房源",
+      title: '跟进房源',
     },
   },
   {
-    path: "/look",
-    name: "look",
-    component: () => import("./view/look"),
+    path: '/look',
+    name: 'look',
+    component: () => import('./view/look'),
     meta: {
-      title: "添加空看",
+      title: '添加空看',
     },
   },
 
   {
-    path: "/secondhand/edit",
-    name: "secondhand.edit",
-    component: () => import("./view/secondhand/edithouse"),
+    path: '/secondhand/edit',
+    name: 'secondhand.edit',
+    component: () => import('./view/secondhand/edithouse'),
     meta: {
-      title: "编辑房源",
+      title: '编辑房源',
     },
   },
   {
-    path: "/renting/edit",
-    name: "renting.edit",
-    component: () => import("./view/renting/edithouse"),
+    path: '/renting/edit',
+    name: 'renting.edit',
+    component: () => import('./view/renting/edithouse'),
     meta: {
-      title: "编辑房源",
+      title: '编辑房源',
     },
   },
   {
-    path: "/resc",
-    name: "resc",
-    component: () => import("./view/resc"),
+    path: '/resc',
+    name: 'resc',
+    component: () => import('./view/resc'),
     meta: {
-      title: "实勘上传",
+      title: '实勘上传',
     },
   },
   {
-    path: "/room-auth",
-    name: "room.auth",
-    component: () => import("./view/room-auth"),
+    path: '/room-auth',
+    name: 'room.auth',
+    component: () => import('./view/room-auth'),
     meta: {
-      title: "委托书新增",
+      title: '委托书新增',
     },
   },
   {
-    path: "/room-key",
-    name: "room.key",
-    component: () => import("./view/room-key"),
+    path: '/room-key',
+    name: 'room.key',
+    component: () => import('./view/room-key'),
     meta: {
-      title: "添加钥匙",
+      title: '添加钥匙',
     },
   },
 ]

src/store/models/shiro.js

@@ -1,12 +1,12 @@
-import { reactive } from "vue"
-import request from "../../utils/request"
+import { reactive } from 'vue'
+import request from '@/utils/request'
 
 export default () => {
   const permissions = reactive({})
 
   const getPermission = (x) => {
     return request({
-      url: "/comm/rights",
+      url: '/comm/rights',
       data: { name: x },
     }).then((res) => {
       permissions[x] = Boolean(res)

src/view/followup/index.vue

@@ -70,16 +70,16 @@
 </template>
 
 <script>
-import { reactive, onMounted, computed } from "vue"
-import { Form, Button, Field, Popup } from "vant"
-import { useRouter } from "vue-router"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import Picker from "@/components/Picker"
-import request from "@/utils/request"
-import { alert } from "@/utils"
+import { reactive, onMounted, computed } from 'vue'
+import { Form, Button, Field, Popup } from 'vant'
+import { useRouter } from 'vue-router'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import Picker from '@/components/Picker'
+import request from '@/utils/request'
+import { alert } from '@/utils'
 
 export default {
-  name: "closehouse",
+  name: 'closehouse',
   components: {
     [Form.name]: Form,
     [Button.name]: Button,
@@ -101,27 +101,27 @@ export default {
     const pattern = /[\u4E00-\u9FA5\uF900-\uFA2D]/
     // var reg = ;
     //  const pattern = /\d{6}/;
-    const { detail, getDetail } = useModel(type === "room" ? "room" : "renting")
+    const { detail, getDetail } = useModel(type === 'room' ? 'room' : 'renting')
 
     const followTypeOptions = computed(() => {
       const options = [
         {
-          text: "日常跟进",
-          value: "2",
+          text: '日常跟进',
+          value: '2',
         },
         {
-          text: "带看",
-          value: "1",
+          text: '带看',
+          value: '1',
         },
         {
-          text: "查看敏感信息",
-          value: "3",
+          text: '查看敏感信息',
+          value: '3',
         },
       ]
       if (detail.roomInfo.status !== 7 && detail.roomInfo.status !== 8) {
         options.push({
-          text: "价格调整",
-          value: "4",
+          text: '价格调整',
+          value: '4',
         })
       }
 
@@ -132,18 +132,16 @@ export default {
       request({
         url: `/${type}/follow/save`,
         data: formData,
-        toast: "请稍候...",
+        toast: '请稍候...',
       }).then(() => {
-        alert("添加成功").then(() => {
+        alert('添加成功').then(() => {
           router.go(-1)
         })
       })
     }
 
     onMounted(() => {
-      if (!detail.roomInfo) {
-        getDetail(roomId)
-      }
+      getDetail(roomId)
     })
 
     return {

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

@@ -49,33 +49,20 @@
     </x-field>
 
     <x-field label=" " v-shiro="'room:info:security'">
-      <van-button
-        block
-        v-if="!unfollowRoom"
-        size="small"
-        type="warning"
-        @click="handleSecurityClick"
+      <van-button block size="small" type="warning" @click="handleSecurityClick"
         >查看敏感信息（剩余 {{ otherData.leftSecurityNum }} 次）</van-button
       >
-      <van-button
-        block
-        v-else
-        size="small"
-        type="info"
-        v-shiro="'room:info:addFollow'"
-        @click="goToAddFollow"
-        >去跟进</van-button
-      >
     </x-field>
   </x-loading>
 </template>
 
 <script>
-import { computed, ref, watch } from 'vue'
+import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { Button } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
 import request from '@/utils/request'
-import { showDanger, alert } from '@/utils'
+import { showDanger, alert, confirm } from '@/utils'
 
 const getSecurity = (roomId) => {
   return request({
@@ -111,8 +98,17 @@ export default {
   },
   setup(props) {
     const router = useRouter()
+    const { permissions, getPermission } = useModel('shiro')
     const securityInfo = ref({})
-    const unfollowRoom = ref()
+    const hasFollowPermission = computed(
+      () => permissions['room:info:addFollow']
+    )
+    if (
+      permissions['room:info:addFollow'] === undefined ||
+      permissions['room:info:addFollow'] === null
+    ) {
+      getPermission('room:info:addFollow')
+    }
 
     const floor = computed(() => {
       const [a, b, c] = (props.roomInfo?.roomFloor || '').split(',')
@@ -130,51 +126,45 @@ export default {
       return `${total || ''} 万元 / ${avg || ''} 元/㎡`
     })
 
-    const goToAddFollow = () =>
-      router.push({
-        name: 'secondhand.detail',
-        query: { roomId: unfollowRoom.value.id },
-      })
-
     const handleSecurityClick = () => {
       if (!securityInfo.value.roomBuild) {
         getSecurity(props.roomInfo.id)
           .then((res) => {
             securityInfo.value = res || {}
-            unfollowRoom.value = undefined
           })
           .catch((e) => {
             if ('1003' === e.code) {
-              unfollowRoom.value = JSON.parse(e.message)
-
-              alert({
-                title: '去跟进',
-                message: `您存在未跟进的房源，房源编号: ${unfollowRoom.value.id}`,
-              }).then(() => {
-                // todo
-              })
+              const followRoom = JSON.parse(e.message)
+
+              // 有跟进权限
+              if (hasFollowPermission.value) {
+                confirm({
+                  title: '去跟进',
+                  message: `您存在未跟进的房源，房源编号: ${followRoom}`,
+                }).then(() => {
+                  router.push({
+                    name: 'secondhand.detail',
+                    query: { roomId: followRoom },
+                  })
+                })
+              } else {
+                alert({
+                  title: '去跟进',
+                  message: `您存在未跟进的房源，房源编号: ${followRoom}`,
+                })
+              }
             } else {
-              unfollowRoom.value = undefined
               showDanger('查看敏感信息失败')
             }
           })
       }
     }
 
-    watch(
-      () => props.roomInfo,
-      () => {
-        console.log('------Main-------->')
-      }
-    )
-
     return {
       floor,
       price,
       securityInfo,
       handleSecurityClick,
-      unfollowRoom,
-      goToAddFollow,
     }
   },
 }