diff --git a/public/static/editor.html b/public/static/editor.html index 29333ec..70161bf 100644 --- a/public/static/editor.html +++ b/public/static/editor.html @@ -193,26 +193,10 @@ // debugger // editor.setDocument("text/lake", ' '); console.log("event", event); - if (event.data.jobInfoYuQue) { - editor.setDocument("text/lake", event.data.jobInfoYuQue); - }else if(event.data.jobInfo){ - let arr = event.data.jobInfo.split("\n"); - console.log(arr); - // let arr = event.data.trim().split("\n"); - let newArr = []; - arr.forEach((item, index) => { - if (index >= 1) { - let item1 = "

" + item + "

"; - newArr.push(item1); - } - }); - var data = newArr.join(" "); - desp = data.replace(/[*]+/g, ""); - console.log(desp); - // 然后就可以获得vue传过来的数据 - console.log("从vue中获得的数据", event); - editor.setDocument("text/lake", desp); - } + var data = event.data; + // 然后就可以获得vue传过来的数据 + console.log("从vue中获得的数据", data); + editor.setDocument("text/lake", data); // var data = event.data.replace(/\n/g, "
"); // desp = data.replace(/[*]+/g, ''); }, diff --git a/src/router/index.js b/src/router/index.js index 47b7de5..d7d7071 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,4 +1,5 @@ import { createRouter, createWebHistory, createWebHashHistory } from 'vue-router' +import noticeData from './modules/message.js'; const router = createRouter({ @@ -53,9 +54,9 @@ const router = createRouter({ meta: { title: '消息通知', }, - component: () => import("../views/homePage/message.vue") + component: () => import("../views/message/index.vue") } - ] + ].concat(noticeData) }, { path: '/login', diff --git a/src/router/modules/message.js b/src/router/modules/message.js new file mode 100644 index 0000000..b205fd7 --- /dev/null +++ b/src/router/modules/message.js @@ -0,0 +1,21 @@ +let data = [ + { + path: "/merchantManagement/messageAdd", + name: "messageAdd", + meta: { + title: '新增通知', + }, + groupName: '消息通知', + component: () => import("../../views/message/add.vue") + }, + { + path: "/merchantManagement/messageEdit", + name: "messageEdit", + meta: { + title: '编辑通知', + }, + groupName: '消息通知', + component: () => import("../../views/message/add.vue") + }, +]; +export default data; \ No newline at end of file diff --git a/src/views/components/breadcrumb.vue b/src/views/components/breadcrumb.vue index 29b7f57..7ddc78c 100644 --- a/src/views/components/breadcrumb.vue +++ b/src/views/components/breadcrumb.vue @@ -79,6 +79,12 @@ watch( } else if (val.name == "recruit") { secondTitle.value = "配置详情"; firstTitle.value = "小程序配置"; + } else if (val.name == "messageAdd") { + secondTitle.value = "新增通知"; + firstTitle.value = "消息通知"; + } else if (val.name == "messageEdit") { + secondTitle.value = "编辑通知"; + firstTitle.value = "消息通知"; } }, { @@ -113,6 +119,8 @@ const pushFirstPage = () => { router.push("/merchantManagement/downstream"); } else if (firstTitle.value == "小程序配置") { router.push("/merchantManagement/miniProgramList"); + } else if (firstTitle.value == "消息通知") { + router.push("/merchantManagement/message"); } }; diff --git a/src/views/homePage/projectData.vue b/src/views/homePage/projectData.vue index f39feab..0ba14a9 100644 --- a/src/views/homePage/projectData.vue +++ b/src/views/homePage/projectData.vue @@ -57,7 +57,7 @@
- +