dever 7 years ago
parent
commit
820463154e

+ 1 - 0
tm/lib/Controller/Admin/Activity/SetPage.class.php

@@ -163,6 +163,7 @@ class SetPage extends Controller {
 		// 活动规则提示语  operationt_tips
 		
 		$info = array();
+		$info['base_num'] = Request::p('base_num', null); //
 		$info['events_tips'] =  Request::p('events_tips', null);
 		$info['events_hd_tips'] = Request::p('events_hd_tips', null); //互动提示语
 		$info['share_button'] = Request::p('share_button', null); //是否显示分享按钮

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

@@ -90,6 +90,10 @@ class Cate extends EventsController {
 				# 点赞人数
 				$eventsData[$tmpKey]['likes'] = $objArticleLikeCounter->getLikes($tmpData['id']);
 				$eventsData[$tmpKey]['likes'] = $eventsData[$tmpKey]['likes'] + $tmpData['article_praise'];
+			} else {
+				if (isset($tmpData['base_num']) && $tmpData['base_num']) {
+					$eventsData[$tmpKey]['user_total'] += $tmpData['base_num'];
+				}
 			}
 		}
 		
@@ -142,6 +146,10 @@ class Cate extends EventsController {
 				# 点赞人数
 				$eventsData[$tmpKey]['likes'] = $objArticleLikeCounter->getLikes($tmpData['id']);
 				$eventsData[$tmpKey]['likes'] = $eventsData[$tmpKey]['likes'] + $tmpData['article_praise'];
+			} else {
+				if (isset($tmpData['base_num']) && $tmpData['base_num']) {
+					$eventsData[$tmpKey]['user_total'] += $tmpData['base_num'];
+				}
 			}
 		}
 		

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

@@ -81,6 +81,10 @@ class EventsController extends Controller {
 		$objMLotteryLog = new LotteryLog ( null, $info['id'] );
 		$info['user_total'] = $objMLotteryLog->getUserParticipateLogNumGroupByUid ();
 
+		if (isset($info['base_num']) && $info['base_num']) {
+			$info['user_total'] += $info['base_num'];
+		}
+
 
 		# 获取登录地址
 		$url = Request::g('url');

+ 4 - 0
tm/lib/Controller/Index.class.php

@@ -99,6 +99,10 @@ class Index extends EventsController {
 				# 点赞人数
 				$eventsData[$tmpKey]['likes'] = $objArticleLikeCounter->getLikes($tmpData['id']);
 				$eventsData[$tmpKey]['likes'] = $eventsData[$tmpKey]['likes'] + $tmpData['article_praise'];
+			} else {
+				if (isset($tmpData['base_num']) && $tmpData['base_num']) {
+					$eventsData[$tmpKey]['user_total'] += $tmpData['base_num'];
+				}
 			}
 		}
 

+ 5 - 0
tm/template_dir/admin/activity/setPage_event.html

@@ -98,6 +98,11 @@
 				<input name="buy_button_app" class="form-control" style="display:inline;width:150px;" type="text" value="<{if $eventData.buy_button_app}><{$eventData.buy_button_app}><{else}>APP链接<{/if}>"/>
 			</div>
 
+			<div class="form-group">
+				<label class="control-label rowlabel">参与人数基数:</label>
+				<input name="base_num" class="form-control" type="text" style="width:300px;" value="<{$eventData.base_num}>"/>
+			</div>
+
 			<div class="form-group">
 				<label class="control-label rowlabel">互动提示语:</label>
 				<input name="events_hd_tips" class="form-control" type="text" style="width:300px;" value="<{$eventData.events_hd_tips}>"/>

+ 2 - 1
tm/template_dir/events_forms_template_new.html

@@ -1,12 +1,13 @@
 
 <{if $info.end == 2}>
-
+    <div class="textcenter">
         <h3>活动已结束!</h3>
         <p>感谢您的关注,期待您参与我们的其他活动</p>
         <section class="button-wrapper">
             <a class="button border" href="<{$listUrl}>">找找其他福利</a>
             <a class="button" href="<{$giftsUrl}>">查看我的奖品</a>
         </section>
+    </div>
 
 <{else}>