Merge branch 'master' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/LiaoningYaopinIframe

src/App.vue

@@ -20,31 +20,37 @@ export default {
       },
     };
   },
+
   mounted() {
-    // 获取地址栏参数
+    // // 获取地址栏参数
-    var queryString = window.location.search;
+    // var queryString = window.location.search;
-    // 创建 URLSearchParams 对象
+    // // 创建 URLSearchParams 对象
-    var params = new URLSearchParams(queryString);
+    // var params = new URLSearchParams(queryString);
-    // 创建空的 JSON 对象
+    // // 创建空的 JSON 对象
+    // var obj = {};
+    // // 遍历参数，并将其添加到 JSON 对象中
+    // params.forEach(function (value, key) {
+    //   // 对地址栏参数进行解码
+    //   var decodedValue = decodeURIComponent(value);
+    //   obj[key] = decodedValue;
+    // });
     var obj = {};
-    // 遍历参数，并将其添加到 JSON 对象中
+    window.addEventListener("message", function (event) {
-    params.forEach(function (value, key) {
+      console.log(event);
-      // 对地址栏参数进行解码
+      obj = event.data.data;
-      var decodedValue = decodeURIComponent(value);
+      console.log(obj);
-      obj[key] = decodedValue;
+      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);
   },
 };
 /**

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) => {
+router.beforeEach((to, from, next) => {
-
+  next()
-    next()
-
 })
 router.afterEach(() => {
   NProgress.done();

src/views/firmContent/components/dialogTitle/index.vue

@@ -22,8 +22,6 @@
   
 </template>
 <script>
-import { stringify } from 'querystring';
-
 export default {
    name:"dialogTitle",
    data() {