From 6d0b76e41ebda3d53c946f6f6d25f70bc6ac8d05 Mon Sep 17 00:00:00 2001 From: monanxiao Date: Sat, 8 Feb 2025 09:28:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=87=8D=E5=A4=8D=E4=B8=8B=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=BC=80=E5=85=B3=EF=BC=8C=E6=9C=8D=E5=8A=A1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mock/permission.js | 5 ++ src/router/originalRoutingTable.js | 9 ++++ src/views/goods/index.vue | 59 +++++++++++++++++++++++ src/views/goods/options.js | 6 +++ src/views/order/index.vue | 2 +- src/views/system/switchOrder.vue | 77 ++++++++++++++++++++++++++++++ 6 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 src/views/system/switchOrder.vue diff --git a/src/mock/permission.js b/src/mock/permission.js index bdf2980..9e50855 100644 --- a/src/mock/permission.js +++ b/src/mock/permission.js @@ -26,6 +26,11 @@ export const menuListItem = [ url: "/activity", icon: "Menu", }, + { + title: "重复下单开关", + url: "/switchOrder", + icon: "Menu", + }, ] }, { diff --git a/src/router/originalRoutingTable.js b/src/router/originalRoutingTable.js index 2903f7e..c4a5667 100644 --- a/src/router/originalRoutingTable.js +++ b/src/router/originalRoutingTable.js @@ -64,6 +64,15 @@ const routerList = [ requiresAuth: true, //有一些页面是否登录才能进去 }, }, + { + path: "/switchOrder", + name: "switchOrder", + component: () => import("../views/system/switchOrder.vue"), + meta: { + name: "重复下单开关", + requiresAuth: true, //有一些页面是否登录才能进去 + }, + }, { path: "/edit", name: "edit", diff --git a/src/views/goods/index.vue b/src/views/goods/index.vue index af09c61..f590c17 100644 --- a/src/views/goods/index.vue +++ b/src/views/goods/index.vue @@ -40,6 +40,20 @@ /> + + + + + + + + + + + From 011f54cf9c91d3d1599a804e328ceedb8bf5664a Mon Sep 17 00:00:00 2001 From: monanxiao Date: Sat, 8 Feb 2025 09:33:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B66?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/goods/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/goods/index.vue b/src/views/goods/index.vue index f590c17..c08153b 100644 --- a/src/views/goods/index.vue +++ b/src/views/goods/index.vue @@ -22,6 +22,7 @@ From ea6208ba8adeeb4e14f223091fc1c04636addb0f Mon Sep 17 00:00:00 2001 From: monanxiao Date: Wed, 12 Feb 2025 10:57:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.js | 3 ++- src/store/modules/users.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index 730d5de..34d2634 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -9,8 +9,9 @@ const errorCode = { default: "系统未知错误,请反馈给管理员", }; -// const url = "https://repair.cpolar.top"; // 开发地址 const url = "https://api.cqcxj.cn"; // 正式地址 +// const url = "https://repair-api.scdswj.cn"; // 测试地址 +// const url = "https://repair.cpolar.top"; // 开发地址 // const url = "https://cqjql.scdswj.cn:9443"; // 临时地址 const service = axios.create({ diff --git a/src/store/modules/users.js b/src/store/modules/users.js index 4c0b912..a15428d 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -8,7 +8,7 @@ export default { state: { UserInfo: {}, token: sessionStorage.getItem("token") || "", - isCollapse: true, + isCollapse: false, themeConfig: { primary: "#4060c7", tabColor: "#FFFFFF", From 8ef70b7ee8acba091322224be501c8e11330b89c Mon Sep 17 00:00:00 2001 From: monanxiao Date: Wed, 19 Feb 2025 15:56:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0=EF=BC=9A=E5=B7=B2=E5=8F=96?= =?UTF-8?q?=E6=B6=88=20=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=9A=20=E5=B7=B2=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 3afe52f..15056d0 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -27,6 +27,7 @@ + @@ -146,6 +147,7 @@ 服务中 待付款 已完成 + 已取消