From 3934d0d780f3415b989fa2d97157c5cdee8a9396 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Thu, 14 Mar 2024 20:54:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=8F=82=E5=8A=A0=E8=AE=B0=E5=BD=95=E5=8F=8A=E5=B0=81=E5=9D=9B?= =?UTF-8?q?=E9=85=92=E8=AE=B0=E5=BD=95=E5=8F=8A=E6=B2=B9=E5=8D=A1=E9=A2=9D?= =?UTF-8?q?=E5=BA=A6=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +- src/api/marketing.js | 5 +- src/router/modules/marketing.js | 31 ++- .../marketing/activity/activity/record.vue | 181 ++++++++++++++ src/views/marketing/exchange/quota/oil.vue | 225 ++++++++++++++++++ src/views/marketing/exchange/quota/wine.vue | 225 ++++++++++++++++++ 6 files changed, 668 insertions(+), 7 deletions(-) create mode 100644 src/views/marketing/activity/activity/record.vue create mode 100644 src/views/marketing/exchange/quota/oil.vue create mode 100644 src/views/marketing/exchange/quota/wine.vue diff --git a/.env.development b/.env.development index 7d858ae..310f352 100644 --- a/.env.development +++ b/.env.development @@ -3,12 +3,12 @@ ENV = 'development' # http://192.168.1.43:8324/admin # http://mer.crmeb.net/admin # base api -#VUE_APP_BASE_API = 'https://bt.test.cdlfjy.com' -VUE_APP_BASE_API = 'https://mp.scwmbh.cn' +VUE_APP_BASE_API = 'https://bt.test.cdlfjy.com' +#VUE_APP_BASE_API = 'https://mp.scwmbh.cn' # socket 连接地址 -#VUE_APP_WS_URL = 'ws://bt.test.cdlfjy.com' -VUE_APP_WS_URL = 'ws://mp.scwmbh.cn' +VUE_APP_WS_URL = 'ws://bt.test.cdlfjy.com' +#VUE_APP_WS_URL = 'ws://mp.scwmbh.cn' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/src/api/marketing.js b/src/api/marketing.js index 0555c44..1498a8c 100644 --- a/src/api/marketing.js +++ b/src/api/marketing.js @@ -814,7 +814,10 @@ export function activityEditFrom(data) { export function activityDel(data) { return request.post('marketing/activity/delInfo', data) } - +// 活动记录 - 列表获取 +export function activityRecordList(data) { + return request.get('marketing/activity/record/list', data) +} diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js index 814b377..0200ecf 100644 --- a/src/router/modules/marketing.js +++ b/src/router/modules/marketing.js @@ -493,6 +493,24 @@ const marketingRouter = }, component: () => import('@/views/marketing/exchange/pickupPoint/index') }, + { + path: 'wine', + name: `exchangeQuotaWine`, + meta: { + title: '封坛酒额度', + noCache: true + }, + component: () => import('@/views/marketing/exchange/quota/wine') + }, + { + path: 'oil', + name: `exchangeQuotaOil`, + meta: { + title: '油卡额度', + noCache: true + }, + component: () => import('@/views/marketing/exchange/quota/oil') + }, ] }, { @@ -557,7 +575,7 @@ const marketingRouter = children: [ { path: 'cate', - name: `agentList`, + name: `activityCate`, meta: { title: '活动分类', noCache: true @@ -566,13 +584,22 @@ const marketingRouter = }, { path: 'index', - name: `agentList`, + name: `activityIndex`, meta: { title: '活动列表', noCache: true }, component: () => import('@/views/marketing/activity/activity/index') }, + { + path: 'record', + name: `activityList`, + meta: { + title: '参加记录', + noCache: true + }, + component: () => import('@/views/marketing/activity/activity/record') + }, ] }, diff --git a/src/views/marketing/activity/activity/record.vue b/src/views/marketing/activity/activity/record.vue new file mode 100644 index 0000000..416377f --- /dev/null +++ b/src/views/marketing/activity/activity/record.vue @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + {{ scope.row.user.nickname }} + {{ scope.row.user.uid }} + + + + + + + + 待支付 + 已支付 + 无需支付 + + + + + + + + + + + + + + diff --git a/src/views/marketing/exchange/quota/oil.vue b/src/views/marketing/exchange/quota/oil.vue new file mode 100644 index 0000000..e030b14 --- /dev/null +++ b/src/views/marketing/exchange/quota/oil.vue @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.nickname }} + ID:{{ scope.row.uid }} + + + + + + + + + + + {{ (scope.row.surplus_quota - scope.row.freeze_quota).toFixed(2) }} + + + + + + + + + + + + + + + {{ scope.row.nickname }} + ID:{{ scope.row.uid }} + + + + + + + + + 增加 + 减少 + + + + + + + + + + + + + + + + + + diff --git a/src/views/marketing/exchange/quota/wine.vue b/src/views/marketing/exchange/quota/wine.vue new file mode 100644 index 0000000..41dbd91 --- /dev/null +++ b/src/views/marketing/exchange/quota/wine.vue @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.nickname }} + ID:{{ scope.row.uid }} + + + + + + + + + + + {{ (scope.row.surplus_quota - scope.row.freeze_quota).toFixed(2) }} + + + + + + + + + + + + + + + {{ scope.row.nickname }} + ID:{{ scope.row.uid }} + + + + + + + + + 增加 + 减少 + + + + + + + + + + + + + + + + + +