From 08f56a277702b7f75d986a2163634706eb5df58b Mon Sep 17 00:00:00 2001 From: gooking Date: Wed, 23 May 2018 06:19:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A0=8D=E4=BB=B7=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=9B=E6=8B=BC=E5=9B=A2=E8=AE=BE=E7=BD=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev.env.js | 2 +- src/api/kanjiaHelp.js | 13 + src/api/kanjiaJoiner.js | 21 ++ src/api/pingtuanSet.js | 37 +++ src/icons/svg/pingtuan.svg | 1 + src/router/index.js | 24 +- src/views/kanjiaHelp/list.vue | 197 +++++++++++++++ src/views/kanjiaJoiner/list.vue | 214 ++++++++++++++++ src/views/kanjiaSet/list.vue | 3 +- src/views/layout/components/Navbar.vue | 1 - src/views/login/index.vue | 3 +- src/views/pingtuanSet/list.vue | 324 +++++++++++++++++++++++++ 12 files changed, 829 insertions(+), 11 deletions(-) create mode 100644 src/api/kanjiaHelp.js create mode 100644 src/api/kanjiaJoiner.js create mode 100644 src/api/pingtuanSet.js create mode 100644 src/icons/svg/pingtuan.svg create mode 100644 src/views/kanjiaHelp/list.vue create mode 100644 src/views/kanjiaJoiner/list.vue create mode 100644 src/views/pingtuanSet/list.vue diff --git a/config/dev.env.js b/config/dev.env.js index 1e22973a..55a82ff3 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -3,5 +3,5 @@ const merge = require('webpack-merge') const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { - NODE_ENV: '"development"' + NODE_ENV: '"development"', }) diff --git a/src/api/kanjiaHelp.js b/src/api/kanjiaHelp.js new file mode 100644 index 00000000..21021234 --- /dev/null +++ b/src/api/kanjiaHelp.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +export function fetchDataList(page, pageSize, data) { + return request({ + url: '/user/kanjiaHelp/list', + method: 'post', + data: { + page, + pageSize, + ...data + } + }) +} diff --git a/src/api/kanjiaJoiner.js b/src/api/kanjiaJoiner.js new file mode 100644 index 00000000..cc865aeb --- /dev/null +++ b/src/api/kanjiaJoiner.js @@ -0,0 +1,21 @@ +import request from '@/utils/request' + +export function fetchDataList(page, pageSize, data) { + return request({ + url: '/user/kanjiaJoiner/list', + method: 'post', + data: { + page, + pageSize, + ...data + } + }) +} + +export function saveStatus(id, status) { + return request({ + url: '/user/kanjiaJoiner/status', + method: 'post', + data: { id, status } + }) +} diff --git a/src/api/pingtuanSet.js b/src/api/pingtuanSet.js new file mode 100644 index 00000000..38e422e9 --- /dev/null +++ b/src/api/pingtuanSet.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +export function fetchDataList(page, pageSize, data) { + return request({ + url: '/user/pingtuanSet/list', + method: 'post', + data: { + page, + pageSize, + ...data + } + }) +} + +export function info(id) { + return request({ + url: '/user/pingtuanSet/info', + method: 'get', + params: { id } + }) +} + +export function delData(id) { + return request({ + url: '/user/pingtuanSet/del', + method: 'post', + data: { id } + }) +} + +export function saveData(data) { + return request({ + url: '/user/pingtuanSet/save', + method: 'post', + data: { ...data } + }) +} diff --git a/src/icons/svg/pingtuan.svg b/src/icons/svg/pingtuan.svg new file mode 100644 index 00000000..a302e493 --- /dev/null +++ b/src/icons/svg/pingtuan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 4bf2d552..d38eecd9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -128,21 +128,33 @@ export const constantRouterMap = [ { name: '营销辅助', - path: '/user/kanjiaSet', + path: '/user', component: Layout, redirect: '/user/kanjiaSet/list', meta: { title: '营销辅助', icon: 'yingxiao' }, children: [{ name: '砍价设置', - path: 'list', + path: 'kanjiaSet/list', component: () => import('@/views/kanjiaSet/list'), meta: { title: '砍价设置', icon: 'kanjia' } }, { - name: '我的资源包2', - path: 'dashboard3', - component: () => import('@/views/dashboard/index'), - meta: { title: '我的资源包2', icon: 'setting' } + name: '砍价参与用户', + path: 'kanjiaJoiner/list', + component: () => import('@/views/kanjiaJoiner/list'), + meta: { title: '砍价参与用户', icon: 'kanjia' } + }, + { + name: '砍价明细', + path: 'kanjiaHelp/list', + component: () => import('@/views/kanjiaHelp/list'), + meta: { title: '砍价明细', icon: 'kanjia' } + }, + { + name: '拼团设置', + path: 'pingtuanSet/list', + component: () => import('@/views/pingtuanSet/list'), + meta: { title: '拼团设置', icon: 'pingtuan' } }] }, diff --git a/src/views/kanjiaHelp/list.vue b/src/views/kanjiaHelp/list.vue new file mode 100644 index 00000000..d2562905 --- /dev/null +++ b/src/views/kanjiaHelp/list.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/src/views/kanjiaJoiner/list.vue b/src/views/kanjiaJoiner/list.vue new file mode 100644 index 00000000..baa511fc --- /dev/null +++ b/src/views/kanjiaJoiner/list.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/src/views/kanjiaSet/list.vue b/src/views/kanjiaSet/list.vue index 6fad1f4b..089d95d2 100644 --- a/src/views/kanjiaSet/list.vue +++ b/src/views/kanjiaSet/list.vue @@ -40,6 +40,7 @@ + 批量删除 { diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 67c51db6..fd1666dc 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -53,7 +53,6 @@ export default { } }, mounted() { - this.centerUserBase.aaa = 'ssddfssfg0000' info().then(res => { this.$store.commit('SET_CENTER_USER_BASE',res.data) }); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index d363305f..f683d350 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,7 +1,7 @@