Commit a2a16aea by LiuJunYi

美行者BUG

parent f06a2356
...@@ -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);
...@@ -74,20 +74,21 @@ class Project extends AuthBase ...@@ -74,20 +74,21 @@ class Project extends AuthBase
$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'];
...@@ -96,8 +97,8 @@ class Project extends AuthBase ...@@ -96,8 +97,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]);
} }
} }
...@@ -122,6 +123,7 @@ class Project extends AuthBase ...@@ -122,6 +123,7 @@ class Project extends AuthBase
} }
} }
//删除项目、商家 //删除项目、商家
public function delete() public function delete()
{ {
...@@ -161,9 +163,9 @@ class Project extends AuthBase ...@@ -161,9 +163,9 @@ class Project extends AuthBase
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;
} }
} }
...@@ -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]);
} }
} }
...@@ -228,7 +230,7 @@ class Project extends AuthBase ...@@ -228,7 +230,7 @@ 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('');
} }
...@@ -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'];
...@@ -316,7 +318,7 @@ class Project extends AuthBase ...@@ -316,7 +318,7 @@ 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('');
} }
...@@ -520,13 +522,14 @@ class Project extends AuthBase ...@@ -520,13 +522,14 @@ class Project extends AuthBase
} }
//设置置顶排序 //设置置顶排序
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());
} }
} }
...@@ -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