diff --git a/package.json b/package.json index e578280b..1baccf7c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "axios": "0.17.1", - "element-ui": "2.3.8", + "element-ui": "2.3.9", "js-cookie": "2.2.0", "normalize.css": "8.0.0", "nprogress": "0.2.0", diff --git a/src/api/kanjia.js b/src/api/kanjia.js new file mode 100644 index 00000000..a9f3718d --- /dev/null +++ b/src/api/kanjia.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +export function fetchDataList(page, pageSize, data) { + return request({ + url: '/user/kanjiaSet/list', + method: 'post', + data: { + page, + pageSize, + ...data + } + }) +} + +export function info(id) { + return request({ + url: '/user/kanjiaSet/info', + method: 'get', + params: { id } + }) +} + +export function delData(id) { + return request({ + url: '/user/kanjiaSet/del', + method: 'post', + data: { id } + }) +} + +export function saveData(data) { + return request({ + url: '/user/kanjiaSet/save', + method: 'post', + data: { ...data } + }) +} diff --git a/src/api/login.js b/src/api/login.js index d5ea2c42..e68381c1 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -64,6 +64,17 @@ export function resetpwd(mobile, pwd, smsCode) { }) } +export function editPwd(oldPwd, newPwd) { + return request({ + url: '/user/editPwd/save', + method: 'post', + data: { + oldPwd, + newPwd + } + }) +} + export function checkToken() { return request({ url: '/user/checkToken', diff --git a/src/icons/svg/kanjia.svg b/src/icons/svg/kanjia.svg new file mode 100644 index 00000000..077a21dc --- /dev/null +++ b/src/icons/svg/kanjia.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/yingxiao.svg b/src/icons/svg/yingxiao.svg new file mode 100644 index 00000000..39e18744 --- /dev/null +++ b/src/icons/svg/yingxiao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 6d837d13..4bf2d552 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,6 +27,18 @@ export const constantRouterMap = [ { path: '/resetpwd', component: () => import('@/views/login/resetpwd'), hidden: true }, { path: '/404', component: () => import('@/views/404'), hidden: true }, + { + name: '修改密码', + path: '/editPwd', + hidden: true, + component: Layout, + meta: { title: '修改密码', icon: 'setting' }, + children: [{ + path: '', + component: () => import('@/views/editPwd/list') + }] + }, + { name: '首页', path: '', @@ -114,6 +126,26 @@ export const constantRouterMap = [ ] }, + { + name: '营销辅助', + path: '/user/kanjiaSet', + component: Layout, + redirect: '/user/kanjiaSet/list', + meta: { title: '营销辅助', icon: 'yingxiao' }, + children: [{ + name: '砍价设置', + path: 'list', + component: () => import('@/views/kanjiaSet/list'), + meta: { title: '砍价设置', icon: 'kanjia' } + }, + { + name: '我的资源包2', + path: 'dashboard3', + component: () => import('@/views/dashboard/index'), + meta: { title: '我的资源包2', icon: 'setting' } + }] + }, + { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/utils/request.js b/src/utils/request.js index 3488f824..7269ea9e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -54,6 +54,22 @@ service.interceptors.response.use( }) return Promise.reject('请先绑定代理商') } + if (res.code === 600) { + Message({ + message: '缺少参数：' + (res.data ? res.data : ''), + type: 'error', + duration: 3 * 1000 + }) + return Promise.reject('缺少参数：' + (res.data ? res.data : '')) + } + if (res.code === -1) { + Message({ + message: '服务器内部错误：' + (res.data ? res.data : ''), + type: 'error', + duration: 3 * 1000 + }) + return Promise.reject('服务器内部错误：' + (res.data ? res.data : '')) + } return response.data }, error => { diff --git a/src/views/apiExtDfs/list.vue b/src/views/apiExtDfs/list.vue index 6a06cb29..c8ec7c82 100644 --- a/src/views/apiExtDfs/list.vue +++ b/src/views/apiExtDfs/list.vue @@ -36,7 +36,7 @@ diff --git a/src/views/centerUserResourceBundle/list.vue b/src/views/centerUserResourceBundle/list.vue index e7be935c..02e3f5a6 100644 --- a/src/views/centerUserResourceBundle/list.vue +++ b/src/views/centerUserResourceBundle/list.vue @@ -48,7 +48,7 @@ diff --git a/src/views/editPwd/list.vue b/src/views/editPwd/list.vue new file mode 100644 index 00000000..220c5e92 --- /dev/null +++ b/src/views/editPwd/list.vue @@ -0,0 +1,85 @@ + + + + + + diff --git a/src/views/kanjiaSet/list.vue b/src/views/kanjiaSet/list.vue new file mode 100644 index 00000000..6fad1f4b --- /dev/null +++ b/src/views/kanjiaSet/list.vue @@ -0,0 +1,335 @@ + + + + + diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 51579fcb..67c51db6 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -13,6 +13,11 @@ 首页 + + + 修改密码 + + 退出