提交调整

pages/login/loading.vue

@@ -27,7 +27,14 @@
 			  plus.runtime.openURL(this.$config.loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
 			  // #endif
 			  // #ifdef H5
-			  window.open(this.$config.loginPath)
+			  console.log('this.$config.loginPath',this.$config.loginPath);
+			  if(this.$config.loginPath.startsWith('http')){
+				  let returnUrl=window.location.protocol+'//'+window.location.host+"/"+this.$config.context;
+				  location.href=this.$config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading');
+			  }else{
+				  location.href=this.$config.loginPath;
+			  }
+			  
 			  // #endif
 			}else{
 			  apiLogin.boeLogin(token).then(rs=>{
@@ -55,9 +62,9 @@
 							}
 						}
 					 }else{
-						 uni.switchTab({
+						uni.switchTab({
 						 	url:'/pages/index/index'
-						 })
+						})
 					 }
 					 
 				  });						

pages/news/index.vue

@@ -105,7 +105,9 @@
 						if(res.result.list.length!=0){
 							res.result.list.forEach(item => {
 								item.authorInfo={avatar:'',name:'',code:'',sex:null};
-								ids.push(item.sendAid);
+								if(item.sendAid){
+									ids.push(item.sendAid);
+								}
 								item.checked = false;
 								this.message.list.push(item);
 							});