diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue index 4f0d9c3..4e087c7 100644 --- a/src/layouts/home/index.vue +++ b/src/layouts/home/index.vue @@ -1,6 +1,5 @@ diff --git a/src/setting.js b/src/setting.js index 906cc9b..1944fe4 100644 --- a/src/setting.js +++ b/src/setting.js @@ -2,8 +2,7 @@ * 业务配置 * */ const url = location.host; -const isDev = process.env.NODE_ENV === "development"; // 开发环境 -const isPro = url.includes("occupationlab.com"); //是否生产 +const isDev = process.env.NODE_ENV === 'development' // 开发环境 let host = `${location.origin}:10000/` if (isDev) { host = 'http://192.168.31.136:10000/' // 测试服 @@ -25,7 +24,6 @@ const Setting = { cookiesExpires: 1, // Cookies 默认保存时间,单位:天 tokenExpires: 1296000000, // token在localStorage的时间(毫秒) isDev, - isPro, /** * 路由白名单 * */ diff --git a/src/styles/common.scss b/src/styles/common.scss index 8a45ee4..2c795d4 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -1,8 +1,8 @@ @import "./default/index.scss"; @font-face { - font-family: youshe; - src: url('font/YouSheBiaoTiHei.ttf'); + font-family: PingFang; + src: url('font/PingFang-Regular.otf'); } [v-cloak] { display: none; diff --git a/src/styles/font/PingFang-Regular.otf b/src/styles/font/PingFang-Regular.otf new file mode 100644 index 0000000..11032b6 Binary files /dev/null and b/src/styles/font/PingFang-Regular.otf differ diff --git a/src/styles/font/YouSheBiaoTiHei.ttf b/src/styles/font/YouSheBiaoTiHei.ttf deleted file mode 100644 index 3729151..0000000 Binary files a/src/styles/font/YouSheBiaoTiHei.ttf and /dev/null differ diff --git a/src/styles/layout/index.scss b/src/styles/layout/index.scss index b8e9e56..551bc53 100644 --- a/src/styles/layout/index.scss +++ b/src/styles/layout/index.scss @@ -11,7 +11,7 @@ body, body { min-width: 1280px; - font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif; + font-family: PingFang, PingFang SC, "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif; font-size: 14px; background: #F0F2F5; } \ No newline at end of file