diff --git a/src/App.vue b/src/App.vue index d882b11..795d18f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,31 +20,37 @@ export default { }, }; }, + mounted() { - // 获取地址栏参数 - var queryString = window.location.search; - // 创建 URLSearchParams 对象 - var params = new URLSearchParams(queryString); - // 创建空的 JSON 对象 + // // 获取地址栏参数 + // var queryString = window.location.search; + // // 创建 URLSearchParams 对象 + // var params = new URLSearchParams(queryString); + // // 创建空的 JSON 对象 + // var obj = {}; + // // 遍历参数,并将其添加到 JSON 对象中 + // params.forEach(function (value, key) { + // // 对地址栏参数进行解码 + // var decodedValue = decodeURIComponent(value); + // obj[key] = decodedValue; + // }); var obj = {}; - // 遍历参数,并将其添加到 JSON 对象中 - params.forEach(function (value, key) { - // 对地址栏参数进行解码 - var decodedValue = decodeURIComponent(value); - obj[key] = decodedValue; + window.addEventListener("message", function (event) { + console.log(event); + obj = event.data.data; + console.log(obj); + if (obj.token) { + localStorage.setItem("MSSM-LIAONING__TOKEN", obj.token); + } else { + this.$alert("token不能为空", "提示", { + confirmButtonText: "返回", + callback: (action) => { + this.$router.go(-1); + }, + }); + } + this.$store.commit("app/URLChange", obj); }); - console.log("obj",obj); - if (obj.token) { - localStorage.setItem("MSSM-LIAONING__TOKEN", obj.token); - } else { - this.$alert("暂无token", "提示", { - confirmButtonText: "返回", - callback: (action) => { - this.$router.go(-1); - }, - }); - } - this.$store.commit("app/URLChange", obj); }, }; /** diff --git a/src/permission.js b/src/permission.js index d45770f..50d4cc4 100644 --- a/src/permission.js +++ b/src/permission.js @@ -12,10 +12,8 @@ import axios from "axios"; NProgress.configure({ showSpinner: false }); const whiteList = ["/login", "/register"]; -router.beforeEach(async (to, from, next) => { - - next() - +router.beforeEach((to, from, next) => { + next() }) router.afterEach(() => { NProgress.done(); diff --git a/src/views/firmContent/components/dialogTitle/index.vue b/src/views/firmContent/components/dialogTitle/index.vue index 8e70322..6959665 100644 --- a/src/views/firmContent/components/dialogTitle/index.vue +++ b/src/views/firmContent/components/dialogTitle/index.vue @@ -22,8 +22,6 @@