edit

tm/lib/Controller/EventsController.class.php

@@ -138,6 +138,10 @@ class EventsController extends Controller {
 		if ($authorize) {
 				if($ckLogin==true){
 					$info['login'] = 2;//需要登录
+					$weixin = $this->checkIsFromWeixin();
+					if (!$weixin) {
+						self::redirect($loginUrl);
+					}
 					//self::redirect($loginUrl);
 				}
 		}
@@ -492,7 +496,6 @@ class EventsController extends Controller {
 			if ($tokenid) {
 				$_COOKIE['tokenid'] = $tokenid;
 			}
-			$this->setOutput('applogin', 1);
 			if ($tokenid) {
 				# app中已登陆
 				$passport_url .= '&tokenid=' . $tokenid;
@@ -507,6 +510,7 @@ class EventsController extends Controller {
 		
 		return $passport_url;
 	}
+
 	public function convertUrlQuery($url) {
 		$arr = parse_url ( $url );
 		$query = $arr ['query'];

tm/template_dir/bottom.html

@@ -23,7 +23,12 @@
 function loadLogin()
 {
     <{if $applogin && $applogin == 1}>
-    istoken('<{$loginUrl}>');
+    $("#loginyes").attr('href', 'javascript:;');
+    $("#loginyes").click(function()
+    {
+        istoken('<{$loginUrl}>');
+    });
+    
     <{else}>
     $('#loginbox').show();
     <{/if}>

tm/template_dir/events_infos.html

@@ -365,7 +365,7 @@ $(body).addClass("bg_white");
         <p>请登录后再参与福利活动</p>
         <section class="button-wrapper">
             <a class="button border" href="<{$listUrl}>">找找其他福利</a>
-            <a class="button" href="<{$loginUrl}>">马上登录</a>
+            <a class="button" id="loginyes" href="<{$loginUrl}>">马上登录</a>
         </section>
     </section>
 </section>