Merge branch 'local' into develop

@@ -44,6 +44,10 @@ export function setChannel(channel) {
 export function goAction(inputUrl) {
 export function goAction(inputUrl) {
 	return (dispatch, getState) => {
 	return (dispatch, getState) => {
 		let json = new RouterService().parseUrl(inputUrl);
 		let json = new RouterService().parseUrl(inputUrl);
+		if (json === null) {
+			return;
+		}
+		
 		let {action, params} = json;
 		let {action, params} = json;
 		let {param, share, shareparam, title, url} = params;
 		let {param, share, shareparam, title, url} = params;
 
 

@@ -43,6 +43,7 @@ export default class RouterService {
 	parseUrl(url) {
 	parseUrl(url) {
 		if (!url) {
 		if (!url) {
 			__DEV__ && console.log('Illegal url: ' + url);
 			__DEV__ && console.log('Illegal url: ' + url);
+			return null;
 		}
 		}
 
 
 		// url解码
 		// url解码
@@ -57,6 +58,7 @@ export default class RouterService {
 
 
 		if (markIndex == -1) {
 		if (markIndex == -1) {
 			__DEV__ && console.log('Can not find url rule: ' + url);
 			__DEV__ && console.log('Can not find url rule: ' + url);
+			return null;
 		}
 		}
 
 
 		let rule = url.substring(markIndex + mark.length);
 		let rule = url.substring(markIndex + mark.length);
@@ -67,6 +69,7 @@ export default class RouterService {
 			return json;
 			return json;
 		} catch (e) {
 		} catch (e) {
 			__DEV__ && console.log('Parse json string fail: ' + e);
 			__DEV__ && console.log('Parse json string fail: ' + e);
+			return null;
 		}
 		}
 	}
 	}
 }
 }