diff --git a/src/pages/notify/NotifyManagementCreate.vue b/src/pages/notify/NotifyCreate.vue similarity index 98% rename from src/pages/notify/NotifyManagementCreate.vue rename to src/pages/notify/NotifyCreate.vue index dc3bb6c..abb303b 100644 --- a/src/pages/notify/NotifyManagementCreate.vue +++ b/src/pages/notify/NotifyCreate.vue @@ -75,7 +75,7 @@ import { useNavBarStore } from "@/store/navBarStore"; import { useCurrentStoreStore } from "@/store/currentStoreStore"; defineOptions({ - name: "NotifyManagementCreate" + name: "NotifyCreate" }); const router = useRouter(); @@ -245,12 +245,12 @@ async function saveNotification(): Promise { Message.success(sendAt ? "定时通知已创建" : "通知已发送"); if (result.id) { await router.replace({ - name: "NotifyManagementDetail", + name: "NotifyDetail", params: { id: result.id } }); return; } - await router.replace({ name: "NotifyManagement" }); + await router.replace({ name: "NotifyList" }); } catch (error) { Message.error(getErrorMessage(error, "通知保存失败")); } finally { diff --git a/src/pages/notify/NotifyDetail.vue b/src/pages/notify/NotifyDetail.vue index 97628b9..bb7c2ee 100644 --- a/src/pages/notify/NotifyDetail.vue +++ b/src/pages/notify/NotifyDetail.vue @@ -1,78 +1,176 @@ diff --git a/src/pages/notify/NotifyManagement.vue b/src/pages/notify/NotifyManagement.vue deleted file mode 100644 index 8a38b1c..0000000 --- a/src/pages/notify/NotifyManagement.vue +++ /dev/null @@ -1,372 +0,0 @@ - - - - - diff --git a/src/pages/notify/NotifyManagementDetail.vue b/src/pages/notify/NotifyManagementDetail.vue deleted file mode 100644 index 0ba5b64..0000000 --- a/src/pages/notify/NotifyManagementDetail.vue +++ /dev/null @@ -1,422 +0,0 @@ - - - - - diff --git a/src/pages/notify/UserNotifyDetail.vue b/src/pages/notify/UserNotifyDetail.vue new file mode 100644 index 0000000..6d68bc7 --- /dev/null +++ b/src/pages/notify/UserNotifyDetail.vue @@ -0,0 +1,249 @@ + + + + + diff --git a/src/pages/notify/UserNotifyList.vue b/src/pages/notify/UserNotifyList.vue new file mode 100644 index 0000000..8850adb --- /dev/null +++ b/src/pages/notify/UserNotifyList.vue @@ -0,0 +1,434 @@ + + + + + diff --git a/src/router/routes/managementRoutes.ts b/src/router/routes/managementRoutes.ts index 39dc276..8f7f876 100644 --- a/src/router/routes/managementRoutes.ts +++ b/src/router/routes/managementRoutes.ts @@ -1,8 +1,8 @@ import type { RouteRecordRaw } from "vue-router"; import AppSettings from "@/pages/setting/AppSettings.vue"; -import NotifyManagement from "@/pages/notify/NotifyManagement.vue"; -import NotifyManagementCreate from "@/pages/notify/NotifyManagementCreate.vue"; -import NotifyManagementDetail from "@/pages/notify/NotifyManagementDetail.vue"; +import NotifyList from "@/pages/notify/NotifyList.vue"; +import NotifyCreate from "@/pages/notify/NotifyCreate.vue"; +import NotifyDetail from "@/pages/notify/NotifyDetail.vue"; import UserProfile from "@/pages/user/UserProfile.vue"; import UserPassword from "@/pages/user/UserPassword.vue"; import CustomerQrCode from "@/pages/customer/CustomerQrCode.vue"; @@ -102,8 +102,8 @@ export const managementSettingRoutes: RouteRecordRaw[] = [ }, { path: "/management/notifications", - name: "NotifyManagement", - component: NotifyManagement, + name: "NotifyList", + component: NotifyList, meta: { depth: 3, navBarVisible: true, @@ -116,8 +116,8 @@ export const managementSettingRoutes: RouteRecordRaw[] = [ }, { path: "/management/notifications/create", - name: "NotifyManagementCreate", - component: NotifyManagementCreate, + name: "NotifyCreate", + component: NotifyCreate, meta: { depth: 4, navBarVisible: true, @@ -130,8 +130,8 @@ export const managementSettingRoutes: RouteRecordRaw[] = [ }, { path: "/management/notifications/:id", - name: "NotifyManagementDetail", - component: NotifyManagementDetail, + name: "NotifyDetail", + component: NotifyDetail, meta: { depth: 4, navBarVisible: true, diff --git a/src/router/routes/notifyRoutes.ts b/src/router/routes/notifyRoutes.ts index 3e55aa7..331e7d5 100644 --- a/src/router/routes/notifyRoutes.ts +++ b/src/router/routes/notifyRoutes.ts @@ -1,12 +1,12 @@ import type { RouteRecordRaw } from "vue-router"; -import NotifyDetail from "@/pages/notify/NotifyDetail.vue"; -import NotifyList from "@/pages/notify/NotifyList.vue"; +import UserNotifyDetail from "@/pages/notify/UserNotifyDetail.vue"; +import UserNotifyList from "@/pages/notify/UserNotifyList.vue"; const notifyRoutes: RouteRecordRaw[] = [ { path: "/notify", - name: "NotifyList", - component: NotifyList, + name: "UserNotifyList", + component: UserNotifyList, meta: { depth: 3, navBarVisible: true, @@ -19,8 +19,8 @@ const notifyRoutes: RouteRecordRaw[] = [ }, { path: "/notify/:id", - name: "NotifyDetail", - component: NotifyDetail, + name: "UserNotifyDetail", + component: UserNotifyDetail, meta: { depth: 4, navBarVisible: true,