From 1858235eb6bd024be905d12cc8180e1e66571c67 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Thu, 6 Jul 2023 16:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/auth/index.js |   4 +
 weapp/src/pages/home/index.jsx        | 101 +++++++++++++++-----------
 weapp/src/pages/user/index.jsx        |  78 ++++++++++++--------
 3 files changed, 107 insertions(+), 76 deletions(-)

diff --git a/api/app/lib/controllers/auth/index.js b/api/app/lib/controllers/auth/index.js
index e77ad9b0..f2554ee0 100644
--- a/api/app/lib/controllers/auth/index.js
+++ b/api/app/lib/controllers/auth/index.js
@@ -90,6 +90,10 @@ async function wxLogin(ctx, next) {
                 delete: false,
             },
             attributes: { exclude: ['password', 'delete'] },
+            include: [{
+                attributes: ["resourceId", "isshow"],
+                model: models.UserResource
+            }]
         });
         if (!userRes) {
             ctx.status = 400;
diff --git a/weapp/src/pages/home/index.jsx b/weapp/src/pages/home/index.jsx
index e6a155d2..2479777a 100644
--- a/weapp/src/pages/home/index.jsx
+++ b/weapp/src/pages/home/index.jsx
@@ -43,52 +43,65 @@ const Index = () => {
     })
   }
 
+  function judgeRight (code) {
+    return userInfo && userInfo.userResources && userInfo.userResources.some(item => item.resourceId === code)
+  }
+
   return (
     <View className='page'>
-
-      <View className='card fill'>
-        <View className='title'>巡 查 上 报</View>
-        <View className='btn' onClick={
-          isSuperAdmin ?
-            () => toPatrolView('patrol')
-            : () => toPatrol('patrol')
-        }>
-          {isSuperAdmin ? '查看' : '填报'}
-        </View>
-      </View>
-
-      <View className='card fill'>
-        <View className='title'>养 护 上 报</View>
-        <View className='btn' onClick={
-          isSuperAdmin ?
-            () => toPatrolView('conserve')
-            : () => toPatrol('conserve')
-        }>
-          {isSuperAdmin ? '查看' : '填报'}
-        </View>
-      </View>
-
-      <View className='card fill_road'>
-        <View className='title'>在 建 道 路</View>
-        <View className='btn' onClick={
-          isSuperAdmin ?
-            () => toPatrolView('road')
-            : () => toPatrol('road')
-        }>
-          {isSuperAdmin ? '查看' : '填报'}
-        </View>
-      </View>
-
-      <View className='card fill_anomaly'>
-        <View className='title'>异 常 反 馈</View>
-        <View className='btn' onClick={
-          isSuperAdmin ?
-            () => toPatrolView('anomaly')
-            : () => toPatrol('anomaly')
-        }>
-          {isSuperAdmin ? '查看' : '填报'}
-        </View>
-      </View>
+      {
+        judgeRight('WXPATROLREPOR') ?
+          <View className='card fill'>
+            <View className='title'>巡 查 上 报</View>
+            <View className='btn' onClick={
+              isSuperAdmin ?
+                () => toPatrolView('patrol')
+                : () => toPatrol('patrol')
+            }>
+              {isSuperAdmin ? '查看' : '填报'}
+            </View>
+          </View>
+          : ''
+      }
+      {
+        judgeRight('WXMAINTENANCEREPORT') ?
+          <View className='card fill'>
+            <View className='title'>养 护 上 报</View>
+            <View className='btn' onClick={
+              isSuperAdmin ?
+                () => toPatrolView('conserve')
+                : () => toPatrol('conserve')
+            }>
+              {isSuperAdmin ? '查看' : '填报'}
+            </View>
+          </View> : ''
+      }
+      {
+        judgeRight('WXBUILDINGROAD') ?
+          <View className='card fill_road'>
+            <View className='title'>在 建 道 路</View>
+            <View className='btn' onClick={
+              isSuperAdmin ?
+                () => toPatrolView('road')
+                : () => toPatrol('road')
+            }>
+              {isSuperAdmin ? '查看' : '填报'}
+            </View>
+          </View> : ''
+      }
+      {
+        judgeRight('WXFEEDBACKMANAGE') ?
+          <View className='card fill_anomaly'>
+            <View className='title'>异 常 反 馈</View>
+            <View className='btn' onClick={
+              isSuperAdmin ?
+                () => toPatrolView('anomaly')
+                : () => toPatrol('anomaly')
+            }>
+              {isSuperAdmin ? '查看' : '填报'}
+            </View>
+          </View> : ''
+      }
 
       {/* {
         isSuperAdmin &&
diff --git a/weapp/src/pages/user/index.jsx b/weapp/src/pages/user/index.jsx
index 83c5c9c2..5472a55a 100644
--- a/weapp/src/pages/user/index.jsx
+++ b/weapp/src/pages/user/index.jsx
@@ -52,6 +52,10 @@ const Index = ({ ...props }) => {
     })
   }
 
+  function judgeRight (code) {
+    return userInfo && userInfo.userResources && userInfo.userResources.some(item => item.resourceId === code)
+  }
+
   return (
     <View className='page'>
       <View className='myBox'>
@@ -64,38 +68,48 @@ const Index = ({ ...props }) => {
         </View>
       </View>
 
-      <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('patrol') : () => toMyReport('patrol')}>
-        <Image className='box-img' src={reportImg} />
-        <View className='box-txt'>
-          {isSuperAdmin ? '巡查上报' : '巡查上报'}
-        </View>
-        <Image className='img' src={moreImg} />
-      </View>
-
-      <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('conserve') : () => toMyReport('conserve')}>
-        <Image className='box-img' src={reportImg} />
-        <View className='box-txt'>
-          {isSuperAdmin ? '养护上报' : '养护上报'}
-        </View>
-        <Image className='img' src={moreImg} />
-      </View>
-
-      <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('road') : () => toMyReport('road')}>
-        <Image className='box-img' src={reportImg} />
-        <View className='box-txt'>
-          {isSuperAdmin ? '在建道路上报' : '在建道路'}
-        </View>
-        <Image className='img' src={moreImg} />
-      </View>
-
-      <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('anomaly') : () => toMyReport('anomaly')}>
-        <Image className='box-img' src={reportImg} />
-        <View className='box-txt'>
-          {isSuperAdmin ? '异常反馈上报' : '异常反馈'}
-        </View>
-        <Image className='img' src={moreImg} />
-      </View>
-
+      {
+        judgeRight('WXPATROLREPOR') ?
+          <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('patrol') : () => toMyReport('patrol')}>
+            <Image className='box-img' src={reportImg} />
+            <View className='box-txt'>
+              {isSuperAdmin ? '巡查上报' : '巡查上报'}
+            </View>
+            <Image className='img' src={moreImg} />
+          </View> : ''
+      }
+      {
+        judgeRight('WXMAINTENANCEREPORT') ?
+          <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('conserve') : () => toMyReport('conserve')}>
+            <Image className='box-img' src={reportImg} />
+            <View className='box-txt'>
+              {isSuperAdmin ? '养护上报' : '养护上报'}
+            </View>
+            <Image className='img' src={moreImg} />
+          </View>
+          : ''
+      }
+      {
+        judgeRight('WXBUILDINGROAD') ?
+          <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('road') : () => toMyReport('road')}>
+            <Image className='box-img' src={reportImg} />
+            <View className='box-txt'>
+              {isSuperAdmin ? '在建道路上报' : '在建道路'}
+            </View>
+            <Image className='img' src={moreImg} />
+          </View> : ''
+      }
+      {
+        judgeRight('WXFEEDBACKMANAGE') ?
+          <View className='box' onClick={isSuperAdmin ? () => toPatrolReport('anomaly') : () => toMyReport('anomaly')}>
+            <Image className='box-img' src={reportImg} />
+            <View className='box-txt'>
+              {isSuperAdmin ? '异常反馈上报' : '异常反馈'}
+            </View>
+            <Image className='img' src={moreImg} />
+          </View>
+          : ''
+      }
       <View className='box' onClick={changePassword} style={{ marginTop: '2rpx' }}>
         <Image className='box-img' src={pswdImg} />
         <View className='box-txt'>修改密码</View>