From 99b9851d5564a11ae5083ed9f19145f4f7a39c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com> Date: Mon, 25 Nov 2024 18:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/coupon.js | 12 + src/api/modules/mer_admin.js | 2 +- src/router/full-routers.js | 13 + .../brand/config/popup/change-password.vue | 130 +++++++- src/views/modules/coupon/index.vue | 298 ++++++++++++++++++ .../modules/coupon/popup/add-or-update.vue | 255 +++++++++++++++ src/views/modules/coupon/popup/commodity.vue | 230 ++++++++++++++ 7 files changed, 928 insertions(+), 12 deletions(-) create mode 100644 src/api/modules/coupon.js create mode 100644 src/views/modules/coupon/index.vue create mode 100644 src/views/modules/coupon/popup/add-or-update.vue create mode 100644 src/views/modules/coupon/popup/commodity.vue diff --git a/src/api/modules/coupon.js b/src/api/modules/coupon.js new file mode 100644 index 0000000..a473bc9 --- /dev/null +++ b/src/api/modules/coupon.js @@ -0,0 +1,12 @@ +import $http from "@/utils/httpRequest.js"; + +export const coupon = { + //优惠券列表 + couponList: (data) => { + return $http.request({ + url: `/merchant-api/coupon/page`, + method: "get", + params: data, + }); + }, +}; diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js index c4afa2b..cd63596 100644 --- a/src/api/modules/mer_admin.js +++ b/src/api/modules/mer_admin.js @@ -176,7 +176,7 @@ export const mer_admin = { }, //修改密码 changePassword: (data) => { - return $http.put(`/merchant-api/brand/admin_password`, data); + return $http.put(`/merchant-api/auth/change/pwd`, data); }, //修改管理员 editAdmin: (data) => { diff --git a/src/router/full-routers.js b/src/router/full-routers.js index d307d85..85bbd20 100644 --- a/src/router/full-routers.js +++ b/src/router/full-routers.js @@ -120,6 +120,19 @@ export default { }, ], }, + { + menuId: getUUID(), + parentId: 0, + parentName: null, + name: "优惠卷管理", + url: "coupon/index", + perms: "", + type: 0, + elIcon: "el-icon-document-remove", + orderNum: 0, + open: null, + list: [], + }, // { // "menuId": getUUID(), // "parentId": 0, diff --git a/src/views/modules/brand/config/popup/change-password.vue b/src/views/modules/brand/config/popup/change-password.vue index 31b34be..3919803 100644 --- a/src/views/modules/brand/config/popup/change-password.vue +++ b/src/views/modules/brand/config/popup/change-password.vue @@ -3,7 +3,7 @@ :title="isAdd ? '修改管理员账号' : '修改密码'" :visible.sync="dialogFormVisible" > - + + + + + + + + + + + +