|
...
|
...
|
@@ -340,20 +340,6 @@ class Seller extends Common |
|
|
|
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(){
|
|
|
|
$data = Request::except('file');
|
...
|
...
|
|