From d095556d27213bba7c2eddc1d2259e32545c1af1 Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Wed, 6 Nov 2024 13:23:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/role/index.vue | 43 ++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/pages/role/index.vue b/src/pages/role/index.vue
index 31f5df9..22b9dbe 100644
--- a/src/pages/role/index.vue
+++ b/src/pages/role/index.vue
@@ -1,22 +1,26 @@
 <template>
   <view class="container">
-    <wd-search
-      v-model="query.name"
-      @focus="focus"
-      @search="search"
-      @clear="clear"
-      maxlength="20"
-    >
-      <template #suffix>
-        <view class="filter-box" @click="showfilter">
-          <wd-icon
-            name="filter"
-            size="22px"
-            custom-style="filter-custom-style"
-          ></wd-icon>
-        </view>
-      </template>
-    </wd-search>
+    <wd-sticky>
+      <wd-search
+        v-model="query.name"
+        @focus="focus"
+        @search="search"
+        @clear="clear"
+        maxlength="20"
+        custom-class="search-custom-class"
+      >
+        <template #suffix>
+          <view class="filter-box" @click="showfilter">
+            <wd-icon
+              name="filter"
+              size="22px"
+              custom-style="filter-custom-style"
+            ></wd-icon>
+          </view>
+        </template>
+      </wd-search>
+    </wd-sticky>
+
     <!--  列表容器  -->
     <view class="content">
       <wd-row v-for="(item, index) in list" :key="index">
@@ -190,3 +194,8 @@
     background-color: #fff;
   }
 </style>
+<style lang="scss">
+  .filter-custom-style{
+    width: 300px;
+  }
+</style>
-- 
Gitee


From a3a4eeef368235448b1754a3b39f38451c221f0d Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Sun, 10 Nov 2024 00:31:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E9=A2=84=E8=A7=88=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json              |   8 ++
 src/pages/role/edit.vue     | 122 +++++++++++++++++++++++++
 src/pages/role/index.vue    | 177 +++++++++++++++++++++---------------
 src/pages/role/show.vue     | 102 +++++++++++++++++++++
 src/service/role/RoleApi.ts |  89 ++++++++++++++----
 src/types/auto-import.d.ts  |  89 +++++++++++++++++-
 src/types/uni-pages.d.ts    |   2 +
 7 files changed, 491 insertions(+), 98 deletions(-)
 create mode 100644 src/pages/role/edit.vue
 create mode 100644 src/pages/role/show.vue

diff --git a/src/pages.json b/src/pages.json
index a26f296..9c2b41e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -151,10 +151,18 @@
         "navigationBarTitleText": "我的信息"
       }
     },
+    {
+      "path": "pages/role/edit",
+      "type": "page"
+    },
     {
       "path": "pages/role/index",
       "type": "page"
     },
+    {
+      "path": "pages/role/show",
+      "type": "page"
+    },
     {
       "path": "pages/colab/detail/index",
       "type": "page",
diff --git a/src/pages/role/edit.vue b/src/pages/role/edit.vue
new file mode 100644
index 0000000..f567109
--- /dev/null
+++ b/src/pages/role/edit.vue
@@ -0,0 +1,122 @@
+<template>
+  <view>
+    <wd-form ref='form' :model='model'>
+      <wd-cell-group border>
+        <wd-input
+          label='角色名称'
+          label-width='100px'
+          prop='name'
+          clearable
+          v-model='model.name'
+          placeholder='请输入角色名称'
+          :rules="[{ required: true, message: '请填写角色名称' }]"
+        />
+        <wd-input
+          label='角色类型'
+          label-width='100px'
+          prop='type'
+          v-model='model.type'
+          placeholder='请输入角色类型'
+          :rules="[{ required: true, message: '请填写角色类型' }]"
+        />
+        <wd-input
+          label='角色标识'
+          label-width='100px'
+          prop='code'
+          v-model='model.code'
+          placeholder='请输入角色标识'
+          :rules="[{ required: true, message: '请填写角色标识' }]"
+        />
+        <wd-cell title='显示排序'>
+          <view class='custom-value'>
+            <wd-input-number v-model='model.sort' />
+          </view>
+        </wd-cell>
+        <wd-cell title='备注'>
+          <template #label>
+            <view class='custom-value'>
+              <wd-textarea v-model='model.remark' placeholder='请输入备注' />
+            </view>
+          </template>
+        </wd-cell>
+        <wd-cell title='状态'>
+          <view class='custom-value'>
+            <wd-switch v-model='model.status' />
+          </view>
+        </wd-cell>
+      </wd-cell-group>
+      <view class='fix-botton'>
+        <wd-row :gutter='5'>
+          <wd-col :span='12'>
+            <wd-button type='primary' :round='false' style='width: 100%' @click='handleSubmit'>保存</wd-button>
+          </wd-col>
+          <wd-col :span='12'>
+            <wd-button type='error' :round='false' style='width: 100%' @click='goBack'>返回</wd-button>
+          </wd-col>
+        </wd-row>
+      </view>
+    </wd-form>
+  </view>
+</template>
+
+<script lang='ts' setup>
+  import { getInfo, createRole, updateRole } from '@/service/role/RoleApi'
+  import { onLoad } from '@dcloudio/uni-app'
+
+  const form = ref()
+
+  const model = reactive({
+    id: '',
+    name: '',
+    type: '',
+    code: '',
+    sort: 0,
+    remark: '',
+    status: true
+  })
+
+  const handleSubmit = () => {
+    form.value
+      .validate().then(({ valid }) => {
+      if (valid) {
+        if (model.id) {
+          updateRole(model).then(res => {
+            uni.navigateBack()
+          })
+        } else {
+          createRole(model).then(res => {
+            uni.navigateBack()
+          })
+        }
+      }
+    })
+      .catch((error) => {
+        console.log(error, 'error')
+      })
+  }
+
+  const goBack = () => {
+    uni.navigateBack()
+  }
+
+  onLoad(async (queryParam) => {
+    if (queryParam.id) {
+      const res = await getInfo(queryParam.id)
+      model.id = res.data.id
+      model.name = res.data.name
+      model.type = res.data.type
+      model.code = res.data.code
+      model.sort = res.data.sort
+      model.remark = res.data.remark
+      model.status = res.data.status === 1 ? true : false
+    }
+  })
+</script>
+
+<style scoped>
+  .fix-botton {
+    position: fixed;
+    bottom: 3%;
+    width: 100%;
+  }
+</style>
diff --git a/src/pages/role/index.vue b/src/pages/role/index.vue
index 22b9dbe..f15da07 100644
--- a/src/pages/role/index.vue
+++ b/src/pages/role/index.vue
@@ -1,20 +1,20 @@
 <template>
-  <view class="container">
+  <view class='container'>
     <wd-sticky>
       <wd-search
-        v-model="query.name"
-        @focus="focus"
-        @search="search"
-        @clear="clear"
-        maxlength="20"
-        custom-class="search-custom-class"
+        v-model='queryParams.name'
+        @focus='focus'
+        @search='search'
+        @clear='clear'
+        maxlength='20'
+        class='!w-[100vw]'
       >
         <template #suffix>
-          <view class="filter-box" @click="showfilter">
+          <view class='filter-box' @click='showFilter'>
             <wd-icon
-              name="filter"
-              size="22px"
-              custom-style="filter-custom-style"
+              name='filter'
+              size='22px'
+              custom-style='filter-custom-style'
             ></wd-icon>
           </view>
         </template>
@@ -22,22 +22,25 @@
     </wd-sticky>
 
     <!--  列表容器  -->
-    <view class="content">
-      <wd-row v-for="(item, index) in list" :key="index">
-        <wd-col :span="24">
-          <view class="item-box" @click="showItem(item)">
-            <view class="list-item-content-title"
-              >{{ item.name }}/{{ item.code }}</view
-            >
-            <wd-gap bg-color="#FFFFFF"></wd-gap>
+    <view class='content'>
+      <wd-row v-for='(item, index) in list' :key='index'>
+        <wd-col :span='24'>
+          <view class='item-box' @click='showItem(item)'>
+            <view class='list-item-content-title'>
+              {{ item.name }}/{{ item.code }}
+            </view>
+            <wd-gap bg-color='#FFFFFF'></wd-gap>
             <wd-row>
-              <wd-col :span="8">
-                <view>
-                  <wd-tag type="primary" plain>{{ item.type }}</wd-tag>
+              <wd-col :span='8'>
+                <view class='tag-container'>
+                  <wd-tag type='primary' plain>{{ item.type }}</wd-tag>
                 </view>
               </wd-col>
-              <wd-col :span="12" :offset="4">
-                <view style="width: 100%">{{ item.createTime }}</view>
+              <wd-col :span='12' :offset='4'>
+                <view style='width: 100%'>{{ item.createTime }}</view>
+                <view style='width: 100%;margin-top: 20px'>
+                  {{ item.remark }}
+                </view>
               </wd-col>
             </wd-row>
           </view>
@@ -52,57 +55,60 @@
   ></page-meta>
 
   <wd-popup
-    v-model="show"
+    v-model='show'
     lock-scroll
-    position="right"
-    :safe-area-inset-bottom="true"
-    custom-style="width: 70%;border-radius: 20px 0 0 20px;margin-top: 11%;"
-    @close="handleClose"
+    position='right'
+    :safe-area-inset-bottom='true'
+    custom-style='width: 70%;border-radius: 20px 0 0 20px;margin-top: 11%;'
+    @close='closeFilter'
   >
-    <wd-row gutter="20">
-      <wd-gap bg-color="#FFFFFF"></wd-gap>
-      <wd-col :span="24">
-        <wd-text text="角色标识" bold size="19px" color="#333333"></wd-text>
-        <wd-gap bg-color="#FFFFFF"></wd-gap>
+    <wd-row gutter='20'>
+      <wd-gap bg-color='#FFFFFF'></wd-gap>
+      <wd-col :span='24'>
+        <wd-text text='角色标识' bold size='19px' color='#333333'></wd-text>
+        <wd-gap bg-color='#FFFFFF'></wd-gap>
       </wd-col>
 
-      <wd-col :span="24">
-        <wd-input v-model="query.code" clearable placeholder="请输入角色标识" />
-        <wd-gap bg-color="#FFFFFF" height="160rpx"></wd-gap>
+      <wd-col :span='24'>
+        <wd-input v-model='queryParams.code' clearable placeholder='请输入角色标识' />
+        <wd-gap bg-color='#FFFFFF' height='160rpx'></wd-gap>
       </wd-col>
-      <wd-col :span="24">
-        <wd-text text="角色类型" bold size="19px" color="#333333"></wd-text>
-        <wd-gap bg-color="#FFFFFF"></wd-gap>
+      <wd-col :span='24'>
+        <wd-text text='角色类型' bold size='19px' color='#333333'></wd-text>
+        <wd-gap bg-color='#FFFFFF'></wd-gap>
       </wd-col>
 
-      <wd-col :span="24">
-        <wd-radio-group v-model="query.type" shape="button">
-          <wd-radio :value="1">沃特</wd-radio>
-          <wd-radio :value="2">商家后台</wd-radio>
+      <wd-col :span='24'>
+        <wd-radio-group v-model='queryParams.type' shape='button'>
+          <wd-radio :value='1'>沃特</wd-radio>
+          <wd-radio :value='2'>商家后台</wd-radio>
         </wd-radio-group>
-        <wd-gap bg-color="#FFFFFF" height="160rpx"></wd-gap>
+        <wd-gap bg-color='#FFFFFF' height='160rpx'></wd-gap>
       </wd-col>
 
-      <wd-col :span="24">
-        <wd-text text="创建时间" bold size="19px" color="#333333"></wd-text>
-        <wd-gap bg-color="#FFFFFF"></wd-gap>
+      <wd-col :span='24'>
+        <wd-text text='创建时间' bold size='19px' color='#333333'></wd-text>
+        <wd-gap bg-color='#FFFFFF'></wd-gap>
       </wd-col>
-      <wd-col :span="24">
-        <wd-datetime-picker v-model="query.createTime" />
-        <wd-gap bg-color="#FFFFFF" height="160rpx"></wd-gap>
+      <wd-col :span='24'>
+        <wd-datetime-picker v-model='queryParams.createTime' />
+        <wd-gap bg-color='#FFFFFF' height='160rpx'></wd-gap>
       </wd-col>
     </wd-row>
   </wd-popup>
-  <wd-fab :draggable="true"></wd-fab>
+  <wd-fab :draggable='true'>
+    <wd-button type='primary' round size='small' @click='goEdit'>
+      新增
+    </wd-button>
+  </wd-fab>
 </template>
 
-<script lang="ts" setup>
-  import { ref } from 'vue'
+<script lang='ts' setup>
   import { getList, deleteRole } from '@/service/role/RoleApi'
   import { onLoad } from '@dcloudio/uni-app'
 
-  // 搜索参数 // TODO @zeyan：改成 queryParams；因为和 router 的 query 命名上有点重叠，会记错
-  const query = ref({
+  // 搜索参数
+  const queryParams = ref({
     name: '',
     code: '',
     status: 0,
@@ -123,46 +129,64 @@
     console.log('blur')
   }
   // 搜索
-  // TODO @zeyan：建议使用 async
-  const search = () => {
-    query.value.pageNo = 1
-    getList(query.value).then((res) => {
+
+  const search = async () => {
+    queryParams.value.pageNo = 1
+    await getList(queryParams.value).then((res) => {
       list.value = res.data
     })
   }
   // 清空
   const clear = () => {
-    query.value.name = ''
+    queryParams.value.name = ''
   }
 
-  // TODO @zeyan：showFilter
-  const showfilter = () => {
+  const showFilter = () => {
     show.value = true
   }
-  // TODO @zeyan：closeFilter；最好保持命名的堆成哈
-  const handleClose = () => {
+
+  const closeFilter = () => {
     show.value = false
   }
   const showItem = (item) => {
-    console.log(item)
+    uni.navigateTo({
+      url: '/pages/role/show?id=' + item.id
+    })
   }
   const handleConfirm = (e) => {
     console.log(e)
   }
 
+  const goEdit = () => {
+    uni.navigateTo({
+      url: '/pages/role/edit'
+    })
+  }
+
+  //在列表中查找id数据进行删除
+  const deleteItem = (id) => {
+    list.value = list.value.filter((item) => item.id !== id)
+  }
+
   onLoad(async () => {
-    const res = await getList(query.value)
+    const res = await getList(queryParams.value)
     list.value = res.data
   })
 
+  onShow((query) => {
+    if (query?.action === 'delete') {
+      deleteItem(query.id)
+    }
+  })
+
   onReachBottom(async () => {
-    query.value.pageNo++
-    const res = await getList(query.value)
+    queryParams.value.pageNo++
+    const res = await getList(queryParams.value)
     list.value = list.value.concat(res.data)
   })
 </script>
 
-<style lang="scss" scoped>
+<style lang='scss' scoped>
   .container {
     display: flex;
     flex-direction: column;
@@ -170,17 +194,24 @@
 
     .content {
       padding: 10px;
-      background-color: #ffffff;
+      min-height: 150px;
 
       .item-box {
         padding: 10px;
         margin-bottom: 5px;
         border: 1px solid #e8e8e8;
+        background-color: #ffffff;
 
         .list-item-content-title {
           font-size: 16px;
           color: #333333;
         }
+
+        .tag-container {
+          display: flex;
+          flex-wrap: wrap;
+          gap: 5px;
+        }
       }
     }
   }
@@ -194,8 +225,8 @@
     background-color: #fff;
   }
 </style>
-<style lang="scss">
-  .filter-custom-style{
+<style lang='scss'>
+  .filter-custom-style {
     width: 300px;
   }
 </style>
diff --git a/src/pages/role/show.vue b/src/pages/role/show.vue
new file mode 100644
index 0000000..8873a75
--- /dev/null
+++ b/src/pages/role/show.vue
@@ -0,0 +1,102 @@
+<template>
+  <view>
+    <view class='content'>
+      <wd-cell-group>
+        <wd-cell title='角色名称' :value='dataInfo.name' />
+        <wd-cell title='角色类型'>
+          <view class='custom-value'>
+            <wd-tag type='primary' plain>{{ dataInfo.type }}</wd-tag>
+          </view>
+        </wd-cell>
+        <wd-cell title='角色标识' :value='dataInfo.code' />
+        <wd-cell title='显示排序' :value='dataInfo.sort' />
+        <wd-cell title='备注' :value='dataInfo.remark' />
+        <wd-cell title='状态'>
+          <view class='custom-value'>
+            <wd-tag type='primary' plain v-if='dataInfo.status === 1'>开启</wd-tag>
+            <wd-tag type='danger' plain v-else>关闭</wd-tag>
+          </view>
+        </wd-cell>
+        <wd-cell title='创建时间' :value='dataInfo.createTime' />
+      </wd-cell-group>
+    </view>
+    <view class='fix-botton'>
+      <wd-row :gutter='5'>
+        <wd-col :span='10'>
+          <wd-button type='warning' :round='false' style='width: 100%' @click='goEdit'>编辑</wd-button>
+        </wd-col>
+        <wd-col :span='10'>
+          <wd-button type='error' :round='false' style='width: 100%' @click='deleteItem'>删除</wd-button>
+        </wd-col>
+        <wd-col :span='4'>
+          <wd-button type='primary' :round='false' @click='showOperation'>
+            <wd-icon name='more' size='22px'></wd-icon>
+          </wd-button>
+        </wd-col>
+      </wd-row>
+    </view>
+  </view>
+  <wd-message-box />
+  <wd-action-sheet v-model='show' :actions='actions' @select='select' />
+</template>
+
+<script lang='ts' setup>
+  import { onLoad } from '@dcloudio/uni-app'
+  import { deleteRole, getInfo } from '@/service/role/RoleApi'
+  import { useMessage } from 'wot-design-uni'
+
+  const message = useMessage()
+
+  const dataInfo = ref({})
+  const show = ref(false)
+  const actions = [
+    { name: '菜单权限' },
+    { name: '数据权限' }
+  ]
+  const goEdit = () => {
+    uni.navigateTo({
+      url: `/pages/role/edit?id=${dataInfo.value.id}`
+    })
+  }
+  const deleteItem = () => {
+    message.confirm('确定删除吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(async () => {
+      const res = await deleteRole(dataInfo.value.id)
+      if (res.code === 200) {
+        uni.reLaunch({
+          url: '/pages/role/index?action=delete&id=' + dataInfo.value.id
+        })
+      }
+    }).catch(() => {
+      message.info('已取消删除')
+    })
+
+  }
+  const showOperation = () => {
+    show.value = true
+  }
+
+  const select = (item) => {
+    console.log(item)
+  }
+
+  onLoad(async (queryParam) => {
+    const res = await getInfo(queryParam.id)
+    dataInfo.value = res.data
+  })
+</script>
+
+<style scoped>
+  .content {
+    padding-bottom: 8vh;
+  }
+
+  .fix-botton {
+    position: fixed;
+    bottom: 3%;
+    width: 100%;
+  }
+</style>
diff --git a/src/service/role/RoleApi.ts b/src/service/role/RoleApi.ts
index 21da0c5..a7f71de 100644
--- a/src/service/role/RoleApi.ts
+++ b/src/service/role/RoleApi.ts
@@ -15,26 +15,48 @@ export interface RoleVO {
 }
 
 const useMock = import.meta.env.VITE_USE_MOCK === 'true'
+// 模拟数据类型是数组
+const mockConfig = (type = 'array') => {
 
+  if (type === 'array') {
+    return {
+      'data|10': [
+        {
+          'id|+1': 1,
+          name: '@name',
+          code: '@word',
+          'sort|1-100': 1,
+          data_scope: '@word',
+          data_scope_dept_ids: '@word',
+          'status|1-2': 1,
+          'type|1-2': '@word',
+          remark: '@sentence',
+          createTime: '@datetime'
+        }
+      ]
+    }
+  } else {
+    return {
+      'data': {
+        id: 1,
+        name: '@name',
+        code: '@word',
+        'sort|1-100': 1,
+        data_scope: '@word',
+        data_scope_dept_ids: '@word',
+        'status|1-2': 1,
+        'type|1-2': '@word',
+        remark: '@sentence',
+        createTime: '@datetime'
+      }
+    }
+  }
+
+}
 export const getList = (query: object) => {
   if (useMock) {
     return new Promise((resolve) => {
-      const data = Mock.mock({
-        'data|10': [
-          {
-            'id|+1': 1,
-            name: '@name',
-            code: '@word',
-            'sort|1-100': 1,
-            data_scope: '@word',
-            data_scope_dept_ids: '@word',
-            'status|1-2': 1,
-            'type|1-2': '@word',
-            remark: '@sentence',
-            createTime: '@datetime'
-          }
-        ]
-      })
+      const data = Mock.mock(mockConfig('array'))
       resolve({ data: data.data })
     })
   } else {
@@ -42,17 +64,44 @@ export const getList = (query: object) => {
   }
 }
 export const getInfo = (id: number): Promise<RoleVO> => {
-  return httpGet<RoleVO>('/system/role/get?id=' + id)
+  if (useMock) {
+    return new Promise((resolve) => {
+      const data = Mock.mock(mockConfig('object'))
+      resolve({ data: data.data })
+    })
+  } else {
+    return httpGet<RoleVO>('/system/role/get?id=' + id)
+  }
 }
 
 export const createRole = (data: object) => {
-  return httpPost('/system/role/create', data)
+  if (useMock) {
+    return new Promise((resolve) => {
+      const data = Mock.mock(mockConfig('object'))
+      resolve({ data: data.data })
+    })
+  } else {
+    return httpPost('/system/role/create', data)
+  }
 }
 
 export const updateRole = (data: object) => {
-  return httpPost('/system/role/update', data)
+  if (useMock) {
+    return new Promise((resolve) => {
+      const data = Mock.mock(mockConfig('object'))
+      resolve({ data: data.data })
+    })
+  } else {
+    return httpPost('/system/role/update', data)
+  }
 }
 
 export const deleteRole = (id: number) => {
-  return httpPost('/system/role/delete' + { id })
+  if (useMock) {
+    return new Promise((resolve) => {
+      resolve({ data: null, code: 200, msg: '删除成功' })
+    })
+  } else {
+    return httpPost('/system/role/delete' + { id })
+  }
 }
diff --git a/src/types/auto-import.d.ts b/src/types/auto-import.d.ts
index b5c1bff..255cb5b 100644
--- a/src/types/auto-import.d.ts
+++ b/src/types/auto-import.d.ts
@@ -94,7 +94,7 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }
 // for vue template auto import
@@ -156,7 +156,6 @@ declare module 'vue' {
     readonly onUnload: UnwrapRef<typeof import('@dcloudio/uni-app')['onUnload']>
     readonly onUnmounted: UnwrapRef<typeof import('vue')['onUnmounted']>
     readonly onUpdated: UnwrapRef<typeof import('vue')['onUpdated']>
-    readonly onWatcherCleanup: UnwrapRef<typeof import('vue')['onWatcherCleanup']>
     readonly provide: UnwrapRef<typeof import('vue')['provide']>
     readonly reactive: UnwrapRef<typeof import('vue')['reactive']>
     readonly readonly: UnwrapRef<typeof import('vue')['readonly']>
@@ -174,11 +173,91 @@ declare module 'vue' {
     readonly useAttrs: UnwrapRef<typeof import('vue')['useAttrs']>
     readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
     readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
-    readonly useId: UnwrapRef<typeof import('vue')['useId']>
-    readonly useModel: UnwrapRef<typeof import('vue')['useModel']>
     readonly useRequest: UnwrapRef<typeof import('../hooks/useRequest')['default']>
     readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
-    readonly useTemplateRef: UnwrapRef<typeof import('vue')['useTemplateRef']>
+    readonly useUpload: UnwrapRef<typeof import('../hooks/useUpload')['default']>
+    readonly watch: UnwrapRef<typeof import('vue')['watch']>
+    readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']>
+    readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
+    readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
+  }
+}
+declare module '@vue/runtime-core' {
+  interface GlobalComponents {}
+  interface ComponentCustomProperties {
+    readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
+    readonly computed: UnwrapRef<typeof import('vue')['computed']>
+    readonly createApp: UnwrapRef<typeof import('vue')['createApp']>
+    readonly customRef: UnwrapRef<typeof import('vue')['customRef']>
+    readonly defineAsyncComponent: UnwrapRef<typeof import('vue')['defineAsyncComponent']>
+    readonly defineComponent: UnwrapRef<typeof import('vue')['defineComponent']>
+    readonly effectScope: UnwrapRef<typeof import('vue')['effectScope']>
+    readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
+    readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+    readonly h: UnwrapRef<typeof import('vue')['h']>
+    readonly inject: UnwrapRef<typeof import('vue')['inject']>
+    readonly isProxy: UnwrapRef<typeof import('vue')['isProxy']>
+    readonly isReactive: UnwrapRef<typeof import('vue')['isReactive']>
+    readonly isReadonly: UnwrapRef<typeof import('vue')['isReadonly']>
+    readonly isRef: UnwrapRef<typeof import('vue')['isRef']>
+    readonly markRaw: UnwrapRef<typeof import('vue')['markRaw']>
+    readonly nextTick: UnwrapRef<typeof import('vue')['nextTick']>
+    readonly onActivated: UnwrapRef<typeof import('vue')['onActivated']>
+    readonly onAddToFavorites: UnwrapRef<typeof import('@dcloudio/uni-app')['onAddToFavorites']>
+    readonly onBackPress: UnwrapRef<typeof import('@dcloudio/uni-app')['onBackPress']>
+    readonly onBeforeMount: UnwrapRef<typeof import('vue')['onBeforeMount']>
+    readonly onBeforeUnmount: UnwrapRef<typeof import('vue')['onBeforeUnmount']>
+    readonly onBeforeUpdate: UnwrapRef<typeof import('vue')['onBeforeUpdate']>
+    readonly onDeactivated: UnwrapRef<typeof import('vue')['onDeactivated']>
+    readonly onError: UnwrapRef<typeof import('@dcloudio/uni-app')['onError']>
+    readonly onErrorCaptured: UnwrapRef<typeof import('vue')['onErrorCaptured']>
+    readonly onHide: UnwrapRef<typeof import('@dcloudio/uni-app')['onHide']>
+    readonly onLaunch: UnwrapRef<typeof import('@dcloudio/uni-app')['onLaunch']>
+    readonly onLoad: UnwrapRef<typeof import('@dcloudio/uni-app')['onLoad']>
+    readonly onMounted: UnwrapRef<typeof import('vue')['onMounted']>
+    readonly onNavigationBarButtonTap: UnwrapRef<typeof import('@dcloudio/uni-app')['onNavigationBarButtonTap']>
+    readonly onNavigationBarSearchInputChanged: UnwrapRef<typeof import('@dcloudio/uni-app')['onNavigationBarSearchInputChanged']>
+    readonly onNavigationBarSearchInputClicked: UnwrapRef<typeof import('@dcloudio/uni-app')['onNavigationBarSearchInputClicked']>
+    readonly onNavigationBarSearchInputConfirmed: UnwrapRef<typeof import('@dcloudio/uni-app')['onNavigationBarSearchInputConfirmed']>
+    readonly onNavigationBarSearchInputFocusChanged: UnwrapRef<typeof import('@dcloudio/uni-app')['onNavigationBarSearchInputFocusChanged']>
+    readonly onPageNotFound: UnwrapRef<typeof import('@dcloudio/uni-app')['onPageNotFound']>
+    readonly onPageScroll: UnwrapRef<typeof import('@dcloudio/uni-app')['onPageScroll']>
+    readonly onPullDownRefresh: UnwrapRef<typeof import('@dcloudio/uni-app')['onPullDownRefresh']>
+    readonly onReachBottom: UnwrapRef<typeof import('@dcloudio/uni-app')['onReachBottom']>
+    readonly onReady: UnwrapRef<typeof import('@dcloudio/uni-app')['onReady']>
+    readonly onRenderTracked: UnwrapRef<typeof import('vue')['onRenderTracked']>
+    readonly onRenderTriggered: UnwrapRef<typeof import('vue')['onRenderTriggered']>
+    readonly onResize: UnwrapRef<typeof import('@dcloudio/uni-app')['onResize']>
+    readonly onScopeDispose: UnwrapRef<typeof import('vue')['onScopeDispose']>
+    readonly onServerPrefetch: UnwrapRef<typeof import('vue')['onServerPrefetch']>
+    readonly onShareAppMessage: UnwrapRef<typeof import('@dcloudio/uni-app')['onShareAppMessage']>
+    readonly onShareTimeline: UnwrapRef<typeof import('@dcloudio/uni-app')['onShareTimeline']>
+    readonly onShow: UnwrapRef<typeof import('@dcloudio/uni-app')['onShow']>
+    readonly onTabItemTap: UnwrapRef<typeof import('@dcloudio/uni-app')['onTabItemTap']>
+    readonly onThemeChange: UnwrapRef<typeof import('@dcloudio/uni-app')['onThemeChange']>
+    readonly onUnhandledRejection: UnwrapRef<typeof import('@dcloudio/uni-app')['onUnhandledRejection']>
+    readonly onUnload: UnwrapRef<typeof import('@dcloudio/uni-app')['onUnload']>
+    readonly onUnmounted: UnwrapRef<typeof import('vue')['onUnmounted']>
+    readonly onUpdated: UnwrapRef<typeof import('vue')['onUpdated']>
+    readonly provide: UnwrapRef<typeof import('vue')['provide']>
+    readonly reactive: UnwrapRef<typeof import('vue')['reactive']>
+    readonly readonly: UnwrapRef<typeof import('vue')['readonly']>
+    readonly ref: UnwrapRef<typeof import('vue')['ref']>
+    readonly resolveComponent: UnwrapRef<typeof import('vue')['resolveComponent']>
+    readonly shallowReactive: UnwrapRef<typeof import('vue')['shallowReactive']>
+    readonly shallowReadonly: UnwrapRef<typeof import('vue')['shallowReadonly']>
+    readonly shallowRef: UnwrapRef<typeof import('vue')['shallowRef']>
+    readonly toRaw: UnwrapRef<typeof import('vue')['toRaw']>
+    readonly toRef: UnwrapRef<typeof import('vue')['toRef']>
+    readonly toRefs: UnwrapRef<typeof import('vue')['toRefs']>
+    readonly toValue: UnwrapRef<typeof import('vue')['toValue']>
+    readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
+    readonly unref: UnwrapRef<typeof import('vue')['unref']>
+    readonly useAttrs: UnwrapRef<typeof import('vue')['useAttrs']>
+    readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
+    readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
+    readonly useRequest: UnwrapRef<typeof import('../hooks/useRequest')['default']>
+    readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
     readonly useUpload: UnwrapRef<typeof import('../hooks/useUpload')['default']>
     readonly watch: UnwrapRef<typeof import('vue')['watch']>
     readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']>
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index db0a3aa..888bc6e 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -16,7 +16,9 @@ interface NavigateToOptions {
        "/pages/my/index" |
        "/pages/my-info/index" |
        "/pages/person-center/index" |
+       "/pages/role/edit" |
        "/pages/role/index" |
+       "/pages/role/show" |
        "/pages/colab/detail/index";
 }
 interface RedirectToOptions extends NavigateToOptions {}
-- 
Gitee