diff --git a/config/dev.env.js b/config/dev.env.js index 648a19eb..1e22973a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -3,6 +3,5 @@ const merge = require('webpack-merge') const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { - NODE_ENV: '"development"', - BASE_API: '"http://user.api.it120.cc"', + NODE_ENV: '"development"' }) diff --git a/src/api/centerUserResourceBundle.js b/src/api/centerUserResourceBundle.js new file mode 100644 index 00000000..dbce7da9 --- /dev/null +++ b/src/api/centerUserResourceBundle.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +export function fetchDataList(page, pageSize) { + return request({ + url: '/user/centerUserResourceBundle/list', + method: 'post', + data:{ + page, + pageSize + } + }) +} + +export function buyResource(key) { + return request({ + url: '/user/centerUserResourceBundle/buy/pc', + method: 'get', + params: { key } + }) +} + +export function delResource(id) { + return request({ + url: '/user/centerUserResourceBundle/del', + method: 'post', + data: { id } + }) +} diff --git a/src/icons/svg/ziyuan.svg b/src/icons/svg/ziyuan.svg new file mode 100644 index 00000000..cc54d021 --- /dev/null +++ b/src/icons/svg/ziyuan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 5a4fc72f..489207b3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,6 +28,7 @@ export const constantRouterMap = [ { path: '/404', component: () => import('@/views/404'), hidden: true }, { + name: '首页', path: '', component: Layout, redirect: '/dashboard', @@ -39,18 +40,22 @@ export const constantRouterMap = [ }, { - path: '', + name: '工厂设置', + path: '/user/centerUserResourceBundle', component: Layout, + redirect: '/user/centerUserResourceBundle/list', meta: { title: '工厂设置', icon: 'setting' }, children: [{ - path: 'dashboard2', - component: () => import('@/views/dashboard/index'), - meta: { title: '我的资源包', icon: 'setting' } + name: '我的资源包', + path: 'list', + component: () => import('@/views/centerUserResourceBundle/list'), + meta: { title: '我的资源包', icon: 'ziyuan' } }, { + name: '我的资源包2', path: 'dashboard3', component: () => import('@/views/dashboard/index'), - meta: { title: '我的资源包', icon: 'setting' } + meta: { title: '我的资源包2', icon: 'setting' } }] }, diff --git a/src/views/centerUserResourceBundle/list.vue b/src/views/centerUserResourceBundle/list.vue new file mode 100644 index 00000000..e16710e0 --- /dev/null +++ b/src/views/centerUserResourceBundle/list.vue @@ -0,0 +1,143 @@ + + + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 4b4625c7..90042ff6 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,7 +1,6 @@