diff --git a/app/portal/controller/ActiveController.php b/app/portal/controller/ActiveController.php
index cc852d6..a764a0b 100644
--- a/app/portal/controller/ActiveController.php
+++ b/app/portal/controller/ActiveController.php
@@ -113,7 +113,13 @@ class ActiveController extends WeChatBaseController
     public function activeAjax(){
         $this->checkUser();
         $status=$this->request->param('status');
-        $data=Db::name('active')->where('status',$status)->select();
+        $data=Db::name('active')->where('status',$status)->select()->toArray();
+        foreach ($data as $k => $v) {
+            $data[$k]['url']=url('portal/active/activeDetail',array('id'=>$data[$k]['id']));
+            $data[$k]['image'] = cmf_get_image_preview_url($data[$k]['thumbnail']);
+            $data[$k]['active_time'] = date('Y-m-d',$data[$k]['active_time']);
+            $data[$k]['end_time'] = date('Y-m-d',$data[$k]['end_time']);
+        };
         $this->assign('list',$data);
         return $this->fetch();
     }
diff --git a/public/themes/simpleboot3/portal/active/active.html b/public/themes/simpleboot3/portal/active/active.html
index 9a893a2..5c3b5c2 100644
--- a/public/themes/simpleboot3/portal/active/active.html
+++ b/public/themes/simpleboot3/portal/active/active.html
@@ -117,19 +117,19 @@
         </div>
     </div>
     <div class="kind">
-        <div class="kind_type active">
+        <div class="kind_type active" data-id="1">
             <p class="kind_img">
                 <img src="__TMPL__/public/assets/images/img/huiyuan.png" alt="">
             </p>
             <p class="kind_name">会员活动</p>
         </div>
-        <div class="kind_type">
+        <div class="kind_type" data-id="2">
             <p class="kind_img">
                 <img src="__TMPL__/public/assets/images/img/shop.png" alt="">
             </p>
             <p class="kind_name">商家活动</p>
         </div>
-        <div class="kind_type">
+        <div class="kind_type" data-id="3">
             <p class="kind_img">
                 <img src="__TMPL__/public/assets/images/img/shang.png" alt="">
             </p>
@@ -138,6 +138,7 @@
     </div>
     <div class="list">
         <foreach name="list" item="vo">
+            <a href="{:url('portal/active/activeDetail',array('id'=>$vo.id))}" style="text-decoration:none;">
         <div class="list_item">
             <div class="item_img">
                 <img src="{:cmf_get_image_preview_url($vo.thumbnail)}" alt="">
@@ -148,12 +149,46 @@
                 <p class="item_date">{:date('Y-m-d',$vo['active_time'])}-{:date('Y-m-d',$vo['end_time'])}</p>
             </div>
         </div>
+            </a>
         </foreach>
     </div>
 </div>
 <script type="text/javascript" src="__TMPL__/public/assets/js/jquery.min.js"></script>
 <script type="text/javascript" src="__TMPL__/public/assets/js/swiper.min.js"></script>
 <script>
+    $(".kind_type").click(function(){
+        $(this).addClass("active");
+        $(this).siblings(".kind_type").removeClass("active")
+    })
+    $(".active").click(function(){
+        var status=$(this).data('id')
+        $.ajax({
+            url: "{:url('portal/active/activeAjax')}",
+            type: "post",
+            data: {
+                status:status,
+            },
+            success: function (data) {
+                var html = "";
+                for (var i = 0; i < data.length; i++) {
+                    html +='            <a href="'+data[i].url+'" style="text-decoration:none;">\n' +
+                        '        <div class="list_item">\n' +
+                        '            <div class="item_img">\n' +
+                        '                <img src="'+data[i].image+'" alt="">\n' +
+                        '            </div>\n' +
+                        '            <div class="flooritem">\n' +
+                        '                <p class="item_name">'+data[i].name+'</p>\n' +
+                        '\n' +
+                        '                <p class="item_date">'+data[i].active_time+'-'+data[i].end_time+'</p>\n' +
+                        '            </div>\n' +
+                        '        </div>\n' +
+                        '            </a>'
+                }
+                $(".list").html(html);
+            }
+        })
+    })
+
     var mySwiper = new Swiper('.swiper-container', {
         pagination: {
             el: '.swiper-pagination',
@@ -161,11 +196,6 @@
         autoplay: true,//可选选项，自动滑动
 
     })
-
-    //活动详情页
-    $(".list_item").click(function(){
-        window.location.href='activedetail.html'
-    })
 </script>
 </body>
 </html>