From 3f216703453e015166bc648f5b5265cfaf53d0d4 Mon Sep 17 00:00:00 2001 From: tk Date: Tue, 18 Jun 2024 19:08:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?= =?UTF-8?q?=EF=BC=9Afeat=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=96=B0=E8=B7=AF=E7=94=B1=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1=20=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E6=B7=BB=E5=8A=A0=E9=94=80?= =?UTF-8?q?=E5=94=AE=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=20=09[=E8=BF=87?= =?UTF-8?q?=E7=A8=8B]=EF=BC=9A=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20?= =?UTF-8?q?=E3=80=90=E7=BB=93=09=E6=9D=9F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # 类型 包含: # feat：新功能（feature） # fix：修补bug # docs：文档（documentation） # style： 格式（不影响代码运行的变动） # refactor：重构（即不是新增功能，也不是修改bug的代码变动） # test：增加测试 # chore：构建过程或辅助工具的变动 --- src/router/index.js | 14 ++++++- src/styles/myIcon.scss | 2 +- src/utils/api/table.js | 1 + src/views/layout/components/headbar.vue | 8 ++-- .../layout/components/main/order/index.vue | 8 ++-- .../layout/components/main/register/index.vue | 1 - vue.config.js | 37 ------------------- 7 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 vue.config.js 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