diff --git a/src/router/index.js b/src/router/index.js index 0ac1a98..f7cb2cb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -402,8 +402,8 @@ const routes = [ component: Layout, redirect: '/order/index', meta: { - title: '订单管理', - icon: 'iconfont icon-a-SalesOrderManagement', + title: '订单与统计', + icon: 'iconfont icon-dingdantongji', roles: ['admin', 'editor'], tapName: 'admin' }, @@ -428,6 +428,16 @@ const routes = [ tapName: 'admin', hidden: true } + }, + { + path: '/order/stat', + component: () => import('@/views/layout/components/main/order/stat'), + meta: { + title: '销售统计', + icon: 'iconfont icon-data-view', + roles: ['admin', 'editor'], + tapName: 'admin' + } } ] }, diff --git a/src/styles/myIcon.scss b/src/styles/myIcon.scss index 5cbf69a..cace451 100644 --- a/src/styles/myIcon.scss +++ b/src/styles/myIcon.scss @@ -1 +1 @@ -@import 'https://at.alicdn.com/t/c/font_3703467_it8bp4b57g9.css'; //iconfont阿里巴巴 \ No newline at end of file +@import 'https://at.alicdn.com/t/c/font_3703467_om4sfs0bw5s.css'; //iconfont阿里巴巴 \ No newline at end of file diff --git a/src/utils/api/table.js b/src/utils/api/table.js index 740c939..b1b31f9 100644 --- a/src/utils/api/table.js +++ b/src/utils/api/table.js @@ -48,6 +48,7 @@ export function questAss (id, state, val) { store.dispatch('fetchOrderList')// 更新订单列表 } else { Message.error(res.data.msg) + store.dispatch('fetchOrderList')// 更新订单列表 } }) } diff --git a/src/views/layout/components/headbar.vue b/src/views/layout/components/headbar.vue index 88cbfc3..8c02363 100644 --- a/src/views/layout/components/headbar.vue +++ b/src/views/layout/components/headbar.vue @@ -47,7 +47,7 @@ @@ -55,7 +55,7 @@ @@ -63,7 +63,7 @@ @@ -183,7 +183,7 @@ export default { */ refreshPage () { mqtt.mqttDestroy()// 断开mqtt - this.$router.go(0)// 刷新页面 + window.location.reload() // 刷新页面 }, /** * @description: 登出 diff --git a/src/views/layout/components/main/order/index.vue b/src/views/layout/components/main/order/index.vue index e6796dd..b2ff21f 100644 --- a/src/views/layout/components/main/order/index.vue +++ b/src/views/layout/components/main/order/index.vue @@ -5,18 +5,18 @@ - + - + - + - + diff --git a/src/views/layout/components/main/register/index.vue b/src/views/layout/components/main/register/index.vue index 704fca9..ba7901f 100644 --- a/src/views/layout/components/main/register/index.vue +++ b/src/views/layout/components/main/register/index.vue @@ -126,7 +126,6 @@ export default { watch: { }, created () { - console.log('hi') }, filters: { parseTime, diff --git a/vue.config.js b/vue.config.js deleted file mode 100644 index 02f93a3..0000000 --- a/vue.config.js +++ /dev/null @@ -1,37 +0,0 @@ -module.exports = { - // 开发服务器配置 - devServer: { - //open: true,//run时浏览器打开 - port: 8080, - proxy: { - '/api': { - target: 'http://localhost:3000', - changeOrigin: true, - pathRewrite: { - '^/api': '' - } - } - } - }, - - // 构建时的配置 - outputDir: 'dist', // 输出目录 - assetsDir: 'static', // 静态资源目录 - publicPath: '/', // 部署应用包时的基本 URL - - // 生产环境是否生成 sourceMap 文件 - productionSourceMap: true, - - // CSS 相关选项 - css: { - sourceMap: true, - loaderOptions: { - css: { - // options here will be passed to css-loader - }, - sass: { - // options here will be passed to sass-loader - } - } - } -} \ No newline at end of file