From d99603fa4c5188d19991de978c185b2b9247c5af Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Sat, 09 May 2020 09:22:02 +0800
Subject: [PATCH] Merge branch 'master' of http://git.hugeinfo.com.cn/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/index.jsx | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index e18b46a..23ee264 100644
--- a/SunshineIns/src/index.jsx
+++ b/SunshineIns/src/index.jsx
@@ -14,7 +14,7 @@
import BusDetail from './page/BusDetail';
import SupPerson from './page/SupPerson';
import Company from './page/Company';
-// 涉未成年负责部门组织
+// 社会组织维护
import UnderAgeList from './page/UnderAgeList';
import KeyWord from './page/KeyWord';
import ActiveManage from './page/ActiveManage';
@@ -48,6 +48,7 @@
import Newly from './page/Newly';
import SignIn from './page/SignIn';
import QuestionDetail from './page/QuestionDetail';
+import QuestionPersonDetail from './page/QuestionPersonDetail';
import NoInspectionReportList from './page/NoInspectionReportList';
import NoInspectionReportDetail from './page/NoInspectionReportDetail';
@@ -69,8 +70,8 @@
{/* <Route path='/questionnaire/newly' component={AttTree} /> */}
{/* 问卷详情 */}
<Route path='/activeManageEditquestionnaire/:id' component={null} />
- {/* 签到墙 */}
- <Route path='/signIn/:id' component={null} />
+ {/* 签到墙 */}
+ <Route path='/signIn/:id' component={null} />
<Route component={Menu} />
</Switch>
<Switch>
@@ -88,7 +89,7 @@
<Route path='/supPerson' component={SupPerson} />
<Route path='/company' component={Company} />
<Route path='/underAgeList' component={UnderAgeList} />
- <Route path='/keyWord' component={KeyWord} />
+ <Route path='/dxWords' component={KeyWord} />
<Route path='/knowledgeBase' component={KnowledgeBase} />
<Route path='/articlePublish' component={ArticlePublish} />
<Route path='/articleEidt/:id' component={ArticleEidt} />
@@ -119,8 +120,10 @@
<Route path='/questionnaire/newly/:id' component={Newly} />
{/* 问卷详情 */}
<Route path='/questionnaire/detail/:id' component={QuestionDetail} />
+ {/* 小程序提交的任务详情 */}
+ <Route path='/questionnaire/persondetail/:id/:userId' component={QuestionPersonDetail} />
-
+
{/* 公安审核 */}
<Route path='/entry/policeSecurity' component={PoliceSecurity} />
<Route path='/entry/policeSecurityEdit/:id' component={policeSecurityEdit} />
@@ -133,7 +136,7 @@
<Route path='/noInspectionReportDetail/:id/:flag' component={NoInspectionReportDetail} />
-
+
<Route path='/' component={Index} />
</Switch>
</Layout>
--
Gitblit v1.8.0