diff --git a/.eslintrc.js b/.eslintrc.js index 2734abe..b4691da 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,12 +3,12 @@ module.exports = { env: { node: true, }, - extends: ["plugin:vue/vue3-essential", "eslint:recommended", "@vue/prettier"], + extends: ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/prettier'], parserOptions: { - parser: "babel-eslint", + parser: 'babel-eslint', }, rules: { - "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", - "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off", + 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', }, -}; +} diff --git a/.stylelintrc.js b/.stylelintrc.js index f521455..591e391 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -1,3 +1,3 @@ module.exports = { - extends: ["stylelint-config-recess-order", "stylelint-config-prettier"], -}; + extends: ['stylelint-config-recess-order', 'stylelint-config-prettier'], +} diff --git a/babel.config.js b/babel.config.js index 162a3ea..c1b783e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,3 +1,3 @@ module.exports = { - presets: ["@vue/cli-plugin-babel/preset"], -}; + presets: ['@vue/cli-plugin-babel/preset'], +} diff --git a/mock/controller/router.js b/mock/controller/router.js index eae70a7..5da2f49 100644 --- a/mock/controller/router.js +++ b/mock/controller/router.js @@ -22,38 +22,38 @@ */ const data = [ { - path: "/", - component: "Layout", - redirect: "/index", + path: '/', + component: 'Layout', + redirect: '/index', meta: { - title: "首页", - icon: "home-4-line", + title: '首页', + icon: 'home-4-line', affix: true, }, children: [ { - path: "index", - name: "Index", - component: "@/views/index", + path: 'index', + name: 'Index', + component: '@/views/index', meta: { - title: "首页", - icon: "home-4-line", + title: '首页', + icon: 'home-4-line', affix: true, }, }, ], }, -]; +] module.exports = [ { - url: "/menu/navigate", - type: "get", + url: '/menu/navigate', + type: 'get', response() { return { code: 200, - msg: "success", + msg: 'success', data, - }; + } }, }, -]; +] diff --git a/mock/controller/table.js b/mock/controller/table.js index f199b64..6e06468 100644 --- a/mock/controller/table.js +++ b/mock/controller/table.js @@ -1,65 +1,65 @@ -const { mock } = require("mockjs"); -const { handleRandomImage } = require("../utils"); -const List = []; -const count = 50; +const { mock } = require('mockjs') +const { handleRandomImage } = require('../utils') +const List = [] +const count = 50 for (let i = 0; i < count; i++) { List.push( mock({ - uuid: "@uuid", - id: "@id", - title: "@title(1, 2)", - description: "@csentence", - "status|1": ["published", "draft", "deleted"], - author: "@cname", - datetime: "@datetime", - pageViews: "@integer(300, 5000)", + uuid: '@uuid', + id: '@id', + title: '@title(1, 2)', + description: '@csentence', + 'status|1': ['published', 'draft', 'deleted'], + author: '@cname', + datetime: '@datetime', + pageViews: '@integer(300, 5000)', img: handleRandomImage(228, 228), - switch: "@boolean", - percent: "@integer(80,99)", - "rate|1": [1, 2, 3, 4, 5], + switch: '@boolean', + percent: '@integer(80,99)', + 'rate|1': [1, 2, 3, 4, 5], }) - ); + ) } module.exports = [ { - url: "/table/getList", - type: "get", + url: '/table/getList', + type: 'get', response(config) { - const { title, current = 1, pageSize = 10 } = config.query; + const { title, current = 1, pageSize = 10 } = config.query let mockList = List.filter((item) => { - return !(title && item.title.indexOf(title) < 0); - }); + return !(title && item.title.indexOf(title) < 0) + }) const pageList = mockList.filter( (item, index) => index < pageSize * current && index >= pageSize * (current - 1) - ); + ) return { code: 200, - msg: "success", + msg: 'success', total: mockList.length, data: pageList, - }; + } }, }, { - url: "/table/doEdit", - type: "post", + url: '/table/doEdit', + type: 'post', response() { return { code: 200, - msg: "模拟保存成功", - }; + msg: '模拟保存成功', + } }, }, { - url: "/table/doDelete", - type: "post", + url: '/table/doDelete', + type: 'post', response() { return { code: 200, - msg: "模拟删除成功", - }; + msg: '模拟删除成功', + } }, }, -]; +] diff --git a/mock/controller/user.js b/mock/controller/user.js index 0f4ffb6..325dd12 100644 --- a/mock/controller/user.js +++ b/mock/controller/user.js @@ -1,103 +1,103 @@ const accessTokens = { - admin: "admin-accessToken", - editor: "editor-accessToken", - test: "test-accessToken", -}; + admin: 'admin-accessToken', + editor: 'editor-accessToken', + test: 'test-accessToken', +} module.exports = [ { - url: "/login", - type: "post", + url: '/login', + type: 'post', response(config) { - const { username } = config.body; - const accessToken = accessTokens[username]; + const { username } = config.body + const accessToken = accessTokens[username] if (!accessToken) { return { code: 500, - msg: "帐户或密码不正确。", - }; + msg: '帐户或密码不正确。', + } } return { code: 200, - msg: "success", + msg: 'success', data: { accessToken }, - }; + } }, }, { - url: "/socialLogin", - type: "post", + url: '/socialLogin', + type: 'post', response(config) { - const { code } = config.body; + const { code } = config.body if (!code) { return { code: 500, - msg: "未成功获取Token。", - }; + msg: '未成功获取Token。', + } } return { code: 200, - msg: "success", - data: { accessToken: accessTokens["admin"] }, - }; + msg: 'success', + data: { accessToken: accessTokens['admin'] }, + } }, }, { - url: "/register", - type: "post", + url: '/register', + type: 'post', response() { return { code: 200, - msg: "模拟注册成功", - }; + msg: '模拟注册成功', + } }, }, { - url: "/userInfo", - type: "post", + url: '/userInfo', + type: 'post', response(config) { - const { accessToken } = config.body; - let roles = ["admin"]; - let ability = ["READ"]; - let username = "admin"; - if ("admin-accessToken" === accessToken) { - roles = ["admin"]; - ability = ["READ", "WRITE", "DELETE"]; - username = "admin"; + const { accessToken } = config.body + let roles = ['admin'] + let ability = ['READ'] + let username = 'admin' + if ('admin-accessToken' === accessToken) { + roles = ['admin'] + ability = ['READ', 'WRITE', 'DELETE'] + username = 'admin' } - if ("editor-accessToken" === accessToken) { - roles = ["editor"]; - ability = ["READ", "WRITE"]; - username = "editor"; + if ('editor-accessToken' === accessToken) { + roles = ['editor'] + ability = ['READ', 'WRITE'] + username = 'editor' } - if ("test-accessToken" === accessToken) { - roles = ["admin", "editor"]; - ability = ["READ"]; - username = "test"; + if ('test-accessToken' === accessToken) { + roles = ['admin', 'editor'] + ability = ['READ'] + username = 'test' } return { code: 200, - msg: "success", + msg: 'success', data: { roles, ability, username, - "avatar|1": [ - "https://i.gtimg.cn/club/item/face/img/2/15922_100.gif", - "https://i.gtimg.cn/club/item/face/img/8/15918_100.gif", + 'avatar|1': [ + 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif', + 'https://i.gtimg.cn/club/item/face/img/8/15918_100.gif', ], }, - }; + } }, }, { - url: "/logout", - type: "post", + url: '/logout', + type: 'post', response() { return { code: 200, - msg: "success", - }; + msg: 'success', + } }, }, -]; +] diff --git a/mock/index.js b/mock/index.js index ed86991..0b91890 100644 --- a/mock/index.js +++ b/mock/index.js @@ -3,14 +3,14 @@ * @description 导入所有 controller 模块,npm run serve时在node环境中自动输出controller文件夹下Mock接口,请勿修改。 */ -const { handleMockArray } = require("./utils"); +const { handleMockArray } = require('./utils') -const mocks = []; -const mockArray = handleMockArray(); +const mocks = [] +const mockArray = handleMockArray() mockArray.forEach((item) => { - const obj = require(item); - mocks.push(...obj); -}); + const obj = require(item) + mocks.push(...obj) +}) module.exports = { mocks, -}; +} diff --git a/mock/mockServer.js b/mock/mockServer.js index c0b6d45..5dfaeac 100644 --- a/mock/mockServer.js +++ b/mock/mockServer.js @@ -1,10 +1,10 @@ -const chokidar = require("chokidar"); -const bodyParser = require("body-parser"); -const chalk = require("chalk"); -const path = require("path"); -const Mock = require("mockjs"); -const { baseURL } = require("../src/config"); -const mockDir = path.join(process.cwd(), "mock"); +const chokidar = require('chokidar') +const bodyParser = require('body-parser') +const chalk = require('chalk') +const path = require('path') +const Mock = require('mockjs') +const { baseURL } = require('../src/config') +const mockDir = path.join(process.cwd(), 'mock') /** * @@ -12,21 +12,21 @@ const mockDir = path.join(process.cwd(), "mock"); * @returns {{mockStartIndex: number, mockRoutesLength: number}} */ const registerRoutes = (app) => { - let mockLastIndex; - const { mocks } = require("./index.js"); + let mockLastIndex + const { mocks } = require('./index.js') const mocksForServer = mocks.map((route) => { - return responseFake(route.url, route.type, route.response); - }); + return responseFake(route.url, route.type, route.response) + }) for (const mock of mocksForServer) { - app[mock.type](mock.url, mock.response); - mockLastIndex = app._router.stack.length; + app[mock.type](mock.url, mock.response) + mockLastIndex = app._router.stack.length } - const mockRoutesLength = Object.keys(mocksForServer).length; + const mockRoutesLength = Object.keys(mocksForServer).length return { mockRoutesLength: mockRoutesLength, mockStartIndex: mockLastIndex - mockRoutesLength, - }; -}; + } +} /** * @@ -38,57 +38,57 @@ const registerRoutes = (app) => { const responseFake = (url, type, respond) => { return { url: new RegExp(`${baseURL}${url}`), - type: type || "get", + type: type || 'get', response(req, res) { - res.status(200); - if (JSON.stringify(req.body) !== "{}") { - console.log(chalk.green(`> 请求地址:${req.path}`)); - console.log(chalk.green(`> 请求参数:${JSON.stringify(req.body)}\n`)); + res.status(200) + if (JSON.stringify(req.body) !== '{}') { + console.log(chalk.green(`> 请求地址:${req.path}`)) + console.log(chalk.green(`> 请求参数:${JSON.stringify(req.body)}\n`)) } else { - console.log(chalk.green(`> 请求地址:${req.path}\n`)); + console.log(chalk.green(`> 请求地址:${req.path}\n`)) } res.json( Mock.mock(respond instanceof Function ? respond(req, res) : respond) - ); + ) }, - }; -}; + } +} /** * * @param app */ module.exports = (app) => { - app.use(bodyParser.json()); + app.use(bodyParser.json()) app.use( bodyParser.urlencoded({ extended: true, }) - ); + ) - const mockRoutes = registerRoutes(app); - let mockRoutesLength = mockRoutes.mockRoutesLength; - let mockStartIndex = mockRoutes.mockStartIndex; + const mockRoutes = registerRoutes(app) + let mockRoutesLength = mockRoutes.mockRoutesLength + let mockStartIndex = mockRoutes.mockStartIndex chokidar .watch(mockDir, { ignored: /mock-server/, ignoreInitial: true, }) - .on("all", (event) => { - if (event === "change" || event === "add") { + .on('all', (event) => { + if (event === 'change' || event === 'add') { try { - app._router.stack.splice(mockStartIndex, mockRoutesLength); + app._router.stack.splice(mockStartIndex, mockRoutesLength) Object.keys(require.cache).forEach((item) => { if (item.includes(mockDir)) { - delete require.cache[require.resolve(item)]; + delete require.cache[require.resolve(item)] } - }); - const mockRoutes = registerRoutes(app); - mockRoutesLength = mockRoutes.mockRoutesLength; - mockStartIndex = mockRoutes.mockStartIndex; + }) + const mockRoutes = registerRoutes(app) + mockRoutesLength = mockRoutes.mockRoutesLength + mockStartIndex = mockRoutes.mockStartIndex } catch (error) { - console.log(chalk.red(error)); + console.log(chalk.red(error)) } } - }); -}; + }) +} diff --git a/mock/utils/index.js b/mock/utils/index.js index 7d6ef7c..e86b6d1 100644 --- a/mock/utils/index.js +++ b/mock/utils/index.js @@ -1,6 +1,6 @@ -const { Random } = require("mockjs"); -const { join } = require("path"); -const fs = require("fs"); +const { Random } = require('mockjs') +const { join } = require('path') +const fs = require('fs') /** * @author chuzhixin 1204505056@qq.com @@ -10,7 +10,7 @@ const fs = require("fs"); * @returns {string} */ function handleRandomImage(width = 50, height = 50) { - return `https://picsum.photos/${width}/${height}?random=${Random.guid()}`; + return `https://picsum.photos/${width}/${height}?random=${Random.guid()}` } /** @@ -19,25 +19,25 @@ function handleRandomImage(width = 50, height = 50) { * @returns {[]} */ function handleMockArray() { - const mockArray = []; + const mockArray = [] const getFiles = (jsonPath) => { - const jsonFiles = []; + const jsonFiles = [] const findJsonFile = (path) => { - const files = fs.readdirSync(path); + const files = fs.readdirSync(path) files.forEach((item) => { - const fPath = join(path, item); - const stat = fs.statSync(fPath); - if (stat.isDirectory() === true) findJsonFile(item); - if (stat.isFile() === true) jsonFiles.push(item); - }); - }; - findJsonFile(jsonPath); - jsonFiles.forEach((item) => mockArray.push(`./controller/${item}`)); - }; - getFiles("mock/controller"); - return mockArray; + const fPath = join(path, item) + const stat = fs.statSync(fPath) + if (stat.isDirectory() === true) findJsonFile(item) + if (stat.isFile() === true) jsonFiles.push(item) + }) + } + findJsonFile(jsonPath) + jsonFiles.forEach((item) => mockArray.push(`./controller/${item}`)) + } + getFiles('mock/controller') + return mockArray } module.exports = { handleRandomImage, handleMockArray, -}; +} diff --git a/prettier.config.js b/prettier.config.js index a7628ac..eb510f0 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -2,15 +2,15 @@ module.exports = { printWidth: 80, tabWidth: 2, useTabs: false, - semi: true, - singleQuote: false, - quoteProps: "as-needed", + semi: false, + singleQuote: true, + quoteProps: 'as-needed', jsxSingleQuote: false, - trailingComma: "es5", + trailingComma: 'es5', bracketSpacing: true, jsxBracketSameLine: false, - arrowParens: "always", - htmlWhitespaceSensitivity: "ignore", + arrowParens: 'always', + htmlWhitespaceSensitivity: 'ignore', vueIndentScriptAndStyle: true, - endOfLine: "lf", -}; + endOfLine: 'lf', +} diff --git a/src/App.vue b/src/App.vue index 54747ea..d13cb8d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,5 +2,5 @@ diff --git a/src/api/router.js b/src/api/router.js index 85ce309..fe1174c 100644 --- a/src/api/router.js +++ b/src/api/router.js @@ -1,9 +1,9 @@ -import request from "@/utils/request"; +import request from '@/utils/request' export function getRouterList(params) { return request({ - url: "/menu/navigate", - method: "get", + url: '/menu/navigate', + method: 'get', params, - }); + }) } diff --git a/src/api/table.js b/src/api/table.js index 44b59bb..90c2c87 100644 --- a/src/api/table.js +++ b/src/api/table.js @@ -1,25 +1,25 @@ -import request from "@/utils/request"; +import request from '@/utils/request' export function getList(params) { return request({ - url: "/table/getList", - method: "get", + url: '/table/getList', + method: 'get', params, - }); + }) } export function doEdit(data) { return request({ - url: "/table/doEdit", - method: "post", + url: '/table/doEdit', + method: 'post', data, - }); + }) } export function doDelete(data) { return request({ - url: "/table/doDelete", - method: "post", + url: '/table/doDelete', + method: 'post', data, - }); + }) } diff --git a/src/api/user.js b/src/api/user.js index a6110cc..2e49498 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,43 +1,43 @@ -import request from "@/utils/request"; -import { tokenName } from "@/config"; +import request from '@/utils/request' +import { tokenName } from '@/config' export async function login(data) { return request({ - url: "/login", - method: "post", + url: '/login', + method: 'post', data, - }); + }) } export async function socialLogin(data) { return request({ - url: "/socialLogin", - method: "post", + url: '/socialLogin', + method: 'post', data, - }); + }) } export function getUserInfo(accessToken) { //此处为了兼容mock.js使用data传递accessToken,如果使用mock可以走headers return request({ - url: "/userInfo", - method: "post", + url: '/userInfo', + method: 'post', data: { [tokenName]: accessToken, }, - }); + }) } export function logout() { return request({ - url: "/logout", - method: "post", - }); + url: '/logout', + method: 'post', + }) } export function register() { return request({ - url: "/register", - method: "post", - }); + url: '/register', + method: 'post', + }) } diff --git a/src/config/config.js b/src/config/config.js index 654afdf..11af816 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -2,8 +2,8 @@ * @description 导出自定义配置 **/ const config = { - layout: "vertical", + layout: 'vertical', donation: true, - templateFolder: "project", -}; -module.exports = config; + templateFolder: 'project', +} +module.exports = config diff --git a/src/config/default/index.js b/src/config/default/index.js index a16c191..15698c8 100644 --- a/src/config/default/index.js +++ b/src/config/default/index.js @@ -1,8 +1,8 @@ /** * @description 导出默认配置(通用配置|主题配置|网络配置) **/ -const setting = require("./setting.config"); -const theme = require("./theme.config"); -const network = require("./net.config"); +const setting = require('./setting.config') +const theme = require('./theme.config') +const network = require('./net.config') -module.exports = { setting, theme, network }; +module.exports = { setting, theme, network } diff --git a/src/config/default/net.config.js b/src/config/default/net.config.js index 961f934..53e6064 100644 --- a/src/config/default/net.config.js +++ b/src/config/default/net.config.js @@ -3,12 +3,12 @@ **/ const network = { //配后端数据的接收方式application/json;charset=UTF-8 或 application/x-www-form-urlencoded;charset=UTF-8 - contentType: "application/json;charset=UTF-8", + contentType: 'application/json;charset=UTF-8', //消息框消失时间 messageDuration: 3000, //最长请求时间 requestTimeout: 10000, //操作正常code,支持String、Array、int多种类型 successCode: [200, 0], -}; -module.exports = network; +} +module.exports = network diff --git a/src/config/default/setting.config.js b/src/config/default/setting.config.js index a9a15c0..1a88e98 100644 --- a/src/config/default/setting.config.js +++ b/src/config/default/setting.config.js @@ -3,77 +3,77 @@ */ const setting = { //开发以及部署时的URL,hash模式时在不确定二级目录名称的情况下建议使用""代表相对路径或者"/二级目录/",history模式默认使用"/"或者"/二级目录/" - publicPath: "", + publicPath: '', //生产环境构建文件的目录名 - outputDir: "dist", + outputDir: 'dist', //放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录。 - assetsDir: "static", + assetsDir: 'static', //开发环境每次保存时是否输出为eslint编译警告 lintOnSave: true, //进行编译的依赖 - transpileDependencies: ["vue-echarts", "resize-detector"], + transpileDependencies: ['vue-echarts', 'resize-detector'], //默认的接口地址 如果是开发环境和生产环境走vab-mock-server,当然你也可以选择自己配置成需要的接口地址 baseURL: - process.env.NODE_ENV === "development" ? "mock-server" : "mock-server", + process.env.NODE_ENV === 'development' ? 'mock-server' : 'mock-server', //标题 (包括初次加载雪花屏的标题 页面的标题 浏览器的标题) - title: "vue-admin-beautiful-antdv", + title: 'vue-admin-beautiful-antdv', //标题分隔符 - titleSeparator: " - ", + titleSeparator: ' - ', //标题是否反转 如果为false:"page - title",如果为ture:"title - page" titleReverse: false, //简写 - abbreviation: "vab-pro", + abbreviation: 'vab-pro', //开发环境端口号 - devPort: "9999", + devPort: '9999', //版本号 version: process.env.VUE_APP_VERSION, //pro版本copyright可随意修改 - copyright: "chuzhixin 1204505056@qq.com", + copyright: 'chuzhixin 1204505056@qq.com', //缓存路由的最大数量 keepAliveMaxNum: 99, //路由模式,可选值为 history 或 hash - routerMode: "hash", + routerMode: 'hash', //不经过token校验的路由 - routesWhiteList: ["/login", "/register", "/callback", "/404", "/403"], + routesWhiteList: ['/login', '/register', '/callback', '/404', '/403'], //加载时显示文字 - loadingText: "正在加载中...", + loadingText: '正在加载中...', //token名称 - tokenName: "accessToken", + tokenName: 'accessToken', //token在localStorage、sessionStorage、cookie存储的key的名称 - tokenTableName: "accessToken", + tokenTableName: 'accessToken', //token存储位置localStorage sessionStorage cookie - storage: "localStorage", + storage: 'localStorage', //token失效回退到登录页时是否记录本次的路由 recordRoute: true, //是否显示logo,不显示时设置false,显示时请填写remixIcon图标名称,暂时只支持设置remixIcon - logo: "vuejs-fill", + logo: 'vuejs-fill', //语言类型zh、en - i18n: "zh", + i18n: 'zh', //在哪些环境下显示高亮错误 - errorLog: ["development", "production"], + errorLog: ['development', 'production'], //是否开启登录拦截 loginInterception: true, //是否开启登录RSA加密 loginRSA: false, //intelligence(前端导出路由)和all(后端导出路由)两种方式 - authentication: "intelligence", + authentication: 'intelligence', //是否开启roles字段进行角色权限控制(如果是all模式后端完全处理角色并进行json组装,可设置false不处理路由中的roles字段) rolesControl: true, //vertical gallery comprehensive common布局时是否只保持一个子菜单的展开 uniqueOpened: false, //vertical布局时默认展开的菜单path,使用逗号隔开建议只展开一个 - defaultOpeneds: ["/vab"], + defaultOpeneds: ['/vab'], //需要加loading层的请求,防止重复提交 - debounce: ["doEdit"], + debounce: ['doEdit'], //需要自动注入并加载的模块 providePlugin: {}, //npm run build时是否自动生成7z压缩包 build7z: false, //代码生成机生成在view下的文件夹名称 - templateFolder: "project", + templateFolder: 'project', //是否显示终端donation打印 donation: false, //画廊布局和综合布局时,是否点击一级菜单默认开启第一个二级菜单 openFirstMenu: true, -}; -module.exports = setting; +} +module.exports = setting diff --git a/src/config/default/theme.config.js b/src/config/default/theme.config.js index c3d7082..0194ffb 100644 --- a/src/config/default/theme.config.js +++ b/src/config/default/theme.config.js @@ -3,9 +3,9 @@ */ const theme = { //布局种类 horizontal vertical gallery comprehensive common - layout: "horizontal", + layout: 'horizontal', //主题名称 default ocean green glory white - themeName: "default", + themeName: 'default', //是否固定头部 fixedHeader: true, //是否显示顶部进度条 @@ -24,5 +24,5 @@ const theme = { showNotice: true, //是否显示全屏组件 showFullScreen: true, -}; -module.exports = theme; +} +module.exports = theme diff --git a/src/config/index.js b/src/config/index.js index 6e9d80c..7e7403e 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -2,8 +2,8 @@ * @description 3个子配置,通用配置|主题配置|网络配置,建议在当前目录下修改config.js修改配置,会覆盖默认配置,也可以直接修改默认配置 */ //默认配置 -const { setting, theme, network } = require("./default"); +const { setting, theme, network } = require('./default') //自定义配置 -const config = require("./config"); +const config = require('./config') //导出配置(以自定义配置为主) -module.exports = Object.assign({}, setting, theme, network, config); +module.exports = Object.assign({}, setting, theme, network, config) diff --git a/src/layout/index.vue b/src/layout/index.vue index c349445..00c717b 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -48,13 +48,13 @@