Skip to content

B
backend
Commit a2a16aea by LiuJunYi
Options

美行者BUG

parent f06a2356
Showing with 81 additions and 78 deletions
application/admin/controller/Project.php
...@@ -24,8 +24,8 @@ class Project extends AuthBase ...@@ -24,8 +24,8 @@ class Project extends AuthBase
public function _initialize() public function _initialize()
{ {
$this->project_model = model("project"); $this->project_model = model("project");
$this->tag_model = model("Tags"); $this->tag_model = model("Tags");
$this->city_model = model("Citys"); $this->city_model = model("Citys");
$this->catalog_model = model("Catalogs"); $this->catalog_model = model("Catalogs");
$this->appoint_model = model("Reservations"); $this->appoint_model = model("Reservations");
parent::_initialize(); parent::_initialize();
...@@ -34,10 +34,10 @@ class Project extends AuthBase ...@@ -34,10 +34,10 @@ class Project extends AuthBase
//活动列表 //活动列表
public function index() public function index()
{ {
$title = input('get.title'); $title = input('get.title');
$type = input('get.type'); $type = input('get.type');
$catalog_id = input('get.catalog_id'); $catalog_id = input('get.catalog_id');
$condition = []; $condition = [];
if ($title) { if ($title) {
$condition['title'] = ['like', "%" . $title . "%"]; $condition['title'] = ['like', "%" . $title . "%"];
} }
...@@ -52,7 +52,7 @@ class Project extends AuthBase ...@@ -52,7 +52,7 @@ class Project extends AuthBase
$project_list = $project_list =
$this->project_model $this->project_model
->where($condition) ->where($condition)
->order('sort','desc') ->order('sort', 'desc')
->order('id desc') ->order('id desc')
->paginate(10, false, ['query' => ['title' => $title, 'type' => $type, 'catalog_id' => $catalog_id]]); ->paginate(10, false, ['query' => ['title' => $title, 'type' => $type, 'catalog_id' => $catalog_id]]);
$this->assign('project_list', $project_list); $this->assign('project_list', $project_list);
...@@ -67,37 +67,38 @@ class Project extends AuthBase ...@@ -67,37 +67,38 @@ class Project extends AuthBase
// 引入上传类 // 引入上传类
$upload = new Upload(); $upload = new Upload();
$file = input('file.'); $file = input('file.');
$data = input('post.'); $data = input('post.');
$poster = ''; $poster = '';
$kf_qrcode = ''; $kf_qrcode = '';
$banners = []; $banners = [];
//如果是商家则保存客服二维码 //如果是商家则保存客服二维码
if ($data['type'] == 2) { if ($data['type'] == 2) {
$result = $upload->sava($file['kf_qrcode']); $file = request()->file('kf_qrcode');
if (!$result['error']) { $info = $file->move('./upload/qrcode/');
$kf_qrcode = $result['result']['url']; if ($info) {
$kf_qrcode = "/upload/qrcode/" . $info->getSaveName();
$data['kf_qrcode'] = $kf_qrcode; $data['kf_qrcode'] = $kf_qrcode;
} }
} }
//保存封面 //保存封面
$result = $upload->sava($file['poster']); $result = $upload->sava(input('file.poster'));
if (!$result['error']) { if (!$result['error']) {
$poster = $result['result']['url']; $poster = $result['result']['url'];
$data['poster'] = $poster; $data['poster'] = $poster;
} }
//遍历banner数组并保存 //遍历banner数组并保存
foreach ($file['banners'] as $name => $f) { foreach (input('file.banners') as $name => $f) {
$result = $upload->sava($f); $result = $upload->sava($f);
if (!$result['error']) { if (!$result['error']) {
$banners[] = $result['result']['url']; $banners[] = $result['result']['url'];
$data['banners'] = json_encode($banners); $data['banners'] = json_encode($banners);
} }
} }
//去除null //去除null
foreach($data as $k=>$v){ foreach ($data as $k => $v) {
if($v==='null'){ if ($v === 'null') {
unset($data[$k]); unset($data[$k]);
} }
} }
...@@ -122,10 +123,11 @@ class Project extends AuthBase ...@@ -122,10 +123,11 @@ class Project extends AuthBase
} }
} }
//删除项目、商家 //删除项目、商家
public function delete() public function delete()
{ {
$id = input('post.id'); $id = input('post.id');
$used = model('Orders')->where('pid', $id)->count(); $used = model('Orders')->where('pid', $id)->count();
// if ($used > 0) { // if ($used > 0) {
// $this->error('该项目已有用户下单,不可删除！', '', '', 1); // $this->error('该项目已有用户下单,不可删除！', '', '', 1);
...@@ -144,26 +146,26 @@ class Project extends AuthBase ...@@ -144,26 +146,26 @@ class Project extends AuthBase
{ {
if (request()->isPost()) { if (request()->isPost()) {
// 引入上传类 // 引入上传类
$id = input('post.id'); $id = input('post.id');
$upload = new Upload(); $upload = new Upload();
$file = input('file.'); $file = input('file.');
$data = input('post.'); $data = input('post.');
$data = array_merge(array_diff($data, array('id' => $id))); $data = array_merge(array_diff($data, array('id' => $id)));
$poster = ''; $poster = '';
$kf_qrcode = ''; $kf_qrcode = '';
$banners = []; $banners = [];
$project_info = $this->project_model->find($id); $project_info = $this->project_model->find($id);
$old_banners = json_decode($project_info['banners_native']); $old_banners = json_decode($project_info['banners_native']);
$old_poster = $project_info['poster']; $old_poster = $project_info['poster'];
$old_kf_qrcode = $project_info['kf_qrcode']; $old_kf_qrcode = $project_info['kf_qrcode'];
//如果是商家则保存客服二维码 //如果是商家则保存客服二维码
if ($data['type'] == 2) { if ($data['type'] == 2) {
if (input('file.kf_qrcode')) { if (input('file.kf_qrcode')) {
$file = request()->file('kf_qrcode'); $file = request()->file('kf_qrcode');
$info = $file->move('./static/qrcode/'); $info = $file->move('./upload/qrcode/');
if ($info) { if ($info) {
$kf_qrcode = "/static/qrcode/".$info->getSaveName(); $kf_qrcode = "/upload/qrcode/" . $info->getSaveName();
$data['kf_qrcode'] = $kf_qrcode; $data['kf_qrcode'] = $kf_qrcode;
} }
} }
...@@ -172,7 +174,7 @@ class Project extends AuthBase ...@@ -172,7 +174,7 @@ class Project extends AuthBase
if (input('file.poster')) { if (input('file.poster')) {
$result = $upload->sava(input('file.poster')); $result = $upload->sava(input('file.poster'));
if (!$result['error']) { if (!$result['error']) {
$poster = $result['result']['url']; $poster = $result['result']['url'];
$data['poster'] = $poster; $data['poster'] = $poster;
} }
} }
...@@ -189,8 +191,8 @@ class Project extends AuthBase ...@@ -189,8 +191,8 @@ class Project extends AuthBase
} }
//去除null //去除null
foreach($data as $k=>$v){ foreach ($data as $k => $v) {
if($v==='null'){ if ($v === 'null') {
unset($data[$k]); unset($data[$k]);
} }
} }
...@@ -209,7 +211,7 @@ class Project extends AuthBase ...@@ -209,7 +211,7 @@ class Project extends AuthBase
//反显，处理项目/商品已使用标签 //反显，处理项目/商品已使用标签
$value = $project_info->tags_id_str; $value = $project_info->tags_id_str;
$value = trim($value, '|'); $value = trim($value, '|');
$tags = explode('|', $value); $tags = explode('|', $value);
$this->assign('tags', $tags); $this->assign('tags', $tags);
//反显，读取所有tags //反显，读取所有tags
$tag_list = $this->tag_model->order('sort', 'asc')->select(); $tag_list = $this->tag_model->order('sort', 'asc')->select();
...@@ -227,8 +229,8 @@ class Project extends AuthBase ...@@ -227,8 +229,8 @@ class Project extends AuthBase
// 标签管理 // 标签管理
public function tags() public function tags()
{ {
$title = input('get.name', ''); $title = input('get.name', '');
$tag_list = $this->tag_model->where('name', 'like', "%" . $title . "%")->order('sort', 'desc')->order('id','desc')->paginate(15); $tag_list = $this->tag_model->where('name', 'like', "%" . $title . "%")->order('sort', 'desc')->order('id', 'desc')->paginate(15);
$this->assign("tag_list", $tag_list); $this->assign("tag_list", $tag_list);
return $this->fetch(''); return $this->fetch('');
} }
...@@ -236,7 +238,7 @@ class Project extends AuthBase ...@@ -236,7 +238,7 @@ class Project extends AuthBase
//添加标签 //添加标签
public function addTag() public function addTag()
{ {
$data = array( $data = array(
'name' => trim(input('post.name')), 'name' => trim(input('post.name')),
'sort' => input('post.sort', 0), 'sort' => input('post.sort', 0),
); );
...@@ -264,9 +266,9 @@ class Project extends AuthBase ...@@ -264,9 +266,9 @@ class Project extends AuthBase
//修改标签 //修改标签
public function updateTag() public function updateTag()
{ {
$id = input('post.id'); $id = input('post.id');
$data = array( $data = array(
'id' => $id, 'id' => $id,
'name' => trim(input('post.name')), 'name' => trim(input('post.name')),
'sort' => input('post.sort', 0) 'sort' => input('post.sort', 0)
); );
...@@ -286,7 +288,7 @@ class Project extends AuthBase ...@@ -286,7 +288,7 @@ class Project extends AuthBase
//删除标签 //删除标签
public function deleteTag() public function deleteTag()
{ {
$id = input('post.id'); $id = input('post.id');
$used = $this->project_model->where('tags', 'like', "%" . '|' . $id . '|' . "%")->count(); $used = $this->project_model->where('tags', 'like', "%" . '|' . $id . '|' . "%")->count();
if ($used > 0) { if ($used > 0) {
$this->error('该标签已在项目中引用,不可删除！', '', '', 1); $this->error('该标签已在项目中引用,不可删除！', '', '', 1);
...@@ -303,7 +305,7 @@ class Project extends AuthBase ...@@ -303,7 +305,7 @@ class Project extends AuthBase
public function appoint() public function appoint()
{ {
$title = input('get.name', ''); $title = input('get.name', '');
$items = $this->appoint_model->where('nickname', 'like', "%" . $title . "%")->order('id', 'desc')->paginate(15, false, ['query' => ['nickname' => $title]])->each(function($item){ $items = $this->appoint_model->where('nickname', 'like', "%" . $title . "%")->order('id', 'desc')->paginate(15, false, ['query' => ['nickname' => $title]])->each(function ($item) {
$project = \app\common\model\Project::withTrashed()->find($item['pid']); $project = \app\common\model\Project::withTrashed()->find($item['pid']);
$item['project_poster'] = $project['poster']; $item['project_poster'] = $project['poster'];
$item['project_title'] = $project['title']; $item['project_title'] = $project['title'];
...@@ -315,8 +317,8 @@ class Project extends AuthBase ...@@ -315,8 +317,8 @@ class Project extends AuthBase
// 城市管理 // 城市管理
public function citys() public function citys()
{ {
$title = input('get.name', ''); $title = input('get.name', '');
$tag_list = $this->city_model->where('name', 'like', "%" . $title . "%")->order('sort', 'desc')->order('id','desc')->paginate(15); $tag_list = $this->city_model->where('name', 'like', "%" . $title . "%")->order('sort', 'desc')->order('id', 'desc')->paginate(15);
$this->assign("tag_list", $tag_list); $this->assign("tag_list", $tag_list);
return $this->fetch(''); return $this->fetch('');
} }
...@@ -324,7 +326,7 @@ class Project extends AuthBase ...@@ -324,7 +326,7 @@ class Project extends AuthBase
//添加城市 //添加城市
public function addCity() public function addCity()
{ {
$data = array( $data = array(
'name' => trim(input('post.name')), 'name' => trim(input('post.name')),
'sort' => input('post.sort', 0), 'sort' => input('post.sort', 0),
); );
...@@ -352,9 +354,9 @@ class Project extends AuthBase ...@@ -352,9 +354,9 @@ class Project extends AuthBase
//编辑城市 //编辑城市
public function updateCity() public function updateCity()
{ {
$id = input('post.id'); $id = input('post.id');
$data = array( $data = array(
'id' => $id, 'id' => $id,
'name' => trim(input('post.name')), 'name' => trim(input('post.name')),
'sort' => input('post.sort', 0) 'sort' => input('post.sort', 0)
); );
...@@ -374,7 +376,7 @@ class Project extends AuthBase ...@@ -374,7 +376,7 @@ class Project extends AuthBase
//删除城市 //删除城市
public function deleteCity() public function deleteCity()
{ {
$id = input('post.id'); $id = input('post.id');
$used = $this->project_model->where('city', $id)->count(); $used = $this->project_model->where('city', $id)->count();
if ($used > 0) { if ($used > 0) {
$this->error('该城市已在项目中引用,不可删除！', '', '', 1); $this->error('该城市已在项目中引用,不可删除！', '', '', 1);
...@@ -391,7 +393,7 @@ class Project extends AuthBase ...@@ -391,7 +393,7 @@ class Project extends AuthBase
// 分类管理 // 分类管理
public function catalogs() public function catalogs()
{ {
$title = input('get.name', ''); $title = input('get.name', '');
$tag_list = $this->catalog_model->where('name', 'like', "%" . $title . "%")->order('sort', 'asc')->paginate(15, false, ['query' => ['name' => $title]]); $tag_list = $this->catalog_model->where('name', 'like', "%" . $title . "%")->order('sort', 'asc')->paginate(15, false, ['query' => ['name' => $title]]);
$this->assign("tag_list", $tag_list); $this->assign("tag_list", $tag_list);
return $this->fetch(''); return $this->fetch('');
...@@ -401,9 +403,9 @@ class Project extends AuthBase ...@@ -401,9 +403,9 @@ class Project extends AuthBase
public function addCatalogs() public function addCatalogs()
{ {
if (request()->isPost()) { if (request()->isPost()) {
$data = array( $data = array(
'name' => trim(input('post.name')), 'name' => trim(input('post.name')),
'sort' => input('post.sort', 0), 'sort' => input('post.sort', 0),
'poster' => input('file.poster') 'poster' => input('file.poster')
); );
$validate = validate('Project'); $validate = validate('Project');
...@@ -417,7 +419,7 @@ class Project extends AuthBase ...@@ -417,7 +419,7 @@ class Project extends AuthBase
return view(); return view();
} }
$data['poster'] = $result['result']['url']; $data['poster'] = $result['result']['url'];
$res = $this->catalog_model->data($data)->save(); $res = $this->catalog_model->data($data)->save();
if (!$res) { if (!$res) {
$this->error('添加失败', $_SERVER["HTTP_REFERER"], '', 1); $this->error('添加失败', $_SERVER["HTTP_REFERER"], '', 1);
} else { } else {
...@@ -442,9 +444,9 @@ class Project extends AuthBase ...@@ -442,9 +444,9 @@ class Project extends AuthBase
//编辑分类 //编辑分类
public function updateCatalogs() public function updateCatalogs()
{ {
$id = input('post.id'); $id = input('post.id');
$data = array( $data = array(
'id' => $id, 'id' => $id,
'name' => trim(input('post.name')), 'name' => trim(input('post.name')),
'sort' => input('post.sort', 0) 'sort' => input('post.sort', 0)
); );
...@@ -474,7 +476,7 @@ class Project extends AuthBase ...@@ -474,7 +476,7 @@ class Project extends AuthBase
//删除分类 //删除分类
public function deleteCatalog() public function deleteCatalog()
{ {
$id = input('post.id'); $id = input('post.id');
$used = $this->project_model->where('catalog_id', $id)->count(); $used = $this->project_model->where('catalog_id', $id)->count();
if ($used > 0) { if ($used > 0) {
$this->error('该分类下有项目,不可删除！', '', '', 1); $this->error('该分类下有项目,不可删除！', '', '', 1);
...@@ -491,12 +493,12 @@ class Project extends AuthBase ...@@ -491,12 +493,12 @@ class Project extends AuthBase
// 处理删除某一张bannner图 // 处理删除某一张bannner图
public function deleteBanners() public function deleteBanners()
{ {
$id = input('post.id'); $id = input('post.id');
$address = input('post.address'); $address = input('post.address');
$project_info = $this->project_model->find($id); $project_info = $this->project_model->find($id);
$banners = json_decode($project_info['banners_native']); $banners = json_decode($project_info['banners_native']);
$new_banners = array_merge(array_diff($banners, array($address))); $new_banners = array_merge(array_diff($banners, array($address)));
$up_res = 0; $up_res = 0;
if ($new_banners != $banners) { if ($new_banners != $banners) {
$up_res = $this->project_model->save([ $up_res = $this->project_model->save([
'banners' => json_encode($new_banners) 'banners' => json_encode($new_banners)
...@@ -504,29 +506,30 @@ class Project extends AuthBase ...@@ -504,29 +506,30 @@ class Project extends AuthBase
} }
if ($up_res) { if ($up_res) {
return array( return array(
'success' => '成功删除该图', 'success' => '成功删除该图',
'data' => input('post.'), 'data' => input('post.'),
'old_banners' => $banners, 'old_banners' => $banners,
'new_banner' => $new_banners, 'new_banner' => $new_banners,
); );
} else { } else {
return array( return array(
'error' => '删除失败，该图片不存在或已经被删除', 'error' => '删除失败，该图片不存在或已经被删除',
'data' => input('post.'), 'data' => input('post.'),
'old_banners' => $banners, 'old_banners' => $banners,
'new_banner' => $new_banners, 'new_banner' => $new_banners,
); );
} }
} }
//设置置顶排序 //设置置顶排序
public function setHeat(){ public function setHeat()
{
$heat = input('post.heat'); $heat = input('post.heat');
$id = input('post.id'); $id = input('post.id');
$res = model('project')->save(['heat'=>$heat],['id'=>$id]); $res = model('project')->save(['heat' => $heat], ['id' => $id]);
if($res){ if ($res) {
$this->success('开启成功'); $this->success('开启成功');
}else{ } else {
$this->success('开启失败'); $this->success('开启失败');
} }
} }
...@@ -535,7 +538,7 @@ class Project extends AuthBase ...@@ -535,7 +538,7 @@ class Project extends AuthBase
public function setSort() public function setSort()
{ {
$project = new \app\common\model\Project(); $project = new \app\common\model\Project();
$project->allowField('id','sort')->update(input('post.')); $project->allowField('id', 'sort')->update(input('post.'));
halt($project->getLastSql()); halt($project->getLastSql());
} }
} }
application/admin/view/project/updateproject.html
...@@ -421,7 +421,7 @@ $(function(){ ...@@ -421,7 +421,7 @@ $(function(){
}); });
} else { } else {
showDialog("提示", data['msg'], function () { showDialog("提示", data['msg'], function () {
$("#btn-save").removeAttr("disabled"); // $("#btn-save").removeAttr("disabled");
}); });
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment