+
+
+
+
+
+
+
diff --git a/src/layout copy/components/Settings/index.vue b/src/layout copy/components/Settings/index.vue
new file mode 100644
index 00000000..5e5f5588
--- /dev/null
+++ b/src/layout copy/components/Settings/index.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+ {{ $t("navbar.dashboard") }}
+
+
+ Github
+
+
+ {{ $t("navbar.gitee") }}
+
+
+ {{ $t("navbar.document") }}
+
+
+ {{ $t("navbar.logout") }}
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layout copy/components/Sidebar/Link.vue b/src/layout copy/components/Sidebar/Link.vue
new file mode 100644
index 00000000..0254b59a
--- /dev/null
+++ b/src/layout copy/components/Sidebar/Link.vue
@@ -0,0 +1,53 @@
+
+
+ 系统布局配置
+
+ 主题颜色
+
+
+
+
+
+ 开启 Tags-View
+
+
+
+ 固定 Header
+
+
+
+ 侧边栏 Logo
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/layout copy/components/Sidebar/Logo.vue b/src/layout copy/components/Sidebar/Logo.vue
new file mode 100644
index 00000000..39c5a7e1
--- /dev/null
+++ b/src/layout copy/components/Sidebar/Logo.vue
@@ -0,0 +1,85 @@
+
+
+
+
+ ![]()
+
+
+ ![]()
+
+
+
+
+
+
+
+
diff --git a/src/layout copy/components/Sidebar/SidebarItem.vue b/src/layout copy/components/Sidebar/SidebarItem.vue
new file mode 100644
index 00000000..069fe7c2
--- /dev/null
+++ b/src/layout copy/components/Sidebar/SidebarItem.vue
@@ -0,0 +1,102 @@
+
+ {{ title }}
+{{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/layout copy/components/Sidebar/index.vue b/src/layout copy/components/Sidebar/index.vue
new file mode 100644
index 00000000..3f320d8d
--- /dev/null
+++ b/src/layout copy/components/Sidebar/index.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layout copy/components/TagsView/ScrollPane.vue b/src/layout copy/components/TagsView/ScrollPane.vue
new file mode 100644
index 00000000..b00e4caa
--- /dev/null
+++ b/src/layout copy/components/TagsView/ScrollPane.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index b5ec9bc2..3480cd75 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -3,7 +3,7 @@
+
+
+
+
-
-
+
+
{{ generateTitle(tag.meta.title) }}
-
-
-
+
-
刷新 @@ -68,7 +47,7 @@ import { ref, watch, onMounted, -ComponentInternalInstance, + ComponentInternalInstance, } from "vue"; import path from "path-browserify"; @@ -155,7 +134,6 @@ function addTags() { if (route.name) { tagsView.addView(route); } - return false; } function moveToCurrentTag() { @@ -188,7 +166,7 @@ function isFirstView() { try { return ( (selectedTag.value as TagView).fullPath === - visitedViews.value[1].fullPath || + visitedViews.value[1].fullPath || (selectedTag.value as TagView).fullPath === "/index" ); } catch (err) { @@ -303,7 +281,7 @@ function handleScroll() { onMounted(() => { initTags(); - addTags(); + addTags(); }); diff --git a/src/types/api/base.d.ts b/src/types/api/base.d.ts deleted file mode 100644 index d934383c..00000000 --- a/src/types/api/base.d.ts +++ /dev/null @@ -1,11 +0,0 @@ - -export interface PageQueryParam { - pageNum: number, - pageSize: number -} - -export interface PageResult { - list: T, - total: number -} - diff --git a/src/types/api/oms/order.d.ts b/src/types/api/oms/order.d.ts deleted file mode 100644 index f4b941d5..00000000 --- a/src/types/api/oms/order.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { PageQueryParam, PageResult } from "../base" - -/** - * 订单查询参数类型声明 - */ -export interface OrderQueryParam extends PageQueryParam { - orderSn: string | undefined; - status: number | undefined; -} - -/** - * 订单分页列表项声明 - */ -export interface Order { - id: string; - orderSn: string; - totalAmount: string; - payAmount: string; - payType: number; - status: number; - totalQuantity: number; - gmtCreate: string; - memberId: string; - sourceType: number; - orderItems: OrderItem[]; -} -export interface OrderItem { - id: string; - orderId: string; - skuId: string; - skuName: string; - picUrl: string; - price: string; - count: number; - totalAmount: number; -} - -/** - * 订单分页项类型声明 - */ -export type OrderPageResult = PageResult { - title?: string -} - -export interface TagsViewState{ - visitedViews: TagView[], - cachedViews: (string)[] -} - -/** - * 用户状态类型声明 - */ - export interface UserState { - token: string, - nickname: string, - avatar: string, - roles: string[], - perms: string[] -} diff --git a/src/views/lab/seata/index.vue b/src/views/lab/seata/index.vue new file mode 100644 index 00000000..cb4d9e57 --- /dev/null +++ b/src/views/lab/seata/index.vue @@ -0,0 +1,316 @@ + + + + + + + ++ + + \ No newline at end of file diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue index 451622c7..dfdab1e3 100644 --- a/src/views/oms/order/index.vue +++ b/src/views/oms/order/index.vue @@ -1,3 +1,122 @@ + + + + ++ + ++ 模拟订单支付流程： + 扣减商品库存 → 扣减会员余额 → 修改订单状态 +
++ 分布式事务生效判断： +
+ +全部成功 + 或 +全部失败 ++ 博客教程： +
++ https://www.cnblogs.com/haoxianrui ++ + ++ ++ ++ ++ + ++ + +订单支付 +刷新数据 ++ +重置数据 ++ ++ + ++ + ++ 商品信息 + + + +++ +++ {{ seataData.skuInfo.name }} + ++ + ++ {{ cacheSeataData.stockNum }} 部 ++ + {{ seataData.skuInfo.stockNum }} 部 + ++ ++ +++ 修改成功 + ++ 修改失败 + ++ + ++ + ++ 会员信息 + + + ++ ++ +++ {{ seataData.memberInfo.nickName }} + ++ ++ {{ (cacheSeataData.balance as any) / 100 }} 元 ++ {{ (seataData.memberInfo.balance as any) / 100 }} 元 + ++ ++ +++ 修改成功 + ++ 修改失败 + ++ + ++ + ++ 订单信息 + + 搞点异常 + ++ {{ seataData.orderInfo.orderSn }} + + ++ + ++++ 待支付 + ++ ++ 待支付 +已支付 + ++++ 修改成功 + ++ 修改失败 + +@@ -116,118 +235,5 @@- - diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue index 00ef8e78..0dadcb1b 100644 --- a/src/views/pms/brand/index.vue +++ b/src/views/pms/brand/index.vue @@ -1,76 +1,10 @@ - -- -- + + + +- - - -- -新增 -删除 -- - -- - -搜索 -重置 -- - - -- - - - - -- - -- -
- -
- - - - -- - - - - - - -- - - - - -- - -- - - -- - -- + ++ + diff --git a/src/views/pms/category/index.vue b/src/views/pms/category/index.vue index f4eb0b90..7abc51bc 100644 --- a/src/views/pms/category/index.vue +++ b/src/views/pms/category/index.vue @@ -1,34 +1,11 @@ - -+ + + ++ + +新增 +删除 ++ + ++ + +搜索 +重置 ++ + + ++ + + + + ++ + ++ +
+ +
+ + + + ++ + + + + + + ++ + + + + ++ + ++ + + ++ + ++ -- + + + +- -- - -- - -- 商品分类 - - - - -- - -- {{category.name}} 规格属性 - - - - - - ++ + diff --git a/src/views/pms/goods/components/GoodsInfo.vue b/src/views/pms/goods/components/GoodsInfo.vue index dcab4c24..96e1d3a0 100644 --- a/src/views/pms/goods/components/GoodsInfo.vue +++ b/src/views/pms/goods/components/GoodsInfo.vue @@ -146,13 +146,13 @@ function handleNext() { .filter((item) => item.main == true && item.url) .map((item) => item.url); if (mainPicUrl && mainPicUrl.length > 0) { - goodsInfo.picUrl = mainPicUrl[0]; + goodsInfo.value.picUrl = mainPicUrl[0]; } const subPicUrl = state.pictures .filter((item) => item.main == false && item.url) .map((item) => item.url); if (subPicUrl && subPicUrl.length > 0) { - goodsInfo.subPicUrls = subPicUrl; + goodsInfo.value.subPicUrls = subPicUrl; } emit("next"); } diff --git a/src/views/pms/goods/components/GoodsStock.vue b/src/views/pms/goods/components/GoodsStock.vue index 196a9577..9cb5d6b1 100644 --- a/src/views/pms/goods/components/GoodsStock.vue +++ b/src/views/pms/goods/components/GoodsStock.vue @@ -203,7 +203,6 @@ watch(() => goodsInfo.value.categoryId, (newVal) => { }); } - }, { immediate: true, diff --git a/src/views/pms/goods/detail.vue b/src/views/pms/goods/detail.vue index 30592718..a042c3ae 100644 --- a/src/views/pms/goods/detail.vue +++ b/src/views/pms/goods/detail.vue @@ -33,10 +33,10 @@ const state = reactive({ loaded: false, active: 0, goodsInfo: { - album: [] as string[], - attrList: [] as any[], - specList: [] as any[], - skuList: [] as any[] + album: [], + attrList: [], + specList: [], + skuList: [] } as GoodsDetail }); @@ -48,8 +48,8 @@ function loadData() { if (goodsId) { getGoodsDetail(goodsId).then((response) => { state.goodsInfo = response.data - state.goodsInfo.originPrice = state.goodsInfo.originPrice / 100 - state.goodsInfo.price = state.goodsInfo.price / 100 + state.goodsInfo.originPrice = (state.goodsInfo.originPrice as any) / 100 + state.goodsInfo.price = (state.goodsInfo.price as any) / 100 state.loaded = true }) } else { diff --git a/src/views/pms/goods/index.vue b/src/views/pms/goods/index.vue index 60babd20..197f02f6 100644 --- a/src/views/pms/goods/index.vue +++ b/src/views/pms/goods/index.vue @@ -1,8 +1,129 @@ + + + + ++ ++ + ++ + ++ 商品分类 + + + + ++ + ++ {{category.name}} 规格属性 + + + + + + - 发布商品 - - diff --git a/src/views/sms/advert/index.vue b/src/views/sms/advert/index.vue index a8c5f7b2..d5bea75d 100644 --- a/src/views/sms/advert/index.vue +++ b/src/views/sms/advert/index.vue @@ -1,102 +1,9 @@ - - - -- + + + + +- - -- - -新增 -删除 -- -- - -搜索 -重置 -- - - -- - - - - -- - -- -
- -
- - - - -开启 -关闭 - -- - - -- - - - - - - -- - - - - -- - -- - - -- ~ - - - - -- - - -- - - -- -开启 -关闭 -- - -- - -- + ++ \ No newline at end of file diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue index 02c9d5e9..39ee3172 100644 --- a/src/views/system/client/index.vue +++ b/src/views/system/client/index.vue @@ -1,3 +1,174 @@ + + + + ++ + ++ + +新增 +删除 ++ ++ + +搜索 +重置 ++ + + ++ + + + + ++ + ++ +
+ +
+ + + + +开启 +关闭 + ++ + + ++ + + + + + + ++ + + + + ++ + ++ + + ++ ~ + + + + ++ + + ++ + + ++ +开启 +关闭 ++ + ++ + ++ @@ -126,168 +297,4 @@- - - + \ No newline at end of file diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 322387e1..ce942da3 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -1,85 +1,9 @@ - --- + + + +- - -- - -新增 -删除 - -- - -- - -- -- - - -- 搜索 - -重置 -- - - -- - - - - -正常 -禁用 - -- - - - -- -- - -- - -- -- - - - - -- -- - -- - -- - -- -正常 -禁用 -++ diff --git a/src/views/system/dict/components/Dict.vue b/src/views/system/dict/components/Dict.vue index 8fc969e0..23be833c 100644 --- a/src/views/system/dict/components/Dict.vue +++ b/src/views/system/dict/components/Dict.vue @@ -1,3 +1,10 @@ + + ++ + ++ + +新增 +删除 + ++ + ++ + ++ ++ + + ++ 搜索 + +重置 ++ + + ++ + + + + +正常 +禁用 + ++ + + + ++ ++ + ++ + ++ ++ + + + + ++ ++ + ++ + ++ + ++ +正常 +禁用 +diff --git a/src/views/system/menu/components/Menu.vue b/src/views/system/menu/components/Menu.vue index f724ad2d..074b0f62 100644 --- a/src/views/system/menu/components/Menu.vue +++ b/src/views/system/menu/components/Menu.vue @@ -57,26 +57,30 @@- - - 否 -是 ++ -+ 菜单 +目录 +外链 + + + + + + ++ + src/views/ .vue - -- - @@ -93,6 +97,10 @@ ++ ++ 显示 @@ -104,9 +112,7 @@- + @@ -125,7 +131,6 @@ import { reactive, ref, onMounted, toRefs } from "vue"; import { Search, Plus, Edit, Refresh, Delete } from "@element-plus/icons-vue"; import { ElForm, ElMessage, ElMessageBox, ElPopover } from "element-plus"; -import { isExternal } from "@/utils/validate"; import { Dialog, Option, @@ -164,20 +169,28 @@ const state = reactive({ dialog: { visible: false } as Dialog, formData: { parentId: "0", + name: '', visible: 1, sort: 1, - component: "Layout", + component: 'Layout', + type: 'MENU' } as MenuFormData, rules: { parentId: [{ required: true, message: "请选择顶级菜单", trigger: "blur" }], name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }], - component: [{ required: true, message: "请输入页面路径", trigger: "blur" }], + type: [{ required: true, message: "请选择菜单类型", trigger: "blur" }], + path: [{ required: true, message: "请输入路由路径", trigger: "blur" }], + component: [{ required: true, message: "请输入组件完整路径", trigger: "blur" }] }, menuOptions: [] as Option[], currentRow: undefined, - isExternalPath: false, // Icon选择器显示状态 - iconSelectVisible: false + iconSelectVisible: false, + cacheData: { + menuType: '', + menuPath: '' + } + }); const { @@ -188,8 +201,8 @@ const { formData, rules, menuOptions, - isExternalPath, - iconSelectVisible + iconSelectVisible, + cacheData } = toRefs(state); /** @@ -237,26 +250,29 @@ async function handleAdd(row: any) { title: "添加菜单", visible: true }; - if (row.id) { - // 行点击新增 + if (row.id) { // 行点击新增 + state.formData.parentId = row.id; if (row.id == '0') { - state.formData.component = "Layout"; + state.formData.type = 'CATALOG'; } else { - state.formData.component = undefined; + state.formData.type = 'MENU'; } - } else { + } else { // 工具栏新增 if (state.currentRow) { - // 工具栏新增 state.formData.parentId = (state.currentRow as any).id; - state.formData.component = undefined; + state.formData.type = 'MENU'; } else { state.formData.parentId = "0"; - state.formData.component = "Layout"; + state.formData.type = 'CATALOG'; } } } + +/** + * 修改弹窗 + */ async function handleUpdate(row: any) { await loadMenuData(); state.dialog = { @@ -266,13 +282,25 @@ async function handleUpdate(row: any) { const id = row.id || state.ids; getMenuDetail(id).then(({ data }) => { state.formData = data; - // 判断是否外部链接 - state.isExternalPath = isExternal(state.formData.path); + cacheData.value.menuType = data.type + cacheData.value.menuPath = data.path }); } /** - * 菜单表单提交 + * 菜单类型change事件 + */ +function handleMenuTypeChange(val: any) { + if (val !== cacheData.value.menuType) { + formData.value.path = '' + } else { + formData.value.path = cacheData.value.menuPath + } +} + + +/** + * 菜单提交 */ function submitForm() { dataFormRef.value.validate((isValid: boolean) => { @@ -326,7 +354,6 @@ function selected(name: string) { state.iconSelectVisible = false; } - onMounted(() => { handleQuery(); }); diff --git a/src/views/system/role/components/Menu.vue b/src/views/system/role/components/Menu.vue index 3c09e192..7023bd72 100644 --- a/src/views/system/role/components/Menu.vue +++ b/src/views/system/role/components/Menu.vue @@ -1,33 +1,23 @@ - - - + + + +- ++ + diff --git a/src/views/system/role/components/Perm.vue b/src/views/system/role/components/Perm.vue index db2ff797..40fca0d6 100644 --- a/src/views/system/role/components/Perm.vue +++ b/src/views/system/role/components/Perm.vue @@ -7,7 +7,7 @@+ + ++ +展开/折叠 ++ +提交 ++ - @@ -36,7 +36,7 @@ import { onMounted, reactive, toRefs, watch } from "vue"; import { listPerms } from "@/api/system/perm"; import { listRolePerms, saveRolePerms } from "@/api/system/role"; import { ElMessage } from "element-plus"; -import { Check } from "@element-plus/icons-vue"; +import { Position } from "@element-plus/icons-vue"; import { PermQueryParam } from "@/types"; const props = defineProps({ diff --git a/src/views/system/role/components/Role.vue b/src/views/system/role/components/Role.vue index 5d02b22a..c480bda2 100644 --- a/src/views/system/role/components/Role.vue +++ b/src/views/system/role/components/Role.vue @@ -1,72 +1,9 @@ - -提交 +提交 - -- + + + + +- - - -- - -新增 -删除 -- - -- - -搜索 -重置 -- - - -- - - - - -- - - - - - - -- - - - - -- - -- - - -- - - -- - -- -正常 -停用 -+ ++ + + \ No newline at end of file diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index cb85f71b..9415c755 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -1,189 +1,9 @@ - -+ + + ++ + +新增 +删除 ++ + ++ + +搜索 +重置 ++ + + ++ + + + + ++ + + + + + + ++ + + + + ++ + ++ + + ++ + + ++ + ++ +正常 +停用 +-- + + + +- - - - -- - - -- -- - - -- -- - -- -- - -- - -新增 -删除 -- - -- - - -- -- - - -搜索 -重置 -- -- -- 导入 - - -- - -下载模板 -导入数据 -导出 -- - -- - - - - - - - - - - - -- - - - - -- - - - - - - -- - - - -- - -- - - -- - - -- - - -- - - -- - - -- -正常 -禁用 -- - -- -- - - - -- -- - -- - - - -- - -- - - -- -- - -- -- -- - 将文件拖到此处，或 - 点击上传 -- -xls/xlsx files- -++ diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue index 17ba70cb..d07b913c 100644 --- a/src/views/ums/member/index.vue +++ b/src/views/ums/member/index.vue @@ -1,3 +1,67 @@ + + + + ++ + + + ++ + + ++ ++ + + ++ ++ + ++ ++ + ++ + +新增 +删除 ++ + ++ + + ++ ++ + + +搜索 +重置 ++ ++ ++ 导入 + + ++ + +下载模板 +导入数据 +导出 ++ + ++ + + + + + + + + + + + ++ + + + + ++ + + + + + + ++ + + + ++ + ++ + + ++ + + ++ + + ++ + + ++ + + ++ +正常 +禁用 ++ + ++ ++ + + + ++ ++ + ++ + + + ++ + ++ + + ++ ++ + ++ ++ ++ + 将文件拖到此处，或 + 点击上传 ++ +xls/xlsx files+ +- -@@ -81,62 +145,5 @@