From bed1787210eb3efc79115b22da3eaf598d293ab1 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Mon, 1 Jul 2024 11:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E6=83=A0=E6=B0=91?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=9F=BA=E6=9C=AC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/marketing.js | 9 + src/router/modules/marketing.js | 101 ++++++-- src/views/marketing/exchange/quota/index.vue | 48 ++-- src/views/marketing/exchange/quota/oil.vue | 229 ------------------ .../marketing/exchange/quota/vegetable.vue | 229 ------------------ src/views/marketing/exchange/quota/wine.vue | 229 ------------------ 6 files changed, 121 insertions(+), 724 deletions(-) delete mode 100644 src/views/marketing/exchange/quota/oil.vue delete mode 100644 src/views/marketing/exchange/quota/vegetable.vue delete mode 100644 src/views/marketing/exchange/quota/wine.vue diff --git a/src/api/marketing.js b/src/api/marketing.js index b8d0779..433354e 100644 --- a/src/api/marketing.js +++ b/src/api/marketing.js @@ -733,6 +733,15 @@ export function exchangeQuotaList(apiName = 'list',data) { // list=持有信息列表,record_list=变更记录列表 return request.get(`user/exchange_quota/quota_${apiName}`,data) } +// 酒卡额度 - 配置获取 +export function exchangeQuotaConfigGet(data = {}) { + return request.get(`user/exchange_quota/quota_get_config`,data) +} +// 酒卡额度 - 配置编辑 +export function exchangeQuotaConfigSet(data) { + return request.post(`user/exchange_quota/quota_set_config`,data) +} + // 兑换积分 - 顶部统计 export function exchangeIntegralTitle() { return request.get(`user/exchange_quota/integral_title`) diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js index 3f78809..509d8ec 100644 --- a/src/router/modules/marketing.js +++ b/src/router/modules/marketing.js @@ -457,24 +457,6 @@ const marketingRouter = redirect: 'noRedirect', component: () => import('@/views/marketing/exchange/index'), children: [ - { - path: 'quota', - name: `exchangeQuota`, - meta: { - title: '酒卡额度', - noCache: true - }, - component: () => import('@/views/marketing/exchange/quota/index') - }, - { - path: 'vegetable', - name: `exchangeVegetableQuota`, - meta: { - title: '菜卡额度', - noCache: true - }, - component: () => import('@/views/marketing/exchange/quota/vegetable') - }, { path: 'integral', name: `exchangeIntegral`, @@ -493,24 +475,68 @@ const marketingRouter = }, component: () => import('@/views/marketing/exchange/pickupPoint/index') }, + // 额度与积分 + { + path: 'quota', + name: `exchangeQuota`, + meta: { + title: '瓶装酒额度', + noCache: true, + quota_type: 1, + }, + component: () => import('@/views/marketing/exchange/quota/index') + }, + { + path: 'vegetable', + name: `exchangeVegetableQuota`, + meta: { + title: '菜卡额度', + noCache: true, + quota_type: 2, + }, + component: () => import('@/views/marketing/exchange/quota/index') + }, { path: 'wine', name: `exchangeQuotaWine`, meta: { title: '封坛酒额度', - noCache: true + noCache: true, + quota_type: 3, }, - component: () => import('@/views/marketing/exchange/quota/wine') + component: () => import('@/views/marketing/exchange/quota/index') }, { path: 'oil', name: `exchangeQuotaOil`, meta: { - title: '油卡额度', + title: '加油卡额度', + noCache: true, + quota_type: 4, + }, + component: () => import('@/views/marketing/exchange/quota/index') + }, + { + path: 'quota_integral', + name: `exchangeQuotaIntegral`, + meta: { + title: '惠民积分', + noCache: true, + quota_type: 5, + }, + component: () => import('@/views/marketing/exchange/quota/index') + }, + { + path: 'quota_integral_set', + name: `exchangeQuotaIntegral`, + meta: { + title: '基本设置',// 惠民积分基本设置 noCache: true }, - component: () => import('@/views/marketing/exchange/quota/oil') + component: () => import('@/views/marketing/exchange/quota/integral_set') }, + + ] }, { @@ -618,7 +644,36 @@ const marketingRouter = }, ] }, - + { + path: 'contract', + name: 'Contract', + meta: { + title: '合同管理', + noCache: true + }, + redirect: 'noRedirect', + component: () => import('@/views/marketing/contract/index'), + children: [ + { + path: 'list', + name: `contractIndex`, + meta: { + title: '合同列表', + noCache: true + }, + component: () => import('@/views/marketing/contract/contract/list') + }, + { + path: 'set', + name: `contractSet`, + meta: { + title: '基本设置', + noCache: true + }, + component: () => import('@/views/marketing/contract/contract/set') + }, + ] + }, diff --git a/src/views/marketing/exchange/quota/index.vue b/src/views/marketing/exchange/quota/index.vue index dae61c9..819d0ab 100644 --- a/src/views/marketing/exchange/quota/index.vue +++ b/src/views/marketing/exchange/quota/index.vue @@ -10,15 +10,13 @@ - - - + @@ -34,18 +32,18 @@ - - - - - + + + + + - + @@ -92,13 +90,23 @@ - - diff --git a/src/views/marketing/exchange/quota/vegetable.vue b/src/views/marketing/exchange/quota/vegetable.vue deleted file mode 100644 index 7258474..0000000 --- a/src/views/marketing/exchange/quota/vegetable.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - - diff --git a/src/views/marketing/exchange/quota/wine.vue b/src/views/marketing/exchange/quota/wine.vue deleted file mode 100644 index 3943fea..0000000 --- a/src/views/marketing/exchange/quota/wine.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - -