PC维护

@@ -340,20 +340,6 @@ class Seller extends Common
         return $this->fetch();
         return $this->fetch();
     }
     }
 
 
-    /**
-     * 商家活动列表页
-     */
-    public function activity(){
-        if(Request::isAjax()){
-            //活动列表
-            $activity_list= file_get_contents(ON_LINE.'App.Seller.GetActivityList');
-            $activity_list = json_decode($activity_list,TRUE);
-            return $result = ['code'=>0,'msg'=>'获取成功!','data'=>$activity_list['data'],'rel'=>1];
-        }
-        $this->assign ( 'title','商家活动配置');
-        return $this->fetch();
-    }
-
     //添加活动
     //添加活动
     public function add_activity(){
     public function add_activity(){
         $data = Request::except('file');
         $data = Request::except('file');

@@ -15,9 +15,6 @@
         <a href="{:url('Seller/seller_activity_list')}" class="layui-btn layui-btn-sm layui-btn-danger">
         <a href="{:url('Seller/seller_activity_list')}" class="layui-btn layui-btn-sm layui-btn-danger">
             <i class="fa fa-file-image-o"></i> 商家列表
             <i class="fa fa-file-image-o"></i> 商家列表
         </a>
         </a>
-        <a href="{:url('Seller/activity')}" class="layui-btn layui-btn-sm">
-            <i class="fa fa-file-image-o"></i> 活动列表
-        </a>
     </blockquote>
     </blockquote>
 
 
     <div class="demoTable">
     <div class="demoTable">