dever 6 anni fa
parent
commit
27aa61e0e6

+ 1 - 0
tm/lib/Controller/EventsCode.class.php

@@ -77,6 +77,7 @@ class EventsCode extends EventsController {
 		$objCount->setPassLog( $events_id,$plat_form_id);
 		
 		$this->tpl = 'events_code';
+		$this->setOutput('display', $codeInfo['list_display']);
 		$this->setOutput('title', $title);
 		$this->setOutput('codeInfo', $codeInfo);
 		$this->setOutput('forms', $codeInfo['forms']);

+ 1 - 0
tm/lib/Controller/EventsController.class.php

@@ -187,6 +187,7 @@ class EventsController extends Controller {
 	 * @param string $title        	
 	 */
 	public function checkIsFromMobile($title) {
+		return true;
 		if (Request::get ( 'kif_debug' ) == '@kimiss') {
 			return true;
 		}

+ 1 - 0
tm/lib/Controller/EventsInvitation.class.php

@@ -89,6 +89,7 @@ class EventsInvitation extends EventsController {
 		}
 		
 		$this->tpl = 'events_invitation';
+		$this->setOutput('display', $info['list_display']);
 		$this->setOutput('title', $info['weixinShare']['title'] ? $info['weixinShare']['title'] : $info['events_name']);
 		$this->setOutput('info', $info);
 		$this->setOutput('forms', $info['forms']);

+ 2 - 0
tm/lib/Controller/EventsLetters.class.php

@@ -124,6 +124,8 @@ class EventsLetters extends EventsController {
 		
 		# 页面数据
 		$this->tpl = 'events_letters';
+
+		$this->setOutput('display', $lettersData['events']['list_display']);
 		$this->setOutput('title', $lettersData['events']['weixinShare']['title'] ? $lettersData['events']['weixinShare']['title'] : $lettersData['events']['events_name']);
 		$this->setOutput('ABCJsonData', $ABCJsonData);
 		$this->setOutput('eventsStatus', $eventsStatus);

+ 2 - 0
tm/lib/Controller/EventsScratch.class.php

@@ -82,6 +82,8 @@ class EventsScratch extends EventsController {
 		$objCount->setPassLog( $events_id,$plat_form_id);
 		
 		$this->tpl = 'events_scratch';
+
+		$this->setOutput('display', $scratchData['events']['list_display']);
 		$this->setOutput('title', $scratchData['events']['weixinShare']['title'] ? $scratchData['events']['weixinShare']['title'] : $scratchData['events']['events_name']);
 		$this->setOutput('scratchData', $scratchData);
 		$this->setOutput('uid', $uid);

+ 1 - 0
tm/lib/Controller/EventsSurvey.class.php

@@ -136,6 +136,7 @@ class EventsSurvey extends EventsController {
 			$surveyInfo['events_tips'] = str_replace($tmpMatch, $tmp_new_video_html, $surveyInfo['events_tips']);
 		}
 		
+		$this->setOutput('display', $surveyInfo['list_display']);
 		$this->setOutput('eventsStatus', $eventsStatus);
 		$this->setOutput('title', $surveyInfo['weixinShare']['title'] ? $surveyInfo['weixinShare']['title'] : $surveyInfo['events_name']);
 		$this->setOutput('surveyInfo', $surveyInfo);

+ 1 - 0
tm/lib/Controller/EventsTry.class.php

@@ -89,6 +89,7 @@ class EventsTry extends EventsController {
 		}
 		
 		$this->tpl = 'events_try';
+		$this->setOutput('display', $tryInfo['list_display']);
 		$this->setOutput('userExpress', $userExpress);
 		$this->setOutput('title', $tryInfo['weixinShare']['title'] ? $tryInfo['weixinShare']['title'] : $tryInfo['events_name']);
 		$this->setOutput('tryInfo', $tryInfo);

+ 2 - 1
tm/lib/Controller/EventsTurntable.class.php

@@ -122,7 +122,8 @@ class EventsTurntable extends EventsController {
 		$jsonTurntableData = json_encode($jsonTurntableData);
 		$this->tpl = 'events_turntable';
 		$this->setOutput('title', $turntableData['events']['weixinShare']['title'] ? $turntableData['events']['weixinShare']['title'] : $turntableData['events']['events_name']);
-		//print_r($otherEventsData);die;
+		//print_r($turntableData);die;
+		$this->setOutput('display', $turntableData['events']['list_display']);
 		$this->setOutput('jsonTurntableData', $jsonTurntableData);
 		$this->setOutput('turntableData', $turntableData);
 		$this->setOutput('otherEventsData', $otherEventsData);

+ 1 - 0
tm/lib/Controller/EventsVote.class.php

@@ -105,6 +105,7 @@ class EventsVote extends EventsController {
 		
 		$this->tpl = 'events_vote';
 		$this->setOutput('title', $voteInfo['weixinShare']['title'] ? $voteInfo['weixinShare']['title'] : $voteInfo['events_name']);
+		$this->setOutput('display', $voteInfo['list_display']);
 		$this->setOutput('vote_type', $voteInfo['vote_type']);
 		$this->setOutput('voteInfo', $voteInfo);
 		$this->setOutput('weixinShare', $voteInfo['weixinShare']);

+ 1 - 1
tm/template_dir/bottom.html

@@ -1,5 +1,5 @@
 <div class="v_block"></div>
-<{if !$cutScreenInfo}>
+<{if !$cutScreenInfo && $display == 1}>
 <!--nav begin-->
 <div class="v_nav">
 	<dl <{if $action != 'gift'}>class="on"<{/if}>>