From 61aa2980d0f5bd2a3659bf878e0998728a813be1 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 30 Aug 2022 19:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=A0=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/channel/weapp.ts                |  11 ++
 admin/src/api/channel/wx_dev.ts               |  11 ++
 .../api/channel/{wechat_oa.ts => wx_oa.ts}    |   4 +-
 admin/src/api/message.ts                      |  31 ++++
 admin/src/install/directives/perms.ts         |   1 -
 .../default/components/sidebar/menu.vue       |   3 +-
 admin/src/router/index.ts                     |  12 +-
 admin/src/router/routes.ts                    |  46 -----
 admin/src/stores/modules/user.ts              |   4 +
 admin/src/utils/util.ts                       |  30 +++-
 admin/src/views/article/lists/index.vue       |   3 +-
 admin/src/views/channel/h5.vue                |   2 +-
 admin/src/views/channel/weapp.vue             | 170 ++++++++++++++++++
 admin/src/views/channel/wx_dev.vue            |  63 +++++++
 .../channel/{wechat_oa => wx_oa}/config.vue   |  28 +--
 .../{wechat_oa => wx_oa}/default_reply.vue    |   0
 .../{wechat_oa => wx_oa}/follow_reply.vue     |   0
 .../{wechat_oa => wx_oa}/keyword_reply.vue    |   0
 .../channel/{wechat_oa => wx_oa}/menu.vue     |   0
 admin/src/views/consumer/lists/detail.vue     |  95 ++++++++++
 admin/src/views/consumer/lists/index.vue      | 132 ++++++++++++++
 admin/src/views/decoration/pages/index.vue    |   0
 admin/src/views/decoration/tabbar.vue         |   0
 admin/src/views/dev_tools/code/index.vue      |   3 +-
 admin/src/views/message/notice/edit.vue       | 121 +++++++++++++
 admin/src/views/message/notice/index.vue      |  91 ++++++++++
 admin/src/views/message/short_letter/edit.vue | 120 +++++++++++++
 .../src/views/message/short_letter/index.vue  |  56 ++++++
 admin/src/views/permission/menu/edit.vue      |  61 +++++--
 admin/src/views/setting/dict/type/index.vue   |   3 +-
 admin/src/views/setting/storage/edit.vue      |   2 +
 admin/src/views/setting/website/filing.vue    |   2 +-
 admin/tailwind.config.js                      |   1 +
 admin/typings/router.d.ts                     |   2 +
 34 files changed, 1029 insertions(+), 79 deletions(-)
 create mode 100644 admin/src/api/channel/weapp.ts
 create mode 100644 admin/src/api/channel/wx_dev.ts
 rename admin/src/api/channel/{wechat_oa.ts => wx_oa.ts} (79%)
 create mode 100644 admin/src/api/message.ts
 create mode 100644 admin/src/views/channel/weapp.vue
 create mode 100644 admin/src/views/channel/wx_dev.vue
 rename admin/src/views/channel/{wechat_oa => wx_oa}/config.vue (91%)
 rename admin/src/views/channel/{wechat_oa => wx_oa}/default_reply.vue (100%)
 rename admin/src/views/channel/{wechat_oa => wx_oa}/follow_reply.vue (100%)
 rename admin/src/views/channel/{wechat_oa => wx_oa}/keyword_reply.vue (100%)
 rename admin/src/views/channel/{wechat_oa => wx_oa}/menu.vue (100%)
 create mode 100644 admin/src/views/consumer/lists/detail.vue
 create mode 100644 admin/src/views/consumer/lists/index.vue
 create mode 100644 admin/src/views/decoration/pages/index.vue
 create mode 100644 admin/src/views/decoration/tabbar.vue
 create mode 100644 admin/src/views/message/notice/edit.vue
 create mode 100644 admin/src/views/message/notice/index.vue
 create mode 100644 admin/src/views/message/short_letter/edit.vue
 create mode 100644 admin/src/views/message/short_letter/index.vue

diff --git a/admin/src/api/channel/weapp.ts b/admin/src/api/channel/weapp.ts
new file mode 100644
index 00000000..59ce0a7b
--- /dev/null
+++ b/admin/src/api/channel/weapp.ts
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 微信小程序配置保存
+export function setWeappConfig(params: any) {
+    return request.post({ url: '/channel/mp/save', params })
+}
+
+// 微信小程序配置详情
+export function getWeappConfig() {
+    return request.get({ url: '/channel/mp/detail' })
+}
diff --git a/admin/src/api/channel/wx_dev.ts b/admin/src/api/channel/wx_dev.ts
new file mode 100644
index 00000000..a39ca962
--- /dev/null
+++ b/admin/src/api/channel/wx_dev.ts
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 微信开发平台配置保存
+export function setWxDevConfig(params: any) {
+    return request.post({ url: '/channel/wx/save', params })
+}
+
+// 微信开发平台配置详情
+export function getWxDevConfig() {
+    return request.get({ url: '/channel/wx/detail' })
+}
diff --git a/admin/src/api/channel/wechat_oa.ts b/admin/src/api/channel/wx_oa.ts
similarity index 79%
rename from admin/src/api/channel/wechat_oa.ts
rename to admin/src/api/channel/wx_oa.ts
index 6ef645cd..fd770cc7 100644
--- a/admin/src/api/channel/wechat_oa.ts
+++ b/admin/src/api/channel/wx_oa.ts
@@ -1,11 +1,11 @@
 import request from '@/utils/request'
 
-// oa渠道配置保存
+// 微信公众号配置保存
 export function setOaConfig(params: any) {
     return request.post({ url: '/channel/oa/save', params })
 }
 
-// oa渠道配置详情
+// 微信公众号配置详情
 export function getOaConfig() {
     return request.get({ url: '/channel/oa/detail' })
 }
diff --git a/admin/src/api/message.ts b/admin/src/api/message.ts
new file mode 100644
index 00000000..8d7ec49e
--- /dev/null
+++ b/admin/src/api/message.ts
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+// 通知设置列表
+export function noticeLists(params: any) {
+    return request.get({ url: '/setting/notice/list', params })
+}
+
+// 通知设置详情
+export function noticeDetail(params: any) {
+    return request.get({ url: '/setting/notice/detail', params })
+}
+
+// 通知设置保存
+export function setNoticeConfig(params: any) {
+    return request.post({ url: '/setting/notice/save', params })
+}
+
+// 短信设置列表
+export function smsLists() {
+    return request.get({ url: '/setting/sms/list' })
+}
+
+// 短信设置详情
+export function smsDetail(params: any) {
+    return request.get({ url: '/setting/sms/detail', params })
+}
+
+// 短信设置保存
+export function setSmsConfig(params: any) {
+    return request.post({ url: '/setting/sms/save', params })
+}
diff --git a/admin/src/install/directives/perms.ts b/admin/src/install/directives/perms.ts
index 507dbfe4..e62765fb 100644
--- a/admin/src/install/directives/perms.ts
+++ b/admin/src/install/directives/perms.ts
@@ -5,7 +5,6 @@
  */
 
 import useUserStore from '@/stores/modules/user'
-
 export default {
     mounted: (el: HTMLElement, binding: any) => {
         const { value } = binding
diff --git a/admin/src/layout/default/components/sidebar/menu.vue b/admin/src/layout/default/components/sidebar/menu.vue
index 3dcae51f..67c38922 100644
--- a/admin/src/layout/default/components/sidebar/menu.vue
+++ b/admin/src/layout/default/components/sidebar/menu.vue
@@ -48,7 +48,8 @@ const props = defineProps({
 defineEmits(['select'])
 
 const route = useRoute()
-const activeMenu = computed<string>(() => (route.meta?.activeMenu as string) ?? route.path)
+console.log(route)
+const activeMenu = computed<string>(() => route.meta?.activeMenu || route.path)
 const themeClass = computed(() => `theme-${props.theme}`)
 </script>
 
diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts
index 09ac78d3..8227b944 100644
--- a/admin/src/router/index.ts
+++ b/admin/src/router/index.ts
@@ -7,6 +7,11 @@ import useUserStore from '@/stores/modules/user'
 // 匹配views里面所有的.vue文件，动态引入
 const modules = import.meta.glob('/src/views/**/*.vue')
 
+//
+export function getModulesKey() {
+    return Object.keys(modules).map((item) => item.replace('/src/views/', '').replace('.vue', ''))
+}
+
 // 过滤路由所需要的数据
 export function filterAsyncRoutes(routes: any[], firstRoute = true) {
     return routes.map((route) => {
@@ -31,7 +36,8 @@ export function createRouteRecord(route: any, firstRoute: boolean): RouteRecordR
             perms: route.perms,
             query: route.params,
             icon: route.menuIcon,
-            type: route.menuType
+            type: route.menuType,
+            activeMenu: route.selected
         }
     }
     switch (route.menuType) {
@@ -79,6 +85,10 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine
     }
 }
 
+export function getRoutePath(perms: string) {
+    return router.getRoutes().find((item) => item.meta?.perms == perms)?.path || ''
+}
+
 // 重置路由
 export function resetRouter() {
     router.removeRoute(INDEX_ROUTE_NAME)
diff --git a/admin/src/router/routes.ts b/admin/src/router/routes.ts
index 26503ab9..dc91f60b 100644
--- a/admin/src/router/routes.ts
+++ b/admin/src/router/routes.ts
@@ -47,52 +47,6 @@ export const constantRoutes: Array<RouteRecordRaw> = [
                 }
             }
         ]
-    },
-    {
-        path: '/dev_tools',
-        component: LAYOUT,
-        children: [
-            {
-                path: 'code/edit',
-                name: Symbol(),
-                component: () => import('@/views/dev_tools/code/edit.vue'),
-                meta: {
-                    title: '编辑数据表',
-                    activeMenu: '/dev_tools/code',
-                    name: Symbol()
-                }
-            }
-        ]
-    },
-    {
-        path: '/setting',
-        component: LAYOUT,
-        children: [
-            {
-                path: 'dict/data',
-                name: Symbol(),
-                component: () => import('@/views/setting/dict/data/index.vue'),
-                meta: {
-                    title: '数据管理',
-                    activeMenu: '/setting/dict'
-                }
-            }
-        ]
-    },
-    {
-        path: '/article',
-        component: LAYOUT,
-        children: [
-            {
-                path: 'lists/edit',
-                name: Symbol(),
-                component: () => import('@/views/article/lists/edit.vue'),
-                meta: {
-                    title: '文章编辑',
-                    activeMenu: '/article/lists'
-                }
-            }
-        ]
     }
 ]
 
diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts
index dbf52a93..f84da3f6 100644
--- a/admin/src/stores/modules/user.ts
+++ b/admin/src/stores/modules/user.ts
@@ -10,6 +10,7 @@ export interface UserState {
     token: string
     userInfo: Record<string, any>
     routes: RouteRecordRaw[]
+    menu: any[]
     perms: string[]
 }
 
@@ -21,6 +22,7 @@ const useUserStore = defineStore({
         userInfo: {},
         // 路由
         routes: [],
+        menu: [],
         // 权限
         perms: []
     }),
@@ -30,6 +32,7 @@ const useUserStore = defineStore({
             this.token = ''
             this.userInfo = {}
             this.perms = []
+            this.menu = []
         },
         login(playload: any) {
             const { account, password } = playload
@@ -78,6 +81,7 @@ const useUserStore = defineStore({
             return new Promise((resolve, reject) => {
                 getMenu()
                     .then((data) => {
+                        this.menu = data
                         this.routes = filterAsyncRoutes(data)
                         resolve(data)
                     })
diff --git a/admin/src/utils/util.ts b/admin/src/utils/util.ts
index 11e12b7b..119b60bc 100644
--- a/admin/src/utils/util.ts
+++ b/admin/src/utils/util.ts
@@ -1,4 +1,5 @@
 import { isObject } from '@vue/shared'
+import { cloneDeep } from 'lodash'
 
 /**
  * @description 添加单位
@@ -25,7 +26,7 @@ export const isEmpty = (value: unknown) => {
  */
 
 export const treeToArray = (data: any[], props = { children: 'children' }) => {
-    data = JSON.parse(JSON.stringify(data))
+    data = cloneDeep(data)
     const { children } = props
     const newData = []
     const queue: any[] = []
@@ -41,6 +42,33 @@ export const treeToArray = (data: any[], props = { children: 'children' }) => {
     return newData
 }
 
+/**
+ * @description 数组转
+ * @param {Array} data  数据
+ * @param {Object} props `{ parent: 'pid', children: 'children' }`
+ */
+
+export const arrayToTree = (
+    data: any[],
+    props = { id: 'id', parentId: 'pid', children: 'children' }
+) => {
+    data = cloneDeep(data)
+    const { id, parentId, children } = props
+    const result: any[] = []
+    const map = new Map()
+    data.forEach((item) => {
+        map.set(item[id], item)
+        const parent = map.get(item[parentId])
+        if (parent) {
+            parent[children] = parent[children] ?? []
+            parent[children].push(item)
+        } else {
+            result.push(item)
+        }
+    })
+    return result
+}
+
 /**
  * @description 获取正确的路经
  * @param {String} path  数据
diff --git a/admin/src/views/article/lists/index.vue b/admin/src/views/article/lists/index.vue
index 8352b640..b139d188 100644
--- a/admin/src/views/article/lists/index.vue
+++ b/admin/src/views/article/lists/index.vue
@@ -79,7 +79,7 @@
                         <el-button v-perms="['article:edit']" type="primary" link>
                             <router-link
                                 :to="{
-                                    path: '/article/lists/edit',
+                                    path: getRoutePath('article:edit'),
                                     query: {
                                         id: row.id
                                     }
@@ -109,6 +109,7 @@
 import { articleLists, articleDelete, articleStatus, articleCateAll } from '@/api/article'
 import { useDictOptions } from '@/hooks/useDictOptions'
 import { usePaging } from '@/hooks/usePaging'
+import { getRoutePath } from '@/router'
 import feedback from '@/utils/feedback'
 const queryParams = reactive({
     title: '',
diff --git a/admin/src/views/channel/h5.vue b/admin/src/views/channel/h5.vue
index 00294399..841c98aa 100644
--- a/admin/src/views/channel/h5.vue
+++ b/admin/src/views/channel/h5.vue
@@ -4,7 +4,7 @@
             <el-alert type="warning" title="温馨提示：H5商城设置" :closable="false" show-icon />
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
-            <el-form ref="formRef" :model="formData" label-width="120px">
+            <el-form ref="formRef" :model="formData" label-width="160px">
                 <el-form-item label="渠道状态" required prop="status">
                     <div>
                         <el-radio-group v-model="formData.status">
diff --git a/admin/src/views/channel/weapp.vue b/admin/src/views/channel/weapp.vue
new file mode 100644
index 00000000..f9649c9c
--- /dev/null
+++ b/admin/src/views/channel/weapp.vue
@@ -0,0 +1,170 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-alert
+                type="warning"
+                title="温馨提示：填写微信小程序开发配置，请前往微信公众平台申请小程序并完成认证"
+                :closable="false"
+                show-icon
+            />
+        </el-card>
+        <el-form ref="formRef" :model="formData" label-width="160px">
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">微信小程序</div>
+                <el-form-item label="小程序名称" prop="name">
+                    <div class="w-80">
+                        <el-input v-model="formData.name" placeholder="请输入小程序名称" />
+                    </div>
+                </el-form-item>
+                <el-form-item label="原始ID" prop="primaryId">
+                    <div class="w-80">
+                        <el-input v-model="formData.primaryId" placeholder="请输入原始ID" />
+                    </div>
+                </el-form-item>
+                <el-form-item label="小程序码" prop="qrCode">
+                    <div>
+                        <div>
+                            <material-picker v-model="formData.qrCode" :limit="1" />
+                        </div>
+                        <div class="form-tips">建议尺寸：宽400px*高400px。jpg，jpeg，png格式</div>
+                    </div>
+                </el-form-item>
+            </el-card>
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">开发者ID</div>
+                <el-form-item label="AppID" prop="appId">
+                    <div class="w-80">
+                        <el-input v-model="formData.appId" placeholder="请输入AppID" />
+                    </div>
+                </el-form-item>
+                <el-form-item label="AppSecret" prop="appSecret">
+                    <div>
+                        <div class="w-80">
+                            <el-input v-model="formData.appSecret" placeholder="请输入AppSecret" />
+                        </div>
+                    </div>
+                </el-form-item>
+                <el-form-item>
+                    <div class="form-tips">
+                        小程序账号登录微信公众平台，点击开发>开发设置->开发者ID，设置AppID和AppSecret
+                    </div>
+                </el-form-item>
+            </el-card>
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">服务器域名</div>
+                <el-form-item label="request合法域名" prop="appId">
+                    <div>
+                        <div class="flex">
+                            <div class="w-80 mr-4">
+                                <el-input v-model="formData.appId" disabled />
+                            </div>
+                            <el-button>复制</el-button>
+                        </div>
+                        <div class="form-tips">
+                            小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名
+                        </div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="socket合法域名" prop="appId">
+                    <div>
+                        <div class="flex">
+                            <div class="w-80 mr-4">
+                                <el-input v-model="formData.appId" disabled />
+                            </div>
+                            <el-button>复制</el-button>
+                        </div>
+                        <div class="form-tips">
+                            小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写wss协议域名
+                        </div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="uploadFile合法域名" prop="appId">
+                    <div>
+                        <div class="flex">
+                            <div class="w-80 mr-4">
+                                <el-input v-model="formData.appId" disabled />
+                            </div>
+                            <el-button>复制</el-button>
+                        </div>
+                        <div class="form-tips">
+                            小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名
+                        </div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="downloadFile合法域名" prop="appId">
+                    <div>
+                        <div class="flex">
+                            <div class="w-80 mr-4">
+                                <el-input v-model="formData.appId" disabled />
+                            </div>
+                            <el-button>复制</el-button>
+                        </div>
+                        <div class="form-tips">
+                            小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名
+                        </div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="udp合法域名" prop="appId">
+                    <div>
+                        <div class="flex">
+                            <div class="w-80 mr-4">
+                                <el-input v-model="formData.appId" disabled />
+                            </div>
+                            <el-button>复制</el-button>
+                        </div>
+                        <div class="form-tips">
+                            小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写udp协议域名
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-card>
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">业务域名</div>
+                <el-form-item label="业务域名" prop="appId">
+                    <div>
+                        <div class="flex">
+                            <div class="w-80 mr-4">
+                                <el-input v-model="formData.appId" disabled />
+                            </div>
+                            <el-button>复制</el-button>
+                        </div>
+                        <div class="form-tips">
+                            小程序账号登录微信公众平台，点击开发>开发设置->业务域名，填写业务域名
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-card>
+        </el-form>
+        <footer-btns v-perms="['channel:h5:save']">
+            <el-button type="primary" @click="handelSave">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+<script lang="ts" setup>
+import { getWeappConfig, setWeappConfig } from '@/api/channel/weapp'
+import feedback from '@/utils/feedback'
+
+const formData = reactive({
+    name: '',
+    primaryId: '',
+    qrCode: '',
+    appId: '',
+    appSecret: ''
+})
+
+const getDetail = async () => {
+    const data = await getWeappConfig()
+    for (const key in formData) {
+        //@ts-ignore
+        formData[key] = data[key]
+    }
+}
+
+const handelSave = async () => {
+    await setWeappConfig(formData)
+    getDetail()
+    feedback.msgSuccess('操作成功')
+}
+
+getDetail()
+</script>
diff --git a/admin/src/views/channel/wx_dev.vue b/admin/src/views/channel/wx_dev.vue
new file mode 100644
index 00000000..88ae3264
--- /dev/null
+++ b/admin/src/views/channel/wx_dev.vue
@@ -0,0 +1,63 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-alert
+                type="warning"
+                title="温馨提示：填写微信开放平台开发配置，请前往微信开放平台创建应用并完成认证；APP应用配置主要用于APP微信登录和微信支付"
+                :closable="false"
+                show-icon
+            />
+        </el-card>
+        <el-form ref="formRef" :model="formData" label-width="160px">
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">APP应用</div>
+                <el-form-item label="AppID" prop="appId">
+                    <div class="w-80">
+                        <el-input v-model="formData.appId" placeholder="请输入AppID" />
+                    </div>
+                </el-form-item>
+                <el-form-item label="AppSecret" prop="appSecret">
+                    <div>
+                        <div class="w-80">
+                            <el-input v-model="formData.appSecret" placeholder="请输入AppSecret" />
+                        </div>
+                    </div>
+                </el-form-item>
+                <el-form-item>
+                    <div class="form-tips">
+                        小程序账号登录微信公众平台，点击开发>开发设置->开发者ID，设置AppID和AppSecret
+                    </div>
+                </el-form-item>
+            </el-card>
+        </el-form>
+        <footer-btns v-perms="['channel:h5:save']">
+            <el-button type="primary" @click="handelSave">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+<script lang="ts" setup>
+import { getH5Config, setH5Config } from '@/api/channel/h5'
+import feedback from '@/utils/feedback'
+
+const formData = reactive({
+    status: 0,
+    close: 0,
+    url: ''
+})
+
+const getDetail = async () => {
+    const data = await getH5Config()
+    for (const key in formData) {
+        //@ts-ignore
+        formData[key] = data[key]
+    }
+}
+
+const handelSave = async () => {
+    await setH5Config(formData)
+    getDetail()
+    feedback.msgSuccess('操作成功')
+}
+
+getDetail()
+</script>
diff --git a/admin/src/views/channel/wechat_oa/config.vue b/admin/src/views/channel/wx_oa/config.vue
similarity index 91%
rename from admin/src/views/channel/wechat_oa/config.vue
rename to admin/src/views/channel/wx_oa/config.vue
index fde8fbb9..5c7cccc2 100644
--- a/admin/src/views/channel/wechat_oa/config.vue
+++ b/admin/src/views/channel/wx_oa/config.vue
@@ -8,7 +8,7 @@
                 show-icon
             />
         </el-card>
-        <el-form ref="formRef" :model="formData" label-width="120px">
+        <el-form ref="formRef" :model="formData" label-width="160px">
             <el-card class="!border-none mt-4" shadow="never">
                 <div class="font-medium mb-7">微信公众号</div>
                 <el-form-item label="公众号名称" prop="name">
@@ -42,23 +42,27 @@
                         <div class="w-80">
                             <el-input v-model="formData.appSecret" placeholder="请输入AppSecret" />
                         </div>
-                        <div class="form-tips">
-                            登录微信公众平台，点击开发>基本配置>公众号开发信息，设置AppID和AppSecret
-                        </div>
+                    </div>
+                </el-form-item>
+                <el-form-item>
+                    <div class="form-tips">
+                        小程序账号登录微信公众平台，点击开发>开发设置->开发者ID，设置AppID和AppSecret
                     </div>
                 </el-form-item>
             </el-card>
             <el-card class="!border-none mt-4" shadow="never">
                 <div class="font-medium mb-7">服务器配置</div>
                 <el-form-item label="URL" prop="appId">
-                    <div class="flex">
-                        <div class="w-80 mr-4">
-                            <el-input v-model="formData.appId" disabled />
+                    <div>
+                        <div class="flex">
+                            <div class="w-80 mr-4">
+                                <el-input v-model="formData.appId" disabled />
+                            </div>
+                            <el-button>复制</el-button>
+                        </div>
+                        <div class="form-tips">
+                            登录微信公众平台，点击开发>基本配置>服务器配置，填写服务器地址（URL）
                         </div>
-                        <el-button>复制</el-button>
-                    </div>
-                    <div class="form-tips">
-                        登录微信公众平台，点击开发>基本配置>服务器配置，填写服务器地址（URL）
                     </div>
                 </el-form-item>
                 <el-form-item label="Token" prop="Token">
@@ -150,7 +154,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { getOaConfig, setOaConfig } from '@/api/channel/wechat_oa'
+import { getOaConfig, setOaConfig } from '@/api/channel/wx_oa'
 import feedback from '@/utils/feedback'
 
 const formData = reactive({
diff --git a/admin/src/views/channel/wechat_oa/default_reply.vue b/admin/src/views/channel/wx_oa/default_reply.vue
similarity index 100%
rename from admin/src/views/channel/wechat_oa/default_reply.vue
rename to admin/src/views/channel/wx_oa/default_reply.vue
diff --git a/admin/src/views/channel/wechat_oa/follow_reply.vue b/admin/src/views/channel/wx_oa/follow_reply.vue
similarity index 100%
rename from admin/src/views/channel/wechat_oa/follow_reply.vue
rename to admin/src/views/channel/wx_oa/follow_reply.vue
diff --git a/admin/src/views/channel/wechat_oa/keyword_reply.vue b/admin/src/views/channel/wx_oa/keyword_reply.vue
similarity index 100%
rename from admin/src/views/channel/wechat_oa/keyword_reply.vue
rename to admin/src/views/channel/wx_oa/keyword_reply.vue
diff --git a/admin/src/views/channel/wechat_oa/menu.vue b/admin/src/views/channel/wx_oa/menu.vue
similarity index 100%
rename from admin/src/views/channel/wechat_oa/menu.vue
rename to admin/src/views/channel/wx_oa/menu.vue
diff --git a/admin/src/views/consumer/lists/detail.vue b/admin/src/views/consumer/lists/detail.vue
new file mode 100644
index 00000000..5c3bcc72
--- /dev/null
+++ b/admin/src/views/consumer/lists/detail.vue
@@ -0,0 +1,95 @@
+<template>
+    <div class="article-edit">
+        <el-card class="!border-none" shadow="never">
+            <el-page-header content="用户详情" @back="$router.back()" />
+        </el-card>
+        <el-card class="mt-4 !border-none" header="基本资料" shadow="never">
+            <el-form
+                ref="formRef"
+                class="ls-form"
+                :model="formData"
+                label-width="120px"
+                :rules="rules"
+            >
+                <div class="bg-page py-5 pl-20 mb-10">
+                    <div class="mb-3 text-tx-regular">用户头像</div>
+                    <el-avatar :size="58" />
+                </div>
+                <el-form-item label="用户编号："> 20000440556 </el-form-item>
+                <el-form-item label="用户昵称："> 热心市民小张 </el-form-item>
+                <el-form-item label="账号："> fwewrwre90 </el-form-item>
+                <el-form-item label="真实姓名："> 张三 </el-form-item>
+                <el-form-item label="性别："> 未知 </el-form-item>
+                <el-form-item label="联系电话："> 13800138000 </el-form-item>
+                <el-form-item label="注册来源："> 微信小程序 </el-form-item>
+                <el-form-item label="注册时间："> 2022-02-15 12:12:12 </el-form-item>
+                <el-form-item label="最近登录时间："> 2022-02-18 12:12:12 </el-form-item>
+            </el-form>
+        </el-card>
+        <footer-btns>
+            <el-button type="primary" @click="handleSave">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import type { FormInstance } from 'element-plus'
+import feedback from '@/utils/feedback'
+import { useDictOptions } from '@/hooks/useDictOptions'
+import { articleCateAll, articleDetail, articleEdit } from '@/api/article'
+
+const route = useRoute()
+const router = useRouter()
+const formData = reactive({
+    id: '',
+    title: '',
+    image: '',
+    cid: '',
+    intro: '',
+    author: '',
+    content: '',
+    visit: 0,
+    sort: 0,
+    isShow: ''
+})
+
+const formRef = shallowRef<FormInstance>()
+const rules = reactive({
+    ['base.tableName']: [{ required: true, message: '请输入表名称', trigger: 'blur' }],
+    ['base.tableComment']: [{ required: true, message: '请输入表描述', trigger: 'blur' }],
+    ['base.entityName']: [{ required: true, message: '请输入实体类名称', trigger: 'blur' }],
+    ['base.authorName']: [{ required: true, message: '请输入作者', trigger: 'blur' }],
+    ['gen.moduleName']: [{ required: true, message: '请输入模块名', trigger: 'blur' }],
+    ['gen.functionName']: [{ required: true, message: '请输入功能名称', trigger: 'blur' }],
+    ['gen.treePrimary']: [{ required: true, message: '请选择树主键字段', trigger: 'blur' }],
+    ['gen.treeParent']: [{ required: true, message: '请选择树父级字段', trigger: 'blur' }],
+    ['gen.treeName']: [{ required: true, message: '请选择树名称字段', trigger: 'blur' }]
+})
+
+const getDetails = async () => {
+    const data = await articleDetail({
+        id: route.query.id
+    })
+    Object.keys(formData).forEach((key) => {
+        //@ts-ignore
+        formData[key] = data[key]
+    })
+}
+
+const { optionsData } = useDictOptions<{
+    articleCate: any[]
+}>({
+    articleCate: {
+        api: articleCateAll
+    }
+})
+
+const handleSave = async () => {
+    await formRef.value?.validate()
+    await articleEdit(formData)
+    feedback.msgSuccess('操作成功')
+    router.back()
+}
+
+getDetails()
+</script>
diff --git a/admin/src/views/consumer/lists/index.vue b/admin/src/views/consumer/lists/index.vue
new file mode 100644
index 00000000..6507111e
--- /dev/null
+++ b/admin/src/views/consumer/lists/index.vue
@@ -0,0 +1,132 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
+                <el-form-item label="用户信息">
+                    <el-input
+                        class="w-56"
+                        v-model="queryParams.title"
+                        placeholder="用户编号/昵称/手机号码"
+                    />
+                </el-form-item>
+                <el-form-item label="注册时间">
+                    <el-select class="w-56" v-model="queryParams.cid">
+                        <el-option label="全部" value />
+                        <el-option
+                            v-for="item in optionsData.articleCate"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="注册来源">
+                    <el-select class="w-56" v-model="queryParams.isShow">
+                        <el-option label="全部" value />
+                        <el-option label="显示" :value="1" />
+                        <el-option label="隐藏" :value="0" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none mt-4" shadow="never">
+            <el-table size="large" v-loading="pager.loading" :data="pager.lists">
+                <el-table-column label="用户编号" prop="id" min-width="80" />
+                <el-table-column label="头像" min-width="100">
+                    <template #default="{ row }">
+                        <image-contain
+                            :src="row.image"
+                            :width="60"
+                            height="45"
+                            :preview-src-list="[row.image]"
+                        />
+                    </template>
+                </el-table-column>
+                <el-table-column label="昵称" prop="category" min-width="100" />
+                <el-table-column label="账号" prop="author" min-width="120" />
+                <el-table-column label="手机号码" prop="visit" min-width="100" />
+                <el-table-column label="性别" min-width="100">
+                    <template #default="{ row }">
+                        <el-switch
+                            v-perms="['article:cate:change']"
+                            v-if="row.id != 1"
+                            v-model="row.isShow"
+                            :active-value="0"
+                            :inactive-value="1"
+                            @change="changeStatus(row.id)"
+                        />
+                    </template>
+                </el-table-column>
+                <el-table-column label="注册来源" prop="sort" min-width="100" />
+                <el-table-column label="注册时间" prop="createTime" min-width="120" />
+                <el-table-column label="操作" width="120" fixed="right">
+                    <template #default="{ row }">
+                        <el-button v-perms="['consumer:lists:detail']" type="primary" link>
+                            <router-link
+                                :to="{
+                                    path: getRoutePath('consumer:lists:detail'),
+                                    query: {
+                                        id: row.id
+                                    }
+                                }"
+                            >
+                                详情
+                            </router-link>
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+<script lang="ts" setup>
+import { articleLists, articleDelete, articleStatus, articleCateAll } from '@/api/article'
+import { useDictOptions } from '@/hooks/useDictOptions'
+import { usePaging } from '@/hooks/usePaging'
+import feedback from '@/utils/feedback'
+import { getRoutePath } from '@/router'
+const queryParams = reactive({
+    title: '',
+    cid: '',
+    isShow: ''
+})
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: articleLists,
+    params: queryParams
+})
+
+const { optionsData } = useDictOptions<{
+    articleCate: any[]
+}>({
+    articleCate: {
+        api: articleCateAll
+    }
+})
+
+const changeStatus = async (id: number) => {
+    try {
+        await articleStatus({ id })
+        feedback.msgSuccess('修改成功')
+        getLists()
+    } catch (error) {
+        getLists()
+    }
+}
+
+const handleDelete = async (id: number) => {
+    await feedback.confirm('确定要删除？')
+    await articleDelete({ id })
+    feedback.msgSuccess('删除成功')
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/admin/src/views/decoration/pages/index.vue b/admin/src/views/decoration/pages/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/admin/src/views/decoration/tabbar.vue b/admin/src/views/decoration/tabbar.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/admin/src/views/dev_tools/code/index.vue b/admin/src/views/dev_tools/code/index.vue
index d27fd94e..0b3acd90 100644
--- a/admin/src/views/dev_tools/code/index.vue
+++ b/admin/src/views/dev_tools/code/index.vue
@@ -73,7 +73,7 @@
                                 <el-button type="primary" link v-perms="['gen:editTable']">
                                     <router-link
                                         :to="{
-                                            path: '/dev_tools/code/edit',
+                                            path: getRoutePath('gen:editTable'),
                                             query: {
                                                 id: row.id
                                             }
@@ -152,6 +152,7 @@ import DataTable from '../components/data-table.vue'
 import CodePreview from '../components/code-preview.vue'
 import feedback from '@/utils/feedback'
 import { streamFileDownload } from '@/utils/file'
+import { getRoutePath } from '@/router'
 
 const formData = reactive({
     tableName: '',
diff --git a/admin/src/views/message/notice/edit.vue b/admin/src/views/message/notice/edit.vue
new file mode 100644
index 00000000..298c4ad3
--- /dev/null
+++ b/admin/src/views/message/notice/edit.vue
@@ -0,0 +1,121 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-page-header content="编辑通知设置" @back="$router.back()" />
+        </el-card>
+        <el-form
+            ref="formRef"
+            :model="formData"
+            label-width="120px"
+            :rules="rules"
+            v-loading="loading"
+        >
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">通知名称</div>
+                <el-form-item label="通知名称" prop="name"> {{ formData.name }} </el-form-item>
+                <el-form-item label="通知类型" prop="name"> {{ formData.type }} </el-form-item>
+                <el-form-item label="通知业务" prop="name"> {{ formData.remarks }} </el-form-item>
+            </el-card>
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">短信通知</div>
+                <el-form-item label="开启状态" prop="smsNotice.status" required>
+                    <el-radio-group v-model="formData.smsNotice.status">
+                        <el-radio label="0">关闭</el-radio>
+                        <el-radio label="1">开启</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="模板ID" prop="smsNotice.templateId">
+                    <div class="w-80">
+                        <el-input
+                            v-model="formData.smsNotice.templateId"
+                            placeholder="请输入模板ID"
+                        />
+                    </div>
+                </el-form-item>
+                <el-form-item label="短信内容" prop="smsNotice.content">
+                    <div class="flex-1">
+                        <div class="w-full max-w-[320px]">
+                            <el-input
+                                type="textarea"
+                                :rows="6"
+                                v-model="formData.smsNotice.content"
+                            />
+                        </div>
+                        <div class="form-tips">
+                            可选变量 用户昵称:nickname 订单编号:order_sn 支付时间:pay_time
+                            <br />
+                            示例：亲爱的${nickname}，您的订单${order_sn}已支付成功，商家正在快马加鞭为您安排发货。
+                            <br />
+                            生效条件：1、管理后台完成短信设置。2、第三方短信平台申请模板。
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-card>
+        </el-form>
+        <footer-btns>
+            <el-button type="primary" @click="handleSave">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import type { FormInstance } from 'element-plus'
+import feedback from '@/utils/feedback'
+import { noticeDetail, setNoticeConfig } from '@/api/message'
+
+const route = useRoute()
+const router = useRouter()
+
+const loading = ref(false)
+const formData = reactive({
+    id: '',
+    name: '',
+    type: '',
+    remarks: '',
+    smsNotice: {
+        status: 0,
+        templateId: '',
+        content: ''
+    }
+})
+
+const rules = {
+    'smsNotice.templateId': [
+        {
+            required: true,
+            message: '请输入模板ID',
+            trigger: 'blur'
+        }
+    ],
+    'smsNotice.content': [
+        {
+            required: true,
+            message: '请输入短信内容',
+            trigger: 'blur'
+        }
+    ]
+}
+
+const formRef = shallowRef<FormInstance>()
+
+const getDetails = async () => {
+    loading.value = true
+    const data = await noticeDetail({
+        id: route.query.id
+    })
+    Object.keys(data).forEach((key) => {
+        //@ts-ignore
+        formData[key] = data[key]
+    })
+    loading.value = false
+}
+
+const handleSave = async () => {
+    await formRef.value?.validate()
+    await setNoticeConfig(formData)
+    feedback.msgSuccess('操作成功')
+    router.back()
+}
+
+route.query.id && getDetails()
+</script>
diff --git a/admin/src/views/message/notice/index.vue b/admin/src/views/message/notice/index.vue
new file mode 100644
index 00000000..8f90fb2a
--- /dev/null
+++ b/admin/src/views/message/notice/index.vue
@@ -0,0 +1,91 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-alert
+                type="warning"
+                title="温馨提示：平台配置在各个场景下的通知发送方式和内容模板"
+                :closable="false"
+                show-icon
+            ></el-alert>
+        </el-card>
+        <el-card class="!border-none mt-4" shadow="never">
+            <el-tabs v-model="tabsActive" @tab-change="getLists">
+                <el-tab-pane
+                    v-for="(item, index) in tabsMap"
+                    :key="index"
+                    :label="item.name"
+                    :name="item.type"
+                    lazy
+                ></el-tab-pane>
+            </el-tabs>
+            <el-table size="large" :data="state.lists" v-loading="state.loading">
+                <el-table-column label="通知场景" prop="name" min-width="120" />
+                <el-table-column label="通知类型" prop="type" min-width="160" />
+                <el-table-column label="短信通知" min-width="80">
+                    <template #default="{ row }">
+                        <el-tag v-if="row.smsStatus == 1">开启</el-tag>
+                        <el-tag type="danger" v-else>关闭</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" min-width="80" fixed="right">
+                    <template #default="{ row }">
+                        <el-button v-perms="['setting:notice:detail']" type="primary" link>
+                            <router-link
+                                :to="{
+                                    path: getRoutePath('setting:notice:detail'),
+                                    query: {
+                                        id: row.id
+                                    }
+                                }"
+                            >
+                                设置
+                            </router-link>
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+    </div>
+</template>
+<script lang="ts" setup>
+import { noticeLists } from '@/api/message'
+import { getRoutePath } from '@/router'
+
+enum NoticeEnums {
+    USER = 1,
+    PLATFORM = 2
+}
+
+const tabsActive = ref(NoticeEnums.USER)
+const tabsMap = [
+    {
+        name: '通知用户',
+        type: NoticeEnums.USER
+    },
+    {
+        name: '通知平台',
+        type: NoticeEnums.PLATFORM
+    }
+]
+
+// 列表数据
+const state = reactive({
+    loading: false,
+    lists: []
+})
+
+// 获取存储引擎列表数据
+const getLists = async () => {
+    try {
+        state.loading = true
+        state.lists = await noticeLists({
+            recipient: tabsActive.value
+        })
+        state.loading = false
+    } catch (error) {
+        state.loading = false
+    }
+}
+
+getLists()
+</script>
diff --git a/admin/src/views/message/short_letter/edit.vue b/admin/src/views/message/short_letter/edit.vue
new file mode 100644
index 00000000..55dfa86c
--- /dev/null
+++ b/admin/src/views/message/short_letter/edit.vue
@@ -0,0 +1,120 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            title="设置存储"
+            :async="true"
+            width="550px"
+            :clickModalClose="true"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="短信渠道">
+                    <div>
+                        {{ formData.name }}
+                    </div>
+                </el-form-item>
+                <el-form-item label="短信签名" prop="sign">
+                    <el-input v-model="formData.sign" placeholder="请输入短信签名" />
+                </el-form-item>
+                <el-form-item label="APP_KEY" prop="appKey">
+                    <el-input v-model="formData.appKey" placeholder="请输入APP_KEY" />
+                </el-form-item>
+                <el-form-item label="SECRET_ID" prop="secretId" v-if="formData.alias == 'tencent'">
+                    <el-input v-model="formData.secretId" placeholder="请输入SECRET_ID" />
+                </el-form-item>
+                <el-form-item label="SECRET_KEY" prop="secretKey">
+                    <el-input v-model="formData.secretKey" placeholder="请输入SECRET_KEY" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-radio-group v-model="formData.status">
+                        <el-radio :label="0">关闭</el-radio>
+                        <el-radio :label="1">开启</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+<script lang="ts" setup>
+import { setSmsConfig, smsDetail } from '@/api/message'
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import feedback from '@/utils/feedback'
+const emit = defineEmits(['success'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const formData = reactive({
+    name: '',
+    alias: '',
+    sign: '',
+    appKey: '',
+    secretKey: '',
+    secretId: '',
+    status: 0
+})
+
+const formRules = {
+    sign: [
+        {
+            required: true,
+            message: '请输入短信签名',
+            trigger: 'blur'
+        }
+    ],
+    appKey: [
+        {
+            required: true,
+            message: '请输入APP_KEY',
+            trigger: 'blur'
+        }
+    ],
+    secretKey: [
+        {
+            required: true,
+            message: '请输入SECRET_KEY',
+            trigger: 'blur'
+        }
+    ],
+    secretId: [
+        {
+            required: true,
+            message: '请输入SECRET_ID',
+            trigger: 'blur'
+        }
+    ]
+}
+
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    await setSmsConfig(formData)
+    feedback.msgSuccess('操作成功')
+    popupRef.value?.close()
+    emit('success')
+}
+
+const getDetail = async () => {
+    const data = await smsDetail({
+        alias: formData.alias
+    })
+    for (const key in data) {
+        //@ts-ignore
+        formData[key] = data[key]
+    }
+}
+
+const open = (type: string) => {
+    formData.alias = type
+    popupRef.value?.open()
+    getDetail()
+}
+
+const handleClose = () => {
+    formRef.value?.resetFields()
+}
+
+defineExpose({
+    open
+})
+</script>
diff --git a/admin/src/views/message/short_letter/index.vue b/admin/src/views/message/short_letter/index.vue
new file mode 100644
index 00000000..8d890365
--- /dev/null
+++ b/admin/src/views/message/short_letter/index.vue
@@ -0,0 +1,56 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never" v-loading="state.loading">
+            <el-table size="large" :data="state.lists">
+                <el-table-column label="短信渠道" prop="name" min-width="120" />
+                <el-table-column label="状态" min-width="120">
+                    <template #default="{ row }">
+                        <el-tag v-if="row.status == 1">开启</el-tag>
+                        <el-tag type="danger" v-else>关闭</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" min-width="120" fixed="right">
+                    <template #default="{ row }">
+                        <el-button
+                            v-perms="['setting:storage:edit']"
+                            type="primary"
+                            link
+                            @click="handleSet(row.alias)"
+                        >
+                            设置
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+        <edit-popup ref="editRef" @success="getLists" />
+    </div>
+</template>
+<script lang="ts" setup>
+import { smsLists } from '@/api/message'
+import EditPopup from './edit.vue'
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+
+// 列表数据
+const state = reactive({
+    loading: false,
+    lists: []
+})
+
+// 获取存储引擎列表数据
+const getLists = async () => {
+    try {
+        state.loading = true
+        state.lists = await smsLists()
+        state.loading = false
+    } catch (error) {
+        state.loading = false
+    }
+}
+
+const handleSet = (alias: string) => {
+    editRef.value?.open(alias)
+}
+
+getLists()
+</script>
diff --git a/admin/src/views/permission/menu/edit.vue b/admin/src/views/permission/menu/edit.vue
index 6145c202..271da053 100644
--- a/admin/src/views/permission/menu/edit.vue
+++ b/admin/src/views/permission/menu/edit.vue
@@ -62,12 +62,31 @@
                         prop="component"
                     >
                         <div class="flex-1">
-                            <el-input v-model="formData.component" placeholder="请输入组件路径" />
+                            <el-autocomplete
+                                class="w-full"
+                                v-model="formData.component"
+                                :fetch-suggestions="querySearch"
+                                clearable
+                                placeholder="请输入组件路径"
+                            />
+                            <!-- <el-input v-model="formData.component" placeholder="请输入组件路径" /> -->
                             <div class="form-tips">
                                 访问的组件路径，如：`permission/admin/index`，默认在`views`目录下
                             </div>
                         </div>
                     </el-form-item>
+                    <el-form-item
+                        label="选中菜单"
+                        prop="p"
+                        v-if="formData.menuType == MenuEnum.MENU"
+                    >
+                        <div class="flex-1">
+                            <el-input v-model="formData.selected" placeholder="请输入路由路径" />
+                            <div class="form-tips">
+                                访问详情页面，编辑页面时，菜单高亮显示，如`/consumer/lists`
+                            </div>
+                        </div>
+                    </el-form-item>
                     <el-form-item
                         v-if="formData.menuType != MenuEnum.CATALOGUE"
                         label="权限字符"
@@ -95,15 +114,20 @@
                             </div>
                         </div>
                     </el-form-item>
-                    <!-- <el-form-item v-if="formData.type == MenuEnum.MENU" label="是否缓存" prop="isCache" required>
-              <div>
-                <el-radio-group v-model="formData.isCache">
-                  <el-radio :label="1">缓存</el-radio>
-                  <el-radio :label="0">不缓存</el-radio>
-                </el-radio-group>
-                <div class="form-tips">选择缓存则会被`keep-alive`缓存</div>
-              </div>
-            </el-form-item>-->
+                    <!-- <el-form-item
+                        v-if="formData.menuType == MenuEnum.MENU"
+                        label="是否缓存"
+                        prop="isCache"
+                        required
+                    >
+                        <div>
+                            <el-radio-group v-model="formData.isCache">
+                                <el-radio :label="1">缓存</el-radio>
+                                <el-radio :label="0">不缓存</el-radio>
+                            </el-radio-group>
+                            <div class="form-tips">选择缓存则会被`keep-alive`缓存</div>
+                        </div>
+                    </el-form-item> -->
                     <el-form-item
                         v-if="formData.menuType != MenuEnum.BUTTON"
                         label="是否显示"
@@ -150,9 +174,11 @@
 <script lang="ts" setup>
 import type { FormInstance } from 'element-plus'
 import { menuLists, menuEdit, menuAdd, menuDetail } from '@/api/perms/menu'
+import { getModulesKey } from '@/router'
 import { MenuEnum } from '@/enums/appEnums'
 import Popup from '@/components/popup/index.vue'
 import feedback from '@/utils/feedback'
+import { arrayToTree, treeToArray } from '@/utils/util'
 
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
@@ -162,6 +188,16 @@ const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑菜单' : '新增菜单'
 })
 
+const componentsOptions = ref(getModulesKey())
+const querySearch = (queryString: string, cb: any) => {
+    const results = queryString
+        ? componentsOptions.value.filter((item) =>
+              item.toLowerCase().includes(queryString.toLowerCase())
+          )
+        : componentsOptions.value
+    cb(results.map((item) => ({ value: item })))
+}
+
 const formData = reactive({
     id: '',
     //父级id
@@ -224,9 +260,14 @@ const formRules = {
 }
 const menuOptions = ref<any[]>([])
 
+const pageOptions = ref<any[]>([])
+
 const getMenu = async () => {
     const data: any = await menuLists()
     const menu = { id: 0, menuName: '顶级', children: [] }
+    pageOptions.value = arrayToTree(
+        treeToArray(data).filter((item) => item.menuType != MenuEnum.BUTTON)
+    )
     menu.children = data
     menuOptions.value.push(menu)
 }
diff --git a/admin/src/views/setting/dict/type/index.vue b/admin/src/views/setting/dict/type/index.vue
index eb1b4884..eea3caa1 100644
--- a/admin/src/views/setting/dict/type/index.vue
+++ b/admin/src/views/setting/dict/type/index.vue
@@ -76,7 +76,7 @@
                                     link
                                     @click="
                                         $router.push({
-                                            path: '/setting/dict/data',
+                                            path: getRoutePath('setting:dict:data:list'),
                                             query: {
                                                 type: row.dictType
                                             }
@@ -109,6 +109,7 @@
 <script lang="ts" setup>
 import { dictTypeDelete, dictTypeLists } from '@/api/setting/dict'
 import { usePaging } from '@/hooks/usePaging'
+import { getRoutePath } from '@/router'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
diff --git a/admin/src/views/setting/storage/edit.vue b/admin/src/views/setting/storage/edit.vue
index c01c4bb8..c56cd27e 100644
--- a/admin/src/views/setting/storage/edit.vue
+++ b/admin/src/views/setting/storage/edit.vue
@@ -67,6 +67,7 @@ import { storageSetup } from '@/api/setting/storage'
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { storageDetail } from '@/api/setting/storage'
+import feedback from '@/utils/feedback'
 enum StorageEnum {
     LOCAL = 'local', // 本地
     QINIU = 'qiniu', // 七牛云
@@ -155,6 +156,7 @@ const getStorageInfo = computed(() => {
 const handleSubmit = async () => {
     await formRef.value?.validate()
     await storageSetup(formData)
+    feedback.msgSuccess('操作成功')
     popupRef.value?.close()
     emit('success')
 }
diff --git a/admin/src/views/setting/website/filing.vue b/admin/src/views/setting/website/filing.vue
index c4a32dde..871da6b8 100644
--- a/admin/src/views/setting/website/filing.vue
+++ b/admin/src/views/setting/website/filing.vue
@@ -11,7 +11,7 @@
                     :show-close="formData.length > 1"
                     @close="handleDelete(index)"
                 >
-                    <div class="bg-page py-4">
+                    <div class="bg-fill-lighter py-4">
                         <el-form-item label="显示名称" prop="name">
                             <div class="w-80">
                                 <div>
diff --git a/admin/tailwind.config.js b/admin/tailwind.config.js
index ca8e520f..36d70a3f 100644
--- a/admin/tailwind.config.js
+++ b/admin/tailwind.config.js
@@ -30,6 +30,7 @@ module.exports = {
             'br-extra-light': 'var(--el-border-color-extra-light)',
             'br-dark': 'var( --el-border-color-dark)',
             fill: 'var(--el-fill-color)',
+            'fill-lighter': 'var(--el-fill-color-lighter)',
             mask: 'var(--el-mask-color)'
         },
         fontFamily: {
diff --git a/admin/typings/router.d.ts b/admin/typings/router.d.ts
index c8091825..e1a4c1c4 100644
--- a/admin/typings/router.d.ts
+++ b/admin/typings/router.d.ts
@@ -2,6 +2,8 @@ import 'vue-router'
 declare module 'vue-router' {
     // 扩展 RouteMeta
     interface RouteMeta {
+        type?: string
+        perms?: string
         title?: string
         icon?: string
         hidden?: boolean