部署到线上

@@ -99,6 +99,8 @@ class SlideItemController extends AdminBaseController
     {
     {
         $id     = $this->request->param('id');
         $id     = $this->request->param('id');
         $result = Db::name('slideItem')->where(['id' => $id])->find();
         $result = Db::name('slideItem')->where(['id' => $id])->find();
+        $activity = Db::name('activity')->where(array('delete_time'=>0,'is_up'=>1))->order('create_time desc')->select();
+        $this->assign('activity', $activity);
 
 
         $this->assign('result', $result);
         $this->assign('result', $result);
         $this->assign('slide_id', $result['slide_id']);
         $this->assign('slide_id', $result['slide_id']);