diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 9961c2e..636ea35 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -9,102 +9,47 @@
+
+
\ No newline at end of file
diff --git a/src/router/modules/cityPartner.js b/src/router/modules/cityPartner.js
index 0a5a229..bd84a36 100644
--- a/src/router/modules/cityPartner.js
+++ b/src/router/modules/cityPartner.js
@@ -1,21 +1,12 @@
import BasicLayout from '@/layouts/home';
-const meta = {};
-
-const pre = 'cityPartner-';
-
export default {
path: '/cityPartner',
- name: 'cityPartner',
- redirect: {
- name: `${pre}list`
- },
- meta,
component: BasicLayout,
children: [
{
- name: `${pre}list`,
- path: `list`,
+ name: `cityPartner`,
+ path: `/cityPartner`,
component: () => import('@/pages/cityPartner/list'),
meta: { title: '城市合伙人' }
},
diff --git a/src/router/modules/devPlatform.js b/src/router/modules/devPlatform.js
index 7bd6203..83dd396 100644
--- a/src/router/modules/devPlatform.js
+++ b/src/router/modules/devPlatform.js
@@ -1,21 +1,12 @@
import BasicLayout from '@/layouts/home';
-const meta = {};
-
-const pre = 'devPlatform-';
-
export default {
path: '/devPlatform',
- name: 'devPlatform',
- redirect: {
- name: `${pre}list`
- },
- meta,
component: BasicLayout,
children: [
{
- name: `${pre}list`,
- path: `list`,
+ name: `devPlatform`,
+ path: `/devPlatform`,
component: () => import('@/pages/devPlatform/list'),
meta: { title: '开发者平台' }
},
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index ec9fd1d..00c357a 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -1,21 +1,12 @@
import BasicLayout from '@/layouts/home';
-const meta = {};
-
-const pre = 'index-';
-
export default {
path: '/index',
- name: 'index',
- redirect: {
- name: `${pre}list`
- },
- meta,
component: BasicLayout,
children: [
{
- name: `${pre}list`,
- path: `list`,
+ name: `index`,
+ path: `/index`,
component: () => import('@/pages/index/list'),
meta: { title: '首页' }
},
diff --git a/src/router/modules/occupationlab.js b/src/router/modules/occupationlab.js
new file mode 100644
index 0000000..20cafbe
--- /dev/null
+++ b/src/router/modules/occupationlab.js
@@ -0,0 +1,14 @@
+import BasicLayout from '@/layouts/home';
+
+export default {
+ path: '/occupationlab',
+ component: BasicLayout,
+ children: [
+ {
+ name: `occupationlab`,
+ path: `/occupationlab`,
+ component: () => import('@/pages/occupationlab/list'),
+ meta: { title: '职站' }
+ },
+ ]
+};
diff --git a/src/router/permission.js b/src/router/permission.js
index 32e4f92..b4c1679 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -1,16 +1,7 @@
import router from "./index";
import Setting from "@/setting";
-import util from "@/libs/util";
-const whiteList = Setting.whiteList // 白名单
router.beforeEach((to, from, next) => {
- document.title = Setting.titleSuffix;
- const role = util.local.get(Setting.tokenKey);
- if (!role && !whiteList.includes(to.path)) {
- next('/login')
- } else if(role && to.path === '/login') {
- next('/station')
- } else {
- next()
- }
-});
\ No newline at end of file
+ document.title = Setting.titleSuffix
+ next()
+})
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index 1410ff4..ded80c9 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -3,16 +3,12 @@
* */
const url = location.host;
const isDev = process.env.NODE_ENV === "development"; // 开发环境
-const isHh = url.includes("10.196.131.73"); //是否河海版本
-const isCH = url.includes("124.71.12.62"); //是否巢湖版本
const isPro = url.includes("occupationlab.com"); //是否职站生产
const isTest = url.includes('121.37.12.51'); //是否中台测试服
let systemPath = `${location.origin}/banksystem`
let host = `${location.origin}/`
let uploadURL = `http://121.37.12.51/`
-let title = (isHh || isCH) ? '学生端' : '职站'
-
if (isPro) {
// 职站生产
uploadURL = `https://www.huorantech.cn/`
@@ -30,7 +26,7 @@ const Setting = {
* 基础配置
* */
platformId: 1, // 平台标识，1职站，2数据平台，3中台
- titleSuffix: title, // 网页标题的后缀
+ titleSuffix: '或然官网', // 网页标题的后缀
routerMode: "hash", // 路由模式，可选值为 history 或 hash
showProgressBar: true, // 页面切换时，是否显示模拟的进度条
apiBaseURL: host, // 接口请求地址
@@ -41,8 +37,8 @@ const Setting = {
errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
cookiesExpires: 1, // Cookies 默认保存时间，单位：天
tokenExpires: 1296000000, // token在localStorage的时间(毫秒)
- tokenKey: "oc_client_token", // localStorage里保存的token的key
- storeKey: "oc_client_store", // localStorage里保存的vuex的key
+ tokenKey: "official_token", // localStorage里保存的token的key
+ storeKey: "official_store", // localStorage里保存的vuex的key
initialPassword: "111aaa", // 默认密码
isDev,
isTest,
@@ -50,7 +46,7 @@ const Setting = {
/**
* 路由白名单
* */
- whiteList: ['/login', '/index/list', '/cityPartner/list', '/devPlatform/list', '/log/list', '/touristMatch/list', '/touristMatch/details', '/touristMatch/noticeDetail'],
+ whiteList: ['/login', '/index/list', '/cityPartner/list', '/devPlatform/list'],
/**
* 平台列表
* */