diff --git a/.env.dev b/.env.dev index f970060..af2fe0a 100644 --- a/.env.dev +++ b/.env.dev @@ -12,7 +12,7 @@ VITE_ROUTER_BASE=/ VITE_ROUTER_HISTORY=hash # api -VITE_API_BASIC=https://zh.shibeitong.com +VITE_API_BASIC=http://10.10.1.6:8070 VITE_API_HTTP=/api/v1/ # storage VITE_STORAGE_NAMESPACE = gin-admin_local_ \ No newline at end of file diff --git a/src/apis/modules/activity.js b/src/apis/modules/activity.js index d098ddb..eff9327 100644 --- a/src/apis/modules/activity.js +++ b/src/apis/modules/activity.js @@ -12,3 +12,5 @@ export const createProject = (params) => request.basic.post('/api/v1/activities' export const updateItem = (id, params) => request.basic.put(`/api/v1/activities/${id}`, params) // 删除数据 export const delItem = (id) => request.basic.delete(`/api/v1/activities/${id}`) +//获取活动报名列表 +export const getActivityList=(params)=>request.basic.get('/api/v1/activity-details',params) \ No newline at end of file diff --git a/src/assets/default.jpg b/src/assets/default.jpg new file mode 100644 index 0000000..a68dc5c Binary files /dev/null and b/src/assets/default.jpg differ diff --git a/src/locales/lang/zh-CN/menu.js b/src/locales/lang/zh-CN/menu.js index b151fd6..fd0d606 100644 --- a/src/locales/lang/zh-CN/menu.js +++ b/src/locales/lang/zh-CN/menu.js @@ -1,3 +1,5 @@ + + export default { welcome: '欢迎', home: '首页', @@ -95,4 +97,5 @@ export default { ycyllvs: '医疗绿色通道', ycparentChild: '亲子权益', ycbirth: '生日礼遇', + activityOrder:'活动报名列表' } diff --git a/src/router/routes/activity.js b/src/router/routes/activity.js index 61c40d0..c17edfb 100644 --- a/src/router/routes/activity.js +++ b/src/router/routes/activity.js @@ -13,5 +13,18 @@ export default [ permission: '*', } + }, + { + path: 'activityOrder/index', + name: 'activityOrder', + component: 'activityOrder/index.vue', + meta: { + icon: CoffeeOutlined, + title: '活动报名列表', + isMenu: true, + keepAlive: true, + permission: '*', + } + }, ] diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue index 883c494..e12fe40 100644 --- a/src/views/activity/index.vue +++ b/src/views/activity/index.vue @@ -155,7 +155,7 @@ async function getPageList() { const { success, data, total } = await apis.activity .getProjectList({ pageSize, - page: current, + current: current, ...searchFormData.value, }) .catch(() => { diff --git a/src/views/activityOrder/index.vue b/src/views/activityOrder/index.vue new file mode 100644 index 0000000..c78f4df --- /dev/null +++ b/src/views/activityOrder/index.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/equite/aiya/index.vue b/src/views/equite/aiya/index.vue index 3d85f21..b75cdc6 100644 --- a/src/views/equite/aiya/index.vue +++ b/src/views/equite/aiya/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('aiya'), ...searchFormData.value, diff --git a/src/views/equite/birth/index.vue b/src/views/equite/birth/index.vue index 7ad3288..a7db602 100644 --- a/src/views/equite/birth/index.vue +++ b/src/views/equite/birth/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('birth'), ...searchFormData.value, diff --git a/src/views/equite/caizhai/index.vue b/src/views/equite/caizhai/index.vue index 574ba0c..d2971ac 100644 --- a/src/views/equite/caizhai/index.vue +++ b/src/views/equite/caizhai/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('menchuang'), ...searchFormData.value, diff --git a/src/views/equite/fangchan/index.vue b/src/views/equite/fangchan/index.vue index 33f689a..21be194 100644 --- a/src/views/equite/fangchan/index.vue +++ b/src/views/equite/fangchan/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('jdnk'), ...searchFormData.value, diff --git a/src/views/equite/hotel/index.vue b/src/views/equite/hotel/index.vue index da8204d..953875e 100644 --- a/src/views/equite/hotel/index.vue +++ b/src/views/equite/hotel/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('hotel'), ...searchFormData.value, diff --git a/src/views/equite/jiazhuang/index.vue b/src/views/equite/jiazhuang/index.vue index 5409763..c8fad29 100644 --- a/src/views/equite/jiazhuang/index.vue +++ b/src/views/equite/jiazhuang/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('jiazhuang'), ...searchFormData.value, diff --git a/src/views/equite/kangyang/index.vue b/src/views/equite/kangyang/index.vue index 4875f00..13f3ab9 100644 --- a/src/views/equite/kangyang/index.vue +++ b/src/views/equite/kangyang/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('kangyang'), ...searchFormData.value, diff --git a/src/views/equite/life/index.vue b/src/views/equite/life/index.vue index 9737ac6..88492e2 100644 --- a/src/views/equite/life/index.vue +++ b/src/views/equite/life/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('life'), ...searchFormData.value, diff --git a/src/views/equite/lvyou/index.vue b/src/views/equite/lvyou/index.vue index d21a1aa..580212d 100644 --- a/src/views/equite/lvyou/index.vue +++ b/src/views/equite/lvyou/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('lvyou'), ...searchFormData.value, diff --git a/src/views/equite/parentChild/index.vue b/src/views/equite/parentChild/index.vue index ec416b4..d1e6880 100644 --- a/src/views/equite/parentChild/index.vue +++ b/src/views/equite/parentChild/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('parentchild'), ...searchFormData.value, diff --git a/src/views/equite/quanwu/index.vue b/src/views/equite/quanwu/index.vue index 8c2b7c9..480b0ac 100644 --- a/src/views/equite/quanwu/index.vue +++ b/src/views/equite/quanwu/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('quanwu'), ...searchFormData.value, diff --git a/src/views/equite/yllvs/index.vue b/src/views/equite/yllvs/index.vue index 522e2d1..e5f132b 100644 --- a/src/views/equite/yllvs/index.vue +++ b/src/views/equite/yllvs/index.vue @@ -96,7 +96,7 @@ async function getPageList() { const { success, data, total } = await apis.productOrder .getProjectList({ pageSize, - page: current, + current: current, channel: 'product', productId: equiteEnum.getValue('yllvs'), ...searchFormData.value, diff --git a/src/views/integral/ integraList/index.vue b/src/views/integral/ integraList/index.vue index 4d4deae..348faae 100644 --- a/src/views/integral/ integraList/index.vue +++ b/src/views/integral/ integraList/index.vue @@ -158,7 +158,7 @@ async function getPageList() { const { success, data, total } = await apis.role .getRoleList({ pageSize, - page: current, + current: current, ...searchFormData.value, }) .catch(() => { diff --git a/src/views/integral/integraLevelList/index.vue b/src/views/integral/integraLevelList/index.vue index 4d4deae..348faae 100644 --- a/src/views/integral/integraLevelList/index.vue +++ b/src/views/integral/integraLevelList/index.vue @@ -158,7 +158,7 @@ async function getPageList() { const { success, data, total } = await apis.role .getRoleList({ pageSize, - page: current, + current: current, ...searchFormData.value, }) .catch(() => { diff --git a/src/views/integral/points/index.vue b/src/views/integral/points/index.vue index 43ffe73..89d7a7c 100644 --- a/src/views/integral/points/index.vue +++ b/src/views/integral/points/index.vue @@ -1,5 +1,5 @@