Merge branches 'master' and 'master' of https://gitlab-pro.ezijing.com/ezijing-web/saas-dml

src/router/index.ts

@@ -15,12 +15,13 @@ router.beforeEach(async (to, from, next) => {
     } catch (e) {
       console.error(e)
     }
-    user.isLogin ? next() : next('/401')
-    return
+    if (!user.isLogin) {
+      next('/401')
+      return
+    }
   }
   if (!to.query.experiment_id) {
-    to.query.experiment_id = '7025368348925886464'
-    next({ path: to.path, query: to.query })
+    next({ path: to.path, query: { ...to.query, experiment_id: from.query.experiment_id || '7025368348925886464' } })
   } else {
     next()
   }

src/utils/axios.ts

@@ -13,10 +13,13 @@ const httpRequest = axios.create({
 // 请求拦截
 httpRequest.interceptors.request.use(
   function (config) {
+    const params = new URLSearchParams(window.location.search)
+
     if (config.method === 'get')
-      config.params = Object.assign({}, config.params, { experiment_id: '7025368348925886464' })
+      config.params = Object.assign({}, config.params, { experiment_id: params.get('experiment_id') })
 
-    if (config.method === 'post') config.data = Object.assign({}, config.data, { experiment_id: '7025368348925886464' })
+    if (config.method === 'post')
+      config.data = Object.assign({}, config.data, { experiment_id: params.get('experiment_id') })
 
     return config
   },