Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice

config/TanPan/router_tanpan.ts

@@ -31,6 +31,6 @@ export default [
   },
   {//单一来源简化流程 选择供应商及上传应答文件
     path: '/ProjectLayout/SimpleUpload',
-    component: './BidEvaluation/components/SimpleUpload'
+    component: './BidEvaluation/components/simpleUpload'
   }
 ];

config/router.config.ts

@@ -3,11 +3,14 @@ import transfer from './router_transfer';
 import home from './HomePage/router_home';
 import juryRoom from './JuryRoom/router_menuJury.config';
 import approvalForm from './router_approval_form';
+import partyMemberTopic from './router_partyMemberTopic';
 export default [
   //========================================================================登陆
   ...transfer,//跳转、登陆
   //审批单
   ...approvalForm,
+  //党建攻坚
+  ...partyMemberTopic,
   {
     path: '/userformal',
     // component: '../layouts/UserLayout',
@@ -29,10 +32,15 @@ export default [
     ],
   },
   //日历组件暂时用
-  {
-    path: '/Calendar',
-    component: './MainPage/ProjectManager/components/CalendarForm',
-  },
+  // {
+  //   path: '/Calendar',
+  //   component: './MainPage/ProjectManager/components/CalendarForm',
+  // },
+  //富文本组件
+  // {
+  //   path: '/editor',
+  //   component: './MainPage/ProjectManager/components/WangEditor',
+  // },
   //401错误页
   {
     exact: true,
@@ -71,6 +79,14 @@ export default [
       },
     ],
   },
+  {//内拍-参与竞拍列表
+    path: '/AuctionParticipateList',
+    component: './Auction/AuctionParticipateList',
+  },
+  {//内拍-参与竞拍详情
+    path: '/AuctionParticipateDetail',
+    component: './Auction/AuctionParticipateDetail',
+  },
   {//公共服务平台
     path: '/PublicPlatform',
     component: './Bid/BiddingAnnouncement/components/PublicPlatform',
@@ -134,7 +150,7 @@ export default [
             path: '/notice',
             routes: [
               { name: 'noticeList', path: '/notice/noticeList', component: './notice/noticeList/components/NoticeList' },//通知公告查看-所有角色
-              { name: 'noticeManage', path: '/notice/noticeManage', component: './notice/noticeManage/components/noticeManage' },//通知公告管理-系统管理员
+              { name: 'noticeManage', path: '/notice/noticeManage', component: './notice/noticeManage/components/NoticeManage' },//通知公告管理-系统管理员
             ]
           },
           {//委托
@@ -145,12 +161,12 @@ export default [
               {//管理员-代理
                 name: 'manager',
                 path: '/Project/EntrustAssign/Manager',
-                component: './Project/EntrustAssign/Manager',
+                component: './Project/EntrustAssign/manager',
               },
               {//项目经理-代理
                 name: 'operator',
                 path: '/Project/EntrustAssign/Operator',
-                component: './Project/EntrustAssign/Operator',
+                component: './Project/EntrustAssign/operator',
               },
               {//采购经理的委托管理
                 name: 'mandatoryAdministration',
@@ -232,7 +248,7 @@ export default [
             path: '/Supervision',
             component: './Project/ProjectManage/Supervision'
           },
-           {//审查人员 项目管理页
+          {//审查人员 项目管理页
             name: 'Examination',
             path: '/Examination',
             component: './Project/ProjectManage/Examination'

config/router_partyMemberTopic.ts

@@ -0,0 +1,53 @@
+export default [
+  {
+    name: '党建攻坚',
+    path: '/partyMemberTopic',
+    routes: [
+      {//首页
+        name: 'home',
+        path: '/partyMemberTopic/home',
+        component: './PartyMemberTopic/Home',
+      },
+      { //物资采购与管理专业线 党支部 省分
+        name: 'partyBranch',
+        path: '/partyMemberTopic/partyBranch',
+        component: './PartyMemberTopic/PartyBranch',
+      },
+      { //物资采购与管理专业线 党支部数据
+        name: 'partyBranches',
+        path: '/partyMemberTopic/partyBranches',
+        component: './PartyMemberTopic/PartyBranches',
+      },
+      { //物资采购与管理专业线 党支部人员信息
+        name: 'personInfor',
+        path: '/partyMemberTopic/personInfor',
+        component: './PartyMemberTopic/PersonInfor',
+      },
+      { // 攻坚克难项目 更多
+        name: 'overDifficult',
+        path: '/partyMemberTopic/overDifficult',
+        component: './PartyMemberTopic/OverDifficult',
+      },
+      { // 活动风采 更多
+        name: 'activityStyle',
+        path: '/partyMemberTopic/activityStyle',
+        component: './PartyMemberTopic/ActivityStyle',
+      },
+      { // 攻坚克难详情
+        name: 'hardDetail',
+        path: '/partyMemberTopic/hardDetail',
+        component: './PartyMemberTopic/HardDetail',
+      },
+      { // 活动风采和banner详情
+        name: 'newsDetail',
+        path: '/partyMemberTopic/newsDetail',
+        component: './PartyMemberTopic/NewsDetail',
+      },
+      {//管理端首页
+        name: 'manage',
+        path: '/partyMemberTopic/manage',
+        component: './PartyMemberTopic/Management/Manage',
+      },
+    ]
+  },
+];