dever há 7 anos atrás
pai
commit
b0b6c3fcc8

+ 19 - 0
tm/lib/Controller/Cate.class.php

@@ -10,6 +10,7 @@ use Cas\Dao\LotteryData;
 use Cas\Module\User;
 use Cas\Dao\LotteryUserExpress;
 use Cas\Dao\Category;
+use Cas\Dao\ArticleLikeCounter;
 /**
  * 分类下的活动列表页 - 首页
  * lihuanchun
@@ -75,12 +76,21 @@ class Cate extends EventsController {
 
 		# 剩余天数
 		$TIME = time();
+		$objArticleLikeCounter = new ArticleLikeCounter();
 		foreach ($eventsData as $tmpKey => $tmpData) {
 			$rday = ($tmpData['end_time'] - $TIME) / (24 * 60 * 60);
 			$eventsData[$tmpKey]['rday'] = ceil($rday);
 			# 参与人数
 			$objMLotteryLog = new LotteryLog ( null, $tmpData['id'] );
 			$eventsData[$tmpKey]['user_total'] = $objMLotteryLog->getUserParticipateLogNumGroupByUid ();
+
+			if ($tmpData['type'] == 9) {
+				# 阅读人数
+				$eventsData[$tmpKey]['click_num'] = $tmpData['click_num'] + ($tmpData['article_pass_base_num']?$tmpData['click_num'] + $tmpData['article_pass_base_num']:0);
+				# 点赞人数
+				$eventsData[$tmpKey]['likes'] = $objArticleLikeCounter->getLikes($tmpData['id']);
+				$eventsData[$tmpKey]['likes'] = $eventsData[$tmpKey]['likes'] + $tmpData['article_praise'];
+			}
 		}
 		
 		$this->setOutput('cate', $cate);
@@ -118,12 +128,21 @@ class Cate extends EventsController {
 		
 		# 剩余天数
 		$TIME = time();
+		$objArticleLikeCounter = new ArticleLikeCounter();
 		foreach ($eventsData as $tmpKey => $tmpData) {
 			$rday = ($tmpData['end_time'] - $TIME) / (24 * 60 * 60);
 			$eventsData[$tmpKey]['rday'] = ceil($rday);
 			# 参与人数
 			$objMLotteryLog = new LotteryLog ( null, $tmpData['id'] );
 			$eventsData[$tmpKey]['user_total'] = $objMLotteryLog->getUserParticipateLogNumGroupByUid ();
+
+			if ($tmpData['type'] == 9) {
+				# 阅读人数
+				$eventsData[$tmpKey]['click_num'] = $tmpData['click_num'] + ($tmpData['article_pass_base_num']?$tmpData['click_num'] + $tmpData['article_pass_base_num']:0);
+				# 点赞人数
+				$eventsData[$tmpKey]['likes'] = $objArticleLikeCounter->getLikes($tmpData['id']);
+				$eventsData[$tmpKey]['likes'] = $eventsData[$tmpKey]['likes'] + $tmpData['article_praise'];
+			}
 		}
 		
 		$this->tpl = 'ajax_list';

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

@@ -81,8 +81,6 @@ class EventsController extends Controller {
 		$objMLotteryLog = new LotteryLog ( null, $info['id'] );
 		$info['user_total'] = $objMLotteryLog->getUserParticipateLogNumGroupByUid ();
 
-		# 阅读人数
-
 
 		# 获取登录地址
 		$url = Request::g('url');

+ 10 - 1
tm/lib/Controller/Index.class.php

@@ -10,6 +10,7 @@ use Cas\Dao\LotteryData;
 use Cas\Module\User;
 use Cas\Dao\LotteryUserExpress;
 use Cas\Dao\Category;
+use Cas\Dao\ArticleLikeCounter;
 /**
  * 活动列表页 - 首页
  * lihuanchun
@@ -83,7 +84,7 @@ class Index extends EventsController {
 		$eventsData =  $this->objMLottery -> getLotteryEventsList($condition, "{$offset},{$size}", $order);
 
 		$TIME = time();
-
+		$objArticleLikeCounter = new ArticleLikeCounter();
 		foreach ($eventsData as $tmpKey => $tmpData) {
 			# 剩余天数
 			$rday = ($tmpData['end_time'] - $TIME) / (24 * 60 * 60);
@@ -91,6 +92,14 @@ class Index extends EventsController {
 			# 参与人数
 			$objMLotteryLog = new LotteryLog ( null, $tmpData['id'] );
 			$eventsData[$tmpKey]['user_total'] = $objMLotteryLog->getUserParticipateLogNumGroupByUid ();
+
+			if ($tmpData['type'] == 9) {
+				# 阅读人数
+				$eventsData[$tmpKey]['click_num'] = $tmpData['click_num'] + ($tmpData['article_pass_base_num']?$tmpData['click_num'] + $tmpData['article_pass_base_num']:0);
+				# 点赞人数
+				$eventsData[$tmpKey]['likes'] = $objArticleLikeCounter->getLikes($tmpData['id']);
+				$eventsData[$tmpKey]['likes'] = $eventsData[$tmpKey]['likes'] + $tmpData['article_praise'];
+			}
 		}
 
 		# 获得福利

+ 10 - 4
tm/template_dir/ajax_list.html

@@ -4,14 +4,20 @@
     <dl>
         <dt><a href="<{$events.url}>"><img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$events.img_url}>"></a></dt>
         <dd><h5><{$events.events_name}></h5></dd>
-        <dd><span class="time">
-
+        <dd>
         <{if $events.rday>=1}>
+        <span class="time">
         <em class="icon-time"></em>剩余<{$events.rday}></span>
-        <{else}>
-        已结束
+        <{elseif $events.type != 9}>
+        <span class="time">已结束</span>
         <{/if}>
+
+        <{if $events.type == 9}>
+        <span>阅读 <{$events.click_num}></span>
+        <span>点赞 <{$events.likes}></span>
+        <{else}>
         <span>参与<{$events.user_total}></span>
+        <{/if}>
 
         </dd>
     </dl>

+ 10 - 4
tm/template_dir/index.html

@@ -52,14 +52,20 @@
     <dl>
         <dt><a href="<{$events.url}>"><img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$events.img_url}>"></a></dt>
         <dd><h5><{$events.events_name}></h5></dd>
-        <dd><span class="time">
-
+        <dd>
         <{if $events.rday>=1}>
+        <span class="time">
         <em class="icon-time"></em>剩余<{$events.rday}></span>
-        <{else}>
-        已结束
+        <{elseif $events.type != 9}>
+        <span class="time">已结束</span>
         <{/if}>
+
+        <{if $events.type == 9}>
+        <span>阅读 <{$events.click_num}></span>
+        <span>点赞 <{$events.likes}></span>
+        <{else}>
         <span>参与<{$events.user_total}></span>
+        <{/if}>
 
         </dd>
     </dl>

+ 8 - 3
tm/template_dir/list.html

@@ -14,14 +14,19 @@
         <dt><a href="<{$events.url}>"><img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$events.img_url}>"></a></dt>
         <dd><h5><{$events.events_name}></h5></dd>
         <dd>
-
         <{if $events.rday>=1}>
         <span class="time">
         <em class="icon-time"></em>剩余<{$events.rday}></span>
-        <{else}>
-        已结束
+        <{elseif $events.type != 9}>
+        <span class="time">已结束</span>
         <{/if}>
+
+        <{if $events.type == 9}>
+        <span>阅读 <{$events.click_num}></span>
+        <span>点赞 <{$events.likes}></span>
+        <{else}>
         <span>参与<{$events.user_total}></span>
+        <{/if}>
 
         </dd>
     </dl>