edit

tm/lib/Controller/Admin/Category/Index.class.php

@@ -6,6 +6,7 @@ use KIF\Core\Request;
 use Cas\Controller\Admin\Controller;
 use KIF\Page\Page;
 use Cas\Dao\Category;
+use KIF\Verify;
 
 /**
  * ＂分类相关＂ - "列表"[分类相关信息]
@@ -155,6 +156,22 @@ class Index extends Controller {
 		header ( "Location: " . Request::schemeDomain () . "/?c=Admin_Category_Index&a=PageList" );
 		exit ();
 	}
+
+	public function doDelete() {
+		\KIF\Core\PermissionController::requireCompetence();
+		
+		$id = Request::p('id');
+		if (!Verify::unsignedInt($id)) {
+			$this->ajax_fail_exit('无效id');
+		}
+		
+		$this->objDCategory->delete ( array (
+				'id' => $id 
+		) );
+		$this->ajax_success_exit();
+	}
+
+
 	public function display() {
 		return $this->render ();
 	}

tm/lib/Controller/Admin/Focus/Index.class.php

@@ -7,6 +7,7 @@ use Cas\Controller\Admin\Controller;
 use KIF\Page\Page;
 use Cas\Dao\Platform;
 use Cas\Dao\Focus;
+use KIF\Verify;
 
 /**
  * ＂推荐相关＂ - "列表"[推荐相关信息]
@@ -166,6 +167,21 @@ class Index extends Controller {
 		header ( "Location: " . Request::schemeDomain () . "/?c=Admin_Focus_Index&a=PageList" );
 		exit ();
 	}
+
+	public function doDelete() {
+		\KIF\Core\PermissionController::requireCompetence();
+		
+		$id = Request::p('id');
+		if (!Verify::unsignedInt($id)) {
+			$this->ajax_fail_exit('无效id');
+		}
+		
+		$this->objDFocus->delete ( array (
+				'id' => $id 
+		) );
+		$this->ajax_success_exit();
+	}
+
 	public function display() {
 		return $this->render ();
 	}

tm/lib/Controller/EventsController.class.php

@@ -81,6 +81,8 @@ class EventsController extends Controller {
 		$objMLotteryLog = new LotteryLog ( null, $info['id'] );
 		$info['user_total'] = $objMLotteryLog->getUserParticipateLogNumGroupByUid ();
 
+		# 阅读人数
+
 
 		# 获取登录地址
 		$url = Request::g('url');
@@ -360,6 +362,8 @@ class EventsController extends Controller {
 			if (isset($v['pic'])) {
 				$data[$k]['pic'] = explode(',', $v['pic']);
 			}
+
+			$type = isset($eventsData['type']) ? $eventsData['type'] : $eventsData[$v['events_id']]['type'];
 			
 			$data[$k]['user'] = array();
 			$data[$k]['user']['cdate'] = date('Y.m.d H:i', isset($v['winners_time']) ? $v['winners_time'] : $v['create_time']);
@@ -367,6 +371,19 @@ class EventsController extends Controller {
 
 			$data[$k]['user']['headimgurl'] = $this->getUserHead($users[$v['uid']]);
 
+
+			$data[$k]['user']['ext'] = '';
+			if ($type == 6) {
+				$data[$k]['user']['ext'] = '邀请';
+			} elseif ($type == 4) {
+				$data[$k]['user']['ext'] = '试用资格';
+			} elseif ($type == 7) {
+				$data[$k]['user']['ext'] = '优惠券';
+			} elseif ($type == 1) {
+				$data[$k]['user']['ext'] = '奖品';
+			}
+
+
 			if (isset($v['express']['phone']) && $v['express']['phone']) {
 				$data[$k]['user']['mobile'] = substr_replace($v['express']['phone'],'****',3,4);
 			} elseif (isset($newUserExpData[$v['uid']]['phone']) && $newUserExpData[$v['uid']]['phone']) {
@@ -558,7 +575,7 @@ class EventsController extends Controller {
 	 * @param string $title        	
 	 */
 	public function checkIsFromMobile($title) {
-		//return true;
+		return true;
 		if (Request::get ( 'debugs' ) == 'rabin') {
 			return true;
 		}

tm/lib/Controller/FeedBack.class.php

@@ -55,7 +55,7 @@ class FeedBack extends EventsController {
 		$data['status'] = 1;
 
 
-		$ids = $objLotteryUserFeedback->findIdsBy ( $where, 1, $order = ' id desc');
+		$ids = $objLotteryUserFeedback->findIdsBy ( $data, 1, $order = ' id desc');
 		$feedback = $objLotteryUserFeedback->gets ( $ids );
 		
 		if ($feedback) {

tm/lib/Controller/Index.class.php

@@ -68,7 +68,7 @@ class Index extends EventsController {
 		# 热门活动
 		$condition = array(
 			'display' => LotteryEvents::EVENT_DISPLAY_SHOW, // 已发布的
-			//'list_display' => LotteryEvents::LIST_DISPLAY_SHOW, // 列表中是否显示
+			'list_display' => LotteryEvents::LIST_DISPLAY_SHOW, // 列表中是否显示
 			'top_display' => LotteryEvents::TOP_DISPLAY_SHOW, // 是否置顶
 			'begin_time'	=> SqlHelper::addCompareOperator('<=', time()),
 			'platform_ids' => SqlHelper::addCompareOperator('&', $plat_form_id),
@@ -94,13 +94,13 @@ class Index extends EventsController {
 		}
 
 		# 获得福利
-		$this->prize($eventsData, $plat_form_id, 6);
+		$this->prize($eventsData, $plat_form_id, 5);
 
 		# 获取分类
 		$this->objDCategory = new Category ();
 		$order = 'id desc';
 		$condition = array ();
-		$ids = $this->objDCategory->findIdsBy ( $condition, '0,5', $order );
+		$ids = $this->objDCategory->findIdsBy ( $condition, '0,50', $order );
 		$categoryData = $this->objDCategory->gets ( $ids );
 		$this->setOutput('categoryData', $categoryData);
 

tm/template_dir/admin/category/list.html

@@ -50,7 +50,7 @@
 					<td><{$item.id}></td>
 					<td><{$item.name}></td>
 					<td><img src="<{$item.icon}>" width="40" /></td>
-					<td><a href="<{$web_cfg.domain}>/?c=Admin_Category_index&a=PageShow&id=<{$item.id}>">编辑</a></td>
+					<td><a href="<{$web_cfg.domain}>/?c=Admin_Category_index&a=PageShow&id=<{$item.id}>">编辑</a> <a href="javascript:;" class="deleteItem" data-id="<{$item.id}>">删除</a></td>
 				</tr>
 				<{/foreach}>
 			</tbody>
@@ -84,6 +84,37 @@
 <script>
 KISSY.use('node, io', function (S, Node, IO) {
 	var $ = S.all;
+
+	$(".deleteItem").on('click', function () {
+		var id = $(this).attr('data-id');
+		if (!id) {
+			alert('无效id');
+			return false;
+		}
+		
+		if (!confirm('确定要删除这项数据？')) {
+			return false;
+		}
+		
+		new IO({
+			type: "post"
+			, url: VG.conf.root_domain + '/?c=Admin_Category_index&a=Delete'
+			, data: {'id':id}
+			, success: function (data) {
+				if (data.ok) { //ok
+					alert('操作成功');
+					location.reload();
+				} else {
+					alert('操作失败，原因：'+data.msg);
+				}
+				return false;
+			}
+			, error: function (NULL, textStatus) {
+				alert("请求服务器失败，原因:"+textStatus);
+			}
+			, dataType: "json"
+		});
+	});
 	
 	$("#add_category_btn").on('click', function () {
 		var name = $("input[name=name]").val();

tm/template_dir/admin/focus/list.html

@@ -52,7 +52,7 @@
 					<td><{$platformList[$item.platform_id].name}></td>
 					<td><{$item.name}></td>
 					<td><img src="<{$item.pic}>" width="100" /><br /><{$item.link}></td>
-					<td><a href="<{$web_cfg.domain}>/?c=Admin_Focus_index&a=PageShow&id=<{$item.id}>">编辑</a></td>
+					<td><a href="<{$web_cfg.domain}>/?c=Admin_Focus_index&a=PageShow&id=<{$item.id}>">编辑</a> <a href="javascript:;" class="deleteItem" data-id="<{$item.id}>">删除</a></td>
 				</tr>
 				<{/foreach}>
 			</tbody>
@@ -105,6 +105,37 @@
 <script>
 KISSY.use('node, io', function (S, Node, IO) {
 	var $ = S.all;
+
+	$(".deleteItem").on('click', function () {
+		var id = $(this).attr('data-id');
+		if (!id) {
+			alert('无效id');
+			return false;
+		}
+		
+		if (!confirm('确定要删除这项数据？')) {
+			return false;
+		}
+		
+		new IO({
+			type: "post"
+			, url: VG.conf.root_domain + '/?c=Admin_Focus_index&a=Delete'
+			, data: {'id':id}
+			, success: function (data) {
+				if (data.ok) { //ok
+					alert('操作成功');
+					location.reload();
+				} else {
+					alert('操作失败，原因：'+data.msg);
+				}
+				return false;
+			}
+			, error: function (NULL, textStatus) {
+				alert("请求服务器失败，原因:"+textStatus);
+			}
+			, dataType: "json"
+		});
+	});
 	
 	$("#add_focus_btn").on('click', function () {
 		var name = $("input[name=name]").val();

tm/template_dir/events_article.html

@@ -16,7 +16,7 @@
         <div class="arti_content clear"><{$article.article_text}></div>
         
         <div class="clear"></div>
-	    <div class="vogue_read"><a href="">阅读原文</a> 阅读 <{$clickNum}> <span class="praise"><i class="fa <{if $isHasLikes}>fa-thumbs-up<{else}>fa-thumbs-o-up<{/if}>"></i> <em><{$likes}></em></span></div>
+	    <div class="vogue_read"><{if $article.article_original_url}><a href="<{$article.article_original_url}>">阅读原文</a> <{/if}>阅读 <{$clickNum}> <span class="praise"><i class="fa <{if $isHasLikes}>fa-thumbs-up<{else}>fa-thumbs-o-up<{/if}>"></i> <em><{$likes}></em></span></div>
 	    <div class="clear"></div>
     </div>
 </div>

tm/template_dir/events_infos.html

@@ -81,7 +81,7 @@ function help()
     <section class="userlist">
         <ul id="lazyLoad">
             <{foreach from=$userEventsData item=v}>
-            <li><img src="<{$v.user.headimgurl}>"><span><{$v.user.mobile}> 的用户 <{$v.user.cdate}> 获得 <{$v.user.events}>活动奖品。</span></li>
+            <li><img src="<{$v.user.headimgurl}>"><span><{$v.user.mobile}> 的用户 <{$v.user.cdate}> 获得 <{$v.user.events}> <{$v.user.ext}>。</span></li>
             <{/foreach}>
         </ul>
     </section>
@@ -164,11 +164,13 @@ $(body).addClass("bg_white");
                 <img src="<{$v.user.headimgurl}>">
                 <div class="dt">
                     <span><{$v.user.mobile}> 的用户 <{$v.user.cdate}> 评价了 <{$v.user.events}>活动：</span>
+                    <{if $v.pic[0]}>
                     <div class="imgs">
                         <{foreach from=$v.pic item=v1}>
                         <img src="<{$v1}>">
                         <{/foreach}>
                     </div>
+                    <{/if}>
                     <p><{$v.content}></p>
                 </div>
             </li>

tm/template_dir/events_vote_content.html

@@ -1,6 +1,6 @@
 
-<{if $surveyInfo.events_hd_tips}>
-    <h2><{$surveyInfo.events_hd_tips}></h2>
+<{if $info.events_hd_tips}>
+    <h2><{$info.events_hd_tips}></h2>
 <{/if}>
 <{if $voteInfo.vote_type == 1}>
        

tm/template_dir/feedback.html

@@ -19,7 +19,7 @@
                 <{/foreach}>
                 <{/if}>
                 <li class="fileselect image_upload" v="1" id="file-upload">
-                    <input type="text" name="file" id="file" accept="image/*" style="cursor:pointer;">
+                    <input type="text" disabled name="file" id="file" accept="image/*" style="cursor:pointer;">
                 </li>
             </ul>
         </section>

tm/template_dir/gifts.html

@@ -6,7 +6,7 @@
 
 <section class="prizelist">
     <{if $data}>
-    <h2>您参与活动所获得的奖品</h2>
+    <h2>您参与活动获得的奖品</h2>
     <{else}>
     <h2>您还没有获得奖品</h2>
     <{/if}>

tm/template_dir/index.html

@@ -39,7 +39,7 @@
     <h2>获得福利</h2>
     <ul>
         <{foreach from=$userEventsData item=v}>
-        <li><img src="<{$v.user.headimgurl}>"><span><{$v.user.mobile}> 的用户 <{$v.user.cdate}> 获得 <{$v.user.events}>活动奖品。</span></li>
+        <li><img src="<{$v.user.headimgurl}>"><span><{$v.user.mobile}> 的用户 <{$v.user.cdate}> 获得 <{$v.user.events}> <{$v.user.ext}>。</span></li>
         <{/foreach}>
     </ul>
 </section>