Merge branch 'master' of ssh://1582597470426922.onaliyun.com@s1.nsloop.com:29418/web_TracerMethodology

pages.json

@@ -101,6 +101,22 @@
 				"enablePullDownRefresh": false
 			}
 		}
+	    ,{
+            "path" : "pages/planList/planList",
+            "style" :
+            {
+                "navigationBarTitleText": "计划列表",
+                "enablePullDownRefresh": false
+            }
+
+        },
+				{
+					"path" : "pages/checkList/checkList",
+					"style" :	{
+						"navigationBarTitleText": "查核列表",
+						"enablePullDownRefresh": false
+					}
+				}
     ,{
        "path" : "pages/planList/planList",
        "style":  {

pages/planList/planList.vue

@@ -91,7 +91,7 @@
 			gotoCheckList(){
 				//跳转到查核列表
 				uni.navigateTo({
-					url: `/pages/creatingSituations/creatingSituations?situationId=${this.situationID}`
+					url: `/pages/checkList/checkList?situationId=${this.situationID}`
 				});
 			}
 		}

pages/situationDetail/situationDetail.vue

@@ -181,7 +181,7 @@
 			gotoCheckPage(){
 				//跳转到查核列表
 				uni.navigateTo({
-					url: `/pages/creatingSituations/creatingSituations?situationId=${this.situationID}`
+					url: `/pages/checkList/checkList?situationId=${this.situationID}`
 				});
 			},
 			gotoImprovePage(){
@@ -232,9 +232,7 @@
 							}
 						}).then((data) => {
 							if(data){
-								uni.navigateTo({
-									 url: `/pages/creatingSituations/creatingSituations`
-								});
+								this.gotoCheckPage();
 							}
 							
 						});