Merge remote-tracking branch 'origin/test'

app/js/cmpInforShow-article.js

@@ -17,8 +17,7 @@ mui.ready(function() {
			});
		})
		
		plus.nativeUI.closeWaiting();
		self.show("slide-in-right", 150);
		
		
	
		
@@ -35,7 +34,8 @@ mui.ready(function() {
					"pageNo": 1
				},
				success: function(data) {
					
					plus.nativeUI.closeWaiting();
					self.show("slide-in-right", 150);
					if(data.success) {
						var obj = data.data.data;
						if(obj.length>0){
@@ -61,7 +61,7 @@ mui.ready(function() {
					}
				},
				error: function() {
					plus.nativeUI.toast("服务器链接超时", toastStyle);
					//plus.nativeUI.toast("服务器链接超时", toastStyle);
					return;
				}
			})

app/js/cmpInforShow-resources.js

@@ -26,9 +26,7 @@ mui.ready(function() {
				success: function(data) {
					if(data.success) {
						console.log(JSON.stringify(data));
						var web = plus.webview.currentWebview()
						plus.nativeUI.closeWaiting();
						web.show("slide-in-right", 150);
						
					}
				},
				error: function() {
@@ -51,6 +49,9 @@ mui.ready(function() {
				},
				success: function(data) {
					console.log(JSON.stringify(data))
					var web = plus.webview.currentWebview()
						plus.nativeUI.closeWaiting();
						web.show("slide-in-right", 150);
					if(data.success) {
						var obj = data.data.data;
						if(obj.length>0){