From f55ba7a61ec990771c22cb88f580d3280b16a9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 1 Nov 2021 12:18:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/cpd.js | 34 +++- src/router/index.js | 17 +- src/routes.js | 67 ------- src/views/layout/components/Navbar.vue | 8 + src/views/mdp/sys/user/UpdateUserInfo.vue | 222 ++++++++++++++++++++++ 5 files changed, 275 insertions(+), 73 deletions(-) delete mode 100644 src/routes.js create mode 100644 src/views/mdp/sys/user/UpdateUserInfo.vue diff --git a/src/api/cpd.js b/src/api/cpd.js index 3a273794..3c1aa098 100644 --- a/src/api/cpd.js +++ b/src/api/cpd.js @@ -2,8 +2,36 @@ import axios from '@/utils/request' import config from '@/common/config' -let base = config.getMallmBasePath(); +let base = config.getMallmBasePath(); -export const getNoticeMsg = params => { return axios.get(`${base}/mallm/cpd/index/toHandleOrdersCount`, { params: params }); }; - \ No newline at end of file +//export const getNoticeMsg = params => { return axios.get(`${base}/mallm/cpd/index/toHandleOrdersCount`, { params: params }); }; + +export const getNoticeMsg = params => { + if(process.env.CONTEXT=='mallm'){ + return axios.get(`${base}/mallm/cpd/index/toHandleOrdersCount`, { params: params }); + }else{ + return new Promise((resolve, reject) => { + var res={ + data:{ + tips:{ + isOk:true, + msg:'请求成功' + }, + data:{ + toPayNum:0, + toSendNum:0, + toReceNum:0, + toApprovaNum:0, + hadApprovaNum:0, + hadFinishNum:0, + hadCloseNum:0, + hadCancelNum:0, + totalNum:0, + } + } + } + resolve(res) + }) + } + }; diff --git a/src/router/index.js b/src/router/index.js index 78ef4b23..124fe118 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,7 +13,7 @@ import routesForm from './routes_form' import routesXm from './routes_xm' import routesDatavXm from './routes_datav_xm' import routesArc from './routes_arc' -import routesIm from './routes_im' +import routesIm from './routes_im' export { Layout } @@ -49,9 +49,20 @@ export const constantRouterMap = [ component: _import('xm/core/xmProject/XmProjectMng'), name: 'dashboard', meta: { title: 'dashboard', icon: 'home-page', noCache: true } - }], + }, + { + path: 'updateUserInfo', + component: _import('mdp/sys/user/UpdateUserInfo'), + name: '账户设置', + meta: { + title: 'updateUserInfo', + icon: 'component' + } + } + ], hidden: true - } + }, + ] export default new Router({ diff --git a/src/routes.js b/src/routes.js deleted file mode 100644 index 3164c364..00000000 --- a/src/routes.js +++ /dev/null @@ -1,67 +0,0 @@ -import Login from './views/Login.vue' -import NotFound from './views/404.vue' -import Home from './views/Home.vue' - -//文档中心 -import ArchiveMng from './views/mdp/arc/archive/ArchiveMng.vue' -import ArchiveListFlow from './views/mdp/arc/archive/ArchiveListFlow.vue' -import ArchiveAttachmentMng from './views/mdp/arc/archiveAttachment/ArchiveAttachmentMng.vue' -import ArcCategoryMng from './views/mdp/arc/category/CategoryMng.vue' -import UploadAdd from './views/mdp/arc/image/UploadAdd.vue' -//内容分发 -import SendPlanMng from './views/mdp/arc/send/sendPlan/SendPlanMng.vue' - -//商城专题设置 -//商城end - -let routes = [ - { - path: '/login', - component: Login, - name: '', - hidden: true - }, - { - path: '/404', - component: NotFound, - name: '', - hidden: true - }, - { - path: '/', - component: Home, - name: '', - hidden: true - }, - { - path: '/oa', - component: Home, - name: '内容/文档中心', - iconCls: 'fa el-icon-menu', - //leaf: true,//只有一个节点 - children: [ - { path: '/arc/Index', component: ArchiveMng, name: '文档管理' }, - { path: '/mdp/arc/archive/ArchiveMng/query', component: ArchiveMng, name: '文档查阅' }, - { path: '/mdp/arc/archive/ArchiveListFlow', component: ArchiveListFlow, name: '流程归档查阅' }, - { path: '/mdp/arc/archiveAttachment/ArchiveAttachmentMng', component: ArchiveAttachmentMng, name: '附件管理' }, - { path: '/mdp/arc/category/CategoryMng', component: ArcCategoryMng, name: '分类管理' }, - { path: '/mdp/arc/image/UploadAdd',component:UploadAdd,name:'图片管理'} - ] - }, - { - path: '/oa', - component: Home, - name: '内容分发', - iconCls: 'fa el-icon-menu', - //leaf: true,//只有一个节点 - children: [ - { path: '/mdp/arc/archive/ArchiveMng/1', component: ArchiveMng, name: '文档分发' }, - { path: '/mdp/arc/send/sendPlan/SendPlanMng', component: SendPlanMng, name: '分发计划管理' }, - { path: '/mdp/arc/send/sendPlan/SendPlanMng/1', component: SendPlanMng, name: '分发结果' }, - { path: '/mdp/arc/archive/ArchiveMng/2', component: ArchiveMng, name: '分发模板设置' } - ] - }, - -]; - -export default routes; \ No newline at end of file diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index e5b0fbb6..75959487 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -225,6 +225,14 @@ export default { window.open(href, '_blank'); NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it + }, + handleCommand(command){ + if(command=='updateUserInfo'){ + this.$router.push({path:'/updateUserInfo'}) + } + }, + goToIndex(){ + this.$router.push({path:'/'}) } }, mounted() { diff --git a/src/views/mdp/sys/user/UpdateUserInfo.vue b/src/views/mdp/sys/user/UpdateUserInfo.vue new file mode 100644 index 00000000..355d4ebc --- /dev/null +++ b/src/views/mdp/sys/user/UpdateUserInfo.vue @@ -0,0 +1,222 @@ + + + + + \ No newline at end of file