From 05848781a3c9dc82478134f99fd3894beec39a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=B5=E5=AE=AA=E7=91=9E?= <9198107+min-xianrui@user.noreply.gitee.com> Date: Tue, 10 Dec 2024 13:07:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=BD=E5=A5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- src/api/activity.js | 9 + src/api/plant.js | 63 ++ src/api/plantorder.js | 63 ++ src/router/modules/marketing.js | 27 +- .../activityList/activity-add-and-update.vue | 12 +- .../marketing/activity/activityList/index.vue | 115 ++-- .../activity/venueReservation/index.vue | 22 +- .../marketing/coupon/list/creatCoupon.vue | 2 +- src/views/marketing/lottery/config/index.vue | 291 ++++----- .../marketing/lottery/exchange/index.vue | 573 ++++++++++++++++++ src/views/marketing/tree/index.vue | 15 + src/views/marketing/tree/item/index.vue | 288 +++++++++ .../tree/item/plant-add-and-update.vue | 290 +++++++++ src/views/marketing/tree/order/index.vue | 225 +++++++ .../tree/order/orde-add-and-update.vue | 111 ++++ 16 files changed, 1913 insertions(+), 196 deletions(-) create mode 100644 src/api/plant.js create mode 100644 src/api/plantorder.js create mode 100644 src/views/marketing/lottery/exchange/index.vue create mode 100644 src/views/marketing/tree/index.vue create mode 100644 src/views/marketing/tree/item/index.vue create mode 100644 src/views/marketing/tree/item/plant-add-and-update.vue create mode 100644 src/views/marketing/tree/order/index.vue create mode 100644 src/views/marketing/tree/order/orde-add-and-update.vue diff --git a/.env.development b/.env.development index 0494149..2c58cd1 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,8 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:20010' +VUE_APP_BASE_API = 'https://syy.xunyingcloud.cn' +#VUE_APP_BASE_API = 'http://localhost:20010/' # 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/activity.js b/src/api/activity.js index 91c3e0d..c9f23ba 100644 --- a/src/api/activity.js +++ b/src/api/activity.js @@ -95,3 +95,12 @@ export function activityPlaceUpdateApi(data) { data }) } + +//用户预约修改 +export function userActivityPlaceListApi(data) { + return request({ + url: `admin/activity/updateRegister?id=${data.id}`, + method: 'POST', + data + }) +} diff --git a/src/api/plant.js b/src/api/plant.js new file mode 100644 index 0000000..661efeb --- /dev/null +++ b/src/api/plant.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + +/** + * 新增plant + * @param pram + */ +export function plantCreateApi(data) { + return request({ + url: 'admin/teaPlant/save', + method: 'POST', + data + }) +} + +/** + * plant更新 + * @param pram + */ +export function plantUpdateApi(data) { + return request({ + url: `admin/teaPlant/update?id=${data.id}`, + method: 'POST', + data + }) +} + +/** + * plant详情 + * @param pram + */ +export function plantDetailApi(params) { + return request({ + url: `admin/teaPlant/info`, + method: 'GET', + params + }) +} + +/** + * plant删除 + * @param pram + */ +export function plantDeleteApi(params) { + return request({ + url: `admin/teaPlant/delete`, + method: 'get', + params + }) +} + + +/** + * plant列表 + * @param pram + */ +export function plantListApi(params) { + return request({ + url: 'admin/teaPlant/list', + method: 'GET', + params + }) +} + diff --git a/src/api/plantorder.js b/src/api/plantorder.js new file mode 100644 index 0000000..f4c98ca --- /dev/null +++ b/src/api/plantorder.js @@ -0,0 +1,63 @@ + + +import request from '@/utils/request' + +/** + * 新增EbTeaPlantOrder + * @param pram + */ +export function EbTeaPlantOrderCreateApi(data) { + return request({ + url: 'autogencode/ebteaplantorder/save', + method: 'POST', + data + }) +} + +/** + * ebteaplantorder更新 + * @param pram + */ +export function ebteaplantorderUpdateApi(data) { + return request({ + url: 'autogencode/ebteaplantorder/update', + method: 'POST', + data + }) +} + +/** + * ebteaplantorder详情 + * @param pram + */ +export function ebteaplantorderDetailApi(id) { + return request({ + url: `autogencode/ebteaplantorder/info/${id}`, + method: 'GET' + }) +} + +/** + * ebteaplantorder删除 + * @param pram + */ +export function ebteaplantorderDeleteApi(id) { + return request({ + url: `autogencode/ebteaplantorder/delete/${id}`, + method: 'get' + }) +} + + +/** + * ebteaplantorder列表 + * @param pram + */ +export function plantOrderListApi(params) { + return request({ + url: 'admin/teaPlant/order', + method: 'GET', + params + }) +} + diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js index 805a4ca..55d3ff8 100644 --- a/src/router/modules/marketing.js +++ b/src/router/modules/marketing.js @@ -64,7 +64,12 @@ const marketingRouter = { name: 'lotteryConfig', meta: { title: '茶株认领', icon: '' } }, - + { + path: 'exchange', + component: () => import('@/views/marketing/lottery/exchange/index'), + name: 'exchange', + meta: { title: '果实兑换', icon: '' } + }, ] }, @@ -88,6 +93,26 @@ const marketingRouter = { }, ] }, + { + path: 'tree', + component: () => import('@/views/marketing/tree/index'), + name: 'tree', + meta: { title: '茶树认领', icon: '' }, + children: [ + { + path: 'item', + component: () => import('@/views/marketing/tree/item/index'), + name: 'item', + meta: { title: '茶树配置', icon: '' } + }, + { + path: 'order', + component: () => import('@/views/marketing/tree/order/index'), + name: 'order', + meta: { title: '认领订单', icon: '' } + }, + ] + }, { path: 'bargain', component: () => import('@/views/marketing/bargain/index'), diff --git a/src/views/marketing/activity/activityList/activity-add-and-update.vue b/src/views/marketing/activity/activityList/activity-add-and-update.vue index 1355552..5d2cf99 100644 --- a/src/views/marketing/activity/activityList/activity-add-and-update.vue +++ b/src/views/marketing/activity/activityList/activity-add-and-update.vue @@ -14,7 +14,6 @@ - @@ -29,23 +28,19 @@ - - - - - - - - + + + diff --git a/src/views/marketing/activity/activityList/index.vue b/src/views/marketing/activity/activityList/index.vue index e9b8d64..327a624 100644 --- a/src/views/marketing/activity/activityList/index.vue +++ b/src/views/marketing/activity/activityList/index.vue @@ -1,22 +1,33 @@ - - - - + + + + + + + + + + + + + - - + + - - - - - - - + + + + + + + - - -