diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5b3aa477e0472e6a8e4518e1552bb3e5850f9d98..3036ebf1c5644a13b8be9bc0636a42e0e7308e73 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,7 @@
     "source.fixAll.eslint": true
   },
   "[vue]": {
-    "editor.defaultFormatter": "Vue.volar"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/README.md b/README.md
index 4a0de6ae53b2342296890bbd7ddb55e5c5e4ea4d..f5619e8bc4a71d1c00e86e3dd61aea0127dc4841 100644
--- a/README.md
+++ b/README.md
@@ -38,14 +38,14 @@
 
 | 框架                                                                   | 说明               | 版本     |
 |----------------------------------------------------------------------|------------------|--------|
-| [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架           | 3.3.4 |
-| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具          | 4.3.8  |
-| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus     | 2.3.4 |
+| [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架           | 3.2.47 |
+| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具          | 4.3.1  |
+| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus     | 2.3.3 |
 | [TypeScript](https://www.typescriptlang.org/docs/)                   | JavaScript 的超集   | 5.0.4  |
-| [pinia](https://pinia.vuejs.org/)                                    | Vue 存储库 替代 vuex5 | 2.1.3 |
-| [vueuse](https://vueuse.org/)                                        | 常用工具集            | 10.1.2 |
+| [pinia](https://pinia.vuejs.org/)                                    | Vue 存储库 替代 vuex5 | 2.0.35 |
+| [vueuse](https://vueuse.org/)                                        | 常用工具集            | 10.1.0 |
 | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化              | 9.2.2  |
-| [vue-router](https://router.vuejs.org/)                              | Vue 路由           | 4.2.1  |
+| [vue-router](https://router.vuejs.org/)                              | Vue 路由           | 4.1.6  |
 | [windicss](https://cn.windicss.org/)                                 | 下一代工具优先的 CSS 框架  | 3.5.6  |
 | [iconify](https://icon-sets.iconify.design/)                         | 在线图标库            | 3.1.0  |
 | [wangeditor](https://www.wangeditor.com/)                            | 富文本编辑器           | 5.1.23 |
diff --git a/build/vite/optimize.ts b/build/vite/optimize.ts
index 70fc3b8f6cb4872eaa50925560551513397107ca..9d5761912f791b6729532f593acadd966b040200 100644
--- a/build/vite/optimize.ts
+++ b/build/vite/optimize.ts
@@ -102,8 +102,7 @@ const include = [
   'element-plus/es/components/timeline-item/style/css',
   'element-plus/es/components/collapse/style/css',
   'element-plus/es/components/collapse-item/style/css',
-  'element-plus/es/components/button-group/style/css',
-  'element-plus/es/components/text/style/css'
+  'element-plus/es/components/button-group/style/css'
 ]
 
 const exclude = ['@iconify/json']
diff --git a/package.json b/package.json
index 74f7959fc69487514efae7baed9dbb85f418fded..2f1b2de22c2fa5de77c32b3178d41040dc2f54a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin-vue3",
-  "version": "1.7.3-snapshot",
+  "version": "1.7.2-snapshot",
   "description": "基于vue3、vite4、element-plus、typesScript",
   "author": "xingyu",
   "private": false,
@@ -18,7 +18,6 @@
     "serve:pro": "vite preview --mode pro",
     "serve:dev": "vite preview --mode dev",
     "serve:test": "vite preview --mode test",
-    "preview": "pnpm build && vite preview",
     "npm:check": "npx npm-check-updates",
     "clean": "npx rimraf node_modules",
     "clean:cache": "npx rimraf node_modules/.cache",
@@ -34,12 +33,12 @@
     "@form-create/element-ui": "^3.1.17",
     "@iconify/iconify": "^3.1.0",
     "@videojs-player/vue": "^1.0.0",
-    "@vueuse/core": "^10.1.2",
+    "@vueuse/core": "^10.1.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.10",
-    "@zxcvbn-ts/core": "^3.0.1",
+    "@zxcvbn-ts/core": "^2.2.1",
     "animate.css": "^4.1.1",
-    "axios": "^1.4.0",
+    "axios": "^1.3.6",
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "^0.10.0",
     "camunda-bpmn-moddle": "^7.0.1",
@@ -49,34 +48,34 @@
     "diagram-js": "^11.6.0",
     "echarts": "^5.4.2",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "2.3.4",
+    "element-plus": "2.3.3",
     "fast-xml-parser": "^4.2.2",
-    "highlight.js": "^11.8.0",
+    "highlight.js": "^11.7.0",
     "intro.js": "^7.0.1",
     "jsencrypt": "^3.3.2",
     "lodash-es": "^4.17.21",
-    "min-dash": "^4.1.1",
+    "min-dash": "^4.1.0",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.1.3",
+    "pinia": "^2.0.35",
     "qrcode": "^1.5.3",
-    "qs": "^6.11.2",
+    "qs": "^6.11.1",
     "steady-xml": "^0.1.0",
     "url": "^0.11.0",
-    "video.js": "^8.3.0",
-    "vue": "3.3.4",
+    "video.js": "^8.0.4",
+    "vue": "3.2.47",
     "vue-i18n": "9.2.2",
-    "vue-router": "^4.2.1",
-    "vue-types": "^5.0.3",
+    "vue-router": "^4.1.6",
+    "vue-types": "^5.0.2",
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "xe-utils": "^3.5.7",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.3",
-    "@commitlint/config-conventional": "^17.6.3",
-    "@iconify/json": "^2.2.67",
+    "@commitlint/cli": "^17.6.1",
+    "@commitlint/config-conventional": "^17.6.1",
+    "@iconify/json": "^2.2.54",
     "@intlify/unplugin-vue-i18n": "^0.10.0",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.1",
@@ -85,39 +84,39 @@
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.59.6",
-    "@typescript-eslint/parser": "^5.59.6",
-    "@vitejs/plugin-legacy": "^4.0.3",
-    "@vitejs/plugin-vue": "^4.2.3",
+    "@typescript-eslint/eslint-plugin": "^5.59.0",
+    "@typescript-eslint/parser": "^5.59.0",
+    "@vitejs/plugin-legacy": "^4.0.2",
+    "@vitejs/plugin-vue": "^4.1.0",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "autoprefixer": "^10.4.14",
     "bpmn-js": "^8.9.0",
     "bpmn-js-properties-panel": "^0.46.0",
     "consola": "^3.1.0",
-    "eslint": "^8.40.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-define-config": "^1.20.0",
+    "eslint-define-config": "^1.18.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.13.0",
-    "lint-staged": "^13.2.2",
+    "eslint-plugin-vue": "^9.11.0",
+    "lint-staged": "^13.2.1",
     "postcss": "^8.4.23",
     "postcss-html": "^1.5.0",
     "postcss-scss": "^4.0.6",
     "prettier": "^2.8.8",
-    "rimraf": "^5.0.1",
-    "rollup": "^3.22.0",
-    "sass": "^1.62.1",
-    "stylelint": "^15.6.2",
+    "rimraf": "^5.0.0",
+    "rollup": "^3.20.7",
+    "sass": "^1.62.0",
+    "stylelint": "^15.6.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recommended": "^12.0.0",
     "stylelint-config-standard": "^33.0.0",
     "stylelint-order": "^6.0.3",
-    "terser": "^5.17.4",
+    "terser": "^5.17.1",
     "typescript": "5.0.4",
-    "unplugin-auto-import": "^0.16.0",
+    "unplugin-auto-import": "^0.15.3",
     "unplugin-element-plus": "^0.7.1",
     "unplugin-vue-components": "^0.24.1",
-    "vite": "4.3.8",
+    "vite": "4.3.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-ejs": "^1.6.4",
     "vite-plugin-eslint": "^1.8.1",
@@ -126,8 +125,8 @@
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-top-level-await": "^1.3.0",
     "vite-plugin-vue-setup-extend-plus": "^0.1.0",
-    "vite-plugin-windicss": "^1.9.0",
-    "vue-tsc": "^1.6.5",
+    "vite-plugin-windicss": "^1.8.10",
+    "vue-tsc": "^1.4.4",
     "windicss": "^3.5.6"
   },
   "engines": {
@@ -136,7 +135,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://gitee.com/yudaocode/yudao-ui-admin-vue3"
+    "url": "git+https://gitee.com/shen_tianyi/nuliyaWeb.git"
   },
   "bugs": {
     "url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues"
diff --git a/src/App.vue b/src/App.vue
index f75478cd6541bb5522165d4a786d714769fcdda7..75edd24f358d4ebb732d258224c9cb165b78b9b7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,6 @@ import { isDark } from '@/utils/is'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import routerSearch from '@/components/RouterSearch/index.vue'
 
 const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('app')
@@ -25,12 +24,10 @@ setDefaultTheme()
 <template>
   <ConfigGlobal :size="currentSize">
     <RouterView :class="greyMode ? `${prefixCls}-grey-mode` : ''" />
-    <routerSearch />
   </ConfigGlobal>
 </template>
 <style lang="scss">
 $prefix-cls: #{$namespace}-app;
-
 .size {
   width: 100%;
   height: 100%;
diff --git a/src/api/entrust/apply/index.ts b/src/api/entrust/apply/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..733b43ff39b938bc8bcb4a07608d967ec1130a74
--- /dev/null
+++ b/src/api/entrust/apply/index.ts
@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+export interface ApplyVO {
+  id: number
+  entrustId: number
+  memberId: number
+  status: byte
+  isPresent: boolean
+}
+
+// 查询委托申请列列表
+export const getApplyPage = async (params) => {
+  return await request.get({ url: `/entrust/apply/page`, params })
+}
+
+// 查询委托申请列详情
+export const getApply = async (id: number) => {
+  return await request.get({ url: `/entrust/apply/get?id=` + id })
+}
+
+// 新增委托申请列
+export const createApply = async (data: ApplyVO) => {
+  return await request.post({ url: `/entrust/apply/create`, data })
+}
+
+// 修改委托申请列
+export const updateApply = async (data: ApplyVO) => {
+  return await request.put({ url: `/entrust/apply/update`, data })
+}
+
+// 删除委托申请列
+export const deleteApply = async (id: number) => {
+  return await request.delete({ url: `/entrust/apply/delete?id=` + id })
+}
+
+// 导出委托申请列 Excel
+export const exportApply = async (params) => {
+  return await request.download({ url: `/entrust/apply/export-excel`, params })
+}
diff --git a/src/api/entrust/entrustItem/index.ts b/src/api/entrust/entrustItem/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8f2b6c58c295684d59fe0611205ab6dadb9b380b
--- /dev/null
+++ b/src/api/entrust/entrustItem/index.ts
@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+export interface entrustItemVO {
+  id: number
+  title: string
+  description: string
+  entrustType: byte
+  placeType: byte
+  timeType: byte
+  clearType: byte
+  genderRequire: byte
+  endTime: Date
+  numberRequire: number
+  requireTag: string
+  projectedIncome: number
+  cashPledge: number
+  status: byte
+  startTime: Date
+  longitude: number
+  latitude: number
+  street: string
+  districtId: string
+  cityId: string
+  provinceId: string
+}
+
+// 查询委托任务列表列表
+export const getentrustItemPage = async (params) => {
+  return await request.get({ url: `/entrust/entrust-item/page`, params })
+}
+
+// 查询委托任务列表详情
+export const getentrustItem = async (id: number) => {
+  return await request.get({ url: `/entrust/entrust-item/get?id=` + id })
+}
+
+// 新增委托任务列表
+export const createentrustItem = async (data: entrustItemVO) => {
+  return await request.post({ url: `/entrust/entrust-item/create`, data })
+}
+
+// 修改委托任务列表
+export const updateentrustItem = async (data: entrustItemVO) => {
+  return await request.put({ url: `/entrust/entrust-item/update`, data })
+}
+
+// 删除委托任务列表
+export const deleteentrustItem = async (id: number) => {
+  return await request.delete({ url: `/entrust/entrust-item/delete?id=` + id })
+}
+
+// 导出委托任务列表 Excel
+export const exportentrustItem = async (params) => {
+  return await request.download({ url: `/entrust/entrust-item/export-excel`, params })
+}
diff --git a/src/api/entrust/equipment/index.ts b/src/api/entrust/equipment/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..949b304f243955d389f47a8724213fbf41fa889c
--- /dev/null
+++ b/src/api/entrust/equipment/index.ts
@@ -0,0 +1,37 @@
+import request from '@/config/axios'
+
+export interface EquipmentVO {
+  id: number
+  entrustId: number
+  equipmentId: number
+}
+
+// 查询委托设备列列表
+export const getEquipmentPage = async (params) => {
+  return await request.get({ url: `/entrust/equipment/page`, params })
+}
+
+// 查询委托设备列详情
+export const getEquipment = async (id: number) => {
+  return await request.get({ url: `/entrust/equipment/get?id=` + id })
+}
+
+// 新增委托设备列
+export const createEquipment = async (data: EquipmentVO) => {
+  return await request.post({ url: `/entrust/equipment/create`, data })
+}
+
+// 修改委托设备列
+export const updateEquipment = async (data: EquipmentVO) => {
+  return await request.put({ url: `/entrust/equipment/update`, data })
+}
+
+// 删除委托设备列
+export const deleteEquipment = async (id: number) => {
+  return await request.delete({ url: `/entrust/equipment/delete?id=` + id })
+}
+
+// 导出委托设备列 Excel
+export const exportEquipment = async (params) => {
+  return await request.download({ url: `/entrust/equipment/export-excel`, params })
+}
diff --git a/src/api/entrust/product/index.ts b/src/api/entrust/product/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..3cccddbc4daf78d7cd2a8f8d5c8408f6494e8315
--- /dev/null
+++ b/src/api/entrust/product/index.ts
@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+export interface ProductVO {
+  id: number
+  entrustId: number
+  skuId: number
+  spuId: number
+  entrustNumber: number
+}
+
+// 查询委托商品列表
+export const getProductPage = async (params) => {
+  return await request.get({ url: `/entrust/product/page`, params })
+}
+
+// 查询委托商品详情
+export const getProduct = async (id: number) => {
+  return await request.get({ url: `/entrust/product/get?id=` + id })
+}
+
+// 新增委托商品
+export const createProduct = async (data: ProductVO) => {
+  return await request.post({ url: `/entrust/product/create`, data })
+}
+
+// 修改委托商品
+export const updateProduct = async (data: ProductVO) => {
+  return await request.put({ url: `/entrust/product/update`, data })
+}
+
+// 删除委托商品
+export const deleteProduct = async (id: number) => {
+  return await request.delete({ url: `/entrust/product/delete?id=` + id })
+}
+
+// 导出委托商品 Excel
+export const exportProduct = async (params) => {
+  return await request.download({ url: `/entrust/product/export-excel`, params })
+}
diff --git a/src/api/equipment/equipmentItem/index.ts b/src/api/equipment/equipmentItem/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..cbd95117c331f5676d523d65d2cf3a70054d21ea
--- /dev/null
+++ b/src/api/equipment/equipmentItem/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+export interface equipmentItemVO {
+  id: number
+  title: string
+  picUrl: string
+  equipmentType: byte
+  compensate: number
+  price: number
+  status: byte
+  saveTime: Date
+  destroyTime: Date
+  districtId: string
+  cityId: string
+  provinceId: string
+}
+
+// 查询设备管理列表
+export const getequipmentItemPage = async (params) => {
+  return await request.get({ url: `/equipment/equipment-item/page`, params })
+}
+
+// 查询设备管理详情
+export const getequipmentItem = async (id: number) => {
+  return await request.get({ url: `/equipment/equipment-item/get?id=` + id })
+}
+
+// 新增设备管理
+export const createequipmentItem = async (data: equipmentItemVO) => {
+  return await request.post({ url: `/equipment/equipment-item/create`, data })
+}
+
+// 修改设备管理
+export const updateequipmentItem = async (data: equipmentItemVO) => {
+  return await request.put({ url: `/equipment/equipment-item/update`, data })
+}
+
+// 删除设备管理
+export const deleteequipmentItem = async (id: number) => {
+  return await request.delete({ url: `/equipment/equipment-item/delete?id=` + id })
+}
+
+// 导出设备管理 Excel
+export const exportequipmentItem = async (params) => {
+  return await request.download({ url: `/equipment/equipment-item/export-excel`, params })
+}
diff --git a/src/api/equipment/useLog/index.ts b/src/api/equipment/useLog/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..da3d9476dbdae4ff2d1b98e1a0f3a29fa9537f05
--- /dev/null
+++ b/src/api/equipment/useLog/index.ts
@@ -0,0 +1,38 @@
+import request from '@/config/axios'
+
+export interface UseLogVO {
+  id: number
+  equipmentId: number
+  type: byte
+  entrustId: number
+}
+
+// 查询设备使用记录列表
+export const getUseLogPage = async (params) => {
+  return await request.get({ url: `/equipment/use-log/page`, params })
+}
+
+// 查询设备使用记录详情
+export const getUseLog = async (id: number) => {
+  return await request.get({ url: `/equipment/use-log/get?id=` + id })
+}
+
+// 新增设备使用记录
+export const createUseLog = async (data: UseLogVO) => {
+  return await request.post({ url: `/equipment/use-log/create`, data })
+}
+
+// 修改设备使用记录
+export const updateUseLog = async (data: UseLogVO) => {
+  return await request.put({ url: `/equipment/use-log/update`, data })
+}
+
+// 删除设备使用记录
+export const deleteUseLog = async (id: number) => {
+  return await request.delete({ url: `/equipment/use-log/delete?id=` + id })
+}
+
+// 导出设备使用记录 Excel
+export const exportUseLog = async (params) => {
+  return await request.download({ url: `/equipment/use-log/export-excel`, params })
+}
diff --git a/src/api/mall/product/brand.ts b/src/api/mall/product/brand.ts
index 94d53704e1ccef0294727c15727ea6cd3e8d8e16..dc8acc2a7938a015426169397aac1eb37e796dca 100644
--- a/src/api/mall/product/brand.ts
+++ b/src/api/mall/product/brand.ts
@@ -54,8 +54,3 @@ export const getBrand = (id: number) => {
 export const getBrandParam = (params: PageParam) => {
   return request.get({ url: '/product/brand/page', params })
 }
-
-// 获得商品品牌精简信息列表
-export const getSimpleBrandList = () => {
-  return request.get({ url: '/product/brand/list-all-simple' })
-}
diff --git a/src/api/mall/product/category.ts b/src/api/mall/product/category.ts
index 8158fc0f1c6cb607e4788718f6bd84215d59b7bc..7ae81285bd2c486b1467df6db5e3e9c8a6544800 100644
--- a/src/api/mall/product/category.ts
+++ b/src/api/mall/product/category.ts
@@ -17,17 +17,17 @@ export interface CategoryVO {
    */
   name: string
   /**
-   * 移动端分类图
+   * 分类图片
    */
   picUrl: string
   /**
-   * PC 端分类图
+   * 分类排序
    */
-  bigPicUrl?: string
+  sort?: number
   /**
-   * 分类排序
+   * 分类描述
    */
-  sort: number
+  description?: string
   /**
    * 开启状态
    */
diff --git a/src/api/mall/product/property.ts b/src/api/mall/product/property.ts
index ac8bac59e28179ccfbf84d8bc48c803b745e3d3b..01c79f9fded6326fa869eb6351eb273a89d2da8e 100644
--- a/src/api/mall/product/property.ts
+++ b/src/api/mall/product/property.ts
@@ -71,8 +71,8 @@ export const getPropertyList = (params: any) => {
 }
 
 // 获得属性项列表
-export const getPropertyListAndValue = (data: any) => {
-  return request.post({ url: '/product/property/get-value-list', data })
+export const getPropertyListAndValue = (params: any) => {
+  return request.get({ url: '/product/property/get-value-list', params })
 }
 
 // ------------------------ 属性值 -------------------
diff --git a/src/api/mall/product/spu.ts b/src/api/mall/product/spu.ts
deleted file mode 100644
index fd55e126ce1f9940b1e6342be7cda91e74a0261f..0000000000000000000000000000000000000000
--- a/src/api/mall/product/spu.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import request from '@/config/axios'
-
-export interface Property {
-  propertyId?: number // 属性编号
-  propertyName?: string // 属性名称
-  valueId?: number // 属性值编号
-  valueName?: string // 属性值名称
-}
-
-// TODO puhui999：是不是直接叫 Sku 更简洁一点哈。type 待后面，总感觉有个类型？
-export interface SkuType {
-  id?: number // 商品 SKU 编号
-  spuId?: number // SPU 编号
-  properties?: Property[] // 属性数组
-  price?: number // 商品价格
-  marketPrice?: number // 市场价
-  costPrice?: number // 成本价
-  barCode?: string // 商品条码
-  picUrl?: string // 图片地址
-  stock?: number // 库存
-  weight?: number // 商品重量，单位：kg 千克
-  volume?: number // 商品体积，单位：m^3 平米
-  subCommissionFirstPrice?: number // 一级分销的佣金
-  subCommissionSecondPrice?: number // 二级分销的佣金
-  salesCount?: number // 商品销量
-}
-
-// TODO puhui999：是不是直接叫 Spu 更简洁一点哈。type 待后面，总感觉有个类型？
-export interface SpuType {
-  id?: number
-  name?: string // 商品名称
-  categoryId?: number | null // 商品分类
-  keyword?: string // 关键字
-  unit?: number | null // 单位
-  picUrl?: string // 商品封面图
-  sliderPicUrls?: string[] // 商品轮播图
-  introduction?: string // 商品简介
-  deliveryTemplateId?: number | null // 运费模版
-  brandId?: number | null // 商品品牌编号
-  specType?: boolean // 商品规格
-  subCommissionType?: boolean // 分销类型
-  skus: SkuType[] // sku数组
-  description?: string // 商品详情
-  sort?: string // 商品排序
-  giveIntegral?: number // 赠送积分
-  virtualSalesCount?: number // 虚拟销量
-  recommendHot?: boolean // 是否热卖
-  recommendBenefit?: boolean // 是否优惠
-  recommendBest?: boolean // 是否精品
-  recommendNew?: boolean // 是否新品
-  recommendGood?: boolean // 是否优品
-}
-
-// 获得 Spu 列表
-export const getSpuPage = (params: PageParam) => {
-  return request.get({ url: '/product/spu/page', params })
-}
-
-// 获得 Spu 列表 tabsCount
-export const getTabsCount = () => {
-  return request.get({ url: '/product/spu/get-count' })
-}
-
-// 创建商品 Spu
-export const createSpu = (data: SpuType) => {
-  return request.post({ url: '/product/spu/create', data })
-}
-
-// 更新商品 Spu
-export const updateSpu = (data: SpuType) => {
-  return request.put({ url: '/product/spu/update', data })
-}
-
-// 更新商品 Spu status
-export const updateStatus = (data: { id: number; status: number }) => {
-  return request.put({ url: '/product/spu/update-status', data })
-}
-
-// 获得商品 Spu
-export const getSpu = (id: number) => {
-  return request.get({ url: `/product/spu/get-detail?id=${id}` })
-}
-
-// 删除商品 Spu
-export const deleteSpu = (id: number) => {
-  return request.delete({ url: `/product/spu/delete?id=${id}` })
-}
-
-// 导出商品 Spu Excel
-export const exportSpu = async (params) => {
-  return await request.download({ url: '/product/spu/export', params })
-}
diff --git a/src/api/mall/trade/delivery/express/index.ts b/src/api/mall/trade/delivery/express/index.ts
deleted file mode 100644
index 95429a40ebf3c15883513337bf066d955081ae08..0000000000000000000000000000000000000000
--- a/src/api/mall/trade/delivery/express/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from '@/config/axios'
-
-export interface DeliveryExpressVO {
-  id: number
-  code: string
-  name: string
-  logo: string
-  sort: number
-  status: number
-}
-
-// 查询快递公司列表
-export const getDeliveryExpressPage = async (params: PageParam) => {
-  return await request.get({ url: '/trade/delivery/express/page', params })
-}
-
-// 查询快递公司详情
-export const getDeliveryExpress = async (id: number) => {
-  return await request.get({ url: '/trade/delivery/express/get?id=' + id })
-}
-
-// 新增快递公司
-export const createDeliveryExpress = async (data: DeliveryExpressVO) => {
-  return await request.post({ url: '/trade/delivery/express/create', data })
-}
-
-// 修改快递公司
-export const updateDeliveryExpress = async (data: DeliveryExpressVO) => {
-  return await request.put({ url: '/trade/delivery/express/update', data })
-}
-
-// 删除快递公司
-export const deleteDeliveryExpress = async (id: number) => {
-  return await request.delete({ url: '/trade/delivery/express/delete?id=' + id })
-}
-
-// 导出快递公司 Excel
-export const exportDeliveryExpressApi = async (params) => {
-  return await request.download({ url: '/trade/delivery/express/export-excel', params })
-}
diff --git a/src/api/mall/trade/delivery/expressTemplate/index.ts b/src/api/mall/trade/delivery/expressTemplate/index.ts
deleted file mode 100644
index 9414c8474983f701a9cfef3ad5ab481edfdb653a..0000000000000000000000000000000000000000
--- a/src/api/mall/trade/delivery/expressTemplate/index.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/config/axios'
-
-export interface DeliveryExpressTemplateVO {
-  id: number
-  name: string
-  chargeMode: number
-  sort: number
-  templateCharge: ExpressTemplateChargeVO[]
-  templateFree: ExpressTemplateFreeVO[]
-}
-
-export declare type ExpressTemplateChargeVO = {
-  areaIds: number[]
-  startCount: number
-  startPrice: number
-  extraCount: number
-  extraPrice: number
-}
-
-export declare type ExpressTemplateFreeVO = {
-  areaIds: number[]
-  freeCount: number
-  freePrice: number
-}
-
-// 查询快递运费模板列表
-export const getDeliveryExpressTemplatePage = async (params: PageParam) => {
-  return await request.get({ url: '/trade/delivery/express-template/page', params })
-}
-
-// 查询快递运费模板详情
-export const getDeliveryExpressTemplate = async (id: number) => {
-  return await request.get({ url: '/trade/delivery/express-template/get?id=' + id })
-}
-
-// 新增快递运费模板
-export const createDeliveryExpressTemplate = async (data: DeliveryExpressTemplateVO) => {
-  return await request.post({ url: '/trade/delivery/express-template/create', data })
-}
-
-// 修改快递运费模板
-export const updateDeliveryExpressTemplate = async (data: DeliveryExpressTemplateVO) => {
-  return await request.put({ url: '/trade/delivery/express-template/update', data })
-}
-
-// 删除快递运费模板
-export const deleteDeliveryExpressTemplate = async (id: number) => {
-  return await request.delete({ url: '/trade/delivery/express-template/delete?id=' + id })
-}
-
-// 导出快递运费模板 Excel
-export const exportDeliveryExpressTemplateApi = async (params) => {
-  return await request.download({ url: '/trade/delivery/express-template/export-excel', params })
-}
diff --git a/src/api/mp/account/index.ts b/src/api/mp/account/index.ts
index e973cda3a93e680b78892d5c3d176d5e6cf29fdc..d641ef3c0377eff948f855cdc1277f95e9923f9a 100644
--- a/src/api/mp/account/index.ts
+++ b/src/api/mp/account/index.ts
@@ -1,7 +1,7 @@
 import request from '@/config/axios'
 
 export interface AccountVO {
-  id: number
+  id?: number
   name: string
 }
 
diff --git a/src/api/system/area/index.ts b/src/api/system/area/index.ts
index b7da941f65f2f2149412088ba3861d2b0125fb11..e91a4997c9e3fe9a9c49df1eaabf84faf8899faa 100644
--- a/src/api/system/area/index.ts
+++ b/src/api/system/area/index.ts
@@ -5,14 +5,6 @@ export const getAreaTree = async () => {
   return await request.get({ url: '/system/area/tree' })
 }
 
-export const getChildrenArea = async (id: number) => {
-  return await request.get({ url: '/system/area/get-children?id=' + id })
-}
-
-export const getAreaListByIds = async (ids) => {
-  return await request.get({ url: '/system/area/get-by-ids?ids=' + ids })
-}
-
 // 获得 IP 对应的地区名
 export const getAreaByIp = async (ip: string) => {
   return await request.get({ url: '/system/area/get-by-ip?ip=' + ip })
diff --git a/src/api/system/oauth2/token.ts b/src/api/system/oauth2/token.ts
index ac89ae898e0f0eb6969053724a02bf25cb3a1dde..8e9dca1e2d0f877740371e7721f4398b1dc04bf8 100644
--- a/src/api/system/oauth2/token.ts
+++ b/src/api/system/oauth2/token.ts
@@ -17,6 +17,6 @@ export const getAccessTokenPage = (params: PageParam) => {
 }
 
 // 删除 token
-export const deleteAccessToken = (accessToken: string) => {
+export const deleteAccessToken = (accessToken: number) => {
   return request.delete({ url: '/system/oauth2-token/delete?accessToken=' + accessToken })
 }
diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts
index cdfc8caac8b6eb600f84c1875da7e728b60fae66..9cab8ff14966fdf884d7714ec92226c43e772063 100644
--- a/src/components/Form/src/helper.ts
+++ b/src/components/Form/src/helper.ts
@@ -1,6 +1,6 @@
 import type { Slots } from 'vue'
 import { getSlot } from '@/utils/tsxHelper'
-import { PlaceholderModel } from './types'
+import { PlaceholderMoel } from './types'
 import { FormSchema } from '@/types/form'
 import { ColProps } from '@/types/components'
 
@@ -10,7 +10,7 @@ import { ColProps } from '@/types/components'
  * @returns 返回提示信息对象
  * @description 用于自动设置placeholder
  */
-export const setTextPlaceholder = (schema: FormSchema): PlaceholderModel => {
+export const setTextPlaceholder = (schema: FormSchema): PlaceholderMoel => {
   const { t } = useI18n()
   const textMap = ['Input', 'Autocomplete', 'InputNumber', 'InputPassword']
   const selectMap = ['Select', 'SelectV2', 'TimePicker', 'DatePicker', 'TimeSelect', 'TimeSelect']
@@ -108,8 +108,8 @@ export const setItemComponentSlots = (
 /**
  *
  * @param schema Form表单结构化数组
- * @param formModel FormModel
- * @returns FormModel
+ * @param formModel FormMoel
+ * @returns FormMoel
  * @description 生成对应的formModel
  */
 export const initModel = (schema: FormSchema[], formModel: Recordable) => {
diff --git a/src/components/Form/src/types.ts b/src/components/Form/src/types.ts
index dcd01e78422e53c81ee2f0c97d181af89a3dd81e..92a49d850f4bc88f3908aeaf1f6ded265f80d407 100644
--- a/src/components/Form/src/types.ts
+++ b/src/components/Form/src/types.ts
@@ -1,6 +1,6 @@
 import { FormSchema } from '@/types/form'
 
-export interface PlaceholderModel {
+export interface PlaceholderMoel {
   placeholder?: string
   startPlaceholder?: string
   endPlaceholder?: string
diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
deleted file mode 100644
index d44ce267b0e21206cf3d9aa28ba9c79d9c4c288d..0000000000000000000000000000000000000000
--- a/src/components/RouterSearch/index.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<template>
-  <ElDialog v-model="showSearch" :show-close="false" title="菜单搜索">
-    <el-select
-      filterable
-      :reserve-keyword="false"
-      remote
-      placeholder="请输入菜单内容"
-      :remote-method="remoteMethod"
-      style="width: 100%"
-      @change="handleChange"
-    >
-      <el-option
-        v-for="item in options"
-        :key="item.value"
-        :label="item.label"
-        :value="item.value"
-      />
-    </el-select>
-  </ElDialog>
-</template>
-
-<script setup lang="ts">
-const router = useRouter() // 路由对象
-const showSearch = ref(false) // 是否显示弹框
-const value: Ref = ref('') // 用户输入的值
-
-const routers = router.getRoutes() // 路由对象
-const options = computed(() => {
-  // 提示选项
-  if (!value.value) {
-    return []
-  }
-  const list = routers.filter((item: any) => {
-    if (item.meta.title?.indexOf(value.value) > -1 || item.path.indexOf(value.value) > -1) {
-      return true
-    }
-  })
-  return list.map((item) => {
-    return {
-      label: `${item.meta.title}${item.path}`,
-      value: item.path
-    }
-  })
-})
-
-function remoteMethod(data) {
-  // 这里可以执行相应的操作（例如打开搜索框等）
-  value.value = data
-}
-
-function handleChange(path) {
-  router.push({ path })
-}
-
-onMounted(() => {
-  window.addEventListener('keydown', listenKey)
-})
-
-onUnmounted(() => {
-  window.removeEventListener('keydown', listenKey)
-})
-
-// 监听 ctrl + k
-function listenKey(event) {
-  if ((event.ctrlKey || event.metaKey) && event.key === 'k') {
-    showSearch.value = !showSearch.value
-    // 这里可以执行相应的操作（例如打开搜索框等）
-  }
-}
-
-defineExpose({
-  openSearch: () => {
-    showSearch.value = true
-  }
-})
-</script>
diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue
index 857959bfa1abde06f6c69bf52c9740258f21f677..82e5030cb34e49cdb2dbd5882b9e8c9e6289aa48 100644
--- a/src/components/UploadFile/src/UploadImgs.vue
+++ b/src/components/UploadFile/src/UploadImgs.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="upload-box">
     <el-upload
-      v-model:file-list="fileList"
-      :accept="fileType.join(',')"
       :action="updateUrl"
-      :before-upload="beforeUpload"
+      list-type="picture-card"
       :class="['upload', drag ? 'no-border' : '']"
-      :drag="drag"
-      :headers="uploadHeaders"
-      :limit="limit"
+      v-model:file-list="fileList"
       :multiple="true"
-      :on-error="uploadError"
+      :limit="limit"
+      :headers="uploadHeaders"
+      :before-upload="beforeUpload"
       :on-exceed="handleExceed"
       :on-success="uploadSuccess"
-      list-type="picture-card"
+      :on-error="uploadError"
+      :drag="drag"
+      :accept="fileType.join(',')"
     >
       <div class="upload-empty">
         <slot name="empty">
@@ -40,15 +40,15 @@
     </div>
     <el-image-viewer
       v-if="imgViewVisible"
-      :url-list="[viewImageUrl]"
       @close="imgViewVisible = false"
+      :url-list="[viewImageUrl]"
     />
   </div>
 </template>
-<script lang="ts" name="UploadImgs" setup>
+<script setup lang="ts" name="UploadImgs">
 import { PropType } from 'vue'
-import type { UploadFile, UploadProps, UploadUserFile } from 'element-plus'
 import { ElNotification } from 'element-plus'
+import type { UploadProps, UploadFile, UploadUserFile } from 'element-plus'
 
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
@@ -88,19 +88,8 @@ const uploadHeaders = ref({
   'tenant-id': getTenantId()
 })
 
-const fileList = ref<UploadUserFile[]>()
-// fix: 改为动态监听赋值解决图片回显问题
-watch(
-  () => props.modelValue,
-  (data) => {
-    if (!data) return
-    fileList.value = data
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
+const fileList = ref<UploadUserFile[]>(props.modelValue)
+
 /**
  * @description 文件上传之前判断
  * @param rawFile 上传的文件
@@ -127,11 +116,9 @@ const beforeUpload: UploadProps['beforeUpload'] = (rawFile) => {
 interface UploadEmits {
   (e: 'update:modelValue', value: UploadUserFile[]): void
 }
-
 const emit = defineEmits<UploadEmits>()
 const uploadSuccess = (response, uploadFile: UploadFile) => {
   if (!response) return
-  // TODO 多图上传组件成功后只是把保存成功后的url替换掉组件选图时的文件路径，所以返回的fileList包含的是一个包含文件信息的对象列表
   uploadFile.url = response.data
   emit('update:modelValue', fileList.value)
   message.success('上传成功')
@@ -172,40 +159,35 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped lang="scss">
 .is-error {
   .upload {
     :deep(.el-upload--picture-card),
     :deep(.el-upload-dragger) {
       border: 1px dashed var(--el-color-danger) !important;
-
       &:hover {
         border-color: var(--el-color-primary) !important;
       }
     }
   }
 }
-
 :deep(.disabled) {
   .el-upload--picture-card,
   .el-upload-dragger {
     cursor: not-allowed;
     background: var(--el-disabled-bg-color) !important;
     border: 1px dashed var(--el-border-color-darker);
-
     &:hover {
       border-color: var(--el-border-color-darker) !important;
     }
   }
 }
-
 .upload-box {
   .no-border {
     :deep(.el-upload--picture-card) {
       border: none !important;
     }
   }
-
   :deep(.upload) {
     .el-upload-dragger {
       display: flex;
@@ -217,17 +199,14 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       overflow: hidden;
       border: 1px dashed var(--el-border-color-darker);
       border-radius: v-bind(borderRadius);
-
       &:hover {
         border: 1px dashed var(--el-color-primary);
       }
     }
-
     .el-upload-dragger.is-dragover {
       background-color: var(--el-color-primary-light-9);
       border: 2px dashed var(--el-color-primary) !important;
     }
-
     .el-upload-list__item,
     .el-upload--picture-card {
       width: v-bind(width);
@@ -235,13 +214,11 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       background-color: transparent;
       border-radius: v-bind(borderRadius);
     }
-
     .upload-image {
       width: 100%;
       height: 100%;
       object-fit: contain;
     }
-
     .upload-handle {
       position: absolute;
       top: 0;
@@ -256,7 +233,6 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       background: rgb(0 0 0 / 60%);
       opacity: 0;
       transition: var(--el-transition-duration-fast);
-
       .handle-icon {
         display: flex;
         flex-direction: column;
@@ -264,18 +240,15 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
         justify-content: center;
         padding: 0 6%;
         color: aliceblue;
-
         .el-icon {
           margin-bottom: 15%;
           font-size: 140%;
         }
-
         span {
           font-size: 100%;
         }
       }
     }
-
     .el-upload-list__item {
       &:hover {
         .upload-handle {
@@ -283,7 +256,6 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
         }
       }
     }
-
     .upload-empty {
       display: flex;
       flex-direction: column;
@@ -291,14 +263,12 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       font-size: 12px;
       line-height: 30px;
       color: var(--el-color-info);
-
       .el-icon {
         font-size: 28px;
         color: var(--el-text-color-secondary);
       }
     }
   }
-
   .el-upload__tip {
     line-height: 15px;
     text-align: center;
diff --git a/src/plugins/echarts/index.ts b/src/plugins/echarts/index.ts
index bfccbb481b9d9ab0d66b95833e45021b62fc5e1a..34f756f64c56b7ac1d8b6b13688cac7f5deb1f1d 100644
--- a/src/plugins/echarts/index.ts
+++ b/src/plugins/echarts/index.ts
@@ -6,8 +6,7 @@ import {
   PieChart,
   MapChart,
   PictorialBarChart,
-  RadarChart,
-  GaugeChart
+  RadarChart
 } from 'echarts/charts'
 
 import {
@@ -17,8 +16,7 @@ import {
   PolarComponent,
   AriaComponent,
   ParallelComponent,
-  LegendComponent,
-  ToolboxComponent
+  LegendComponent
 } from 'echarts/components'
 
 import { CanvasRenderer } from 'echarts/renderers'
@@ -27,7 +25,6 @@ echarts.use([
   LegendComponent,
   TitleComponent,
   TooltipComponent,
-  ToolboxComponent,
   GridComponent,
   PolarComponent,
   AriaComponent,
@@ -38,8 +35,7 @@ echarts.use([
   MapChart,
   CanvasRenderer,
   PictorialBarChart,
-  RadarChart,
-  GaugeChart
+  RadarChart
 ])
 
 export default echarts
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index e530c4100340aa093d8b3b1f872d53909f083621..55e933ed3cbbfc9b5cdb1c779128ad0087d8def3 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -2,9 +2,9 @@ import { Layout } from '@/utils/routerHelper'
 
 const { t } = useI18n()
 /**
- * redirect: noredirect        当设置 noredirect 的时候该路由在面包屑导航中不可被点击
- * name:'router-name'          设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
- * meta : {
+* redirect: noredirect        当设置 noredirect 的时候该路由在面包屑导航中不可被点击
+* name:'router-name'          设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
+* meta : {
     hidden: true              当设置 true 的时候该路由不会再侧边栏出现 如404，login等页面(默认 false)
 
     alwaysShow: true          当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式，
@@ -31,7 +31,7 @@ const { t } = useI18n()
 
     canTo: true               设置为true即使hidden为true，也依然可以进行路由跳转(默认 false)
   }
- **/
+**/
 const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/redirect',
@@ -345,42 +345,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
         meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' }
       }
     ]
-  },
-  {
-    path: '/product',
-    component: Layout,
-    name: 'Product',
-    meta: {
-      hidden: true
-    },
-    children: [
-      {
-        path: 'productSpuAdd', // TODO @puhui999：最好拆成 add 和 edit 两个路由；添加商品；修改商品 fix
-        component: () => import('@/views/mall/product/spu/addForm.vue'),
-        name: 'ProductSpuAdd',
-        meta: {
-          noCache: true,
-          hidden: true,
-          canTo: true,
-          icon: 'ep:edit',
-          title: '添加商品',
-          activeMenu: '/product/product-spu'
-        }
-      },
-      {
-        path: 'productSpuEdit/:spuId(\\d+)',
-        component: () => import('@/views/mall/product/spu/addForm.vue'),
-        name: 'productSpuEdit',
-        meta: {
-          noCache: true,
-          hidden: true,
-          canTo: true,
-          icon: 'ep:edit',
-          title: '编辑商品',
-          activeMenu: '/product/product-spu'
-        }
-      }
-    ]
   }
 ]
 
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 33d29123fcf2961bc6d679a21abff6631b99bb43..2781c12e891f17925268151ebafd5f3c5b893956 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -10,12 +10,6 @@
   width: 100% !important;
 }
 
-// 解决表格内容超过表格总宽度后，横向滚动条前端顶不到表格边缘的问题
-.el-scrollbar__bar {
-  display: flex;
-  justify-content: flex-start;
-}
-
 /* nprogress 适配 element-plus 的主题色 */
 #nprogress {
   & .bar {
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index e37b6abcac5094d2ac9083adca703617d4e06abb..5cda391f6e117cee48285c99a239b6ddcd602267 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -220,21 +220,3 @@ export const PayRefundStatusEnum = {
     name: '退款关闭'
   }
 }
-
-/**
- * 商品SPU枚举类
- */
-export const ProductSpuStatusEnum = {
-  RECYCLE: {
-    status: -1,
-    name: '回收站'
-  },
-  DISABLE: {
-    status: 0,
-    name: '下架'
-  },
-  ENABLE: {
-    status: 1,
-    name: '上架'
-  }
-}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index c742274f7d7f6260a01d7f6f11b798fe6728cc2d..dc967e8176422114b98f35f49a8596e8abf6e430 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -146,9 +146,15 @@ export enum DICT_TYPE {
   MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
   MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
 
-  // ========== MALL 模块 ==========
-  PRODUCT_UNIT = 'product_unit', // 商品单位
-  PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
-  // ========== MALL 交易模块 ==========
-  EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode' //快递的计费方式
+  // ========== ENT 模块 ==========
+  ENT_ENTRUST_TYPE = 'ent_entrust_type',
+  ENT_PLACE_TYPE = 'ent_place_type',
+  ENT_TIME_TYPE = 'ent_time_type',
+  ENT_CLEAR_TYPE = 'ent_clear_type',
+  ENT_ENTRUST_STATUS = 'ent_entrust_status',
+  ENT_GENDER_REQUIRE = 'ent_gender_require',
+  ENT_REQUIRE_TAG = 'ent_require_tag',
+  ENT_EQUIPMENT_TYPE = 'ent_equipment_type',
+  ENT_EQUIPMENT_STATUS = 'ent_equipment_status',
+  ENT_APPLY_STATUS = 'ent_apply_status'
 }
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 3d596a36c18d51560ee7a4016d0209d4bd5c5ee3..e016c1e20687df864c5871b2a44c05c9e8d3a952 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -155,57 +155,3 @@ export const fileSizeFormatter = (row, column, cellValue) => {
   const sizeStr = size.toFixed(2) //保留的小数位数
   return sizeStr + ' ' + unitArr[index]
 }
-
-/**
- * 将值复制到目标对象，且以目标对象属性为准，例：target: {a:1} source:{a:2,b:3} 结果为：{a:2}
- * @param target 目标对象
- * @param source 源对象
- */
-export const copyValueToTarget = (target, source) => {
-  const newObj = Object.assign({}, target, source)
-  // 删除多余属性
-  Object.keys(newObj).forEach((key) => {
-    // 如果不是target中的属性则删除
-    if (Object.keys(target).indexOf(key) === -1) {
-      delete newObj[key]
-    }
-  })
-  // 更新目标对象值
-  Object.assign(target, newObj)
-}
-
-// TODO @puhui999：返回要带上 .00 哈.例如说 1.00
-/**
- * 将一个整数转换为分数保留两位小数
- * @param num
- */
-export const formatToFraction = (num: number | string | undefined): number => {
-  if (typeof num === 'undefined') return 0
-  const parsedNumber = typeof num === 'string' ? parseFloat(num) : num
-  return parseFloat((parsedNumber / 100).toFixed(2))
-}
-
-/**
- * 将一个分数转换为整数
- * @param num
- */
-export const convertToInteger = (num: number | string | undefined): number => {
-  if (typeof num === 'undefined') return 0
-  const parsedNumber = typeof num === 'string' ? parseFloat(num) : num
-  // TODO 分转元后还有小数则四舍五入
-  return Math.round(parsedNumber * 100)
-}
-
-/**
- * 元转分
- */
-export const yuanToFen = (amount: string | number): number => {
-  return Math.round(Number(amount) * 100)
-}
-
-/**
- * 分转元
- */
-export const fenToYuan = (amount: string | number): number => {
-  return Number((Number(amount) / 100).toFixed(2))
-}
diff --git a/src/utils/tree.ts b/src/utils/tree.ts
index 445adf1b029a40c4c42c872389e290276a7dbe1b..51a64bd180eb27aec0ac94476fc1c81db0526e6a 100644
--- a/src/utils/tree.ts
+++ b/src/utils/tree.ts
@@ -11,8 +11,7 @@ const DEFAULT_CONFIG: TreeHelperConfig = {
 export const defaultProps = {
   children: 'children',
   label: 'name',
-  value: 'id',
-  isLeaf: 'leaf'
+  value: 'id'
 }
 
 const getConfig = (config: Partial<TreeHelperConfig>) => Object.assign({}, DEFAULT_CONFIG, config)
diff --git a/src/views/mall/trade/delivery/express/ExpressForm.vue b/src/views/entrust/apply/ApplyForm.vue
similarity index 57%
rename from src/views/mall/trade/delivery/express/ExpressForm.vue
rename to src/views/entrust/apply/ApplyForm.vue
index ea7656e7cb00dd44ea4d5a320919c5e572c2018f..3d9f8c0a5a8832a61e59a7121c4ef9c153f20dbb 100644
--- a/src/views/mall/trade/delivery/express/ExpressForm.vue
+++ b/src/views/entrust/apply/ApplyForm.vue
@@ -4,26 +4,19 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="120px"
+      label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="快递公司编码" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入快递编码" />
+      <el-form-item label="委托ID" prop="entrustId">
+        <el-input v-model="formData.entrustId" placeholder="请输入委托ID" />
       </el-form-item>
-      <el-form-item label="快递公司名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入快递名称" />
+      <el-form-item label="用户ID" prop="memberId">
+        <el-input v-model="formData.memberId" placeholder="请输入用户ID" />
       </el-form-item>
-      <el-form-item label="快递公司 logo" prop="logo">
-        <UploadImg v-model="formData.logo" :limit="1" :is-show-tip="false" />
-        <div style="font-size: 10px" class="pl-10px">推荐 180x180 图片分辨率</div>
-      </el-form-item>
-      <el-form-item label="分类排序" prop="sort">
-        <el-input-number v-model="formData.sort" controls-position="right" :min="0" />
-      </el-form-item>
-      <el-form-item label="开启状态" prop="status">
+      <el-form-item label="申请状态（ 0 申请拒绝 1 申请中 2 通过 ）" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_APPLY_STATUS)"
             :key="dict.value"
             :label="dict.value"
           >
@@ -31,6 +24,11 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否当前" prop="isPresent">
+        <el-radio-group v-model="formData.isPresent">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -38,10 +36,10 @@
     </template>
   </Dialog>
 </template>
-<script setup lang="ts" name="ExpressForm">
+<script setup lang="ts">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { CommonStatusEnum } from '@/utils/constants'
-import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
+import * as ApplyApi from '@/api/entrust/apply'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -51,18 +49,18 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  code: '',
-  name: '',
-  logo: '',
-  sort: 0,
-  status: CommonStatusEnum.ENABLE
+  entrustId: undefined,
+  memberId: undefined,
+  status: undefined,
+  isPresent: undefined
 })
 const formRules = reactive({
-  code: [{ required: true, message: '快递编码不能为空', trigger: 'blur' }],
-  name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
-  logo: [{ required: true, message: '分类图片不能为空', trigger: 'blur' }],
-  sort: [{ required: true, message: '分类排序不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }]
+  entrustId: [{ required: true, message: '委托ID不能为空', trigger: 'blur' }],
+  memberId: [{ required: true, message: '用户ID不能为空', trigger: 'blur' }],
+  status: [
+    { required: true, message: '申请状态（ 0 申请拒绝 1 申请中 2 通过 ）不能为空', trigger: 'blur' }
+  ],
+  isPresent: [{ required: true, message: '是否当前不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -76,7 +74,7 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await DeliveryExpressApi.getDeliveryExpress(id)
+      formData.value = await ApplyApi.getApply(id)
     } finally {
       formLoading.value = false
     }
@@ -94,12 +92,12 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as DeliveryExpressApi.DeliveryExpressVO
+    const data = formData.value as unknown as ApplyApi.ApplyVO
     if (formType.value === 'create') {
-      await DeliveryExpressApi.createDeliveryExpress(data)
+      await ApplyApi.createApply(data)
       message.success(t('common.createSuccess'))
     } else {
-      await DeliveryExpressApi.updateDeliveryExpress(data)
+      await ApplyApi.updateApply(data)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -114,10 +112,10 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    name: '',
-    picUrl: '',
-    bigPicUrl: '',
-    status: CommonStatusEnum.ENABLE
+    entrustId: undefined,
+    memberId: undefined,
+    status: undefined,
+    isPresent: undefined
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/entrust/apply/index.vue b/src/views/entrust/apply/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..502357f39fd126fb940a9b8de2d161e469ef98ba
--- /dev/null
+++ b/src/views/entrust/apply/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="委托ID" prop="entrustId">
+        <el-input
+          v-model="queryParams.entrustId"
+          placeholder="请输入委托ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="用户ID" prop="memberId">
+        <el-input
+          v-model="queryParams.memberId"
+          placeholder="请输入用户ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="申请状态（ 0 申请拒绝 1 申请中 2 通过 ）" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择申请状态（ 0 申请拒绝 1 申请中 2 通过 ）"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_APPLY_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否当前" prop="isPresent">
+        <el-select
+          v-model="queryParams.isPresent"
+          placeholder="请选择是否当前"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['entrust:apply:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['entrust:apply:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="委托ID" align="center" prop="entrustId" />
+      <el-table-column label="用户ID" align="center" prop="memberId" />
+      <el-table-column
+        label="申请状态（ 0 申请拒绝 1 申请中 2 通过 ）"
+        align="center"
+        prop="status"
+      >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_APPLY_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否当前" align="center" prop="isPresent" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['entrust:apply:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['entrust:apply:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ApplyForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts" name="EntrustApply">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ApplyApi from '@/api/entrust/apply'
+import ApplyForm from './ApplyForm.vue'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  entrustId: null,
+  memberId: null,
+  status: null,
+  isPresent: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ApplyApi.getApplyPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ApplyApi.deleteApply(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ApplyApi.exportApply(queryParams)
+    download.excel(data, '委托申请列.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/entrust/entrustItem/entrustItemForm.vue b/src/views/entrust/entrustItem/entrustItemForm.vue
new file mode 100644
index 0000000000000000000000000000000000000000..69c654266f7f5a13790f122ebcf1882c2ede6db5
--- /dev/null
+++ b/src/views/entrust/entrustItem/entrustItemForm.vue
@@ -0,0 +1,295 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="formData.title" placeholder="请输入标题" />
+      </el-form-item>
+      <el-form-item label="描述">
+        <Editor :model-value="formData.description" height="150px" @change="change" />
+      </el-form-item>
+      <el-form-item label="委托类型" prop="entrustType">
+        <el-select v-model="formData.entrustType" placeholder="请选择委托类型（1 销售，2 地推）">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_ENTRUST_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="位置类型" prop="placeType">
+        <el-select v-model="formData.placeType" placeholder="请选择位置类型（1 地摊，2 集会）">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_PLACE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间类型" prop="timeType">
+        <el-select v-model="formData.timeType" placeholder="请选择时间类型（1 早班，2 中晚，3 晚）">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_TIME_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="结算类型" prop="clearType">
+        <el-select v-model="formData.clearType" placeholder="请选择结算类型">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_CLEAR_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="性别需求" prop="genderRequire">
+        <el-select v-model="formData.genderRequire" placeholder="请选择性别需求">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_GENDER_REQUIRE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工作结束时间" prop="endTime">
+        <el-date-picker
+          v-model="formData.endTime"
+          type="datetime"
+          value-format="x"
+          placeholder="选择工作结束时间"
+          format="YYYY/MM/DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="人数需求" prop="numberRequire">
+        <el-input v-model="formData.numberRequire" placeholder="请输入人数需求" />
+      </el-form-item>
+      <el-form-item label="性格需求标签" prop="requireTag">
+        <el-checkbox-group v-model="formData.requireTag">
+          <el-checkbox
+            v-for="dict in getStrDictOptions(DICT_TYPE.ENT_REQUIRE_TAG)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="预计收入（单位分）" prop="projectedIncome">
+        <el-input v-model="formData.projectedIncome" placeholder="请输入预计收入（每天/单位分）" />
+      </el-form-item>
+      <el-form-item label="押金（单位分）" prop="cashPledge">
+        <el-input v-model="formData.cashPledge" placeholder="请输入押金（单位分）" />
+      </el-form-item>
+      <el-form-item label="委托状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_ENTRUST_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="工作开始时间" prop="startTime">
+        <el-date-picker
+          v-model="formData.startTime"
+          type="datetime"
+          value-format="x"
+          placeholder="选择工作开始时间"
+          format="YYYY/MM/DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="经度" prop="longitude">
+        <el-input v-model="formData.longitude" placeholder="请输入经度" />
+      </el-form-item>
+      <el-form-item label="维度" prop="latitude">
+        <el-input v-model="formData.latitude" placeholder="请输入维度" />
+      </el-form-item>
+      <el-form-item label="街道名称" prop="street">
+        <el-input v-model="formData.street" placeholder="请输入街道名称" />
+      </el-form-item>
+      <el-form-item label="区id" prop="districtId">
+        <el-input v-model="formData.districtId" placeholder="请输入区id" />
+      </el-form-item>
+      <el-form-item label="市id" prop="cityId">
+        <el-input v-model="formData.cityId" placeholder="请输入市id" />
+      </el-form-item>
+      <el-form-item label="省id" prop="provinceId">
+        <el-input v-model="formData.provinceId" placeholder="请输入省id" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import { IDomEditor } from '@wangeditor/editor'
+import * as entrustItemApi from '@/api/entrust/entrustItem'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  title: undefined,
+  description: '',
+  entrustType: undefined,
+  placeType: undefined,
+  timeType: undefined,
+  clearType: undefined,
+  genderRequire: undefined,
+  endTime: undefined,
+  numberRequire: undefined,
+  requireTag: [],
+  projectedIncome: undefined,
+  cashPledge: undefined,
+  status: undefined,
+  startTime: undefined,
+  longitude: undefined,
+  latitude: undefined,
+  street: undefined,
+  districtId: undefined,
+  cityId: undefined,
+  provinceId: undefined
+})
+const formRules = reactive({
+  title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+  entrustType: [
+    { required: true, message: '委托类型（1 销售，2 地推）不能为空', trigger: 'change' }
+  ],
+  placeType: [{ required: true, message: '位置类型（1 地摊，2 集会）不能为空', trigger: 'change' }],
+  timeType: [
+    { required: true, message: '时间类型（1 早班，2 中晚，3 晚）不能为空', trigger: 'change' }
+  ],
+  clearType: [
+    {
+      required: true,
+      message: '结算类型（1 日结 2 周结 3 月结 4 特定结算）不能为空',
+      trigger: 'change'
+    }
+  ],
+  genderRequire: [
+    {
+      required: true,
+      message: '性别需求 （1 男性 2 女性 3 无 4 至少一名女性 5 至少一名男性）不能为空',
+      trigger: 'blur'
+    }
+  ],
+  endTime: [{ required: true, message: '工作结束时间不能为空', trigger: 'blur' }],
+  numberRequire: [{ required: true, message: '人数需求不能为空', trigger: 'blur' }],
+  projectedIncome: [
+    { required: true, message: '预计收入（每天/单位分）不能为空', trigger: 'blur' }
+  ],
+  status: [
+    {
+      required: true,
+      message: '委托状态( 0 待发布 1 发布 2 已承接 3已完成)不能为空',
+      trigger: 'blur'
+    }
+  ],
+  startTime: [{ required: true, message: '工作开始时间不能为空', trigger: 'blur' }],
+  street: [{ required: true, message: '街道名称不能为空', trigger: 'blur' }],
+  districtId: [{ required: true, message: '区id不能为空', trigger: 'blur' }],
+  cityId: [{ required: true, message: '市id不能为空', trigger: 'blur' }],
+  provinceId: [{ required: true, message: '省id不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await entrustItemApi.getentrustItem(id)
+      formData.value.requireTag = JSON.parse(formData.value.requireTag)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as entrustItemApi.entrustItemVO
+    data.requireTag = JSON.stringify(data.requireTag)
+    if (formType.value === 'create') {
+      await entrustItemApi.createentrustItem(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await entrustItemApi.updateentrustItem(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    title: undefined,
+    description: '',
+    entrustType: undefined,
+    placeType: undefined,
+    timeType: undefined,
+    clearType: undefined,
+    genderRequire: undefined,
+    endTime: undefined,
+    numberRequire: undefined,
+    requireTag: [],
+    projectedIncome: undefined,
+    cashPledge: undefined,
+    status: undefined,
+    startTime: undefined,
+    longitude: undefined,
+    latitude: undefined,
+    street: undefined,
+    districtId: undefined,
+    cityId: undefined,
+    provinceId: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+const change = (editor: IDomEditor) => {
+  formData.value.description = editor.getHtml()
+}
+</script>
diff --git a/src/views/entrust/entrustItem/index.vue b/src/views/entrust/entrustItem/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..0021e8fff691bd8019e520fdc6b54f3191741437
--- /dev/null
+++ b/src/views/entrust/entrustItem/index.vue
@@ -0,0 +1,353 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="委托类型（1 销售，2 地推）" prop="entrustType">
+        <el-select
+          v-model="queryParams.entrustType"
+          placeholder="请选择委托类型（1 销售，2 地推）"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_ENTRUST_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="位置类型（1 地摊，2 集会）" prop="placeType">
+        <el-select
+          v-model="queryParams.placeType"
+          placeholder="请选择位置类型（1 地摊，2 集会）"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_PLACE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间类型（1 早班，2 中晚，3 晚）" prop="timeType">
+        <el-select
+          v-model="queryParams.timeType"
+          placeholder="请选择时间类型（1 早班，2 中晚，3 晚）"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_TIME_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="结算类型（1 日结 2 周结 3 月结 4 特定结算）" prop="clearType">
+        <el-select
+          v-model="queryParams.clearType"
+          placeholder="请选择结算类型（1 日结 2 周结 3 月结 4 特定结算）"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_CLEAR_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="委托状态( 0 待发布 1 发布 2 已承接 3已完成)" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择委托状态( 0 待发布 1 发布 2 已承接 3已完成)"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_ENTRUST_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="街道名称" prop="street">
+        <el-input
+          v-model="queryParams.street"
+          placeholder="请输入街道名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="区id" prop="districtId">
+        <el-input
+          v-model="queryParams.districtId"
+          placeholder="请输入区id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="市id" prop="cityId">
+        <el-input
+          v-model="queryParams.cityId"
+          placeholder="请输入市id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="省id" prop="provinceId">
+        <el-input
+          v-model="queryParams.provinceId"
+          placeholder="请输入省id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['entrust:entrust-item:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['entrust:entrust-item:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="描述" align="center" prop="description" />
+      <el-table-column label="委托类型" align="center" prop="entrustType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_ENTRUST_TYPE" :value="scope.row.entrustType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="位置类型" align="center" prop="placeType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_PLACE_TYPE" :value="scope.row.placeType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="时间类型" align="center" prop="timeType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_TIME_TYPE" :value="scope.row.timeType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="结算类型" align="center" prop="clearType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_CLEAR_TYPE" :value="scope.row.clearType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="性别需求" align="center" prop="genderRequire">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_GENDER_REQUIRE" :value="scope.row.genderRequire" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="工作结束时间"
+        align="center"
+        prop="endTime"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="人数需求" align="center" prop="numberRequire" />
+      <el-table-column label="预计收入" align="center" prop="projectedIncome" />
+      <el-table-column label="押金" align="center" prop="cashPledge" />
+      <el-table-column label="委托状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_ENTRUST_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="工作开始时间"
+        align="center"
+        prop="startTime"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="街道名称" align="center" prop="street" />
+      <el-table-column label="区id" align="center" prop="districtId" />
+      <el-table-column label="市id" align="center" prop="cityId" />
+      <el-table-column label="省id" align="center" prop="provinceId" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['entrust:entrust-item:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['entrust:entrust-item:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <entrustItemForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts" name="entrustItem">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as entrustItemApi from '@/api/entrust/entrustItem'
+import entrustItemForm from './entrustItemForm.vue'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  title: null,
+  entrustType: null,
+  placeType: null,
+  timeType: null,
+  clearType: null,
+  status: null,
+  street: null,
+  districtId: null,
+  cityId: null,
+  provinceId: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await entrustItemApi.getentrustItemPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await entrustItemApi.deleteentrustItem(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await entrustItemApi.exportentrustItem(queryParams)
+    download.excel(data, '委托任务列表.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/mall/product/spu/components/ProductAttributesAddForm.vue b/src/views/entrust/equipment/EquipmentForm.vue
similarity index 40%
rename from src/views/mall/product/spu/components/ProductAttributesAddForm.vue
rename to src/views/entrust/equipment/EquipmentForm.vue
index 06987b0a7b6641808ca9af4705be72d27ed54e78..312d22e6553da398f34715b6c1730af297eb5bee 100644
--- a/src/views/mall/product/spu/components/ProductAttributesAddForm.vue
+++ b/src/views/entrust/equipment/EquipmentForm.vue
@@ -1,65 +1,66 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
     <el-form
       ref="formRef"
-      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="80px"
+      label-width="100px"
+      v-loading="formLoading"
     >
-      <el-form-item label="属性名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入名称" />
+      <el-form-item label="任务ID" prop="entrustId">
+        <el-input v-model="formData.entrustId" placeholder="请输入任务ID" />
+      </el-form-item>
+      <el-form-item label="设备ID" prop="equipmentId">
+        <el-input v-model="formData.equipmentId" placeholder="请输入设备ID" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="ProductPropertyForm" setup>
-import * as PropertyApi from '@/api/mall/product/property'
+<script setup lang="ts">
+import * as EquipmentApi from '@/api/entrust/equipment'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('添加商品属性') // 弹窗的标题
+const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
-  name: ''
+  id: undefined,
+  entrustId: undefined,
+  equipmentId: undefined
 })
 const formRules = reactive({
-  name: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
+  entrustId: [{ required: true, message: '任务ID不能为空', trigger: 'blur' }],
+  equipmentId: [{ required: true, message: '设备ID不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-const attributeList = ref([]) // 商品属性列表
-const props = defineProps({
-  propertyList: {
-    type: Array,
-    default: () => {}
-  }
-})
 
-watch(
-  () => props.propertyList,
-  (data) => {
-    if (!data) return
-    attributeList.value = data
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
 /** 打开弹窗 */
-const open = async () => {
+const open = async (type: string, id?: number) => {
   dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
   resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await EquipmentApi.getEquipment(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
   if (!formRef) return
@@ -68,20 +69,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as PropertyApi.PropertyVO
-    // 检查属性是否已存在，如果有则返回属性和其下属性值
-    const res = await PropertyApi.getPropertyListAndValue({ name: data.name })
-    if (res.length === 0) {
-      const propertyId = await PropertyApi.createProperty(data)
-      attributeList.value.push({ id: propertyId, ...formData.value, values: [] })
+    const data = formData.value as unknown as EquipmentApi.EquipmentVO
+    if (formType.value === 'create') {
+      await EquipmentApi.createEquipment(data)
+      message.success(t('common.createSuccess'))
     } else {
-      if (res[0].values === null) {
-        res[0].values = []
-      }
-      attributeList.value.push(res[0]) // 因为只用一个
+      await EquipmentApi.updateEquipment(data)
+      message.success(t('common.updateSuccess'))
     }
-    message.success(t('common.createSuccess'))
     dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
   } finally {
     formLoading.value = false
   }
@@ -90,8 +88,9 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    name: '',
-    remark: ''
+    id: undefined,
+    entrustId: undefined,
+    equipmentId: undefined
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/mall/trade/delivery/express/index.vue b/src/views/entrust/equipment/index.vue
similarity index 64%
rename from src/views/mall/trade/delivery/express/index.vue
rename to src/views/entrust/equipment/index.vue
index 323a297f8d10704fdf9bae6a00a4634cad607dbc..ad7f84486e12600714fbd3bfdd6bb4ca957f3c2d 100644
--- a/src/views/mall/trade/delivery/express/index.vue
+++ b/src/views/entrust/equipment/index.vue
@@ -1,31 +1,42 @@
 <template>
-  <!-- 搜索工作栏 -->
   <ContentWrap>
+    <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="100px"
+      label-width="68px"
     >
-      <el-form-item label="快递公司编号" prop="code">
+      <el-form-item label="任务ID" prop="entrustId">
         <el-input
-          v-model="queryParams.code"
-          placeholder="请输快递公司编号"
+          v-model="queryParams.entrustId"
+          placeholder="请输入任务ID"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="快递公司名称" prop="name">
+      <el-form-item label="设备ID" prop="equipmentId">
         <el-input
-          v-model="queryParams.name"
-          placeholder="请输快递公司名称"
+          v-model="queryParams.equipmentId"
+          placeholder="请输入设备ID"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -33,7 +44,7 @@
           type="primary"
           plain
           @click="openForm('create')"
-          v-hasPermi="['trade:delivery:express:create']"
+          v-hasPermi="['entrust:equipment:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
@@ -42,7 +53,7 @@
           plain
           @click="handleExport"
           :loading="exportLoading"
-          v-hasPermi="['trade:delivery:express:export']"
+          v-hasPermi="['entrust:equipment:export']"
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
@@ -53,24 +64,13 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="快递公司编号" prop="code" />
-      <el-table-column label="快递公司名称" prop="name" />
-      <el-table-column label="快递公司 logo " prop="logo">
-        <template #default="scope">
-          <img v-if="scope.row.logo" :src="scope.row.logo" alt="快递公司logo" class="h-100px" />
-        </template>
-      </el-table-column>
-      <el-table-column label="排序" align="center" prop="sort" />
-      <el-table-column label="开启状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="任务ID" align="center" prop="entrustId" />
+      <el-table-column label="设备ID" align="center" prop="equipmentId" />
       <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
-        width="180"
         :formatter="dateFormatter"
       />
       <el-table-column label="操作" align="center">
@@ -79,7 +79,7 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['trade:delivery:express:update']"
+            v-hasPermi="['entrust:equipment:update']"
           >
             编辑
           </el-button>
@@ -87,34 +87,43 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['trade:delivery:express:delete']"
+            v-hasPermi="['entrust:equipment:delete']"
           >
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <ExpressForm ref="formRef" @success="getList" />
+  <EquipmentForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="Express">
-import { DICT_TYPE } from '@/utils/dict'
+
+<script setup lang="ts" name="EntrustEquipment">
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
-import ExpressForm from './ExpressForm.vue'
+import * as EquipmentApi from '@/api/entrust/equipment'
+import EquipmentForm from './EquipmentForm.vue'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const total = ref(0) // 列表的总页数
+
 const loading = ref(true) // 列表的加载中
-const list = ref<any[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  code: '',
-  name: ''
+  entrustId: null,
+  equipmentId: null,
+  createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -123,7 +132,7 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await DeliveryExpressApi.getDeliveryExpressPage(queryParams)
+    const data = await EquipmentApi.getEquipmentPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -155,7 +164,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await DeliveryExpressApi.deleteDeliveryExpress(id)
+    await EquipmentApi.deleteEquipment(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -169,8 +178,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await DeliveryExpressApi.exportDeliveryExpressApi(queryParams)
-    download.excel(data, '快递公司.xls')
+    const data = await EquipmentApi.exportEquipment(queryParams)
+    download.excel(data, '委托设备列.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/entrust/product/ProductForm.vue b/src/views/entrust/product/ProductForm.vue
new file mode 100644
index 0000000000000000000000000000000000000000..fe18eff25bc871d4ecbbea5a595fcb56570e9eec
--- /dev/null
+++ b/src/views/entrust/product/ProductForm.vue
@@ -0,0 +1,109 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="委托ID" prop="entrustId">
+        <el-input v-model="formData.entrustId" placeholder="请输入委托ID" />
+      </el-form-item>
+      <el-form-item label="商品skuID" prop="skuId">
+        <el-input v-model="formData.skuId" placeholder="请输入商品skuID" />
+      </el-form-item>
+      <el-form-item label="商品spuID" prop="spuId">
+        <el-input v-model="formData.spuId" placeholder="请输入商品spuID" />
+      </el-form-item>
+      <el-form-item label="委托数量" prop="entrustNumber">
+        <el-input v-model="formData.entrustNumber" placeholder="请输入委托数量" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as ProductApi from '@/api/entrust/product'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  entrustId: undefined,
+  skuId: undefined,
+  spuId: undefined,
+  entrustNumber: undefined
+})
+const formRules = reactive({
+  entrustId: [{ required: true, message: '委托ID不能为空', trigger: 'blur' }],
+  skuId: [{ required: true, message: '商品skuID不能为空', trigger: 'blur' }],
+  spuId: [{ required: true, message: '商品spuID不能为空', trigger: 'blur' }],
+  entrustNumber: [{ required: true, message: '委托数量不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ProductApi.getProduct(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ProductApi.ProductVO
+    if (formType.value === 'create') {
+      await ProductApi.createProduct(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductApi.updateProduct(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    entrustId: undefined,
+    skuId: undefined,
+    spuId: undefined,
+    entrustNumber: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/entrust/product/index.vue b/src/views/entrust/product/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..df3d66b4ef9f006e34954763909ff2f8ff772c6c
--- /dev/null
+++ b/src/views/entrust/product/index.vue
@@ -0,0 +1,215 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="委托ID" prop="entrustId">
+        <el-input
+          v-model="queryParams.entrustId"
+          placeholder="请输入委托ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="商品skuID" prop="skuId">
+        <el-input
+          v-model="queryParams.skuId"
+          placeholder="请输入商品skuID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="商品spuID" prop="spuId">
+        <el-input
+          v-model="queryParams.spuId"
+          placeholder="请输入商品spuID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="委托数量" prop="entrustNumber">
+        <el-input
+          v-model="queryParams.entrustNumber"
+          placeholder="请输入委托数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['entrust:product:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['entrust:product:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="委托ID" align="center" prop="entrustId" />
+      <el-table-column label="商品skuID" align="center" prop="skuId" />
+      <el-table-column label="商品spuID" align="center" prop="spuId" />
+      <el-table-column label="委托数量" align="center" prop="entrustNumber" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['entrust:product:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['entrust:product:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ProductForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts" name="EntrustProduct">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ProductApi from '@/api/entrust/product'
+import ProductForm from './ProductForm.vue'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  entrustId: null,
+  skuId: null,
+  spuId: null,
+  entrustNumber: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProductApi.getProductPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductApi.deleteProduct(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductApi.exportProduct(queryParams)
+    download.excel(data, '委托商品.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/equipment/equipmentItem/equipmentItemForm.vue b/src/views/equipment/equipmentItem/equipmentItemForm.vue
new file mode 100644
index 0000000000000000000000000000000000000000..63a1ef3e405a0be0cf64ca95abc0229f18469c3f
--- /dev/null
+++ b/src/views/equipment/equipmentItem/equipmentItemForm.vue
@@ -0,0 +1,189 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="formData.title" placeholder="请输入标题" />
+      </el-form-item>
+      <el-form-item label="图片">
+        <UploadImg v-model="formData.picUrl" />
+      </el-form-item>
+      <el-form-item label="设备类型（1 推车 2 桌子 3 椅子）" prop="equipmentType">
+        <el-select
+          v-model="formData.equipmentType"
+          placeholder="请选择设备类型（1 推车 2 桌子 3 椅子）"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_EQUIPMENT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="损坏赔偿（单位分）" prop="compensate">
+        <el-input v-model="formData.compensate" placeholder="请输入损坏赔偿（单位分）" />
+      </el-form-item>
+      <el-form-item label="设备价格（单位分）" prop="price">
+        <el-input v-model="formData.price" placeholder="请输入设备价格（单位分）" />
+      </el-form-item>
+      <el-form-item
+        label="委托状态( 0 损坏 1待分配 2已分配  3已租出  4已回收 5维修中  )"
+        prop="status"
+      >
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_EQUIPMENT_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="入库时间" prop="saveTime">
+        <el-date-picker
+          v-model="formData.saveTime"
+          type="date"
+          value-format="x"
+          placeholder="选择入库时间"
+        />
+      </el-form-item>
+      <el-form-item label="损毁时间" prop="destroyTime">
+        <el-date-picker
+          v-model="formData.destroyTime"
+          type="date"
+          value-format="x"
+          placeholder="选择损毁时间"
+        />
+      </el-form-item>
+      <el-form-item label="区id" prop="districtId">
+        <el-input v-model="formData.districtId" placeholder="请输入区id" />
+      </el-form-item>
+      <el-form-item label="市id" prop="cityId">
+        <el-input v-model="formData.cityId" placeholder="请输入市id" />
+      </el-form-item>
+      <el-form-item label="省id" prop="provinceId">
+        <el-input v-model="formData.provinceId" placeholder="请输入省id" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as equipmentItemApi from '@/api/equipment/equipmentItem'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  title: undefined,
+  picUrl: undefined,
+  equipmentType: undefined,
+  compensate: undefined,
+  price: undefined,
+  status: undefined,
+  saveTime: undefined,
+  destroyTime: undefined,
+  districtId: undefined,
+  cityId: undefined,
+  provinceId: undefined
+})
+const formRules = reactive({
+  title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+  equipmentType: [
+    { required: true, message: '设备类型（1 推车 2 桌子 3 椅子）不能为空', trigger: 'change' }
+  ],
+  compensate: [{ required: true, message: '损坏赔偿（单位分）不能为空', trigger: 'blur' }],
+  price: [{ required: true, message: '设备价格（单位分）不能为空', trigger: 'blur' }],
+  status: [
+    {
+      required: true,
+      message: '委托状态( 0 损坏 1待分配 2已分配  3已租出  4已回收 5维修中  )不能为空',
+      trigger: 'blur'
+    }
+  ],
+  saveTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }],
+  districtId: [{ required: true, message: '区id不能为空', trigger: 'blur' }],
+  cityId: [{ required: true, message: '市id不能为空', trigger: 'blur' }],
+  provinceId: [{ required: true, message: '省id不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await equipmentItemApi.getequipmentItem(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as equipmentItemApi.equipmentItemVO
+    if (formType.value === 'create') {
+      await equipmentItemApi.createequipmentItem(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await equipmentItemApi.updateequipmentItem(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    title: undefined,
+    picUrl: undefined,
+    equipmentType: undefined,
+    compensate: undefined,
+    price: undefined,
+    status: undefined,
+    saveTime: undefined,
+    destroyTime: undefined,
+    districtId: undefined,
+    cityId: undefined,
+    provinceId: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/equipment/equipmentItem/index.vue b/src/views/equipment/equipmentItem/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b03c83ba3850910897b86326a7ce41b2a78816f9
--- /dev/null
+++ b/src/views/equipment/equipmentItem/index.vue
@@ -0,0 +1,320 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="设备类型（1 推车 2 桌子 3 椅子）" prop="equipmentType">
+        <el-select
+          v-model="queryParams.equipmentType"
+          placeholder="请选择设备类型（1 推车 2 桌子 3 椅子）"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_EQUIPMENT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="损坏赔偿（单位分）" prop="compensate">
+        <el-input
+          v-model="queryParams.compensate"
+          placeholder="请输入损坏赔偿（单位分）"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="设备价格（单位分）" prop="price">
+        <el-input
+          v-model="queryParams.price"
+          placeholder="请输入设备价格（单位分）"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item
+        label="委托状态( 0 损坏 1待分配 2已分配  3已租出  4已回收 5维修中  )"
+        prop="status"
+      >
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择委托状态( 0 损坏 1待分配 2已分配  3已租出  4已回收 5维修中  )"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_EQUIPMENT_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="入库时间" prop="saveTime">
+        <el-date-picker
+          v-model="queryParams.saveTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="损毁时间" prop="destroyTime">
+        <el-date-picker
+          v-model="queryParams.destroyTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="区id" prop="districtId">
+        <el-input
+          v-model="queryParams.districtId"
+          placeholder="请输入区id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="市id" prop="cityId">
+        <el-input
+          v-model="queryParams.cityId"
+          placeholder="请输入市id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="省id" prop="provinceId">
+        <el-input
+          v-model="queryParams.provinceId"
+          placeholder="请输入省id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['equipment:equipment-item:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['equipment:equipment-item:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="图片" align="center" prop="picUrl" />
+      <el-table-column label="设备类型（1 推车 2 桌子 3 椅子）" align="center" prop="equipmentType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_EQUIPMENT_TYPE" :value="scope.row.equipmentType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="损坏赔偿（单位分）" align="center" prop="compensate" />
+      <el-table-column label="设备价格（单位分）" align="center" prop="price" />
+      <el-table-column
+        label="委托状态( 0 损坏 1待分配 2已分配  3已租出  4已回收 5维修中  )"
+        align="center"
+        prop="status"
+      >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ENT_EQUIPMENT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="入库时间" align="center" prop="saveTime" :formatter="dateFormatter" />
+      <el-table-column
+        label="损毁时间"
+        align="center"
+        prop="destroyTime"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="区id" align="center" prop="districtId" />
+      <el-table-column label="市id" align="center" prop="cityId" />
+      <el-table-column label="省id" align="center" prop="provinceId" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['equipment:equipment-item:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['equipment:equipment-item:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <equipmentItemForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts" name="equipmentItem">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as equipmentItemApi from '@/api/equipment/equipmentItem'
+import equipmentItemForm from './equipmentItemForm.vue'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  title: null,
+  picUrl: null,
+  equipmentType: null,
+  compensate: null,
+  price: null,
+  status: null,
+  saveTime: [],
+  destroyTime: [],
+  districtId: null,
+  cityId: null,
+  provinceId: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await equipmentItemApi.getequipmentItemPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await equipmentItemApi.deleteequipmentItem(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await equipmentItemApi.exportequipmentItem(queryParams)
+    download.excel(data, '设备管理.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/equipment/useLog/UseLogForm.vue b/src/views/equipment/useLog/UseLogForm.vue
new file mode 100644
index 0000000000000000000000000000000000000000..89104c1cab9bd59967aa8ae76c5579b1337962b4
--- /dev/null
+++ b/src/views/equipment/useLog/UseLogForm.vue
@@ -0,0 +1,122 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="设备ID" prop="equipmentId">
+        <el-input v-model="formData.equipmentId" placeholder="请输入设备ID" />
+      </el-form-item>
+      <el-form-item
+        label="记录类型（0 损坏 1发布 2分配 3给租客  4从租客回收 5进入维修  ）"
+        prop="type"
+      >
+        <el-select
+          v-model="formData.type"
+          placeholder="请选择记录类型（0 损坏 1发布 2分配 3给租客  4从租客回收 5进入维修  ）"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_EQUIPMENT_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="委托ID" prop="entrustId">
+        <el-input v-model="formData.entrustId" placeholder="请输入委托ID" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as UseLogApi from '@/api/equipment/useLog'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  equipmentId: undefined,
+  type: undefined,
+  entrustId: undefined
+})
+const formRules = reactive({
+  equipmentId: [{ required: true, message: '设备ID不能为空', trigger: 'blur' }],
+  type: [
+    {
+      required: true,
+      message: '记录类型（0 损坏 1发布 2分配 3给租客  4从租客回收 5进入维修  ）不能为空',
+      trigger: 'change'
+    }
+  ]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await UseLogApi.getUseLog(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as UseLogApi.UseLogVO
+    if (formType.value === 'create') {
+      await UseLogApi.createUseLog(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await UseLogApi.updateUseLog(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    equipmentId: undefined,
+    type: undefined,
+    entrustId: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mall/trade/delivery/expressTemplate/index.vue b/src/views/equipment/useLog/index.vue
similarity index 48%
rename from src/views/mall/trade/delivery/expressTemplate/index.vue
rename to src/views/equipment/useLog/index.vue
index e9f670f55d01ff6a4ac510be9f4ee25f141da780..a737a64e2341313ce52014a2d3fb4718253ce0a0 100644
--- a/src/views/mall/trade/delivery/expressTemplate/index.vue
+++ b/src/views/equipment/useLog/index.vue
@@ -1,37 +1,60 @@
 <template>
-  <!-- 搜索工作栏 -->
   <ContentWrap>
+    <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="100px"
+      label-width="68px"
     >
-      <el-form-item label="模板名称" prop="name">
+      <el-form-item label="设备ID" prop="equipmentId">
         <el-input
-          v-model="queryParams.name"
-          placeholder="请输入模板名称"
+          v-model="queryParams.equipmentId"
+          placeholder="请输入设备ID"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="计费方式" prop="chargeMode">
+      <el-form-item
+        label="记录类型（0 损坏 1发布 2分配 3给租客  4从租客回收 5进入维修  ）"
+        prop="type"
+      >
         <el-select
-          v-model="queryParams.chargeMode"
-          placeholder="计费方式"
+          v-model="queryParams.type"
+          placeholder="请选择记录类型（0 损坏 1发布 2分配 3给租客  4从租客回收 5进入维修  ）"
           clearable
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.ENT_EQUIPMENT_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="委托ID" prop="entrustId">
+        <el-input
+          v-model="queryParams.entrustId"
+          placeholder="请输入委托ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -39,10 +62,18 @@
           type="primary"
           plain
           @click="openForm('create')"
-          v-hasPermi="['trade:delivery:express-template:create']"
+          v-hasPermi="['equipment:use-log:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['equipment:use-log:export']"
         >
-          <Icon icon="ep:plus" class="mr-5px" />
-          新增
+          <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
     </el-form>
@@ -51,19 +82,22 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" prop="id" />
-      <el-table-column label="模板名称" prop="name" />
-      <el-table-column label="计费方式" prop="chargeMode" align="center">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="设备ID" align="center" prop="equipmentId" />
+      <el-table-column
+        label="记录类型（0 损坏 1发布 2分配 3给租客  4从租客回收 5进入维修  ）"
+        align="center"
+        prop="type"
+      >
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.EXPRESS_CHARGE_MODE" :value="scope.row.chargeMode" />
+          <dict-tag :type="DICT_TYPE.ENT_EQUIPMENT_STATUS" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="排序" prop="sort" />
+      <el-table-column label="委托ID" align="center" prop="entrustId" />
       <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
-        width="180"
         :formatter="dateFormatter"
       />
       <el-table-column label="操作" align="center">
@@ -72,7 +106,7 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['trade:delivery:express-template:update']"
+            v-hasPermi="['equipment:use-log:update']"
           >
             编辑
           </el-button>
@@ -80,41 +114,54 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['trade:delivery:express-template:delete']"
+            v-hasPermi="['equipment:use-log:delete']"
           >
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <ExpressTemplateForm ref="formRef" @success="getList" />
+  <UseLogForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts" name="DeliveryExpressTemplate">
+
+<script setup lang="ts" name="EquipmentUseLog">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
-import * as DeliveryExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
-import ExpressTemplateForm from './ExpressTemplateForm.vue'
-
+import download from '@/utils/download'
+import * as UseLogApi from '@/api/equipment/useLog'
+import UseLogForm from './UseLogForm.vue'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const total = ref(0) // 列表的总页数
+
 const loading = ref(true) // 列表的加载中
-const list = ref<any[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  name: '',
-  chargeMode: undefined
+  equipmentId: null,
+  type: null,
+  entrustId: null,
+  createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
-    const data = await DeliveryExpressTemplateApi.getDeliveryExpressTemplatePage(queryParams)
+    const data = await UseLogApi.getUseLogPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -146,13 +193,28 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await DeliveryExpressTemplateApi.deleteDeliveryExpressTemplate(id)
+    await UseLogApi.deleteUseLog(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
   } catch {}
 }
 
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await UseLogApi.exportUseLog(queryParams)
+    download.excel(data, '设备使用记录.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()
diff --git a/src/views/infra/redis/index.vue b/src/views/infra/redis/index.vue
index f98f2f30928ccba86bc3a7ba35135b7f666767f2..8315a207b89a3c1414908f8f1dc74f85b9e29924 100644
--- a/src/views/infra/redis/index.vue
+++ b/src/views/infra/redis/index.vue
@@ -1,6 +1,7 @@
 <template>
   <doc-alert title="Redis 缓存" url="https://doc.iocoder.cn/redis-cache/" />
   <doc-alert title="本地缓存" url="https://doc.iocoder.cn/local-cache/" />
+
   <el-scrollbar height="calc(100vh - 88px - 40px - 50px)">
     <el-row>
       <!-- 基本信息 -->
@@ -50,219 +51,127 @@
       <!-- 命令统计 -->
       <el-col :span="12" class="mt-3">
         <el-card :gutter="12" shadow="hover">
-          <Echart :options="commandStatsRefChika" :height="420" />
+          <div ref="commandStatsRef" class="h-88"></div>
         </el-card>
       </el-col>
       <!-- 内存使用量统计 -->
       <el-col :span="12" class="mt-3">
         <el-card class="ml-3" :gutter="12" shadow="hover">
-          <Echart :options="usedmemoryEchartChika" :height="420" />
+          <div ref="usedmemory" class="h-88"></div>
         </el-card>
       </el-col>
     </el-row>
   </el-scrollbar>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="InfraRedis">
+import * as echarts from 'echarts'
 import * as RedisApi from '@/api/infra/redis'
 import { RedisMonitorInfoVO } from '@/api/infra/redis/types'
+
 const cache = ref<RedisMonitorInfoVO>()
 
 // 基本信息
 const readRedisInfo = async () => {
   const data = await RedisApi.getCache()
   cache.value = data
+  loadEchartOptions(data.commandStats)
 }
+// 图表
+const commandStatsRef = ref<HTMLElement>()
+const usedmemory = ref<HTMLDivElement>()
 
-// 内存使用情况
-const usedmemoryEchartChika = reactive<any>({
-  title: {
-    // 仪表盘标题。
-    text: '内存使用情况',
-    left: 'center',
-    show: true, // 是否显示标题,默认 true。
-    offsetCenter: [0, '20%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
-    color: 'yellow', // 文字的颜色,默认 #333。
-    fontSize: 20 // 文字的字体大小,默认 15。
-  },
-  toolbox: {
-    show: false,
-    feature: {
-      restore: { show: true },
-      saveAsImage: { show: true }
-    }
-  },
-  series: [
-    {
-      name: '峰值',
-      type: 'gauge',
-      min: 0,
-      max: 50,
-      splitNumber: 10,
-      //这是指针的颜色
-      color: '#F5C74E',
-      radius: '85%',
-      center: ['50%', '50%'],
-      startAngle: 225,
-      endAngle: -45,
-      axisLine: {
-        // 坐标轴线
-        lineStyle: {
-          // 属性lineStyle控制线条样式
-          color: [
-            [0.2, '#7FFF00'],
-            [0.8, '#00FFFF'],
-            [1, '#FF0000']
-          ],
-          //width: 6 外框的大小（环的宽度）
-          width: 10
-        }
-      },
-      axisTick: {
-        // 坐标轴小标记
-        //里面的线长是5（短线）
-        length: 5, // 属性length控制线长
-        lineStyle: {
-          // 属性lineStyle控制线条样式
-          color: '#76D9D7'
-        }
-      },
-      splitLine: {
-        // 分隔线
-        length: 20, // 属性length控制线长
-        lineStyle: {
-          // 属性lineStyle（详见lineStyle）控制线条样式
-          color: '#76D9D7'
-        }
-      },
-      axisLabel: {
-        color: '#76D9D7',
-        distance: 15,
-        fontSize: 15
-      },
-      pointer: {
-        // 指针的大小
-        width: 7,
-        show: true
-      },
-      detail: {
-        textStyle: {
-          fontWeight: 'normal',
-          // 里面文字下的数值大小（50）
-          fontSize: 15,
-          color: '#FFFFFF'
-        },
-        valueAnimation: true
-      },
-      progress: {
-        show: true
-      }
-    }
-  ]
-})
+const loadEchartOptions = (stats) => {
+  const commandStats = [] as any[]
+  const nameList = [] as string[]
+  stats.forEach((row) => {
+    commandStats.push({
+      name: row.command,
+      value: row.calls
+    })
+    nameList.push(row.command)
+  })
 
-// 指令使用情况
-const commandStatsRefChika = reactive({
-  title: {
-    text: '命令统计',
-    left: 'center'
-  },
-  tooltip: {
-    trigger: 'item',
-    formatter: '{a} <br/>{b} : {c} ({d}%)'
-  },
-  legend: {
-    type: 'scroll',
-    orient: 'vertical',
-    right: 30,
-    top: 10,
-    bottom: 20,
-    data: [] as any[],
-    textStyle: {
-      color: '#a1a1a1'
-    }
-  },
-  series: [
-    {
-      name: '命令',
-      type: 'pie',
-      radius: [20, 120],
-      center: ['40%', '60%'],
-      data: [] as any[],
-      roseType: 'radius',
-      label: {
-        show: true
-      },
-      emphasis: {
+  const commandStatsInstance = echarts.init(commandStatsRef.value!, 'macarons')
+
+  commandStatsInstance.setOption({
+    title: {
+      text: '命令统计',
+      left: 'center'
+    },
+    tooltip: {
+      trigger: 'item',
+      formatter: '{a} <br/>{b} : {c} ({d}%)'
+    },
+    legend: {
+      type: 'scroll',
+      orient: 'vertical',
+      right: 30,
+      top: 10,
+      bottom: 20,
+      data: nameList,
+      textStyle: {
+        color: '#a1a1a1'
+      }
+    },
+    series: [
+      {
+        name: '命令',
+        type: 'pie',
+        radius: [20, 120],
+        center: ['40%', '60%'],
+        data: commandStats,
+        roseType: 'radius',
         label: {
           show: true
         },
-        itemStyle: {
-          shadowBlur: 10,
-          shadowOffsetX: 0,
-          shadowColor: 'rgba(0, 0, 0, 0.5)'
+        emphasis: {
+          label: {
+            show: true
+          },
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
         }
       }
-    }
-  ]
-})
-
-/** 加载数据 */
-const getSummary = () => {
-  // 初始化命令图表
-  initCommandStatsChart()
-  usedMemoryInstance()
-}
-
-/** 命令使用情况 */
-const initCommandStatsChart = async () => {
-  usedmemoryEchartChika.series[0].data = []
-  // 发起请求
-  try {
-    const data = await RedisApi.getCache()
-    cache.value = data
-    // 处理数据
-    const commandStats = [] as any[]
-    const nameList = [] as string[]
-    data.commandStats.forEach((row) => {
-      commandStats.push({
-        name: row.command,
-        value: row.calls
-      })
-      nameList.push(row.command)
-    })
-    commandStatsRefChika.legend.data = nameList
-    commandStatsRefChika.series[0].data = commandStats
-  } catch {}
-}
-const usedMemoryInstance = async () => {
-  try {
-    const data = await RedisApi.getCache()
-    cache.value = data
-    // 仪表盘详情，用于显示数据。
-    usedmemoryEchartChika.series[0].detail = {
-      show: true, // 是否显示详情,默认 true。
-      offsetCenter: [0, '50%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
-      color: 'auto', // 文字的颜色,默认 auto。
-      fontSize: 30, // 文字的字体大小,默认 15。
-      formatter: cache.value!.info.used_memory_human // 格式化函数或者字符串
-    }
+    ]
+  })
 
-    usedmemoryEchartChika.series[0].data[0] = {
-      value: cache.value!.info.used_memory_human,
-      name: '内存消耗'
-    }
-    console.log(cache.value!.info)
-    usedmemoryEchartChika.tooltip = {
+  const usedMemoryInstance = echarts.init(usedmemory.value!, 'macarons')
+  usedMemoryInstance.setOption({
+    title: {
+      text: '内存使用情况',
+      left: 'center'
+    },
+    tooltip: {
       formatter: '{b} <br/>{a} : ' + cache.value!.info.used_memory_human
-    }
-  } catch {}
+    },
+    series: [
+      {
+        name: '峰值',
+        type: 'gauge',
+        min: 0,
+        max: 100,
+        progress: {
+          show: true
+        },
+        detail: {
+          formatter: cache.value!.info.used_memory_human
+        },
+        data: [
+          {
+            value: parseFloat(cache.value!.info.used_memory_human),
+            name: '内存消耗'
+          }
+        ]
+      }
+    ]
+  })
 }
 
-/** 初始化 **/
-onMounted(() => {
-  // 读取 redis 信息
+onBeforeMount(() => {
+  // TODO @hiiwbs 微信，优化使用 Echart 组件
   readRedisInfo()
-  // 加载数据
-  getSummary()
 })
 </script>
diff --git a/src/views/mall/product/category/CategoryForm.vue b/src/views/mall/product/category/CategoryForm.vue
index dfe8133364ae14ec45f3873020fa50563b087445..19bce87216ca8ad9ade2e358f325cf258d948fee 100644
--- a/src/views/mall/product/category/CategoryForm.vue
+++ b/src/views/mall/product/category/CategoryForm.vue
@@ -4,30 +4,27 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="120px"
+      label-width="80px"
       v-loading="formLoading"
     >
       <el-form-item label="上级分类" prop="parentId">
-        <el-select v-model="formData.parentId" placeholder="请选择上级分类">
-          <el-option :key="0" label="顶级分类" :value="0" />
-          <el-option
-            v-for="item in categoryList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+        <el-tree-select
+          v-model="formData.parentId"
+          :data="categoryTree"
+          :props="{ label: 'name', value: 'id' }"
+          :render-after-expand="false"
+          placeholder="请选择上级分类"
+          check-strictly
+          default-expand-all
+        />
       </el-form-item>
       <el-form-item label="分类名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入分类名称" />
       </el-form-item>
-      <el-form-item label="移动端分类图" prop="picUrl">
+      <el-form-item label="分类图片" prop="picUrl">
         <UploadImg v-model="formData.picUrl" :limit="1" :is-show-tip="false" />
-        <div style="font-size: 10px" class="pl-10px">推荐 180x180 图片分辨率</div>
-      </el-form-item>
-      <el-form-item label="PC 端分类图" prop="bigPicUrl">
-        <UploadImg v-model="formData.bigPicUrl" :limit="1" :is-show-tip="false" />
-        <div style="font-size: 10px" class="pl-10px">推荐 468x340 图片分辨率</div>
+        <div v-if="formData.parentId === 0" style="font-size: 10px">推荐 200x100 图片分辨率</div>
+        <div v-else style="font-size: 10px">推荐 100x100 图片分辨率</div>
       </el-form-item>
       <el-form-item label="分类排序" prop="sort">
         <el-input-number v-model="formData.sort" controls-position="right" :min="0" />
@@ -43,6 +40,9 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="分类描述">
+        <el-input v-model="formData.description" type="textarea" placeholder="请输入分类描述" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -53,6 +53,7 @@
 <script setup lang="ts" name="ProductCategory">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
+import { handleTree } from '@/utils/tree'
 import * as ProductCategoryApi from '@/api/mall/product/category'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -65,8 +66,8 @@ const formData = ref({
   id: undefined,
   name: '',
   picUrl: '',
-  bigPicUrl: '',
-  status: CommonStatusEnum.ENABLE
+  status: CommonStatusEnum.ENABLE,
+  description: ''
 })
 const formRules = reactive({
   parentId: [{ required: true, message: '请选择上级分类', trigger: 'blur' }],
@@ -76,7 +77,7 @@ const formRules = reactive({
   status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-const categoryList = ref<any[]>([]) // 分类树
+const categoryTree = ref<any[]>([]) // 分类树
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -94,7 +95,7 @@ const open = async (type: string, id?: number) => {
     }
   }
   // 获得分类树
-  categoryList.value = await ProductCategoryApi.getCategoryList({ parentId: 0 })
+  await getTree()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -130,9 +131,17 @@ const resetForm = () => {
     id: undefined,
     name: '',
     picUrl: '',
-    bigPicUrl: '',
-    status: CommonStatusEnum.ENABLE
+    status: CommonStatusEnum.ENABLE,
+    description: ''
   }
   formRef.value?.resetFields()
 }
+
+/** 获得分类树 */
+const getTree = async () => {
+  const data = await ProductCategoryApi.getCategoryList({})
+  const tree = handleTree(data, 'id', 'parentId')
+  const menu = { id: 0, name: '顶级分类', children: tree }
+  categoryTree.value = [menu]
+}
 </script>
diff --git a/src/views/mall/product/category/index.vue b/src/views/mall/product/category/index.vue
index ebe1d63f61ce7eb1e6e3433fa273184b12cc29e8..f57e35f8bc2c586553bbda6b67039f0b013fbfde 100644
--- a/src/views/mall/product/category/index.vue
+++ b/src/views/mall/product/category/index.vue
@@ -36,9 +36,9 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" row-key="id" default-expand-all>
       <el-table-column label="分类名称" prop="name" sortable />
-      <el-table-column label="移动端分类图" align="center" prop="picUrl">
+      <el-table-column label="分类图片" align="center" prop="picUrl">
         <template #default="scope">
-          <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="移动端分类图" class="h-100px" />
+          <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="分类图片" class="h-100px" />
         </template>
       </el-table-column>
       <el-table-column label="分类排序" align="center" prop="sort" />
diff --git a/src/views/mall/product/property/index.vue b/src/views/mall/product/property/index.vue
index 399633bddaed577ab2c2a9e2e9c9c126194d5106..102ee8a5c0d0f56529787504b2dd78555a1e5741 100644
--- a/src/views/mall/product/property/index.vue
+++ b/src/views/mall/product/property/index.vue
@@ -2,49 +2,42 @@
   <!-- 搜索工作栏 -->
   <ContentWrap>
     <el-form
+      class="-mb-15px"
+      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      :model="queryParams"
-      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          class="!w-240px"
-          clearable
           placeholder="请输入名称"
+          clearable
           @keyup.enter="handleQuery"
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery">
-          <Icon class="mr-5px" icon="ep:search" />
-          搜索
-        </el-button>
-        <el-button @click="resetQuery">
-          <Icon class="mr-5px" icon="ep:refresh" />
-          重置
-        </el-button>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
         <el-button
-          v-hasPermi="['product:property:create']"
           plain
           type="primary"
           @click="openForm('create')"
+          v-hasPermi="['product:property:create']"
         >
-          <Icon class="mr-5px" icon="ep:plus" />
-          新增
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
       </el-form-item>
     </el-form>
@@ -53,23 +46,23 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column align="center" label="编号" prop="id" />
-      <el-table-column align="center" label="名称" prop="name" />
-      <el-table-column :show-overflow-tooltip="true" align="center" label="备注" prop="remark" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="名称" align="center" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column
-        :formatter="dateFormatter"
-        align="center"
         label="创建时间"
+        align="center"
         prop="createTime"
         width="180"
+        :formatter="dateFormatter"
       />
-      <el-table-column align="center" label="操作">
+      <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
-            v-hasPermi="['product:property:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
+            v-hasPermi="['product:property:update']"
           >
             编辑
           </el-button>
@@ -77,10 +70,10 @@
             <router-link :to="'/property/value/' + scope.row.id">属性值</router-link>
           </el-button>
           <el-button
-            v-hasPermi="['product:property:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
+            v-hasPermi="['product:property:delete']"
           >
             删除
           </el-button>
@@ -89,9 +82,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
       :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
   </ContentWrap>
@@ -99,11 +92,10 @@
   <!-- 表单弹窗：添加/修改 -->
   <PropertyForm ref="formRef" @success="getList" />
 </template>
-<script lang="ts" name="ProductProperty" setup>
+<script setup lang="ts" name="ProductProperty">
 import { dateFormatter } from '@/utils/formatTime'
 import * as PropertyApi from '@/api/mall/product/property'
 import PropertyForm from './PropertyForm.vue'
-
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
diff --git a/src/views/mall/product/spu/addForm.vue b/src/views/mall/product/spu/addForm.vue
deleted file mode 100644
index 18f9d0b658cf4b597ef137dd43723ed209daf795..0000000000000000000000000000000000000000
--- a/src/views/mall/product/spu/addForm.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-  <ContentWrap v-loading="formLoading">
-    <el-tabs v-model="activeName">
-      <el-tab-pane label="商品信息" name="basicInfo">
-        <BasicInfoForm
-          ref="basicInfoRef"
-          v-model:activeName="activeName"
-          :propFormData="formData"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="商品详情" name="description">
-        <DescriptionForm
-          ref="descriptionRef"
-          v-model:activeName="activeName"
-          :propFormData="formData"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="其他设置" name="otherSettings">
-        <OtherSettingsForm
-          ref="otherSettingsRef"
-          v-model:activeName="activeName"
-          :propFormData="formData"
-        />
-      </el-tab-pane>
-    </el-tabs>
-    <el-form>
-      <el-form-item style="float: right">
-        <el-button :loading="formLoading" type="primary" @click="submitForm">保存</el-button>
-        <el-button @click="close">返回</el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-</template>
-<script lang="ts" name="ProductSpuForm" setup>
-import { cloneDeep } from 'lodash-es'
-import { useTagsViewStore } from '@/store/modules/tagsView'
-import { BasicInfoForm, DescriptionForm, OtherSettingsForm } from './components'
-// 业务api
-import * as ProductSpuApi from '@/api/mall/product/spu'
-import { convertToInteger, formatToFraction } from '@/utils'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-const { push, currentRoute } = useRouter() // 路由
-const { params } = useRoute() // 查询参数
-const { delView } = useTagsViewStore() // 视图操作
-
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const activeName = ref('basicInfo') // Tag 激活的窗口
-const basicInfoRef = ref<ComponentRef<typeof BasicInfoForm>>() // 商品信息Ref
-const descriptionRef = ref<ComponentRef<typeof DescriptionForm>>() // 商品详情Ref
-const otherSettingsRef = ref<ComponentRef<typeof OtherSettingsForm>>() // 其他设置Ref
-// spu 表单数据
-const formData = ref<ProductSpuApi.SpuType>({
-  name: '', // 商品名称
-  categoryId: null, // 商品分类
-  keyword: '', // 关键字
-  unit: null, // 单位
-  picUrl: '', // 商品封面图
-  sliderPicUrls: [], // 商品轮播图
-  introduction: '', // 商品简介
-  deliveryTemplateId: 1, // 运费模版
-  brandId: null, // 商品品牌
-  specType: false, // 商品规格
-  subCommissionType: false, // 分销类型
-  skus: [
-    {
-      price: 0, // 商品价格
-      marketPrice: 0, // 市场价
-      costPrice: 0, // 成本价
-      barCode: '', // 商品条码
-      picUrl: '', // 图片地址
-      stock: 0, // 库存
-      weight: 0, // 商品重量
-      volume: 0, // 商品体积
-      subCommissionFirstPrice: 0, // 一级分销的佣金
-      subCommissionSecondPrice: 0 // 二级分销的佣金
-    }
-  ],
-  description: '', // 商品详情
-  sort: 0, // 商品排序
-  giveIntegral: 0, // 赠送积分
-  virtualSalesCount: 0, // 虚拟销量
-  recommendHot: false, // 是否热卖
-  recommendBenefit: false, // 是否优惠
-  recommendBest: false, // 是否精品
-  recommendNew: false, // 是否新品
-  recommendGood: false // 是否优品
-})
-
-/** 获得详情 */
-const getDetail = async () => {
-  const id = params.spuId as number
-  if (id) {
-    formLoading.value = true
-    try {
-      const res = (await ProductSpuApi.getSpu(id)) as ProductSpuApi.SpuType
-      res.skus.forEach((item) => {
-        // 回显价格分转元
-        item.price = formatToFraction(item.price)
-        item.marketPrice = formatToFraction(item.marketPrice)
-        item.costPrice = formatToFraction(item.costPrice)
-        item.subCommissionFirstPrice = formatToFraction(item.subCommissionFirstPrice)
-        item.subCommissionSecondPrice = formatToFraction(item.subCommissionSecondPrice)
-      })
-      formData.value = res
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-
-/** 提交按钮 */
-const submitForm = async () => {
-  // 提交请求
-  formLoading.value = true
-  // 三个表单逐一校验，如果有一个表单校验不通过则切换到对应表单，如果有两个及以上的情况则切换到最前面的一个并弹出提示消息
-  // 校验各表单
-  try {
-    await unref(basicInfoRef)?.validate()
-    await unref(descriptionRef)?.validate()
-    await unref(otherSettingsRef)?.validate()
-    const deepCopyFormData = cloneDeep(unref(formData.value)) // 深拷贝一份 fix:这样最终 server 端不满足，不需要恢复，
-    // TODO 兜底处理 sku 空数据
-    formData.value.skus.forEach((sku) => {
-      // 因为是空数据这里判断一下商品条码是否为空就行
-      if (sku.barCode === '') {
-        const index = deepCopyFormData.skus.findIndex(
-          (item) => JSON.stringify(item.properties) === JSON.stringify(sku.properties)
-        )
-        // 删除这条 sku
-        deepCopyFormData.skus.splice(index, 1)
-      }
-    })
-    deepCopyFormData.skus.forEach((item) => {
-      // 给sku name赋值
-      item.name = deepCopyFormData.name
-      // sku相关价格元转分
-      item.price = convertToInteger(item.price)
-      item.marketPrice = convertToInteger(item.marketPrice)
-      item.costPrice = convertToInteger(item.costPrice)
-      item.subCommissionFirstPrice = convertToInteger(item.subCommissionFirstPrice)
-      item.subCommissionSecondPrice = convertToInteger(item.subCommissionSecondPrice)
-    })
-    // 处理轮播图列表
-    const newSliderPicUrls = []
-    deepCopyFormData.sliderPicUrls.forEach((item) => {
-      // 如果是前端选的图
-      typeof item === 'object' ? newSliderPicUrls.push(item.url) : newSliderPicUrls.push(item)
-    })
-    deepCopyFormData.sliderPicUrls = newSliderPicUrls
-    // 校验都通过后提交表单
-    const data = deepCopyFormData as ProductSpuApi.SpuType
-    const id = params.spuId as number
-    if (!id) {
-      await ProductSpuApi.createSpu(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ProductSpuApi.updateSpu(data)
-      message.success(t('common.updateSuccess'))
-    }
-    close()
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 关闭按钮 */
-const close = () => {
-  delView(unref(currentRoute))
-  push('/product/product-spu')
-}
-
-/** 初始化 */
-onMounted(async () => {
-  await getDetail()
-})
-</script>
diff --git a/src/views/mall/product/spu/components/BasicInfoForm.vue b/src/views/mall/product/spu/components/BasicInfoForm.vue
deleted file mode 100644
index d800e33282b35b115e75a745fb05dff23eac36be..0000000000000000000000000000000000000000
--- a/src/views/mall/product/spu/components/BasicInfoForm.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-  <el-form ref="productSpuBasicInfoRef" :model="formData" :rules="rules" label-width="120px">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="商品名称" prop="name">
-          <el-input v-model="formData.name" placeholder="请输入商品名称" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <!-- TODO @puhui999：只能选根节点 -->
-        <el-form-item label="商品分类" prop="categoryId">
-          <el-tree-select
-            v-model="formData.categoryId"
-            :data="categoryList"
-            :props="defaultProps"
-            check-strictly
-            class="w-1/1"
-            node-key="id"
-            placeholder="请选择商品分类"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="商品关键字" prop="keyword">
-          <el-input v-model="formData.keyword" placeholder="请输入商品关键字" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="单位" prop="unit">
-          <el-select v-model="formData.unit" class="w-1/1" placeholder="请选择单位">
-            <el-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.PRODUCT_UNIT)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="商品简介" prop="introduction">
-          <el-input
-            v-model="formData.introduction"
-            :rows="3"
-            placeholder="请输入商品简介"
-            type="textarea"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="商品封面图" prop="picUrl">
-          <UploadImg v-model="formData.picUrl" height="80px" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="商品轮播图" prop="sliderPicUrls">
-          <UploadImgs v-model:modelValue="formData.sliderPicUrls" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="运费模板" prop="deliveryTemplateId">
-          <el-select v-model="formData.deliveryTemplateId" placeholder="请选择">
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
-          <el-button class="ml-20px">运费模板</el-button>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="品牌" prop="brandId">
-          <el-select v-model="formData.brandId" placeholder="请选择">
-            <el-option
-              v-for="item in brandList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="商品规格" props="specType">
-          <el-radio-group v-model="formData.specType" @change="onChangeSpec">
-            <el-radio :label="false" class="radio">单规格</el-radio>
-            <el-radio :label="true">多规格</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="分销类型" props="subCommissionType">
-          <el-radio-group v-model="formData.subCommissionType" @change="changeSubCommissionType">
-            <el-radio :label="false">默认设置</el-radio>
-            <el-radio :label="true" class="radio">自行设置</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-col>
-      <!-- 多规格添加-->
-      <el-col :span="24">
-        <el-form-item v-if="formData.specType" label="商品属性">
-          <el-button class="mr-15px mb-10px" @click="attributesAddFormRef.open">添加规格</el-button>
-          <ProductAttributes :propertyList="propertyList" @success="generateSkus" />
-        </el-form-item>
-        <template v-if="formData.specType && propertyList.length > 0">
-          <el-form-item label="批量设置">
-            <SkuList :is-batch="true" :prop-form-data="formData" :propertyList="propertyList" />
-          </el-form-item>
-          <el-form-item label="属性列表">
-            <SkuList ref="skuListRef" :prop-form-data="formData" :propertyList="propertyList" />
-          </el-form-item>
-        </template>
-        <el-form-item v-if="!formData.specType">
-          <SkuList :prop-form-data="formData" :propertyList="propertyList" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-  <ProductAttributesAddForm ref="attributesAddFormRef" :propertyList="propertyList" />
-</template>
-<script lang="ts" name="ProductSpuBasicInfoForm" setup>
-import { PropType } from 'vue'
-import { copyValueToTarget } from '@/utils'
-import { propTypes } from '@/utils/propTypes'
-import { defaultProps, handleTree } from '@/utils/tree'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import type { SpuType } from '@/api/mall/product/spu'
-import { UploadImg, UploadImgs } from '@/components/UploadFile'
-import { ProductAttributes, ProductAttributesAddForm, SkuList } from './index'
-import * as ProductCategoryApi from '@/api/mall/product/category'
-import { getSimpleBrandList } from '@/api/mall/product/brand'
-
-const message = useMessage() // 消息弹窗
-
-const props = defineProps({
-  propFormData: {
-    type: Object as PropType<SpuType>,
-    default: () => {}
-  },
-  activeName: propTypes.string.def('')
-})
-const attributesAddFormRef = ref() // 添加商品属性表单
-const productSpuBasicInfoRef = ref() // 表单 Ref
-const propertyList = ref([]) // 商品属性列表
-const skuListRef = ref() // 商品属性列表Ref
-/** 调用 SkuList generateTableData 方法*/
-const generateSkus = (propertyList) => {
-  skuListRef.value.generateTableData(propertyList)
-}
-const formData = reactive<SpuType>({
-  name: '', // 商品名称
-  categoryId: null, // 商品分类
-  keyword: '', // 关键字
-  unit: '', // 单位
-  picUrl: '', // 商品封面图
-  sliderPicUrls: [], // 商品轮播图
-  introduction: '', // 商品简介
-  deliveryTemplateId: 1, // 运费模版
-  brandId: null, // 商品品牌
-  specType: false, // 商品规格
-  subCommissionType: false, // 分销类型
-  skus: []
-})
-const rules = reactive({
-  name: [required],
-  categoryId: [required],
-  keyword: [required],
-  unit: [required],
-  introduction: [required],
-  picUrl: [required],
-  sliderPicUrls: [required],
-  // deliveryTemplateId: [required],
-  brandId: [required],
-  specType: [required],
-  subCommissionType: [required]
-})
-
-/**
- * 将传进来的值赋值给 formData
- */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) {
-      return
-    }
-    copyValueToTarget(formData, data)
-    formData.sliderPicUrls = data['sliderPicUrls'].map((item) => ({
-      url: item
-    }))
-    // TODO @puhui999：if return，减少嵌套层级
-    // 只有是多规格才处理
-    if (formData.specType) {
-      //  直接拿返回的 skus 属性逆向生成出 propertyList
-      const properties = []
-      formData.skus.forEach((sku) => {
-        sku.properties.forEach(({ propertyId, propertyName, valueId, valueName }) => {
-          // 添加属性
-          if (!properties.some((item) => item.id === propertyId)) {
-            properties.push({ id: propertyId, name: propertyName, values: [] })
-          }
-          // 添加属性值
-          const index = properties.findIndex((item) => item.id === propertyId)
-          if (!properties[index].values.some((value) => value.id === valueId)) {
-            properties[index].values.push({ id: valueId, name: valueName })
-          }
-        })
-      })
-      propertyList.value = properties
-    }
-  },
-  {
-    immediate: true
-  }
-)
-
-/**
- * 表单校验
- */
-const emit = defineEmits(['update:activeName'])
-const validate = async () => {
-  // 校验表单
-  if (!productSpuBasicInfoRef) return
-  return await unref(productSpuBasicInfoRef).validate((valid) => {
-    if (!valid) {
-      message.warning('商品信息未完善！！')
-      emit('update:activeName', 'basicInfo')
-      // 目的截断之后的校验
-      throw new Error('商品信息未完善！！')
-    } else {
-      // 校验通过更新数据
-      Object.assign(props.propFormData, formData)
-    }
-  })
-}
-defineExpose({ validate })
-
-/** 分销类型 */
-const changeSubCommissionType = () => {
-  // 默认为零，类型切换后也要重置为零
-  for (const item of formData.skus) {
-    item.subCommissionFirstPrice = 0
-    item.subCommissionSecondPrice = 0
-  }
-}
-
-/** 选择规格 */
-const onChangeSpec = () => {
-  // 重置商品属性列表
-  propertyList.value = []
-  // 重置sku列表
-  formData.skus = [
-    {
-      price: 0,
-      marketPrice: 0,
-      costPrice: 0,
-      barCode: '',
-      picUrl: '',
-      stock: 0,
-      weight: 0,
-      volume: 0,
-      subCommissionFirstPrice: 0,
-      subCommissionSecondPrice: 0
-    }
-  ]
-}
-
-const categoryList = ref([]) // 分类树
-const brandList = ref([]) // 精简商品品牌列表
-onMounted(async () => {
-  // 获得分类树
-  const data = await ProductCategoryApi.getCategoryList({})
-  categoryList.value = handleTree(data, 'id', 'parentId')
-  // 获取商品品牌列表
-  brandList.value = await getSimpleBrandList()
-})
-</script>
diff --git a/src/views/mall/product/spu/components/DescriptionForm.vue b/src/views/mall/product/spu/components/DescriptionForm.vue
deleted file mode 100644
index fbae9a86b628d278a4ccfa66a450b6c00371be23..0000000000000000000000000000000000000000
--- a/src/views/mall/product/spu/components/DescriptionForm.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <el-form ref="descriptionFormRef" :model="formData" :rules="rules" label-width="120px">
-    <!--富文本编辑器组件-->
-    <el-form-item label="商品详情" prop="description">
-      <Editor v-model:modelValue="formData.description" />
-    </el-form-item>
-  </el-form>
-</template>
-<script lang="ts" name="DescriptionForm" setup>
-import type { SpuType } from '@/api/mall/product/spu'
-import { Editor } from '@/components/Editor'
-import { PropType } from 'vue'
-import { propTypes } from '@/utils/propTypes'
-import { copyValueToTarget } from '@/utils'
-
-const message = useMessage() // 消息弹窗
-const props = defineProps({
-  propFormData: {
-    type: Object as PropType<SpuType>,
-    default: () => {}
-  },
-  activeName: propTypes.string.def('')
-})
-const descriptionFormRef = ref() // 表单Ref
-const formData = ref<SpuType>({
-  description: '' // 商品详情
-})
-// 表单规则
-const rules = reactive({
-  description: [required]
-})
-/**
- * 富文本编辑器如果输入过再清空会有残留，需再重置一次
- */
-watch(
-  () => formData.value.description,
-  (newValue) => {
-    if ('<p><br></p>' === newValue) {
-      formData.value.description = ''
-    }
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-/**
- * 将传进来的值赋值给formData
- */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) return
-    // fix：三个表单组件监听赋值必须使用 copyValueToTarget 使用 formData.value = data 会监听非常多次
-    copyValueToTarget(formData.value, data)
-  },
-  {
-    // fix: 去掉深度监听只有对象引用发生改变的时候才执行,解决改一动多的问题
-    immediate: true
-  }
-)
-
-/**
- * 表单校验
- */
-const emit = defineEmits(['update:activeName'])
-const validate = async () => {
-  // 校验表单
-  if (!descriptionFormRef) return
-  return await unref(descriptionFormRef).validate((valid) => {
-    if (!valid) {
-      message.warning('商品详情为完善!!')
-      emit('update:activeName', 'description')
-      // 目的截断之后的校验
-      throw new Error('商品详情为完善!!')
-    } else {
-      // 校验通过更新数据
-      Object.assign(props.propFormData, formData.value)
-    }
-  })
-}
-defineExpose({ validate })
-</script>
diff --git a/src/views/mall/product/spu/components/OtherSettingsForm.vue b/src/views/mall/product/spu/components/OtherSettingsForm.vue
deleted file mode 100644
index 48608b7bffb2e1f71260751e8973524bb98aa581..0000000000000000000000000000000000000000
--- a/src/views/mall/product/spu/components/OtherSettingsForm.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <el-form ref="otherSettingsFormRef" :model="formData" :rules="rules" label-width="120px">
-    <el-row>
-      <el-col :span="24">
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="商品排序" prop="sort">
-              <el-input-number v-model="formData.sort" :min="0" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="赠送积分" prop="giveIntegral">
-              <el-input-number v-model="formData.giveIntegral" :min="0" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="虚拟销量" prop="virtualSalesCount">
-              <el-input-number
-                v-model="formData.virtualSalesCount"
-                :min="0"
-                placeholder="请输入虚拟销量"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="商品推荐">
-          <el-checkbox-group v-model="checkboxGroup" @change="onChangeGroup">
-            <el-checkbox v-for="(item, index) in recommendOptions" :key="index" :label="item.value">
-              {{ item.name }}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <!--   TODO tag展示暂时不考虑排序 -->
-        <el-form-item label="活动优先级">
-          <el-tag>默认</el-tag>
-          <el-tag class="ml-2" type="success">秒杀</el-tag>
-          <el-tag class="ml-2" type="info">砍价</el-tag>
-          <el-tag class="ml-2" type="warning">拼团</el-tag>
-        </el-form-item>
-      </el-col>
-      <!-- TODO @puhui999：等优惠劵 ok 在搞 -->
-      <el-col :span="24">
-        <el-form-item label="赠送优惠劵">
-          <el-button>选择优惠券</el-button>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script lang="ts" name="OtherSettingsForm" setup>
-import type { SpuType } from '@/api/mall/product/spu'
-import { PropType } from 'vue'
-import { propTypes } from '@/utils/propTypes'
-import { copyValueToTarget } from '@/utils'
-
-const message = useMessage() // 消息弹窗
-
-const props = defineProps({
-  propFormData: {
-    type: Object as PropType<SpuType>,
-    default: () => {}
-  },
-  activeName: propTypes.string.def('')
-})
-
-const otherSettingsFormRef = ref() // 表单Ref
-// 表单数据
-const formData = ref<SpuType>({
-  sort: 1, // 商品排序
-  giveIntegral: 1, // 赠送积分
-  virtualSalesCount: 1, // 虚拟销量
-  recommendHot: false, // 是否热卖
-  recommendBenefit: false, // 是否优惠
-  recommendBest: false, // 是否精品
-  recommendNew: false, // 是否新品
-  recommendGood: false // 是否优品
-})
-// 表单规则
-const rules = reactive({
-  sort: [required],
-  giveIntegral: [required],
-  virtualSalesCount: [required]
-})
-const recommendOptions = [
-  { name: '是否热卖', value: 'recommendHot' },
-  { name: '是否优惠', value: 'recommendBenefit' },
-  { name: '是否精品', value: 'recommendBest' },
-  { name: '是否新品', value: 'recommendNew' },
-  { name: '是否优品', value: 'recommendGood' }
-] // 商品推荐选项
-const checkboxGroup = ref<string[]>([]) // 选中的推荐选项
-
-/** 选择商品后赋值 */
-const onChangeGroup = () => {
-  recommendOptions.forEach(({ value }) => {
-    formData.value[value] = checkboxGroup.value.includes(value)
-  })
-}
-
-/**
- * 将传进来的值赋值给formData
- */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) {
-      return
-    }
-    copyValueToTarget(formData.value, data)
-    recommendOptions.forEach(({ value }) => {
-      if (formData.value[value] && !checkboxGroup.value.includes(value)) {
-        checkboxGroup.value.push(value)
-      }
-    })
-  },
-  {
-    immediate: true
-  }
-)
-
-/**
- * 表单校验
- */
-const emit = defineEmits(['update:activeName'])
-const validate = async () => {
-  // 校验表单
-  if (!otherSettingsFormRef) return
-  return await unref(otherSettingsFormRef).validate((valid) => {
-    if (!valid) {
-      message.warning('商品其他设置未完善！！')
-      emit('update:activeName', 'otherSettings')
-      // 目的截断之后的校验
-      throw new Error('商品其他设置未完善！！')
-    } else {
-      // 校验通过更新数据
-      Object.assign(props.propFormData, formData.value)
-    }
-  })
-}
-defineExpose({ validate })
-</script>
diff --git a/src/views/mall/product/spu/components/ProductAttributes.vue b/src/views/mall/product/spu/components/ProductAttributes.vue
deleted file mode 100644
index 8ab88be3fe529bdad7a6a6f261b7ce798c1747e9..0000000000000000000000000000000000000000
--- a/src/views/mall/product/spu/components/ProductAttributes.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-  <el-col v-for="(item, index) in attributeList" :key="index">
-    <div>
-      <el-text class="mx-1">属性名：</el-text>
-      <el-tag class="mx-1" closable type="success" @close="handleCloseProperty(index)"
-        >{{ item.name }}
-      </el-tag>
-    </div>
-    <div>
-      <el-text class="mx-1">属性值：</el-text>
-      <el-tag
-        v-for="(value, valueIndex) in item.values"
-        :key="value.id"
-        class="mx-1"
-        closable
-        @close="handleCloseValue(index, valueIndex)"
-      >
-        {{ value.name }}
-      </el-tag>
-      <el-input
-        v-show="inputVisible(index)"
-        :id="`input${index}`"
-        :ref="setInputRef"
-        v-model="inputValue"
-        class="!w-20"
-        size="small"
-        @blur="handleInputConfirm(index, item.id)"
-        @keyup.enter="handleInputConfirm(index, item.id)"
-      />
-      <el-button
-        v-show="!inputVisible(index)"
-        class="button-new-tag ml-1"
-        size="small"
-        @click="showInput(index)"
-      >
-        + 添加
-      </el-button>
-    </div>
-    <el-divider class="my-10px" />
-  </el-col>
-</template>
-
-<script lang="ts" name="ProductAttributes" setup>
-import { ElInput } from 'element-plus'
-import * as PropertyApi from '@/api/mall/product/property'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-const inputValue = ref('') // 输入框值
-const attributeIndex = ref<number | null>(null) // 获取焦点时记录当前属性项的index
-// 输入框显隐控制
-const inputVisible = computed(() => (index) => {
-  if (attributeIndex.value === null) return false
-  if (attributeIndex.value === index) return true
-})
-const inputRef = ref([]) //标签输入框Ref
-/** 解决 ref 在 v-for 中的获取问题*/
-const setInputRef = (el) => {
-  if (el === null || typeof el === 'undefined') return
-  // 如果不存在id相同的元素才添加
-  if (!inputRef.value.some((item) => item.input?.attributes.id === el.input?.attributes.id)) {
-    inputRef.value.push(el)
-  }
-}
-const attributeList = ref([]) // 商品属性列表
-const props = defineProps({
-  propertyList: {
-    type: Array,
-    default: () => {}
-  }
-})
-
-watch(
-  () => props.propertyList,
-  (data) => {
-    if (!data) return
-    attributeList.value = data
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-
-/** 删除属性值*/
-const handleCloseValue = (index, valueIndex) => {
-  attributeList.value[index].values?.splice(valueIndex, 1)
-}
-/** 删除属性*/
-const handleCloseProperty = (index) => {
-  attributeList.value?.splice(index, 1)
-}
-/** 显示输入框并获取焦点 */
-const showInput = async (index) => {
-  attributeIndex.value = index
-  inputRef.value[index].focus()
-}
-
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-
-/** 输入框失去焦点或点击回车时触发 */
-const handleInputConfirm = async (index, propertyId) => {
-  if (inputValue.value) {
-    // 保存属性值
-    try {
-      const id = await PropertyApi.createPropertyValue({ propertyId, name: inputValue.value })
-      attributeList.value[index].values.push({ id, name: inputValue.value })
-      message.success(t('common.createSuccess'))
-      emit('success', attributeList.value)
-    } catch {
-      message.error('添加失败，请重试') // TODO 缺少国际化
-    }
-  }
-  attributeIndex.value = null
-  inputValue.value = ''
-}
-</script>
diff --git a/src/views/mall/product/spu/components/SkuList.vue b/src/views/mall/product/spu/components/SkuList.vue
deleted file mode 100644
index 527f658a684a1c4c6f54ca8f7d2a7fecb3b917a3..0000000000000000000000000000000000000000
--- a/src/views/mall/product/spu/components/SkuList.vue
+++ /dev/null
@@ -1,317 +0,0 @@
-<template>
-  <el-table
-    :data="isBatch ? skuList : formData.skus"
-    border
-    class="tabNumWidth"
-    max-height="500"
-    size="small"
-  >
-    <el-table-column align="center" fixed="left" label="图片" min-width="100">
-      <template #default="{ row }">
-        <UploadImg v-model="row.picUrl" height="80px" width="100%" />
-      </template>
-    </el-table-column>
-    <template v-if="formData.specType && !isBatch">
-      <!--  根据商品属性动态添加 -->
-      <el-table-column
-        v-for="(item, index) in tableHeaders"
-        :key="index"
-        :label="item.label"
-        align="center"
-        min-width="120"
-      >
-        <template #default="{ row }">
-          <!-- TODO puhui999：展示成蓝色，有点区分度哈 -->
-          {{ row.properties[index]?.valueName }}
-        </template>
-      </el-table-column>
-    </template>
-    <el-table-column align="center" label="商品条码" min-width="168">
-      <template #default="{ row }">
-        <el-input v-model="row.barCode" class="w-100%" />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="销售价(元)" min-width="168">
-      <template #default="{ row }">
-        <el-input-number v-model="row.price" :min="0" :precision="2" :step="0.1" class="w-100%" />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="市场价(元)" min-width="168">
-      <template #default="{ row }">
-        <el-input-number
-          v-model="row.marketPrice"
-          :min="0"
-          :precision="2"
-          :step="0.1"
-          class="w-100%"
-        />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="成本价(元)" min-width="168">
-      <template #default="{ row }">
-        <el-input-number
-          v-model="row.costPrice"
-          :min="0"
-          :precision="2"
-          :step="0.1"
-          class="w-100%"
-        />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="库存" min-width="168">
-      <template #default="{ row }">
-        <el-input-number v-model="row.stock" :min="0" class="w-100%" />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="重量(kg)" min-width="168">
-      <template #default="{ row }">
-        <el-input-number v-model="row.weight" :min="0" :precision="2" :step="0.1" class="w-100%" />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="体积(m^3)" min-width="168">
-      <template #default="{ row }">
-        <el-input-number v-model="row.volume" :min="0" :precision="2" :step="0.1" class="w-100%" />
-      </template>
-    </el-table-column>
-    <template v-if="formData.subCommissionType">
-      <el-table-column align="center" label="一级返佣(元)" min-width="168">
-        <template #default="{ row }">
-          <el-input-number
-            v-model="row.subCommissionFirstPrice"
-            :min="0"
-            :precision="2"
-            :step="0.1"
-            class="w-100%"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="二级返佣(元)" min-width="168">
-        <template #default="{ row }">
-          <el-input-number
-            v-model="row.subCommissionSecondPrice"
-            :min="0"
-            :precision="2"
-            :step="0.1"
-            class="w-100%"
-          />
-        </template>
-      </el-table-column>
-    </template>
-    <el-table-column v-if="formData.specType" align="center" fixed="right" label="操作" width="80">
-      <template #default="{ row }">
-        <el-button v-if="isBatch" link size="small" type="primary" @click="batchAdd">
-          批量添加
-        </el-button>
-        <el-button v-else link size="small" type="primary" @click="deleteSku(row)">删除</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-</template>
-<script lang="ts" name="SkuList" setup>
-import { PropType } from 'vue'
-import { copyValueToTarget } from '@/utils'
-import { propTypes } from '@/utils/propTypes'
-import { UploadImg } from '@/components/UploadFile'
-import type { Property, SkuType, SpuType } from '@/api/mall/product/spu'
-
-const props = defineProps({
-  propFormData: {
-    type: Object as PropType<SpuType>,
-    default: () => {}
-  },
-  propertyList: {
-    type: Array,
-    default: () => []
-  },
-  isBatch: propTypes.bool.def(false) // 是否作为批量操作组件
-})
-const formData = ref<SpuType>() // 表单数据
-const skuList = ref<SkuType[]>([
-  {
-    price: 0, // 商品价格
-    marketPrice: 0, // 市场价
-    costPrice: 0, // 成本价
-    barCode: '', // 商品条码
-    picUrl: '', // 图片地址
-    stock: 0, // 库存
-    weight: 0, // 商品重量
-    volume: 0, // 商品体积
-    subCommissionFirstPrice: 0, // 一级分销的佣金
-    subCommissionSecondPrice: 0 // 二级分销的佣金
-  }
-]) // 批量添加时的临时数据
-// TODO @puhui999：保存时，每个商品规格的表单要校验下。例如说，销售金额最低是 0.01 这种。
-
-/** 批量添加 */
-const batchAdd = () => {
-  formData.value.skus.forEach((item) => {
-    copyValueToTarget(item, skuList.value[0])
-  })
-}
-
-/** 删除 sku */
-const deleteSku = (row) => {
-  const index = formData.value.skus.findIndex(
-    // 直接把列表转成字符串比较
-    (sku) => JSON.stringify(sku.properties) === JSON.stringify(row.properties)
-  )
-  formData.value.skus.splice(index, 1)
-}
-const tableHeaders = ref<{ prop: string; label: string }[]>([]) // 多属性表头
-
-/**
- * 将传进来的值赋值给 skuList
- */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) return
-    formData.value = data
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-
-/** 生成表数据 */
-const generateTableData = (propertyList: any[]) => {
-  // 构建数据结构
-  const propertyValues = propertyList.map((item) =>
-    item.values.map((v) => ({
-      propertyId: item.id,
-      propertyName: item.name,
-      valueId: v.id,
-      valueName: v.name
-    }))
-  )
-  // TODO @puhui：是不是 buildSkuList，这样容易理解一点哈。item 改成 sku
-  const buildList = build(propertyValues)
-  // 如果回显的 sku 属性和添加的属性不一致则重置 skus 列表
-  if (!validateData(propertyList)) {
-    // 如果不一致则重置表数据，默认添加新的属性重新生成 sku 列表
-    formData.value!.skus = []
-  }
-  for (const item of buildList) {
-    const row = {
-      properties: Array.isArray(item) ? item : [item], // 如果只有一个属性的话返回的是一个 property 对象
-      price: 0,
-      marketPrice: 0,
-      costPrice: 0,
-      barCode: '',
-      picUrl: '',
-      stock: 0,
-      weight: 0,
-      volume: 0,
-      subCommissionFirstPrice: 0,
-      subCommissionSecondPrice: 0
-    }
-    // 如果存在属性相同的 sku 则不做处理
-    const index = formData.value!.skus.findIndex(
-      (sku) => JSON.stringify(sku.properties) === JSON.stringify(row.properties)
-    )
-    if (index !== -1) {
-      continue
-    }
-    formData.value.skus.push(row)
-  }
-}
-
-/**
- * 生成 skus 前置校验
- */
-const validateData = (propertyList: any[]) => {
-  const skuPropertyIds = []
-  formData.value.skus.forEach((sku) =>
-    sku.properties
-      ?.map((property) => property.propertyId)
-      .forEach((propertyId) => {
-        if (skuPropertyIds.indexOf(propertyId) === -1) {
-          skuPropertyIds.push(propertyId)
-        }
-      })
-  )
-  const propertyIds = propertyList.map((item) => item.id)
-  return skuPropertyIds.length === propertyIds.length
-}
-
-/** 构建所有排列组合 */
-const build = (propertyValuesList: Property[][]) => {
-  if (propertyValuesList.length === 0) {
-    return []
-  } else if (propertyValuesList.length === 1) {
-    return propertyValuesList[0]
-  } else {
-    const result: Property[][] = []
-    const rest = build(propertyValuesList.slice(1))
-    for (let i = 0; i < propertyValuesList[0].length; i++) {
-      for (let j = 0; j < rest.length; j++) {
-        // 第一次不是数组结构，后面的都是数组结构
-        if (Array.isArray(rest[j])) {
-          result.push([propertyValuesList[0][i], ...rest[j]])
-        } else {
-          result.push([propertyValuesList[0][i], rest[j]])
-        }
-      }
-    }
-    return result
-  }
-}
-
-/** 监听属性列表，生成相关参数和表头 */
-watch(
-  () => props.propertyList,
-  (propertyList) => {
-    // 如果不是多规格则结束
-    if (!formData.value.specType) {
-      return
-    }
-    // 如果当前组件作为批量添加数据使用，则重置表数据
-    if (props.isBatch) {
-      skuList.value = [
-        {
-          price: 0,
-          marketPrice: 0,
-          costPrice: 0,
-          barCode: '',
-          picUrl: '',
-          stock: 0,
-          weight: 0,
-          volume: 0,
-          subCommissionFirstPrice: 0,
-          subCommissionSecondPrice: 0
-        }
-      ]
-    }
-
-    // 判断代理对象是否为空
-    if (JSON.stringify(propertyList) === '[]') {
-      return
-    }
-    // 重置表头
-    tableHeaders.value = []
-    // 生成表头
-    propertyList.forEach((item, index) => {
-      // name加属性项index区分属性值
-      tableHeaders.value.push({ prop: `name${index}`, label: item.name })
-    })
-
-    // 如果回显的 sku 属性和添加的属性一致则不处理
-    if (validateData(propertyList)) {
-      return
-    }
-    // 添加新属性没有属性值也不做处理
-    if (propertyList.some((item) => item.values.length === 0)) {
-      return
-    }
-    // 生成 table 数据，即 sku 列表
-    generateTableData(propertyList)
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-// 暴露出生成 sku 方法，给添加属性成功时调用
-defineExpose({ generateTableData })
-</script>
diff --git a/src/views/mall/product/spu/components/index.ts b/src/views/mall/product/spu/components/index.ts
deleted file mode 100644
index f908e7d3be4df90ba46687b0cc34c26754a42f43..0000000000000000000000000000000000000000
--- a/src/views/mall/product/spu/components/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import BasicInfoForm from './BasicInfoForm.vue'
-import DescriptionForm from './DescriptionForm.vue'
-import OtherSettingsForm from './OtherSettingsForm.vue'
-import ProductAttributes from './ProductAttributes.vue'
-import ProductAttributesAddForm from './ProductAttributesAddForm.vue'
-import SkuList from './SkuList.vue'
-
-export {
-  BasicInfoForm,
-  DescriptionForm,
-  OtherSettingsForm,
-  ProductAttributes,
-  ProductAttributesAddForm,
-  SkuList
-}
diff --git a/src/views/mall/product/spu/index.vue b/src/views/mall/product/spu/index.vue
deleted file mode 100644
index 539171b06bf073a30fd7af795b6dd6459c43cd7f..0000000000000000000000000000000000000000
--- a/src/views/mall/product/spu/index.vue
+++ /dev/null
@@ -1,422 +0,0 @@
-<template>
-  <!-- 搜索工作栏 -->
-  <ContentWrap>
-    <el-form
-      ref="queryFormRef"
-      :inline="true"
-      :model="queryParams"
-      class="-mb-15px"
-      label-width="68px"
-    >
-      <!-- TODO @puhui999：品牌应该是数据下拉哈 -->
-      <el-form-item label="品牌名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          class="!w-240px"
-          clearable
-          placeholder="请输入品牌名称"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <!--  TODO 分类只能选择二级分类目前还没做，还是先以联调通顺为主 -->
-      <!-- TODO puhui999：我们要不改成支持选择一级。如果选择一级，后端要递归查询下子分类，然后去 in？ -->
-      <el-form-item label="商品分类" prop="categoryId">
-        <el-tree-select
-          v-model="queryParams.categoryId"
-          :data="categoryList"
-          :props="defaultProps"
-          check-strictly
-          class="w-1/1"
-          node-key="id"
-          placeholder="请选择商品分类"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery">
-          <Icon class="mr-5px" icon="ep:search" />
-          搜索
-        </el-button>
-        <el-button @click="resetQuery">
-          <Icon class="mr-5px" icon="ep:refresh" />
-          重置
-        </el-button>
-        <el-button v-hasPermi="['product:spu:create']" plain type="primary" @click="openForm">
-          <Icon class="mr-5px" icon="ep:plus" />
-          新增
-        </el-button>
-        <el-button
-          v-hasPermi="['product:spu:export']"
-          :loading="exportLoading"
-          plain
-          type="success"
-          @click="handleExport"
-        >
-          <Icon class="mr-5px" icon="ep:download" />
-          导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-tabs v-model="queryParams.tabType" @tab-click="handleTabClick">
-      <el-tab-pane
-        v-for="item in tabsData"
-        :key="item.type"
-        :label="item.name + '(' + item.count + ')'"
-        :name="item.type"
-      />
-    </el-tabs>
-    <el-table v-loading="loading" :data="list">
-      <!-- TODO puhui：这几个属性哈，一行三个
-      商品分类：服装鞋包/箱包
-商品市场价格：100.00
-成本价：0.00
-收藏：5
-虚拟销量：999   -->
-      <el-table-column type="expand" width="30">
-        <template #default="{ row }">
-          <el-form class="demo-table-expand" inline label-position="left">
-            <el-form-item label="市场价：">
-              <span>{{ formatToFraction(row.marketPrice) }}</span>
-            </el-form-item>
-            <el-form-item label="成本价：">
-              <span>{{ formatToFraction(row.costPrice) }}</span>
-            </el-form-item>
-            <el-form-item label="虚拟销量：">
-              <span>{{ row.virtualSalesCount }}</span>
-            </el-form-item>
-          </el-form>
-        </template>
-      </el-table-column>
-      <el-table-column key="id" align="center" label="商品编号" prop="id" />
-      <el-table-column label="商品图" min-width="80">
-        <template #default="{ row }">
-          <el-image :src="row.picUrl" @click="imagePreview(row.picUrl)" class="w-30px h-30px" />
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" label="商品名称" min-width="300" prop="name" />
-      <el-table-column align="center" label="商品售价" min-width="90" prop="price">
-        <template #default="{ row }">
-          {{ formatToFraction(row.price) }}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="销量" min-width="90" prop="salesCount" />
-      <el-table-column align="center" label="库存" min-width="90" prop="stock" />
-      <el-table-column align="center" label="排序" min-width="70" prop="sort" />
-      <el-table-column
-        :formatter="dateFormatter"
-        align="center"
-        label="创建时间"
-        prop="createTime"
-        width="180"
-      />
-      <el-table-column align="center" label="状态" min-width="80">
-        <template #default="{ row }">
-          <template v-if="row.status >= 0">
-            <el-switch
-              v-model="row.status"
-              :active-value="1"
-              :inactive-value="0"
-              active-text="上架"
-              inactive-text="下架"
-              inline-prompt
-              @change="changeStatus(row)"
-            />
-          </template>
-          <template v-else>
-            <el-tag type="info">回收站</el-tag>
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" fixed="right" label="操作" min-width="200">
-        <template #default="{ row }">
-          <!-- TODO @puhui999：【详情】，可以后面点做哈 -->
-          <el-button v-hasPermi="['product:spu:update']" link type="primary" @click="openDetail">
-            详情
-          </el-button>
-          <template v-if="queryParams.tabType === 4">
-            <el-button
-              v-hasPermi="['product:spu:delete']"
-              link
-              type="danger"
-              @click="handleDelete(row.id)"
-            >
-              删除
-            </el-button>
-            <el-button
-              v-hasPermi="['product:spu:update']"
-              link
-              type="primary"
-              @click="changeStatus(row, ProductSpuStatusEnum.DISABLE.status)"
-            >
-              恢复到仓库
-            </el-button>
-          </template>
-          <template v-else>
-            <!-- 只有不是上架和回收站的商品可以编辑 -->
-            <el-button
-              v-if="queryParams.tabType !== 0"
-              v-hasPermi="['product:spu:update']"
-              link
-              type="primary"
-              @click="openForm(row.id)"
-            >
-              修改
-            </el-button>
-            <el-button
-              v-hasPermi="['product:spu:update']"
-              link
-              type="primary"
-              @click="changeStatus(row, ProductSpuStatusEnum.RECYCLE.status)"
-            >
-              加入回收站
-            </el-button>
-          </template>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
-      :total="total"
-      @pagination="getList"
-    />
-  </ContentWrap>
-</template>
-<script lang="ts" name="ProductSpu" setup>
-import { TabsPaneContext } from 'element-plus'
-import { cloneDeep } from 'lodash-es'
-import { createImageViewer } from '@/components/ImageViewer'
-import { dateFormatter } from '@/utils/formatTime'
-import { defaultProps, handleTree } from '@/utils/tree'
-import { ProductSpuStatusEnum } from '@/utils/constants'
-import { formatToFraction } from '@/utils'
-import download from '@/utils/download'
-import * as ProductSpuApi from '@/api/mall/product/spu'
-import * as ProductCategoryApi from '@/api/mall/product/category'
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const { currentRoute, push } = useRouter() // 路由跳转
-
-const loading = ref(false) // 列表的加载中
-const exportLoading = ref(false) // 导出的加载中
-const total = ref(0) // 列表的总页数
-const list = ref<any[]>([]) // 列表的数据
-// tabs 数据
-const tabsData = ref([
-  {
-    count: 0,
-    name: '出售中商品',
-    type: 0
-  },
-  {
-    count: 0,
-    name: '仓库中商品',
-    type: 1
-  },
-  {
-    count: 0,
-    name: '已经售空商品',
-    type: 2
-  },
-  {
-    count: 0,
-    name: '警戒库存',
-    type: 3
-  },
-  {
-    count: 0,
-    name: '商品回收站',
-    type: 4
-  }
-])
-
-/** 获得每个 Tab 的数量 */
-const getTabsCount = async () => {
-  const res = await ProductSpuApi.getTabsCount()
-  for (let objName in res) {
-    tabsData.value[Number(objName)].count = res[objName]
-  }
-}
-const queryParams = ref({
-  pageNo: 1,
-  pageSize: 10,
-  tabType: 0
-}) // 查询参数
-const queryFormRef = ref() // 搜索的表单Ref
-
-const handleTabClick = (tab: TabsPaneContext) => {
-  queryParams.value.tabType = tab.paneName
-  getList()
-}
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await ProductSpuApi.getSpuPage(queryParams.value)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/**
- * 更改 SPU 状态
- *
- * @param row
- * @param status 更改前的值
- */
-const changeStatus = async (row, status?: number) => {
-  const deepCopyValue = cloneDeep(unref(row))
-  if (typeof status !== 'undefined') deepCopyValue.status = status
-  try {
-    let text = ''
-    switch (deepCopyValue.status) {
-      case ProductSpuStatusEnum.DISABLE.status:
-        text = ProductSpuStatusEnum.DISABLE.name
-        break
-      case ProductSpuStatusEnum.ENABLE.status:
-        text = ProductSpuStatusEnum.ENABLE.name
-        break
-      case ProductSpuStatusEnum.RECYCLE.status:
-        text = `加入${ProductSpuStatusEnum.RECYCLE.name}`
-        break
-    }
-    await message.confirm(
-      deepCopyValue.status === -1
-        ? `确认要将[${row.name}]${text}吗？`
-        : row.status === -1 // 再判断一次原对象是否等于-1，例: 把回收站中的商品恢复到仓库中，事件触发时原对象status为-1 深拷贝对象status被赋值为0
-        ? `确认要将[${row.name}]恢复到仓库吗？`
-        : `确认要${text}[${row.name}]吗？`
-    )
-    await ProductSpuApi.updateStatus({ id: deepCopyValue.id, status: deepCopyValue.status })
-    message.success('更新状态成功')
-    // 刷新 tabs 数据
-    await getTabsCount()
-    // 刷新列表
-    await getList()
-  } catch {
-    // 取消更改状态时回显数据
-    row.status =
-      row.status === ProductSpuStatusEnum.DISABLE.status
-        ? ProductSpuStatusEnum.ENABLE.status
-        : ProductSpuStatusEnum.DISABLE.status
-  }
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ProductSpuApi.deleteSpu(id)
-    message.success(t('common.delSuccess'))
-    // 刷新tabs数据
-    await getTabsCount()
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 商品图预览 */
-const imagePreview = (imgUrl: string) => {
-  createImageViewer({
-    urlList: [imgUrl]
-  })
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/**
- * 新增或修改
- *
- * @param id 商品 SPU 编号
- */
-const openForm = (id?: number) => {
-  // 修改
-  if (typeof id === 'number') {
-    push('/product/productSpuEdit/' + id)
-    return
-  }
-  // 新增
-  push('/product/productSpuAdd')
-}
-
-/**
- * 查看商品详情
- */
-const openDetail = () => {
-  message.alert('查看详情未完善！！！')
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await ProductSpuApi.exportSpu(queryParams)
-    download.excel(data, '商品列表.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-// 监听路由变化更新列表 TODO @puhui999：这个是必须加的么？fix: 因为编辑表单是以路由的方式打开，保存表单后列表不会刷新
-watch(
-  () => currentRoute.value,
-  () => {
-    getList()
-  }
-)
-
-const categoryList = ref() // 分类树
-/** 初始化 **/
-onMounted(async () => {
-  await getTabsCount()
-  await getList()
-  // 获得分类树
-  const data = await ProductCategoryApi.getCategoryList({})
-  categoryList.value = handleTree(data, 'id', 'parentId')
-})
-</script>
-<style lang="scss" scoped>
-.demo-table-expand {
-  padding-left: 42px;
-
-  :deep(.el-form-item__label) {
-    width: 82px;
-    font-weight: bold;
-    color: #99a9bf;
-  }
-}
-</style>
diff --git a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue b/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
deleted file mode 100644
index 5b25422d470258aa57f6f146e704ac1f27a7d96e..0000000000000000000000000000000000000000
--- a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
+++ /dev/null
@@ -1,405 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="80%">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="80px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="模板名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入模板名称" />
-      </el-form-item>
-      <el-form-item label="计费方式" prop="chargeMode">
-        <el-radio-group v-model="formData.chargeMode" @change="changeChargeMode">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="运费" prop="templateCharge">
-        <el-table border style="width: 100%" :data="formData.templateCharge">
-          <el-table-column align="center" label="区域" width="180">
-            <template #default="{ row }">
-              <!--   区域数据太多，用赖加载方式，要不然性能有问题 -->
-              <el-tree-select
-                v-model="row.areaIds"
-                lazy
-                :load="loadChargeArea"
-                :props="defaultProps"
-                multiple
-                node-key="id"
-                check-strictly
-                show-checkbox
-                check-on-click-node
-                :render-after-expand="false"
-                :cache-data="areaCache"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="columnTitle.startCountTitle"
-            width="180"
-            prop="startCount"
-          >
-            <template #default="{ row }">
-              <el-input-number v-model="row.startCount" :min="1" />
-            </template>
-          </el-table-column>
-          <el-table-column width="180" align="center" label="运费(元)" prop="startPrice">
-            <template #default="{ row }">
-              <el-input-number v-model="row.startPrice" :min="1" />
-            </template>
-          </el-table-column>
-          <el-table-column
-            width="180"
-            align="center"
-            :label="columnTitle.extraCountTitle"
-            prop="extraCount"
-          >
-            <template #default="{ row }">
-              <el-input-number v-model="row.extraCount" :min="1" />
-            </template>
-          </el-table-column>
-          <el-table-column width="180" align="center" label="续费(元)" prop="extraPrice">
-            <template #default="{ row }">
-              <el-input-number v-model="row.extraPrice" :min="1" />
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template #default="scope">
-              <el-button link type="danger" @click="deleteChargeArea(scope.$index)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" plain @click="addChargeArea()">
-          <Icon icon="ep:plus" class="mr-5px" /> 添加区域
-        </el-button>
-      </el-form-item>
-      <el-form-item label="包邮区域" prop="templateFree">
-        <el-table border style="width: 100%" :data="formData.templateFree">
-          <el-table-column align="center" label="区域">
-            <template #default="{ row }">
-              <!--   区域数据太多，用赖加载方式，要不然性能有问题 -->
-              <el-tree-select
-                v-model="row.areaIds"
-                multiple
-                lazy
-                :load="loadFreeArea"
-                :props="defaultProps"
-                node-key="id"
-                check-strictly
-                show-checkbox
-                check-on-click-node
-                :render-after-expand="true"
-                :cache-data="areaCache"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column align="center" :label="columnTitle.freeCountTitle" prop="freeCount">
-            <template #default="{ row }">
-              <el-input-number v-model="row.freeCount" :min="1" />
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="包邮金额（元）" prop="freePrice">
-            <template #default="{ row }">
-              <el-input-number v-model="row.freePrice" :min="1" />
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template #default="scope">
-              <el-button link type="danger" @click="deleteFreeArea(scope.$index)"> 删除 </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" plain @click="addFreeArea()">
-          <Icon icon="ep:plus" class="mr-5px" /> 添加区域
-        </el-button>
-      </el-form-item>
-      <el-form-item label="排序" prop="sort">
-        <el-input-number v-model="formData.sort" controls-position="right" :min="0" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import * as DeliveryExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
-import { defaultProps } from '@/utils/tree'
-import { yuanToFen, fenToYuan } from '@/utils'
-import { getChildrenArea, getAreaListByIds } from '@/api/system/area'
-import { cloneDeep } from 'lodash-es'
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  name: '',
-  chargeMode: 1,
-  sort: 0,
-  templateCharge: [],
-  templateFree: []
-})
-const columnTitleMap = new Map()
-const columnTitle = ref({
-  startCountTitle: '首件',
-  extraCountTitle: '续件',
-  freeCountTitle: '包邮件数'
-})
-const formRules = reactive({
-  name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
-  chargeMode: [{ required: true, message: '配送计费方式不能为空', trigger: 'blur' }],
-  sort: [{ required: true, message: '分类排序不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-const areaCache = ref([]) //由于区域节点懒加载，已选区域节点需要缓存展示
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  try {
-    // 修改时，设置数据
-    if (id) {
-      formLoading.value = true
-      formData.value = await DeliveryExpressTemplateApi.getDeliveryExpressTemplate(id)
-      columnTitle.value = columnTitleMap.get(formData.value.chargeMode)
-      const chargeAreaIds = []
-      const freeAreaIds = []
-      formData.value.templateCharge.forEach((item) => {
-        for (let i = 0; i < item.areaIds.length; i++) {
-          if (!chargeAreaIds.includes(item.areaIds[i])) {
-            chargeAreaIds.push(item.areaIds[i])
-          }
-        }
-        //前端价格以元展示
-        item.startPrice = fenToYuan(item.startPrice)
-        item.extraPrice = fenToYuan(item.extraPrice)
-      })
-      formData.value.templateFree.forEach((item) => {
-        for (let i = 0; i < item.areaIds.length; i++) {
-          if (!chargeAreaIds.includes(item.areaIds[i]) && !freeAreaIds.includes(item.areaIds[i])) {
-            freeAreaIds.push(item.areaIds[i])
-          }
-        }
-        item.freePrice = fenToYuan(item.freePrice)
-      })
-      //已选的区域节点
-      const areaIds = chargeAreaIds.concat(freeAreaIds)
-      //区域节点，懒加载方式。 已选节点需要缓存展示
-      areaCache.value = await getAreaListByIds(areaIds.join(','))
-    }
-  } finally {
-    formLoading.value = false
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as DeliveryExpressTemplateApi.DeliveryExpressTemplateVO
-    data.templateCharge.forEach((item) => {
-      //前端价格以元展示，提交到后端。用分计算
-      item.startPrice = yuanToFen(item.startPrice)
-      item.extraPrice = yuanToFen(item.extraPrice)
-    })
-    data.templateFree.forEach((item) => {
-      item.freePrice = yuanToFen(item.freePrice)
-    })
-    if (formType.value === 'create') {
-      await DeliveryExpressTemplateApi.createDeliveryExpressTemplate(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await DeliveryExpressTemplateApi.updateDeliveryExpressTemplate(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    name: '',
-    chargeMode: 1,
-    templateCharge: [
-      {
-        areaIds: [1],
-        startCount: 2,
-        startPrice: 5,
-        extraCount: 5,
-        extraPrice: 10
-      }
-    ],
-    templateFree: [],
-    sort: 0
-  }
-  columnTitle.value = columnTitleMap.get(1)
-  formRef.value?.resetFields()
-}
-/** 配送计费方法改变 */
-const changeChargeMode = (chargeMode: number) => {
-  columnTitle.value = columnTitleMap.get(chargeMode)
-}
-const defaultArea = [{ id: 1, name: '全国', disabled: false }]
-
-/** 初始化数据 */
-const initData = async () => {
-  // TODO 从服务端全量加载数据， 后面看懒加载是不是可以从前端获取数据。 目前从后端获取数据
-  // formLoading.value = true
-  // try {
-  //   const data = await getAreaTree()
-  //   areaTree = data
-  //   console.log('areaTree', areaTree)
-  // } finally {
-  //   formLoading.value = false
-  // }
-  //表头标题和计费方式的映射
-  columnTitleMap.set(1, {
-    startCountTitle: '首件',
-    extraCountTitle: '续件',
-    freeCountTitle: '包邮件数'
-  })
-  columnTitleMap.set(2, {
-    startCountTitle: '首件重量(kg)',
-    extraCountTitle: '续件重量(kg)',
-    freeCountTitle: '包邮重量(kg)'
-  })
-  columnTitleMap.set(3, {
-    startCountTitle: '首件体积(m³)',
-    extraCountTitle: '续件体积(m³)',
-    freeCountTitle: '包邮体积(m³)'
-  })
-}
-
-/** 懒加载运费区域树 */
-const loadChargeArea = async (node, resolve) => {
-  //已选区域需要禁止再次选择
-  const areaIds = []
-  formData.value.templateCharge.forEach((item) => {
-    if (item.areaIds.length > 0) {
-      item.areaIds.forEach((areaId) => areaIds.push(areaId))
-    }
-  })
-  if (node.isLeaf) return resolve([])
-  const length = node.data.length
-  if (length === 0) {
-    const data = cloneDeep(defaultArea)
-    const item = data[0]
-    if (areaIds.includes(item.id)) {
-      // TODO 禁止选中的区域有些问题， 导致修改时候不能重新选择 不知道如何处理。 暂时注释掉 @芋艿 有空瞅瞅
-      //item.disabled = true
-    }
-    resolve(data)
-  } else {
-    const id = node.data.id
-    const data = await getChildrenArea(id)
-    data.forEach((item) => {
-      if (areaIds.includes(item.id)) {
-        //item.disabled = true
-      }
-    })
-    resolve(data)
-  }
-}
-
-/** 懒加载包邮区域树 */
-const loadFreeArea = async (node, resolve) => {
-  if (node.isLeaf) return resolve([])
-  //已选区域需要禁止再次选择
-  const areaIds = []
-  formData.value.templateFree.forEach((item) => {
-    if (item.areaIds.length > 0) {
-      item.areaIds.forEach((areaId) => areaIds.push(areaId))
-    }
-  })
-  const length = node.data.length
-  if (length === 0) {
-    // 为空，从全国开始选择。全国 id == 1
-    const data = cloneDeep(defaultArea)
-    const item = data[0]
-    if (areaIds.includes(item.id)) {
-      //item.disabled = true
-    }
-    resolve(data)
-  } else {
-    const id = node.data.id
-    const data = await getChildrenArea(id)
-    //已选区域需要禁止再次选择
-    data.forEach((item) => {
-      if (areaIds.includes(item.id)) {
-        // TODO 禁止选中的区域有些问题， 导致修改时候不能重新选择 不知道如何处理。 暂时注释掉 @芋艿 有空瞅瞅
-        //item.disabled = true
-      }
-    })
-    resolve(data)
-  }
-}
-/** 添加计费区域 */
-const addChargeArea = () => {
-  const data = formData.value
-  data.templateCharge.push({
-    areaIds: [],
-    startCount: 1,
-    startPrice: 1,
-    extraCount: 1,
-    extraPrice: 1
-  })
-}
-/** 删除计费区域 */
-const deleteChargeArea = (index) => {
-  const data = formData.value
-  data.templateCharge.splice(index, 1)
-}
-/** 添加包邮区域 */
-const addFreeArea = () => {
-  const data = formData.value
-  data.templateFree.push({
-    areaIds: [],
-    freeCount: 1,
-    freePrice: 1
-  })
-}
-/** 删除包邮区域 */
-const deleteFreeArea = (index) => {
-  const data = formData.value
-  data.templateFree.splice(index, 1)
-}
-
-/** 初始化 **/
-onMounted(() => {
-  initData()
-})
-</script>
diff --git a/src/views/mp/autoReply/components/ReplyForm.vue b/src/views/mp/autoReply/components/ReplyForm.vue
deleted file mode 100644
index edcbc696b77ddabdf81fe3ae41cc3fea85d1fc77..0000000000000000000000000000000000000000
--- a/src/views/mp/autoReply/components/ReplyForm.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div>
-    <el-form ref="formRef" :model="replyForm" :rules="rules" label-width="80px">
-      <el-form-item label="消息类型" prop="requestMessageType" v-if="msgType === MsgType.Message">
-        <el-select v-model="replyForm.requestMessageType" placeholder="请选择">
-          <template v-for="dict in getDictOptions(DICT_TYPE.MP_MESSAGE_TYPE)" :key="dict.value">
-            <el-option
-              v-if="RequestMessageTypes.includes(dict.value)"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </template>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="匹配类型" prop="requestMatch" v-if="msgType === MsgType.Keyword">
-        <el-select v-model="replyForm.requestMatch" placeholder="请选择匹配类型" clearable>
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MP_AUTO_REPLY_REQUEST_MATCH)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="关键词" prop="requestKeyword" v-if="msgType === MsgType.Keyword">
-        <el-input v-model="replyForm.requestKeyword" placeholder="请输入内容" clearable />
-      </el-form-item>
-      <el-form-item label="回复消息">
-        <WxReplySelect v-model="reply" />
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script setup lang="ts" name="ReplyForm">
-import WxReplySelect, { type Reply } from '@/views/mp/components/wx-reply'
-import type { FormInstance } from 'element-plus'
-import { MsgType } from './types'
-import { DICT_TYPE, getDictOptions, getIntDictOptions } from '@/utils/dict'
-
-const props = defineProps<{
-  modelValue: any
-  reply: Reply
-  msgType: MsgType
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:reply', v: Reply)
-  (e: 'update:modelValue', v: any)
-}>()
-
-const reply = computed<Reply>({
-  get: () => props.reply,
-  set: (val) => emit('update:reply', val)
-})
-
-const replyForm = computed<any>({
-  get: () => props.modelValue,
-  set: (val) => emit('update:modelValue', val)
-})
-
-const formRef = ref<FormInstance | null>(null) // 表单 ref
-
-const RequestMessageTypes = ['text', 'image', 'voice', 'video', 'shortvideo', 'location', 'link'] // 允许选择的请求消息类型
-
-// 表单校验
-const rules = {
-  requestKeyword: [{ required: true, message: '请求的关键字不能为空', trigger: 'blur' }],
-  requestMatch: [{ required: true, message: '请求的关键字的匹配不能为空', trigger: 'blur' }]
-}
-
-defineExpose({
-  resetFields: () => formRef.value?.resetFields(),
-  validate: async () => formRef.value?.validate()
-})
-</script>
-
-<style scoped></style>
diff --git a/src/views/mp/autoReply/index.vue b/src/views/mp/autoReply/index.vue
index b3826de5039707de9b73ace56ff8781664357820..20a1e683d40de62100b1900a7c5d629b5c99165c 100644
--- a/src/views/mp/autoReply/index.vue
+++ b/src/views/mp/autoReply/index.vue
@@ -53,13 +53,38 @@
       @on-delete="onDelete"
     />
 
-    <el-dialog
-      :title="isCreating ? '新增自动回复' : '修改自动回复'"
-      v-model="showDialog"
-      width="800px"
-      destroy-on-close
-    >
-      <ReplyForm v-model="replyForm" v-model:reply="reply" :msg-type="msgType" ref="formRef" />
+    <!-- 添加或修改自动回复的对话框 -->
+    <!-- TODO @Dhb52 -->
+    <el-dialog :title="dialogTitle" v-model="showFormDialog" width="800px" destroy-on-close>
+      <el-form ref="formRef" :model="replyForm" :rules="rules" label-width="80px">
+        <el-form-item label="消息类型" prop="requestMessageType" v-if="msgType === MsgType.Message">
+          <el-select v-model="replyForm.requestMessageType" placeholder="请选择">
+            <template v-for="dict in getDictOptions(DICT_TYPE.MP_MESSAGE_TYPE)" :key="dict.value">
+              <el-option
+                v-if="RequestMessageTypes.includes(dict.value)"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="匹配类型" prop="requestMatch" v-if="msgType === MsgType.Keyword">
+          <el-select v-model="replyForm.requestMatch" placeholder="请选择匹配类型" clearable>
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.MP_AUTO_REPLY_REQUEST_MATCH)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键词" prop="requestKeyword" v-if="msgType === MsgType.Keyword">
+          <el-input v-model="replyForm.requestKeyword" placeholder="请输入内容" clearable />
+        </el-form-item>
+        <el-form-item label="回复消息">
+          <WxReplySelect v-model="reply" />
+        </el-form-item>
+      </el-form>
       <template #footer>
         <el-button @click="cancel">取 消</el-button>
         <el-button type="primary" @click="onSubmit">确 定</el-button>
@@ -68,43 +93,52 @@
   </ContentWrap>
 </template>
 <script setup lang="ts" name="MpAutoReply">
-import ReplyForm from '@/views/mp/autoReply/components/ReplyForm.vue'
-import { type Reply, ReplyType } from '@/views/mp/components/wx-reply'
+import WxReplySelect, { type Reply, ReplyType } from '@/views/mp/components/wx-reply'
 import WxAccountSelect from '@/views/mp/components/wx-account-select'
 import * as MpAutoReplyApi from '@/api/mp/autoReply'
+import { DICT_TYPE, getDictOptions, getIntDictOptions } from '@/utils/dict'
 import { ContentWrap } from '@/components/ContentWrap'
-import type { TabPaneName } from 'element-plus'
+import type { FormInstance, TabPaneName } from 'element-plus'
 import ReplyTable from './components/ReplyTable.vue'
 import { MsgType } from './components/types'
 const message = useMessage() // 消息
 
-const accountId = ref(-1) // 公众号ID
 const msgType = ref<MsgType>(MsgType.Keyword) // 消息类型
+const RequestMessageTypes = ['text', 'image', 'voice', 'video', 'shortvideo', 'location', 'link'] // 允许选择的请求消息类型
 const loading = ref(true) // 遮罩层
 const total = ref(0) // 总条数
 const list = ref<any[]>([]) // 自动回复列表
-const formRef = ref<InstanceType<typeof ReplyForm> | null>(null) // 表单 ref
+const formRef = ref<FormInstance | null>(null) // 表单 ref
 // 查询参数
-const queryParams = reactive({
+interface QueryParams {
+  pageNo: number
+  pageSize: number
+  accountId: number
+}
+const queryParams: QueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  accountId: accountId
+  accountId: 0
 })
 
-const isCreating = ref(false) // 是否新建（否则编辑）
-const showDialog = ref(false) // 是否显示弹出层
+const dialogTitle = ref('') // 弹出层标题
+const showFormDialog = ref(false) // 是否显示弹出层
 const replyForm = ref<any>({}) // 表单参数
 // 回复消息
 const reply = ref<Reply>({
   type: ReplyType.Text,
-  accountId: -1
+  accountId: 0
 })
+// 表单校验
+const rules = {
+  requestKeyword: [{ required: true, message: '请求的关键字不能为空', trigger: 'blur' }],
+  requestMatch: [{ required: true, message: '请求的关键字的匹配不能为空', trigger: 'blur' }]
+}
 
 /** 侦听账号变化 */
 const onAccountChanged = (id: number) => {
-  accountId.value = id
+  queryParams.accountId = id
   reply.value.accountId = id
-  queryParams.pageNo = 1
   getList()
 }
 
@@ -143,8 +177,8 @@ const onCreate = () => {
     accountId: queryParams.accountId
   }
 
-  isCreating.value = true
-  showDialog.value = true
+  dialogTitle.value = '新增自动回复'
+  showFormDialog.value = true
 }
 
 /** 修改按钮操作 */
@@ -176,8 +210,8 @@ const onUpdate = async (id: number) => {
   }
 
   // 打开表单
-  isCreating.value = false
-  showDialog.value = true
+  dialogTitle.value = '修改自动回复'
+  showFormDialog.value = true
 }
 
 /** 删除按钮操作 */
@@ -189,7 +223,8 @@ const onDelete = async (id: number) => {
 }
 
 const onSubmit = async () => {
-  await formRef.value?.validate()
+  const valid = await formRef.value?.validate()
+  if (!valid) return
 
   // 处理回复消息
   const submitForm: any = { ...replyForm.value }
@@ -213,7 +248,7 @@ const onSubmit = async () => {
     message.success('新增成功')
   }
 
-  showDialog.value = false
+  showFormDialog.value = false
   await getList()
 }
 
@@ -232,7 +267,7 @@ const reset = () => {
 
 // 取消按钮
 const cancel = () => {
-  showDialog.value = false
+  showFormDialog.value = false
   reset()
 }
 </script>
diff --git a/src/views/mp/components/wx-account-select/main.vue b/src/views/mp/components/wx-account-select/main.vue
index e25016572b0260367b15d1b30ac9df14888f2aed..8dbad499ac96758bda6ee7d65ed6615bda63a3fe 100644
--- a/src/views/mp/components/wx-account-select/main.vue
+++ b/src/views/mp/components/wx-account-select/main.vue
@@ -8,14 +8,13 @@
 import * as MpAccountApi from '@/api/mp/account'
 
 const account: MpAccountApi.AccountVO = reactive({
-  id: -1,
+  id: undefined,
   name: ''
 })
-
-const accountList = ref<MpAccountApi.AccountVO[]>([])
+const accountList: Ref<MpAccountApi.AccountVO[]> = ref([])
 
 const emit = defineEmits<{
-  (e: 'change', id: number, name: string)
+  (e: 'change', id: number, name: string): void
 }>()
 
 const handleQuery = async () => {
diff --git a/src/views/mp/components/wx-msg/components/Msg.vue b/src/views/mp/components/wx-msg/components/Msg.vue
deleted file mode 100644
index eff834c99079670dcc43ab43e04ad134162821fd..0000000000000000000000000000000000000000
--- a/src/views/mp/components/wx-msg/components/Msg.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <div>
-    <MsgEvent v-if="item.type === MsgType.Event" :item="item" />
-
-    <div v-else-if="item.type === MsgType.Text">{{ item.content }}</div>
-
-    <div v-else-if="item.type === MsgType.Voice">
-      <WxVoicePlayer :url="item.mediaUrl" :content="item.recognition" />
-    </div>
-
-    <div v-else-if="item.type === MsgType.Image">
-      <a target="_blank" :href="item.mediaUrl">
-        <img :src="item.mediaUrl" style="width: 100px" />
-      </a>
-    </div>
-
-    <div
-      v-else-if="item.type === MsgType.Video || item.type === 'shortvideo'"
-      style="text-align: center"
-    >
-      <WxVideoPlayer :url="item.mediaUrl" />
-    </div>
-
-    <div v-else-if="item.type === MsgType.Link" class="avue-card__detail">
-      <el-link type="success" :underline="false" target="_blank" :href="item.url">
-        <div class="avue-card__title"><i class="el-icon-link"></i>{{ item.title }}</div>
-      </el-link>
-      <div class="avue-card__info" style="height: unset">{{ item.description }}</div>
-    </div>
-
-    <div v-else-if="item.type === MsgType.Location">
-      <WxLocation :label="item.label" :location-y="item.locationY" :location-x="item.locationX" />
-    </div>
-
-    <div v-else-if="item.type === MsgType.News" style="width: 300px">
-      <WxNews :articles="item.articles" />
-    </div>
-
-    <div v-else-if="item.type === MsgType.Music">
-      <WxMusic
-        :title="item.title"
-        :description="item.description"
-        :thumb-media-url="item.thumbMediaUrl"
-        :music-url="item.musicUrl"
-        :hq-music-url="item.hqMusicUrl"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts" name="Msg">
-import WxVideoPlayer from '@/views/mp/components/wx-video-play'
-import WxVoicePlayer from '@/views/mp/components/wx-voice-play'
-import WxNews from '@/views/mp/components/wx-news'
-import WxLocation from '@/views/mp/components/wx-location'
-import WxMusic from '@/views/mp/components/wx-music'
-import MsgEvent from './MsgEvent.vue'
-import { MsgType } from '../types'
-
-const props = defineProps<{
-  item: any
-}>()
-
-const item = ref<any>(props.item)
-</script>
-
-<style scoped></style>
diff --git a/src/views/mp/components/wx-msg/components/MsgEvent.vue b/src/views/mp/components/wx-msg/components/MsgEvent.vue
deleted file mode 100644
index d23c9366e4b6d9673ac3a40af1f3db22b7adf4a0..0000000000000000000000000000000000000000
--- a/src/views/mp/components/wx-msg/components/MsgEvent.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <div>
-    <div v-if="item.event === 'subscribe'">
-      <el-tag type="success">关注</el-tag>
-    </div>
-    <div v-else-if="item.event === 'unsubscribe'">
-      <el-tag type="danger">取消关注</el-tag>
-    </div>
-    <div v-else-if="item.event === 'CLICK'">
-      <el-tag>点击菜单</el-tag>
-      【{{ item.eventKey }}】
-    </div>
-    <div v-else-if="item.event === 'VIEW'">
-      <el-tag>点击菜单链接</el-tag>
-      【{{ item.eventKey }}】
-    </div>
-    <div v-else-if="item.event === 'scancode_waitmsg'">
-      <el-tag>扫码结果</el-tag>
-      【{{ item.eventKey }}】
-    </div>
-    <div v-else-if="item.event === 'scancode_push'">
-      <el-tag>扫码结果</el-tag>
-      【{{ item.eventKey }}】
-    </div>
-    <div v-else-if="item.event === 'pic_sysphoto'">
-      <el-tag>系统拍照发图</el-tag>
-    </div>
-    <div v-else-if="item.event === 'pic_photo_or_album'">
-      <el-tag>拍照或者相册</el-tag>
-    </div>
-    <div v-else-if="item.event === 'pic_weixin'">
-      <el-tag>微信相册</el-tag>
-    </div>
-    <div v-else-if="item.event === 'location_select'">
-      <el-tag>选择地理位置</el-tag>
-    </div>
-    <div v-else>
-      <el-tag type="danger">未知事件类型</el-tag>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-const props = defineProps<{
-  item: any
-}>()
-
-const item = ref(props.item)
-</script>
diff --git a/src/views/mp/components/wx-msg/components/MsgList.vue b/src/views/mp/components/wx-msg/components/MsgList.vue
deleted file mode 100644
index f759adda663c8ccfdd64ae817f089311e5dfec17..0000000000000000000000000000000000000000
--- a/src/views/mp/components/wx-msg/components/MsgList.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div class="execution" v-for="item in props.list" :key="item.id">
-    <div
-      class="avue-comment"
-      :class="{ 'avue-comment--reverse': item.sendFrom === SendFrom.MpBot }"
-    >
-      <div class="avatar-div">
-        <img :src="getAvatar(item.sendFrom)" class="avue-comment__avatar" />
-        <div class="avue-comment__author">
-          {{ getNickname(item.sendFrom) }}
-        </div>
-      </div>
-      <div class="avue-comment__main">
-        <div class="avue-comment__header">
-          <div class="avue-comment__create_time">{{ formatDate(item.createTime) }}</div>
-        </div>
-        <div
-          class="avue-comment__body"
-          :style="item.sendFrom === SendFrom.MpBot ? 'background: #6BED72;' : ''"
-        >
-          <Msg :item="item" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script setup lang="ts" name="MsgList">
-import Msg from './Msg.vue'
-import { formatDate } from '@/utils/formatTime'
-import { User } from '../types'
-import avatarWechat from '@/assets/imgs/wechat.png'
-
-const props = defineProps<{
-  list: any[]
-  accountId: number
-  user: User
-}>()
-
-enum SendFrom {
-  User = 1,
-  MpBot = 2
-}
-
-const getAvatar = (sendFrom: SendFrom) =>
-  sendFrom === SendFrom.User ? props.user.avatar : avatarWechat
-
-const getNickname = (sendFrom: SendFrom) =>
-  sendFrom === SendFrom.User ? props.user.nickname : '公众号'
-</script>
-
-<style lang="scss" scoped>
-/* 因为 joolun 实现依赖 avue 组件，该页面使用了 comment.scss、card.scc  */
-@import '../comment.scss';
-@import '../card.scss';
-
-.avatar-div {
-  text-align: center;
-  width: 80px;
-}
-</style>
diff --git a/src/views/mp/components/wx-msg/main.vue b/src/views/mp/components/wx-msg/main.vue
index 1eeab64a7a5f68446e73d5d772a469bb0fef0fe8..19763245c5ed9f323982fb635dd2a1aeba7df3d7 100644
--- a/src/views/mp/components/wx-msg/main.vue
+++ b/src/views/mp/components/wx-msg/main.vue
@@ -7,22 +7,123 @@
 -->
 <template>
   <ContentWrap>
-    <div class="msg-div" ref="msgDivRef">
+    <div class="msg-div" :id="'msg-div' + nowStr">
       <!-- 加载更多 -->
       <div v-loading="loading"></div>
       <div v-if="!loading">
-        <div class="el-table__empty-block" v-if="hasMore" @click="loadMore"
+        <div class="el-table__empty-block" v-if="loadMore" @click="loadingMore"
           ><span class="el-table__empty-text">点击加载更多</span></div
         >
-        <div class="el-table__empty-block" v-if="!hasMore"
+        <div class="el-table__empty-block" v-if="!loadMore"
           ><span class="el-table__empty-text">没有更多了</span></div
         >
       </div>
-
       <!-- 消息列表 -->
-      <MsgList :list="list" :account-id="accountId" :user="user" />
+      <div class="execution" v-for="item in list" :key="item.id">
+        <div class="avue-comment" :class="item.sendFrom === 2 ? 'avue-comment--reverse' : ''">
+          <div class="avatar-div">
+            <img
+              :src="item.sendFrom === 1 ? user.avatar : mp.avatar"
+              class="avue-comment__avatar"
+            />
+            <div class="avue-comment__author"
+              >{{ item.sendFrom === 1 ? user.nickname : mp.nickname }}
+            </div>
+          </div>
+          <div class="avue-comment__main">
+            <div class="avue-comment__header">
+              <div class="avue-comment__create_time">{{ formatDate(item.createTime) }}</div>
+            </div>
+            <div
+              class="avue-comment__body"
+              :style="item.sendFrom === 2 ? 'background: #6BED72;' : ''"
+            >
+              <!-- 【事件】区域 -->
+              <div v-if="item.type === MsgType.Event && item.event === 'subscribe'">
+                <el-tag type="success">关注</el-tag>
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'unsubscribe'">
+                <el-tag type="danger">取消关注</el-tag>
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'CLICK'">
+                <el-tag>点击菜单</el-tag>
+                【{{ item.eventKey }}】
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'VIEW'">
+                <el-tag>点击菜单链接</el-tag>
+                【{{ item.eventKey }}】
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'scancode_waitmsg'">
+                <el-tag>扫码结果</el-tag>
+                【{{ item.eventKey }}】
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'scancode_push'">
+                <el-tag>扫码结果</el-tag>
+                【{{ item.eventKey }}】
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'pic_sysphoto'">
+                <el-tag>系统拍照发图</el-tag>
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'pic_photo_or_album'">
+                <el-tag>拍照或者相册</el-tag>
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'pic_weixin'">
+                <el-tag>微信相册</el-tag>
+              </div>
+              <div v-else-if="item.type === MsgType.Event && item.event === 'location_select'">
+                <el-tag>选择地理位置</el-tag>
+              </div>
+              <div v-else-if="item.type === MsgType.Event">
+                <el-tag type="danger">未知事件类型</el-tag>
+              </div>
+              <!-- 【消息】区域 -->
+              <div v-else-if="item.type === MsgType.Text">{{ item.content }}</div>
+              <div v-else-if="item.type === MsgType.Voice">
+                <WxVoicePlayer :url="item.mediaUrl" :content="item.recognition" />
+              </div>
+              <div v-else-if="item.type === MsgType.Image">
+                <a target="_blank" :href="item.mediaUrl">
+                  <img :src="item.mediaUrl" style="width: 100px" />
+                </a>
+              </div>
+              <div
+                v-else-if="item.type === MsgType.Video || item.type === 'shortvideo'"
+                style="text-align: center"
+              >
+                <WxVideoPlayer :url="item.mediaUrl" />
+              </div>
+              <div v-else-if="item.type === MsgType.Link" class="avue-card__detail">
+                <el-link type="success" :underline="false" target="_blank" :href="item.url">
+                  <div class="avue-card__title"><i class="el-icon-link"></i>{{ item.title }}</div>
+                </el-link>
+                <div class="avue-card__info" style="height: unset">{{ item.description }}</div>
+              </div>
+              <!-- TODO 芋艿：待完善 -->
+              <div v-else-if="item.type === MsgType.Location">
+                <WxLocation
+                  :label="item.label"
+                  :location-y="item.locationY"
+                  :location-x="item.locationX"
+                />
+              </div>
+              <div v-else-if="item.type === MsgType.News" style="width: 300px">
+                <!-- TODO 芋艿：待测试；详情页也存在类似的情况 -->
+                <WxNews :articles="item.articles" />
+              </div>
+              <div v-else-if="item.type === MsgType.Music">
+                <WxMusic
+                  :title="item.title"
+                  :description="item.description"
+                  :thumb-media-url="item.thumbMediaUrl"
+                  :music-url="item.musicUrl"
+                  :hq-music-url="item.hqMusicUrl"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
-
     <div class="msg-send" v-loading="sendLoading">
       <WxReplySelect ref="replySelectRef" v-model="reply" />
       <el-button type="success" class="send-but" @click="sendMsg">发送(S)</el-button>
@@ -31,12 +132,18 @@
 </template>
 
 <script setup lang="ts" name="WxMsg">
-import WxReplySelect, { Reply, ReplyType } from '@/views/mp/components/wx-reply'
-import MsgList from './components/MsgList.vue'
+import WxReplySelect from '@/views/mp/components/wx-reply'
+import WxVideoPlayer from '@/views/mp/components/wx-video-play'
+import WxVoicePlayer from '@/views/mp/components/wx-voice-play'
+import WxNews from '@/views/mp/components/wx-news'
+import WxLocation from '@/views/mp/components/wx-location'
+import WxMusic from '@/views/mp/components/wx-music'
 import { getMessagePage, sendMessage } from '@/api/mp/message'
 import { getUser } from '@/api/mp/user'
+import { formatDate } from '@/utils/formatTime'
 import profile from '@/assets/imgs/profile.jpg'
-import { User } from './types'
+import wechat from '@/assets/imgs/wechat.png'
+import { MsgType } from './types'
 
 const message = useMessage() // 消息弹窗
 
@@ -47,41 +154,61 @@ const props = defineProps({
   }
 })
 
-const accountId = ref(-1) // 公众号ID，需要通过userId初始化
+const nowStr = ref(new Date().getTime()) // 当前的时间戳，用于每次消息加载后，回到原位置；具体见 :id="'msg-div' + nowStr" 处
 const loading = ref(false) // 消息列表是否正在加载中
-const hasMore = ref(true) // 是否可以加载更多
+const loadMore = ref(true) // 是否可以加载更多
 const list = ref<any[]>([]) // 消息列表
 const queryParams = reactive({
   pageNo: 1, // 当前页数
   pageSize: 14, // 每页显示多少条
-  accountId: accountId
+  accountId: undefined
 })
 
+interface User {
+  nickname: string
+  avatar: string
+  accountId: number
+}
 // 由于微信不再提供昵称，直接使用“用户”展示
 const user: User = reactive({
   nickname: '用户',
   avatar: profile,
-  accountId: accountId // 公众号账号编号
+  accountId: 0 // 公众号账号编号
+})
+
+interface Mp {
+  nickname: string
+  avatar: string
+}
+const mp: Mp = reactive({
+  nickname: '公众号',
+  avatar: wechat
 })
 
 // ========= 消息发送 =========
 const sendLoading = ref(false) // 发送消息是否加载中
+interface Reply {
+  type: MsgType
+  accountId: number | null
+  articles: any[]
+}
+
 // 微信发送消息
 const reply = ref<Reply>({
-  type: ReplyType.Text,
-  accountId: -1,
+  type: MsgType.Text,
+  accountId: null,
   articles: []
 })
 
-const replySelectRef = ref<InstanceType<typeof WxReplySelect> | null>(null) // WxReplySelect组件ref，用于消息发送成功后清除内容
-const msgDivRef = ref<HTMLDivElement | null>(null) // 消息显示窗口ref，用于滚动到底部
+const replySelectRef = ref<InstanceType<typeof WxReplySelect> | null>(null)
 
 /** 完成加载 */
 onMounted(async () => {
   const data = await getUser(props.userId)
   user.nickname = data.nickname?.length > 0 ? data.nickname : user.nickname
   user.avatar = user.avatar?.length > 0 ? data.avatar : user.avatar
-  accountId.value = data.accountId
+  user.accountId = data.accountId
+  queryParams.accountId = data.accountId
   reply.value.accountId = data.accountId
 
   refreshChange()
@@ -89,15 +216,11 @@ onMounted(async () => {
 
 // 执行发送
 const sendMsg = async () => {
-  if (!unref(reply)) {
+  if (!reply) {
     return
   }
   // 公众号限制：客服消息，公众号只允许发送一条
-  if (
-    reply.value.type === ReplyType.News &&
-    reply.value.articles &&
-    reply.value.articles.length > 1
-  ) {
+  if (reply.value.type === MsgType.News && reply.value.articles.length > 1) {
     reply.value.articles = [reply.value.articles[0]]
     message.success('图文消息条数限制在 1 条以内，已默认发送第一条')
   }
@@ -106,18 +229,18 @@ const sendMsg = async () => {
   sendLoading.value = false
 
   list.value = [...list.value, ...[data]]
-  await scrollToBottom()
+  scrollToBottom()
 
   // 发送后清空数据
   replySelectRef.value?.clear()
 }
 
-const loadMore = () => {
+const loadingMore = () => {
   queryParams.pageNo++
   getPage(queryParams, null)
 }
 
-const getPage = async (page: any, params: any = null) => {
+const getPage = async (page, params) => {
   loading.value = true
   let dataTemp = await getMessagePage(
     Object.assign(
@@ -131,45 +254,62 @@ const getPage = async (page: any, params: any = null) => {
     )
   )
 
-  const scrollHeight = msgDivRef.value?.scrollHeight ?? 0
+  const msgDiv = document.getElementById('msg-div' + nowStr.value)
+  let scrollHeight = 0
+  if (msgDiv) {
+    scrollHeight = msgDiv.scrollHeight
+  }
   // 处理数据
   const data = dataTemp.list.reverse()
   list.value = [...data, ...list.value]
   loading.value = false
   if (data.length < queryParams.pageSize || data.length === 0) {
-    hasMore.value = false
+    loadMore.value = false
   }
   queryParams.pageNo = page.pageNo
   queryParams.pageSize = page.pageSize
   // 滚动到原来的位置
   if (queryParams.pageNo === 1) {
     // 定位到消息底部
-    await scrollToBottom()
+    scrollToBottom()
   } else if (data.length !== 0) {
     // 定位滚动条
-    await nextTick()
-    if (scrollHeight !== 0) {
-      if (msgDivRef.value) {
-        msgDivRef.value.scrollTop = msgDivRef.value.scrollHeight - scrollHeight - 100
+    await nextTick(() => {
+      if (scrollHeight !== 0) {
+        let div = document.getElementById('msg-div' + nowStr.value)
+        if (div && msgDiv) {
+          msgDiv.scrollTop = div.scrollHeight - scrollHeight - 100
+        }
       }
-    }
+    })
   }
 }
 
 const refreshChange = () => {
-  getPage(queryParams)
+  getPage(queryParams, null)
 }
 
 /** 定位到消息底部 */
-const scrollToBottom = async () => {
-  await nextTick()
-  if (msgDivRef.value) {
-    msgDivRef.value.scrollTop = msgDivRef.value.scrollHeight
-  }
+const scrollToBottom = () => {
+  nextTick(() => {
+    let div = document.getElementById('msg-div' + nowStr.value)
+    if (div) {
+      div.scrollTop = div.scrollHeight
+    }
+  })
 }
 </script>
 
 <style lang="scss" scoped>
+/* 因为 joolun 实现依赖 avue 组件，该页面使用了 comment.scss、card.scc  */
+@import './comment.scss';
+@import './card.scss';
+
+.msg-main {
+  margin-top: -30px;
+  padding: 10px;
+}
+
 .msg-div {
   height: 50vh;
   overflow: auto;
@@ -182,6 +322,11 @@ const scrollToBottom = async () => {
   padding: 10px;
 }
 
+.avatar-div {
+  text-align: center;
+  width: 80px;
+}
+
 .send-but {
   float: right;
   margin-top: 8px;
diff --git a/src/views/mp/components/wx-msg/types.ts b/src/views/mp/components/wx-msg/types.ts
index 38a0ff86c2925bad6f029c0181ba010bb11a9c8b..b1989ea7386c180058b9819923490b1b0470b931 100644
--- a/src/views/mp/components/wx-msg/types.ts
+++ b/src/views/mp/components/wx-msg/types.ts
@@ -9,9 +9,3 @@ export enum MsgType {
   Music = 'music',
   News = 'news'
 }
-
-export interface User {
-  nickname: string
-  avatar: string
-  accountId: number
-}
diff --git a/src/views/mp/components/wx-music/main.vue b/src/views/mp/components/wx-music/main.vue
index f528359d89ac79291cf9a7ec0ea53f9a33e73b68..70f4c58b4d6eda3961c67d0136deda09099843bd 100644
--- a/src/views/mp/components/wx-music/main.vue
+++ b/src/views/mp/components/wx-music/main.vue
@@ -55,6 +55,6 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-/* 因为 joolun 实现依赖 avue 组件，该页面使用了 card.scss  */
-@import '../wx-msg/card.scss';
+/* 因为 joolun 实现依赖 avue 组件，该页面使用了 card.scc  */
+@import url('../wx-msg/card.scss');
 </style>
diff --git a/src/views/mp/draft/components/CoverSelect.vue b/src/views/mp/draft/components/CoverSelect.vue
index bbb2b44c5ccdc499223d889e5a09d412bed97738..944b7d968cab731bd9134c23a038554ec2d09700 100644
--- a/src/views/mp/draft/components/CoverSelect.vue
+++ b/src/views/mp/draft/components/CoverSelect.vue
@@ -51,7 +51,7 @@
       >
         <WxMaterialSelect
           type="image"
-          :account-id="accountId!"
+          :account-id="accountId"
           @select-material="onMaterialSelected"
         />
       </el-dialog>
@@ -93,11 +93,11 @@ const showImageDialog = ref(false)
 const fileList = ref<UploadFiles>([])
 interface UploadData {
   type: UploadType
-  accountId: number
+  accountId: number | undefined
 }
 const uploadData: UploadData = reactive({
   type: UploadType.Image,
-  accountId: accountId!
+  accountId: accountId
 })
 
 /** 素材选择完成事件*/
diff --git a/src/views/mp/draft/components/NewsForm.vue b/src/views/mp/draft/components/NewsForm.vue
index 97166a4b149b9c942b5745198033bf350e36ba36..a2b88a5b3ef65dfc51173fd075282696c3384681 100644
--- a/src/views/mp/draft/components/NewsForm.vue
+++ b/src/views/mp/draft/components/NewsForm.vue
@@ -125,7 +125,7 @@
   </el-container>
 </template>
 
-<script setup lang="ts" name="NewsForm">
+<script setup lang="ts">
 import { Editor } from '@/components/Editor'
 import { createEditorConfig } from '../editor-config'
 import CoverSelect from './CoverSelect.vue'
diff --git a/src/views/mp/draft/index.vue b/src/views/mp/draft/index.vue
index a916ed397001469ff11aeed79be9a0eab6317591..d8e771a0fd0d5f8d654f08b013e4eef6642fb34e 100644
--- a/src/views/mp/draft/index.vue
+++ b/src/views/mp/draft/index.vue
@@ -76,17 +76,30 @@ import {
 
 const message = useMessage() // 消息
 
-const accountId = ref(-1)
+const accountId = ref<number>(0)
 provide('accountId', accountId)
 
 const loading = ref(true) // 列表的加载中
 const list = ref<any[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-
-const queryParams = reactive({
+interface QueryParams {
+  pageNo: number
+  pageSize: number
+  accountId: number
+}
+const queryParams: QueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  accountId: accountId
+  accountId: 0
+})
+
+interface UploadData {
+  type: 'image' | 'video' | 'audio'
+  accountId: number
+}
+const uploadData: UploadData = reactive({
+  type: 'image',
+  accountId: 0
 })
 
 // ========== 草稿新建 or 修改 ==========
@@ -98,8 +111,7 @@ const isSubmitting = ref(false)
 
 /** 侦听公众号变化 **/
 const onAccountChanged = (id: number) => {
-  accountId.value = id
-  queryParams.pageNo = 1
+  setAccountId(id)
   getList()
 }
 
@@ -112,6 +124,12 @@ const onBeforeDialogClose = async (onDone: () => {}) => {
 }
 
 // ======================== 列表查询 ========================
+/** 设置账号编号 */
+const setAccountId = (id: number) => {
+  queryParams.accountId = id
+  uploadData.accountId = id
+}
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -152,10 +170,10 @@ const onSubmitNewsItem = async () => {
   isSubmitting.value = true
   try {
     if (isCreating.value) {
-      await MpDraftApi.createDraft(accountId.value, newsList.value)
+      await MpDraftApi.createDraft(queryParams.accountId, newsList.value)
       message.notifySuccess('新增成功')
     } else {
-      await MpDraftApi.updateDraft(accountId.value, mediaId.value, newsList.value)
+      await MpDraftApi.updateDraft(queryParams.accountId, mediaId.value, newsList.value)
       message.notifySuccess('更新成功')
     }
   } finally {
@@ -167,6 +185,7 @@ const onSubmitNewsItem = async () => {
 
 // ======================== 草稿箱发布 ========================
 const onPublish = async (item: Article) => {
+  const accountId = queryParams.accountId
   const mediaId = item.mediaId
   const content =
     '你正在通过发布的方式发表内容。 发布不占用群发次数，一天可多次发布。' +
@@ -174,7 +193,7 @@ const onPublish = async (item: Article) => {
     '发布后，你可以前往发表记录获取链接，也可以将发布内容添加到自定义菜单、自动回复、话题和页面模板中。'
   try {
     await message.confirm(content)
-    await MpFreePublishApi.submitFreePublish(accountId.value, mediaId)
+    await MpFreePublishApi.submitFreePublish(accountId, mediaId)
     message.notifySuccess('发布成功')
     await getList()
   } catch {}
@@ -182,10 +201,11 @@ const onPublish = async (item: Article) => {
 
 /** 删除按钮操作 */
 const onDelete = async (item: Article) => {
+  const accountId = queryParams.accountId
   const mediaId = item.mediaId
   try {
     await message.confirm('此操作将永久删除该草稿, 是否继续?')
-    await MpDraftApi.deleteDraft(accountId.value, mediaId)
+    await MpDraftApi.deleteDraft(accountId, mediaId)
     message.notifySuccess('删除成功')
     await getList()
   } catch {}
diff --git a/src/views/mp/freePublish/index.vue b/src/views/mp/freePublish/index.vue
index 62ca1999af76d7e4a4933b71ed6018d9565491ff..08a202c2af16e06dd3e38b58544239fac0283ca6 100644
--- a/src/views/mp/freePublish/index.vue
+++ b/src/views/mp/freePublish/index.vue
@@ -59,16 +59,20 @@ const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref<any[]>([]) // 列表的数据
 
-const queryParams = reactive({
+interface QueryParams {
+  pageNo: number
+  pageSize: number
+  accountId: number
+}
+const queryParams: QueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  accountId: -1
+  accountId: 0
 })
 
 /** 侦听公众号变化 **/
 const onAccountChanged = (id: number) => {
   queryParams.accountId = id
-  queryParams.pageNo = 1
   getList()
 }
 
diff --git a/src/views/mp/material/index.vue b/src/views/mp/material/index.vue
index b72c9ad6d4102531bcb816319ad115f03d83b231..0e2a87d62ee9bc837d0f546f5fb4800c7bfdef0b 100644
--- a/src/views/mp/material/index.vue
+++ b/src/views/mp/material/index.vue
@@ -100,10 +100,16 @@ const loading = ref(false) // 遮罩层
 const list = ref<any[]>([]) // 总条数
 const total = ref(0) // 数据列表
 // 查询参数
-const queryParams = reactive({
+interface QueryParams {
+  pageNo: number
+  pageSize: number
+  accountId: number
+  permanent: boolean
+}
+const queryParams: QueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  accountId: -1,
+  accountId: 0,
   permanent: true
 })
 const showCreateVideo = ref(false) // 是否新建视频的弹窗
@@ -111,7 +117,6 @@ const showCreateVideo = ref(false) // 是否新建视频的弹窗
 /** 侦听公众号变化 **/
 const onAccountChanged = (id: number) => {
   queryParams.accountId = id
-  queryParams.pageNo = 1
   getList()
 }
 
diff --git a/src/views/mp/menu/components/MenuPreviewer.vue b/src/views/mp/menu/components/MenuPreviewer.vue
index d26263206deefe70302f0c15a08ba93250f5980a..3066e5902f00ccafee05dcb775649ce98e3c39da 100644
--- a/src/views/mp/menu/components/MenuPreviewer.vue
+++ b/src/views/mp/menu/components/MenuPreviewer.vue
@@ -4,7 +4,7 @@
     item-key="id"
     ghost-class="draggable-ghost"
     :animation="400"
-    @end="onParentDragEnd"
+    @end="onDragEnd"
   >
     <template #item="{ element: parent, index: x }">
       <div class="menu_bottom">
@@ -23,7 +23,6 @@
             item-key="id"
             ghost-class="draggable-ghost"
             :animation="400"
-            @end="onChildDragEnd"
           >
             <template #item="{ element: child, index: y }">
               <div class="subtitle menu_bottom">
@@ -119,49 +118,42 @@ const subMenuClicked = (child: Menu, x: number, y: number) => {
 }
 
 /**
- * 处理一级菜单展开后被拖动，激活(展开)原来活动的一级菜单
+ * 处理一级菜单展开后被拖动
  *
  * @param oldIndex: 一级菜单拖动前的位置
  * @param newIndex: 一级菜单拖动后的位置
  */
-const onParentDragEnd = ({ oldIndex, newIndex }) => {
+const onDragEnd = ({ oldIndex, newIndex }) => {
   // 二级菜单没有展开，直接返回
   if (props.activeIndex === '__MENU_NOT_SELECTED__') {
     return
   }
 
-  // 使用一个辅助数组来模拟菜单移动，然后找到展开的二级菜单的新下标`newParent`
-  let positions = new Array<boolean>(menuList.value.length).fill(false)
-  positions[props.parentIndex] = true
-  const [out] = positions.splice(oldIndex, 1) // 移出菜单，保存到变量out
-  positions.splice(newIndex, 0, out) // 把out变量插入被移出的菜单
-  const newParentIndex = positions.indexOf(true)
+  let newParent = props.parentIndex
+  if (props.parentIndex === oldIndex) {
+    newParent = newIndex
+  } else if (props.parentIndex === newIndex) {
+    newParent = oldIndex
+  } else {
+    // 如果展开的二级菜单下标`props.parentIndex`不是被移动的菜单的前后下标。
+    // 那么使用一个辅助素组来模拟菜单移动，然后找到展开的二级菜单的新下标`newParent`
+    let positions = new Array<boolean>(menuList.value.length).fill(false)
+    positions[props.parentIndex] = true
+    positions.splice(oldIndex, 1)
+    positions.splice(newIndex, 0, true)
+    newParent = positions.indexOf(true)
+  }
 
   // 找到菜单元素，触发一级菜单点击
-  const parent = menuList.value[newParentIndex]
-  emit('menu-clicked', parent, newParentIndex)
-}
-
-/**
- * 处理二级菜单展开后被拖动，激活被拖动的菜单
- *
- * @param newIndex 二级菜单拖动后的位置
- */
-const onChildDragEnd = ({ newIndex }) => {
-  const x = props.parentIndex
-  const y = newIndex
-  const children = menuList.value[x]?.children
-  if (children && children?.length > 0) {
-    const child = children[y]
-    emit('submenu-clicked', child, x, y)
-  }
+  const parent = menuList.value[newParent]
+  emit('menu-clicked', parent, newParent)
 }
 </script>
 
 <style lang="scss" scoped>
 .menu_bottom {
   position: relative;
-  display: block;
+  display: inline-block;
   float: left;
   width: 85.5px;
   text-align: center;
diff --git a/src/views/mp/menu/index.vue b/src/views/mp/menu/index.vue
index 0b02cc165f61899a7964e51635d90ef1706dd398..442e33b5e2f1dcc4dbca4109446388b219e21064 100644
--- a/src/views/mp/menu/index.vue
+++ b/src/views/mp/menu/index.vue
@@ -65,7 +65,7 @@ const MENU_NOT_SELECTED = '__MENU_NOT_SELECTED__'
 
 // ======================== 列表查询 ========================
 const loading = ref(false) // 遮罩层
-const accountId = ref(-1)
+const accountId = ref<number>(0)
 const accountName = ref<string>('')
 const menuList = ref<Menu[]>([])
 
@@ -339,7 +339,7 @@ div {
 
   .left {
     position: relative;
-    display: block;
+    display: inline-block;
     float: left;
     width: 350px;
     height: 715px;
diff --git a/src/views/mp/message/index.vue b/src/views/mp/message/index.vue
index db92cc0f0e39e8645f15353f0342a20b9e3052a5..85048f3810f4951fff183bdb71172501d8ee6eee 100644
--- a/src/views/mp/message/index.vue
+++ b/src/views/mp/message/index.vue
@@ -93,12 +93,20 @@ const total = ref(0) // 数据的总页数
 const list = ref<any[]>([]) // 当前页的列表数据
 
 // 搜索参数
-const queryParams = reactive({
+interface QueryParams {
+  pageNo: number
+  pageSize: number
+  openid: string | undefined
+  accountId: number
+  type: MsgType | undefined
+  createTime: string[] | []
+}
+const queryParams: QueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  openid: '',
-  accountId: -1,
-  type: MsgType.Text,
+  openid: undefined,
+  accountId: 0,
+  type: undefined,
   createTime: []
 })
 const queryFormRef = ref<FormInstance | null>(null) // 搜索的表单
@@ -112,7 +120,6 @@ const messageBox = reactive({
 /** 侦听accountId */
 const onAccountChanged = (id: number) => {
   queryParams.accountId = id
-  queryParams.pageNo = 1
   handleQuery()
 }
 
diff --git a/src/views/mp/statistics/index.vue b/src/views/mp/statistics/index.vue
index 4e2dbfcc6ab38785bfab65758140249c706d8932..cef8e0797b792e7829a5a7f0eeb07ed69a6ac64d 100644
--- a/src/views/mp/statistics/index.vue
+++ b/src/views/mp/statistics/index.vue
@@ -84,7 +84,7 @@ const dateRange = ref([
   beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)),
   endOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24))
 ])
-const accountId = ref(-1) // 选中的公众号编号
+const accountId = ref() // 选中的公众号编号
 const accountList = ref<MpAccountApi.AccountVO[]>([]) // 公众号账号列表
 
 const xAxisDate = ref([] as any[]) // X 轴的日期范围
@@ -232,7 +232,7 @@ const getAccountList = async () => {
   accountList.value = await MpAccountApi.getSimpleAccountList()
   // 默认选中第一个
   if (accountList.value.length > 0) {
-    accountId.value = accountList.value[0].id!
+    accountId.value = accountList.value[0].id
   }
 }
 
diff --git a/src/views/mp/tag/index.vue b/src/views/mp/tag/index.vue
index 8d452a5d77539f2540675077cc40ba84ee03642f..a92d9127ae0d60fcc44ceb5f54c91a7e723c56ec 100644
--- a/src/views/mp/tag/index.vue
+++ b/src/views/mp/tag/index.vue
@@ -95,18 +95,23 @@ const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref<any[]>([]) // 列表的数据
 
-const queryParams = reactive({
+interface QueryParams {
+  pageNo: number
+  pageSize: number
+  accountId: number
+}
+const queryParams: QueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  accountId: -1
+  accountId: 0
 })
 
 const formRef = ref<InstanceType<typeof TagForm> | null>(null)
 
 /** 侦听公众号变化 **/
 const onAccountChanged = (id: number) => {
-  queryParams.accountId = id
   queryParams.pageNo = 1
+  queryParams.accountId = id
   getList()
 }
 
diff --git a/src/views/mp/user/index.vue b/src/views/mp/user/index.vue
index 422e219bae3fcbeb09c3a303553b150623ff51b1..03e58a7fbddbf485c2994de2e332b928ddaa8362 100644
--- a/src/views/mp/user/index.vue
+++ b/src/views/mp/user/index.vue
@@ -113,20 +113,27 @@ const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref<any[]>([]) // 列表的数据
 
-const queryParams = reactive({
+interface QueryParams {
+  pageNo: number
+  pageSize: number
+  accountId: number
+  openid: string | null
+  nickname: string | null
+}
+const queryParams: QueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  accountId: -1,
-  openid: '',
-  nickname: ''
+  accountId: 0,
+  openid: null,
+  nickname: null
 })
 const queryFormRef = ref<FormInstance | null>(null) // 搜索的表单
 const tagList = ref<any[]>([]) // 公众号标签列表
 
 /** 侦听公众号变化 **/
 const onAccountChanged = (id: number) => {
-  queryParams.accountId = id
   queryParams.pageNo = 1
+  queryParams.accountId = id
   getList()
 }
 
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 755b94155a15c54e4c60716487c26f602c7780f6..bbcd8a2ccbd688bbb173a1eb1e6251e696d2c3c4 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -2,36 +2,36 @@
   <!-- 搜索工作栏 -->
   <ContentWrap>
     <el-form
+      class="-mb-15px"
+      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      :model="queryParams"
-      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="字典名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          class="!w-240px"
-          clearable
           placeholder="请输入字典名称"
+          clearable
           @keyup.enter="handleQuery"
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="字典类型" prop="type">
         <el-input
           v-model="queryParams.type"
-          class="!w-240px"
-          clearable
           placeholder="请输入字典类型"
+          clearable
           @keyup.enter="handleQuery"
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
-          class="!w-240px"
-          clearable
           placeholder="请选择字典状态"
+          clearable
+          class="!w-240px"
         >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -44,41 +44,33 @@
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="yyyy-MM-dd HH:mm:ss"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery">
-          <Icon class="mr-5px" icon="ep:search" />
-          搜索
-        </el-button>
-        <el-button @click="resetQuery">
-          <Icon class="mr-5px" icon="ep:refresh" />
-          重置
-        </el-button>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
         <el-button
-          v-hasPermi="['system:dict:create']"
-          plain
           type="primary"
+          plain
           @click="openForm('create')"
+          v-hasPermi="['system:dict:create']"
         >
-          <Icon class="mr-5px" icon="ep:plus" />
-          新增
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
         <el-button
-          v-hasPermi="['system:dict:export']"
-          :loading="exportLoading"
-          plain
           type="success"
+          plain
           @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:dict:export']"
         >
-          <Icon class="mr-5px" icon="ep:download" />
-          导出
+          <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
     </el-form>
@@ -87,29 +79,29 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column align="center" label="字典编号" prop="id" />
-      <el-table-column align="center" label="字典名称" prop="name" show-overflow-tooltip />
-      <el-table-column align="center" label="字典类型" prop="type" width="300" />
-      <el-table-column align="center" label="状态" prop="status">
+      <el-table-column label="字典编号" align="center" prop="id" />
+      <el-table-column label="字典名称" align="center" prop="name" show-overflow-tooltip />
+      <el-table-column label="字典类型" align="center" prop="type" width="300" />
+      <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
+        label="创建时间"
         :formatter="dateFormatter"
         align="center"
-        label="创建时间"
         prop="createTime"
         width="180"
       />
-      <el-table-column align="center" label="操作">
+      <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
-            v-hasPermi="['system:dict:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
+            v-hasPermi="['system:dict:update']"
           >
             修改
           </el-button>
@@ -117,10 +109,10 @@
             <el-button link type="primary">数据</el-button>
           </router-link>
           <el-button
-            v-hasPermi="['system:dict:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:dict:delete']"
           >
             删除
           </el-button>
@@ -129,9 +121,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
       :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
   </ContentWrap>
@@ -140,13 +132,12 @@
   <DictTypeForm ref="formRef" @success="getList" />
 </template>
 
-<script lang="ts" name="SystemDictType" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+<script setup lang="ts" name="SystemDictType">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import DictTypeForm from './DictTypeForm.vue'
 import download from '@/utils/download'
-
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
diff --git a/src/views/system/notice/NoticeForm.vue b/src/views/system/notice/NoticeForm.vue
index c1962f197d041b5fcd30cd30e8ca5334f5d1aa36..42060abd2b64c5a02e44c2010e173cb6773543ce 100644
--- a/src/views/system/notice/NoticeForm.vue
+++ b/src/views/system/notice/NoticeForm.vue
@@ -11,7 +11,7 @@
         <el-input v-model="formData.title" placeholder="请输入公告标题" />
       </el-form-item>
       <el-form-item label="公告内容" prop="content">
-        <Editor v-model="formData.content" height="150px" />
+        <Editor :model-value="formData.content" height="150px" />
       </el-form-item>
       <el-form-item label="公告类型" prop="type">
         <el-select v-model="formData.type" clearable placeholder="请选择公告类型">
diff --git a/src/views/system/notify/template/NotifyTemplateSendForm.vue b/src/views/system/notify/template/NotifyTemplateSendForm.vue
index 78788f0dfde672b32d9ab3b79beb29f112d982c0..3f0aafe12901fad3f4697538c6fb9156d7ca3df7 100644
--- a/src/views/system/notify/template/NotifyTemplateSendForm.vue
+++ b/src/views/system/notify/template/NotifyTemplateSendForm.vue
@@ -44,6 +44,7 @@
   </Dialog>
 </template>
 <script lang="ts" name="SystemNotifyTemplateSendForm" setup>
+import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
 import * as UserApi from '@/api/system/user'
 import * as NotifyTemplateApi from '@/api/system/notify/template'
 const message = useMessage() // 消息弹窗
@@ -101,8 +102,8 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as NotifyTemplateApi.NotifySendReqVO
-    const logId = await NotifyTemplateApi.sendNotify(data)
+    const data = formData.value as unknown as SmsTemplateApi.SendSmsReqVO
+    const logId = await SmsTemplateApi.sendSms(data)
     if (logId) {
       message.success('提交发送成功！发送结果，见发送日志编号：' + logId)
     }
diff --git a/src/views/system/oauth2/token/index.vue b/src/views/system/oauth2/token/index.vue
index b97506ff711f6ba7998ed9b36cfdcd111e69a99c..803cd7d10c93f4fb03fa5988bd141d530949b20b 100644
--- a/src/views/system/oauth2/token/index.vue
+++ b/src/views/system/oauth2/token/index.vue
@@ -80,7 +80,7 @@
           <el-button
             link
             type="danger"
-            @click="handleForceLogout(scope.row.accessToken)"
+            @click="handleForceLogout(scope.row.id)"
             v-hasPermi="['system:oauth2-token:delete']"
           >
             强退
@@ -142,12 +142,12 @@ const resetQuery = () => {
 }
 
 /** 强制退出操作 */
-const handleForceLogout = async (accessToken: string) => {
+const handleForceLogout = async (id: number) => {
   try {
     // 删除的二次确认
     await message.confirm('是否要强制退出用户')
     // 发起删除
-    await OAuth2AccessTokenApi.deleteAccessToken(accessToken)
+    await OAuth2AccessTokenApi.deleteAccessToken(id)
     message.success(t('common.success'))
     // 刷新列表
     await getList()