edit

tm/lib/Controller/EventsController.class.php

@@ -139,7 +139,7 @@ class EventsController extends Controller {
 				if($ckLogin==true){
 					$info['login'] = 2;//需要登录
 					$weixin = $this->checkIsFromWeixin();
-					if (!$weixin) {
+					if (!$weixin && $this->applogin == 2) {
 						self::redirect($loginUrl);
 					}
 					//self::redirect($loginUrl);
@@ -487,6 +487,7 @@ class EventsController extends Controller {
 		$passport_url .= '&cas_uid=' . $uid;
 
 		$this->setOutput('applogin', 2);
+		$this->applogin = 2;
 		
 		if (!$weixin) {
 			$tokenid = Request::g('tokenid');
@@ -505,6 +506,7 @@ class EventsController extends Controller {
 			} else {
 				# app中未登陆
 				$this->setOutput('applogin', 1);
+				$this->applogin = 1;
 			}
 		}